[Phpgroupware-cvs] CVS: netsaint/inc class.uinetsaint.inc.php,1.22,1.23 class.uinscontact.inc.php,1.23,1.24 class.uinshost.inc.php,1.33,1.34 class.uitimeperiod.inc.php,1.30,1.31

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/netsaint/inc
In directory subversions:/tmp/cvs-serv8185/inc

Modified Files:
        class.uinetsaint.inc.php class.uinscontact.inc.php 
        class.uinshost.inc.php class.uitimeperiod.inc.php 
Log Message:
update

Index: class.uinetsaint.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/netsaint/inc/class.uinetsaint.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** class.uinetsaint.inc.php    24 May 2002 23:57:32 -0000      1.22
--- class.uinetsaint.inc.php    13 Oct 2002 22:05:53 -0000      1.23
***************
*** 285,289 ****
                        $this->t->set_var('lang_action',lang('Services'));
                        
$this->t->set_var('cat_action',$phpgw->link('/index.php',$link_data));
!                       
$this->t->set_var('categories',$this->cats->formated_list('select','all',$this->cat_id,'True'));
                        
$this->t->set_var('filter_action',$phpgw->link('/index.php',$link_data));
                        
$this->t->set_var('filter_list',$this->nextmatchs->filter(1,1));
--- 285,289 ----
                        $this->t->set_var('lang_action',lang('Services'));
                        
$this->t->set_var('cat_action',$phpgw->link('/index.php',$link_data));
!                       
$this->t->set_var('categories',$this->cats->formatted_list('select','all',$this->cat_id,'True'));
                        
$this->t->set_var('filter_action',$phpgw->link('/index.php',$link_data));
                        
$this->t->set_var('filter_list',$this->nextmatchs->filter(1,1));
***************
*** 430,434 ****
                        }
                        
$this->t->set_var('cat_action',$phpgw->link('/index.php',$link_data));
!                       
$this->t->set_var('categories',$this->cats->formated_list('select','all',$this->cat_id,'True'));
                        
$this->t->set_var('filter_action',$phpgw->link('/index.php',$link_data));
                        
$this->t->set_var('filter_list',$this->nextmatchs->filter(1,1));
--- 430,434 ----
                        }
                        
$this->t->set_var('cat_action',$phpgw->link('/index.php',$link_data));
!                       
$this->t->set_var('categories',$this->cats->formatted_list('select','all',$this->cat_id,'True'));
                        
$this->t->set_var('filter_action',$phpgw->link('/index.php',$link_data));
                        
$this->t->set_var('filter_list',$this->nextmatchs->filter(1,1));
***************
*** 588,592 ****
                        $this->t->set_var('lang_action',lang('Commands'));
                        
$this->t->set_var('cat_action',$phpgw->link('/index.php',$link_data));
!                       
$this->t->set_var('categories',$this->cats->formated_list('select','all',$this->cat_id,'True'));
  /*                    
$this->t->set_var('filter_action',$phpgw->link('/index.php',$link_data));
                        
$this->t->set_var('filter_list',$this->nextmatchs->filter(1,1)); */
--- 588,592 ----
                        $this->t->set_var('lang_action',lang('Commands'));
                        
$this->t->set_var('cat_action',$phpgw->link('/index.php',$link_data));
!                       
$this->t->set_var('categories',$this->cats->formatted_list('select','all',$this->cat_id,'True'));
  /*                    
$this->t->set_var('filter_action',$phpgw->link('/index.php',$link_data));
                        
$this->t->set_var('filter_list',$this->nextmatchs->filter(1,1)); */
***************
*** 733,737 ****
                        $this->t->set_var('lang_action',lang('Add service'));
  
!                       
$this->t->set_var('cats_list',$this->cats->formated_list('select','all',$cat_id,True));
  
                        $this->t->set_var('event_list','');
--- 733,737 ----
                        $this->t->set_var('lang_action',lang('Add service'));
  
!                       
$this->t->set_var('cats_list',$this->cats->formatted_list('select','all',$cat_id,True));
  
                        $this->t->set_var('event_list','');
***************
*** 812,816 ****
                        $this->t->set_var('lang_action',lang('Add command'));
  
