[Phpgroupware-cvs] CVS: property/inc class.uitts.inc.php,1.17,1.18

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv28736/inc

Modified Files:
        class.uitts.inc.php 
Log Message:
no message

Index: class.uitts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** class.uitts.inc.php 23 Apr 2003 07:21:34 -0000      1.17
--- class.uitts.inc.php 23 Apr 2003 15:21:20 -0000      1.18
***************
*** 75,80 ****
                                                                                
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 
'search_field'));
  
!                       $sub = get_var('sub',array('POST','GET'));
!                       $links = $this->bocommon->menu($sub);
  
  
--- 75,79 ----
                                                                                
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 
'search_field'));
  
!                       $links = $this->bocommon->menu();
  
  
***************
*** 120,124 ****
                                                                                
        'order' =>      $this->order,
                                                                                
        'extra'         => array('menuaction'   => 
$this->currentapp.'.uitts.index',
-                                                                               
                                                        'sub'           =>$sub,
                                                                                
                                                        'cat_id'        
=>$this->cat_id,
                                                                                
                                                        'filter'        
=>$this->filter,
--- 119,122 ----
***************
*** 135,139 ****
                                                                                
        'order' =>      $this->order,
                                                                                
        'extra'         => array('menuaction'   => 
$this->currentapp.'.uitts.index',
-                                                                               
                                                        'sub'           =>$sub,
                                                                                
                                                        'cat_id'        
=>$this->cat_id,
                                                                                
                                                        'filter'        
=>$this->filter,
--- 133,136 ----
***************
*** 156,160 ****
                                                                                
        'order' =>      $this->order,
                                                                                
        'extra'         => array('menuaction'   => 
$this->currentapp.'.uitts.index',
-                                                                               
                                                        'sub'           =>$sub,
                                                                                
                                                        'cat_id'        
=>$this->cat_id,
                                                                                
                                                        'filter'        
=>$this->filter,
--- 153,156 ----
***************
*** 168,172 ****
                                                                                
        'order' =>      $this->order,
                                                                                
        'extra'         => array('menuaction'   => 
$this->currentapp.'.uitts.index',
-                                                                               
                                                        'sub'           =>$sub,
                                                                                
                                                        'cat_id'        
=>$this->cat_id,
                                                                                
                                                        'filter'        
=>$this->filter,
--- 164,167 ----
***************
*** 181,185 ****
                                'lang_add'                              => 
lang('add'),
                                'lang_add_statustext'   => lang('add a ticket'),
!                               'add_action'                    => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitts.add&sub='
 . $sub)
                        );
  
--- 176,180 ----
                                'lang_add'                              => 
lang('add'),
                                'lang_add_statustext'   => lang('add a ticket'),
!                               'add_action'                    => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitts.add')
                        );
  
***************
*** 187,191 ****
                        (
                                'menuaction'    => 
$this->currentapp.'.uitts.index',
-                                               'sub'           =>$sub,
                                                'sort'          =>$this->sort,
                                                'order'         =>$this->order,
--- 182,185 ----
***************
*** 249,253 ****
  
                        $values         = get_var('values',array('POST'));
-                       $sub            = get_var('sub',array('POST','GET'));
  
                        if($values)
--- 243,246 ----
***************
*** 308,312 ****
                                        $receipt = $this->bo->add($values);
                                        
$GLOBALS['phpgw']->session->appsession('receipt',$this->currentapp,$receipt);
!                                       header('Location: '. 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitts.index&sub=ticket&order=id&sort=DESC'));
                                }
                        }
--- 301,305 ----
                                        $receipt = $this->bo->add($values);
                                        
$GLOBALS['phpgw']->session->appsession('receipt',$this->currentapp,$receipt);
!                                       header('Location: '. 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitts.index&order=id&sort=DESC'));
                                }
                        }
***************
*** 314,319 ****
                        $link_data = array
                        (
!                               'menuaction'    => 
$this->currentapp.'.uitts.add',
!                               'sub'                   => $sub
                        );
  
--- 307,311 ----
                        $link_data = array
                        (
!                               'menuaction'    => 
$this->currentapp.'.uitts.add'
                        );
  
***************
*** 338,342 ****
  
                                'form_action'                                   
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
!                               'done_action'                                   
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitts.index&sub='
 . $sub),
                                'lang_subject'                                  
=> lang('Subject'),
                                'lang_subject_statustext'               => 
lang('Enter the subject of this ticket'),
--- 330,334 ----
  
                                'form_action'                                   
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
!                               'done_action'                                   
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitts.index'),
                                'lang_subject'                                  
=> lang('Subject'),
                                'lang_subject_statustext'               => 
lang('Enter the subject of this ticket'),
***************
*** 410,414 ****
                {
                        $id = get_var('id',array('GET'));
-                       $sub = get_var('sub',array('POST','GET'));
                        $values = get_var('values',array('POST','GET'));
  
--- 402,405 ----
***************
*** 451,456 ****
                        (
                                'menuaction'    => 
$this->currentapp.'.uitts.view',
!                               'id'                    => $id,
!                               'sub'                   => 'tts'
                        );
  
--- 442,446 ----
                        (
                                'menuaction'    => 
$this->currentapp.'.uitts.view',
!                               'id'                    => $id
                        );
  
***************
*** 535,539 ****
  
                                'form_action'                                   
=> $GLOBALS['phpgw']->link('/index.php',$form_link),
!                               'done_action'                                   
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitts.index&sub='
 . $sub),
                                'value_subject'                                 
=> '[ #'. $id . ' ] - ' .$ticket['subject'],
  
--- 525,529 ----
  
                                'form_action'                                   
=> $GLOBALS['phpgw']->link('/index.php',$form_link),
!                               'done_action'                                   
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitts.index'),
                                'value_subject'                                 
=> '[ #'. $id . ' ] - ' .$ticket['subject'],