!                       
$this->t->set_var('cats_list',$this->cats->formated_list('select','all',$cat_id,True));
                        $this->t->set_var('enabled','<input type="checkbox" 
name="values[enabled]" value="True"' . ($values['enabled'] == '1'?' 
checked':'') . '>');
                        $this->t->set_var('line',$values['line']);
--- 812,816 ----
                        $this->t->set_var('lang_action',lang('Add command'));
  
!                       
$this->t->set_var('cats_list',$this->cats->formatted_list('select','all',$cat_id,True));
                        $this->t->set_var('enabled','<input type="checkbox" 
name="values[enabled]" value="True"' . ($values['enabled'] == '1'?' 
checked':'') . '>');
                        $this->t->set_var('line',$values['line']);
***************
*** 911,915 ****
                        }
  
!                       
$this->t->set_var('cats_list',$this->cats->formated_list('select','all',$cat_id,True));
                        $this->t->set_var('access','<input type="checkbox" 
name="values[access]" value="True"' . ($values['access'] == 'private'?' 
checked':'') . '>');
  
--- 911,915 ----
                        }
  
!                       
$this->t->set_var('cats_list',$this->cats->formatted_list('select','all',$cat_id,True));
                        $this->t->set_var('access','<input type="checkbox" 
name="values[access]" value="True"' . ($values['access'] == 'private'?' 
checked':'') . '>');
  
***************
*** 996,1000 ****
                        }
  
!                       
$this->t->set_var('cats_list',$this->cats->formated_list('select','all',$cat_id,True));
                        $this->t->set_var('access','<input type="checkbox" 
name="values[access]" value="True"' . ($values['access'] == 'private'?' 
checked':'') . '>');
  
--- 996,1000 ----
                        }
  
!                       
$this->t->set_var('cats_list',$this->cats->formatted_list('select','all',$cat_id,True));
                        $this->t->set_var('access','<input type="checkbox" 
name="values[access]" value="True"' . ($values['access'] == 'private'?' 
checked':'') . '>');
  
***************
*** 1071,1075 ****
                        
$this->t->set_var('actionurl',$phpgw->link('/index.php',$link_data));
                        $this->t->set_var('lang_action',lang('Edit service'));
!                       
$this->t->set_var('cats_list',$this->cats->formated_list('select','all',$values['cat'],True));
  
                        $this->t->set_var('event_list','');
--- 1071,1075 ----
                        
$this->t->set_var('actionurl',$phpgw->link('/index.php',$link_data));
                        $this->t->set_var('lang_action',lang('Edit service'));
!                       
$this->t->set_var('cats_list',$this->cats->formatted_list('select','all',$values['cat'],True));
  
                        $this->t->set_var('event_list','');
***************
*** 1162,1166 ****
                        
$this->t->set_var('actionurl',$phpgw->link('/index.php',$link_data));
                        $this->t->set_var('lang_action',lang('Edit command'));
!                       
$this->t->set_var('cats_list',$this->cats->formated_list('select','all',$values['cat'],True));
                        $this->t->set_var('enabled','<input type="checkbox" 
name="values[enabled]" value="True"' . ($values['enabled'] == '1'?' 
checked':'') . '>');
                        
$this->t->set_var('co_name',$phpgw->strip_html($values['name']));
--- 1162,1166 ----
                        
$this->t->set_var('actionurl',$phpgw->link('/index.php',$link_data));
                        $this->t->set_var('lang_action',lang('Edit command'));
!                       
$this->t->set_var('cats_list',$this->cats->formatted_list('select','all',$values['cat'],True));
                        $this->t->set_var('enabled','<input type="checkbox" 
name="values[enabled]" value="True"' . ($values['enabled'] == '1'?' 
checked':'') . '>');
                        
$this->t->set_var('co_name',$phpgw->strip_html($values['name']));

Index: class.uinscontact.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/netsaint/inc/class.uinscontact.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** class.uinscontact.inc.php   24 May 2002 23:57:32 -0000      1.23
--- class.uinscontact.inc.php   13 Oct 2002 22:05:53 -0000      1.24
***************
*** 251,255 ****
  
                        
$this->t->set_var('cat_action',$phpgw->link('/index.php',$link_data));
!                       
$this->t->set_var('categories',$c->formated_list('select','all',$cat_id,'True'));
                        
$this->t->set_var('filter_action',$phpgw->link('/index.php',$link_data));
                        
$this->t->set_var('filter_list',$this->nextmatchs->filter(1,1));
--- 251,255 ----
  
                        
$this->t->set_var('cat_action',$phpgw->link('/index.php',$link_data));
!                       
$this->t->set_var('categories',$c->formatted_list('select','all',$cat_id,'True'));
                        
$this->t->set_var('filter_action',$phpgw->link('/index.php',$link_data));
                        
$this->t->set_var('filter_list',$this->nextmatchs->filter(1,1));
***************
*** 338,342 ****
                        $this->t->set_var('lang_action',lang('Contacts'));
                        
$this->t->set_var('cat_action',$phpgw->link('/index.php',$link_data));
!                       
$this->t->set_var('categories',$this->cats->formated_list('select','all',$this->cat_id,'True'));
                        
$this->t->set_var('filter_action',$phpgw->link('/index.php',$link_data));
                        
$this->t->set_var('filter_list',$this->nextmatchs->filter(1,1));
--- 338,342 ----
                        $this->t->set_var('lang_action',lang('Contacts'));
                        
$this->t->set_var('cat_action',$phpgw->link('/index.php',$link_data));
!                       
$this->t->set_var('categories',$this->cats->formatted_list('select','all',$this->cat_id,'True'));
                        
$this->t->set_var('filter_action',$phpgw->link('/index.php',$link_data));
                        
$this->t->set_var('filter_list',$this->nextmatchs->filter(1,1));
***************
*** 521,525 ****
                        $this->t->set_var('lang_action',lang('Add contact'));
  
!                       
$this->t->set_var('cats_list',$this->cats->formated_list('select','all',$cat_id,True));
  
                        
$this->t->set_var('service_comand_list',$this->bonetsaint->select_comand_list('snot_enabled',$snot));
--- 521,525 ----
                        $this->t->set_var('lang_action',lang('Add contact'));
  
!                       
$this->t->set_var('cats_list',$this->cats->formatted_list('select','all',$cat_id,True));
  
                        
$this->t->set_var('service_comand_list',$this->bonetsaint->select_comand_list('snot_enabled',$snot));
***************
*** 658,662 ****
                        $this->t->set_var('lang_action',lang('Edit contact'));
                        
$this->t->set_var('addressbook_link',$phpgw->link('/index.php','menuaction=netsaint.uinscontact.abook'));
!                       
$this->t->set_var('cats_list',$this->cats->formated_list('select','all',$values['cat'],True));
  
                        $saved_snot = 
explode(',',$phpgw->strip_html($values['s_comand']));
--- 658,662 ----
                        $this->t->set_var('lang_action',lang('Edit contact'));
                        
$this->t->set_var('addressbook_link',$phpgw->link('/index.php','menuaction=netsaint.uinscontact.abook'));
!                       
$this->t->set_var('cats_list',$this->cats->formatted_list('select','all',$values['cat'],True));
  
                        $saved_snot = 
explode(',',$phpgw->strip_html($values['s_comand']));
***************
*** 926,930 ****
                        $this->t->set_var('lang_action',lang('Contact groups'));
                        
$this->t->set_var('cat_action',$phpgw->link('/index.php',$link_data));
!                       
$this->t->set_var('categories',$this->cats->formated_list('select','all',$this->cat_id,'True'));
                        
$this->t->set_var('filter_action',$phpgw->link('/index.php',$link_data));
                        
$this->t->set_var('filter_list',$this->nextmatchs->filter(1,1));
--- 926,930 ----
                        $this->t->set_var('lang_action',lang('Contact groups'));
                        
$this->t->set_var('cat_action',$phpgw->link('/index.php',$link_data));
!                       
$this->t->set_var('categories',$this->cats->formatted_list('select','all',$this->cat_id,'True'));
                        
$this->t->set_var('filter_action',$phpgw->link('/index.php',$link_data));
                        
$this->t->set_var('filter_list',$this->nextmatchs->filter(1,1));
***************
*** 1083,1087 ****
                        
$this->t->set_var('actionurl',$phpgw->link('/index.php',$link_data));
                        $this->t->set_var('lang_action',lang('Add 
contactgroup'));
!                       
$this->t->set_var('cats_list',$this->cats->formated_list('select','all',$cat_id,True));
  
                        
$this->t->set_var('contact_list',$this->bonscontact->select_contact_list('contact',$contacts));
--- 1083,1087 ----
                        
$this->t->set_var('actionurl',$phpgw->link('/index.php',$link_data));
                        $this->t->set_var('lang_action',lang('Add 
contactgroup'));
!                       
$this->t->set_var('cats_list',$this->cats->formatted_list('select','all',$cat_id,True));
  
                        
$this->t->set_var('contact_list',$this->bonscontact->select_contact_list('contact',$contacts));
***************
*** 1153,1157 ****
                        
$this->t->set_var('actionurl',$phpgw->link('/index.php',$link_data));
                        $this->t->set_var('lang_action',lang('Edit 
contactgroup'));
!                       
$this->t->set_var('cats_list',$this->cats->formated_list('select','all',$values['cat'],True));
  
                        $saved_contacts = 
explode(',',$phpgw->strip_html($values['contacts']));
--- 1153,1157 ----
                        
$this->t->set_var('actionurl',$phpgw->link('/index.php',$link_data));
                        $this->t->set_var('lang_action',lang('Edit 
contactgroup'));
!                       
$this->t->set_var('cats_list',$this->cats->formatted_list('select','all',$values['cat'],True));
  
                        $saved_contacts = 
explode(',',$phpgw->strip_html($values['contacts']));

Index: class.uinshost.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/netsaint/inc/class.uinshost.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** class.uinshost.inc.php      24 May 2002 23:57:32 -0000      1.33
--- class.uinshost.inc.php      13 Oct 2002 22:05:53 -0000      1.34
***************
*** 223,227 ****
                        $this->t->set_var('lang_action',lang('Hosts'));
                        
$this->t->set_var('cat_action',$phpgw->link('/index.php',$link_data));
!                       
$this->t->set_var('categories',$this->cats->formated_list('select','all',$this->cat_id,'True'));
                        
$this->t->set_var('filter_action',$phpgw->link('/index.php',$link_data));
                        
$this->t->set_var('filter_list',$this->nextmatchs->filter(1,1));
--- 223,227 ----
                        $this->t->set_var('lang_action',lang('Hosts'));
                        
$this->t->set_var('cat_action',$phpgw->link('/index.php',$link_data));
!                       
$this->t->set_var('categories',$this->cats->formatted_list('select','all',$this->cat_id,'True'));
                        
$this->t->set_var('filter_action',$phpgw->link('/index.php',$link_data));
                        
$this->t->set_var('filter_list',$this->nextmatchs->filter(1,1));
***************
*** 377,381 ****
                        
$this->t->set_var('actionurl',$phpgw->link('/index.php',$link_data));
                        $this->t->set_var('lang_action',lang('Add host'));
!                       
$this->t->set_var('cats_list',$this->cats->formated_list('select','all',$cat_id,True));
                        
$this->t->set_var('parent_list',$this->bonshost->select_host_list($hosts));
                        
$this->t->set_var('comand_list',$this->bonetsaint->select_comand_list('com_enabled',$values['comand']));
--- 377,381 ----
                        
$this->t->set_var('actionurl',$phpgw->link('/index.php',$link_data));
                        $this->t->set_var('lang_action',lang('Add host'));
!                       
$this->t->set_var('cats_list',$this->cats->formatted_list('select','all',$cat_id,True));
                        
$this->t->set_var('parent_list',$this->bonshost->select_host_list($hosts));
                        
$this->t->set_var('comand_list',$this->bonetsaint->select_comand_list('com_enabled',$values['comand']));
***************
*** 457,461 ****
                        
$this->t->set_var('actionurl',$phpgw->link('/index.php',$link_data));
                        $this->t->set_var('lang_action',lang('Edit host'));
!                       
$this->t->set_var('cats_list',$this->cats->formated_list('select','all',$values['cat'],True));
  
                        $saved_hosts = 
explode(',',$phpgw->strip_html($values['parent']));
--- 457,461 ----
                        
$this->t->set_var('actionurl',$phpgw->link('/index.php',$link_data));
                        $this->t->set_var('lang_action',lang('Edit host'));
!                       
$this->t->set_var('cats_list',$this->cats->formatted_list('select','all',$values['cat'],True));
  
                        $saved_hosts = 
explode(',',$phpgw->strip_html($values['parent']));
***************
*** 660,664 ****
                        $this->t->set_var('lang_action',lang('Host groups'));
                        
$this->t->set_var('cat_action',$phpgw->link('/index.php',$link_data));
!                       
$this->t->set_var('categories',$this->cats->formated_list('select','all',$this->cat_id,'True'));
                        
$this->t->set_var('filter_action',$phpgw->link('/index.php',$link_data));
                        
$this->t->set_var('filter_list',$this->nextmatchs->filter(1,1));
--- 660,664 ----
                        $this->t->set_var('lang_action',lang('Host groups'));
                        
$this->t->set_var('cat_action',$phpgw->link('/index.php',$link_data));
!                       
$this->t->set_var('categories',$this->cats->formatted_list('select','all',$this->cat_id,'True'));
                        
$this->t->set_var('filter_action',$phpgw->link('/index.php',$link_data));
                        
$this->t->set_var('filter_list',$this->nextmatchs->filter(1,1));
***************
*** 822,826 ****
                        
$this->t->set_var('actionurl',$phpgw->link('/index.php',$link_data));
                        $this->t->set_var('lang_action',lang('Add hostgroup'));
!                       
$this->t->set_var('cats_list',$this->cats->formated_list('select','all',$cat_id,True));
  
                        
$this->t->set_var('contact_list',$this->bonscontact->select_contact_list('cg',$cg));
--- 822,826 ----
                        
$this->t->set_var('actionurl',$phpgw->link('/index.php',$link_data));
                        $this->t->set_var('lang_action',lang('Add hostgroup'));
!                       
$this->t->set_var('cats_list',$this->cats->formatted_list('select','all',$cat_id,True));
  
                        
$this->t->set_var('contact_list',$this->bonscontact->select_contact_list('cg',$cg));
***************
*** 898,902 ****
                        
$this->t->set_var('actionurl',$phpgw->link('/index.php',$link_data));
                        $this->t->set_var('lang_action',lang('Edit hostgroup'));
!                       
$this->t->set_var('cats_list',$this->cats->formated_list('select','all',$values['cat'],True));
  
                        $saved_hosts = 
explode(',',$phpgw->strip_html($values['hosts']));
--- 898,902 ----
                        
$this->t->set_var('actionurl',$phpgw->link('/index.php',$link_data));
                        $this->t->set_var('lang_action',lang('Edit hostgroup'));
!                       
$this->t->set_var('cats_list',$this->cats->formatted_list('select','all',$values['cat'],True));
  
                        $saved_hosts = 
explode(',',$phpgw->strip_html($values['hosts']));

Index: class.uitimeperiod.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/netsaint/inc/class.uitimeperiod.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** class.uitimeperiod.inc.php  24 May 2002 23:57:32 -0000      1.30
--- class.uitimeperiod.inc.php  13 Oct 2002 22:05:53 -0000      1.31
***************
*** 219,223 ****
                        $this->t->set_var('lang_action',lang('Time periods'));
                        
$this->t->set_var('cat_action',$phpgw->link('/index.php',$link_data));
!                       
$this->t->set_var('categories',$this->cats->formated_list('select','all',$this->cat_id,'True'));
                        
$this->t->set_var('filter_action',$phpgw->link('/index.php',$link_data));
                        
$this->t->set_var('filter_list',$this->nextmatchs->filter(1,1));
--- 219,223 ----
                        $this->t->set_var('lang_action',lang('Time periods'));
                        
$this->t->set_var('cat_action',$phpgw->link('/index.php',$link_data));
!                       
$this->t->set_var('categories',$this->cats->formatted_list('select','all',$this->cat_id,'True'));
                        
$this->t->set_var('filter_action',$phpgw->link('/index.php',$link_data));
                        
$this->t->set_var('filter_list',$this->nextmatchs->filter(1,1));
***************
*** 455,459 ****
  
                        $this->t->set_var('lang_action',lang('Add time 
period'));
!                       
$this->t->set_var('cats_list',$this->cats->formated_list('select','all',$cat_id,True));
  
                        $this->t->set_var('access','<input type="checkbox" 
name="values[access]" value="True"' . ($values['access'] == 'private'?' 
checked':'') . '>');
--- 455,459 ----
  
                        $this->t->set_var('lang_action',lang('Add time 
period'));
!                       
$this->t->set_var('cats_list',$this->cats->formatted_list('select','all',$cat_id,True));
  
                        $this->t->set_var('access','<input type="checkbox" 
name="values[access]" value="True"' . ($values['access'] == 'private'?' 
checked':'') . '>');
***************
*** 619,623 ****
                        $values = $this->botimeperiod->read_single_tp($tp_id);
  
!                       
$this->t->set_var('cats_list',$this->cats->formated_list('select','all',$values['cat'],True));
  
                        $this->t->set_var('access','<input type="checkbox" 
name="values[access]" value="True"' . ($values['access'] == 'private'?' 
checked':'') . '>');
--- 619,623 ----
                        $values = $this->botimeperiod->read_single_tp($tp_id);
  
!                       
$this->t->set_var('cats_list',$this->cats->formatted_list('select','all',$values['cat'],True));
  
                        $this->t->set_var('access','<input type="checkbox" 
name="values[access]" value="True"' . ($values['access'] == 'private'?' 
checked':'') . '>');