[Phpgroupware-cvs] CVS: tts index.php,1.43.2.4,1.43.2.5

[Mark A Peters <address@hidden>]

Update of /cvsroot/phpgroupware/tts
In directory subversions:/tmp/cvs-serv30259/tts

Modified Files:
      Tag: Version-0_9_14-branch
        index.php 
Log Message:
GNU Patch #187 - Fix for GNU Bug#100597.

Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/tts/index.php,v
retrieving revision 1.43.2.4
retrieving revision 1.43.2.5
diff -C2 -r1.43.2.4 -r1.43.2.5
*** index.php   28 Jan 2002 18:34:16 -0000      1.43.2.4
--- index.php   24 Mar 2002 16:53:06 -0000      1.43.2.5
***************
*** 31,35 ****
        include('../header.inc.php');
  
!       $phpgw->historylog = createobject('phpgwapi.historylog','tts');
  
        $GLOBALS['phpgw']->template->set_file('index','index.tpl');
--- 31,35 ----
        include('../header.inc.php');
  
!       $GLOBALS['phpgw']->historylog = 
createobject('phpgwapi.historylog','tts');
  
        $GLOBALS['phpgw']->template->set_file('index','index.tpl');
***************
*** 106,110 ****
  
  
!       $db2 = $phpgw->db;
        $GLOBALS['phpgw']->db->query("select * from phpgw_tts_tickets 
$filtermethod $sortmethod",__LINE__,__FILE__);
        $numfound = $GLOBALS['phpgw']->db->num_rows();
--- 106,110 ----
  
  
!       $db2 = $GLOBALS['phpgw']->db;
        $GLOBALS['phpgw']->db->query("select * from phpgw_tts_tickets 
$filtermethod $sortmethod",__LINE__,__FILE__);
        $numfound = $GLOBALS['phpgw']->db->num_rows();
***************
*** 186,191 ****
                        }
  
!                       $db2->query("select count(*) from phpgw_tts_views where 
view_id='" . $phpgw->db->f('ticket_id')
!                               . "' and view_account_id='" . 
$phpgw_info['user']['account_id'] . "'",__LINE__,__FILE__);
                        $db2->next_record();
  
--- 186,191 ----
                        }
  
!                       $db2->query("select count(*) from phpgw_tts_views where 
view_id='" . $GLOBALS['phpgw']->db->f('ticket_id')
!                               . "' and view_account_id='" . 
$GLOBALS['phpgw_info']['user']['account_id'] . "'",__LINE__,__FILE__);
                        $db2->next_record();
  
***************
*** 202,206 ****
                        
$GLOBALS['phpgw']->template->set_var('tts_ticketdetails_link', 
$GLOBALS['phpgw']->link('/tts/viewticket_details.php','ticket_id=' . 
$GLOBALS['phpgw']->db->f('ticket_id')));
  
!                       
$GLOBALS['phpgw']->template->set_var('row_ticket_id','<a href="' . 
$phpgw->link('/tts/viewticket_details.php','ticket_id=' . 
$GLOBALS['phpgw']->db->f('ticket_id')) . '">' . 
$GLOBALS['phpgw']->db->f('ticket_id') . '</a>');
  
                        if (! $ticket_read)
--- 202,206 ----
                        
$GLOBALS['phpgw']->template->set_var('tts_ticketdetails_link', 
$GLOBALS['phpgw']->link('/tts/viewticket_details.php','ticket_id=' . 
$GLOBALS['phpgw']->db->f('ticket_id')));
  
!                       
$GLOBALS['phpgw']->template->set_var('row_ticket_id','<a href="' . 
$GLOBALS['phpgw']->link('/tts/viewticket_details.php','ticket_id=' . 
$GLOBALS['phpgw']->db->f('ticket_id')) . '">' . 
$GLOBALS['phpgw']->db->f('ticket_id') . '</a>');
  
                        if (! $ticket_read)
***************
*** 221,254 ****
                        
$GLOBALS['phpgw']->template->set_var('tts_t_priostr',$priostr );
  
!                       $cat_name   = 
$phpgw->categories->id2name($GLOBALS['phpgw']->db->f('ticket_category'));
                        
$GLOBALS['phpgw']->template->set_var('row_category',$cat_name);
  
!                       $group_name = 
$phpgw->accounts->id2name($GLOBALS['phpgw']->db->f('ticket_group'));
                        $group_name = ($group_name ? $group_name : '--');
                        
$GLOBALS['phpgw']->template->set_var('row_group',$group_name);
  
!                       
$GLOBALS['phpgw']->template->set_var('tts_t_assignedto', 
$GLOBALS['phpgw']->db->f('ticket_assignedto')?$phpgw->accounts->id2name($GLOBALS['phpgw']->db->f('ticket_assignedto')):lang('None'));
!                       
$GLOBALS['phpgw']->template->set_var('tts_t_user',$phpgw->accounts->id2name($phpgw->db->f('ticket_owner')));
  
!                       $history_values = 
$phpgw->historylog->return_array(array(),array('O'),'','',$phpgw->db->f('ticket_id'));
!                       
$GLOBALS['phpgw']->template->set_var('tts_t_timestampopened',$phpgw->common->show_date($history_values[0]['datetime']));
  
!                       if ($GLOBALS['phpgw']->db->f('ticket_status') == 'C')
                        {
! //                            
$timestampclosed=$GLOBALS['phpgw']->common->show_date($GLOBALS['phpgw']->db->f('t_timestamp_closed'));
!                               
$GLOBALS['phpgw']->template->set_var('tts_t_timestampclosed','Fix me!');
                                
$GLOBALS['phpgw']->template->parse('tts_col_status','tts_col_ifviewall',False);
                        }
                        elseif ($filter != 'viewopen')
                        {
!                               if 
($GLOBALS['phpgw']->db->f('ticket_assignedto') != -1)
!                               {
!                                       $assigned_to = lang('Not assigned');
!                               }
!                               else
!                               {
!                                       $assigned_to = 
$phpgw->accounts->id2name($GLOBALS['phpgw']->db->f('ticket_assignedto'));
!                               }
!                               
$GLOBALS['phpgw']->template->set_var('tts_t_timestampclosed',$assigned_to);
                                
$GLOBALS['phpgw']->template->parse('tts_col_status','tts_col_ifviewall',False);
                        }
--- 221,255 ----
                        
$GLOBALS['phpgw']->template->set_var('tts_t_priostr',$priostr );
  
!                       $cat_name   = 
$GLOBALS['phpgw']->categories->id2name($GLOBALS['phpgw']->db->f('ticket_category'));
                        
$GLOBALS['phpgw']->template->set_var('row_category',$cat_name);
  
!                       $group_name = 
$GLOBALS['phpgw']->accounts->id2name($GLOBALS['phpgw']->db->f('ticket_group'));
                        $group_name = ($group_name ? $group_name : '--');
                        
$GLOBALS['phpgw']->template->set_var('row_group',$group_name);
  
!                       
$GLOBALS['phpgw']->template->set_var('tts_t_assignedto', 
$GLOBALS['phpgw']->db->f('ticket_assignedto')?$GLOBALS['phpgw']->accounts->id2name($GLOBALS['phpgw']->db->f('ticket_assignedto')):lang('None'));
!                       
$GLOBALS['phpgw']->template->set_var('tts_t_user',$GLOBALS['phpgw']->accounts->id2name($GLOBALS['phpgw']->db->f('ticket_owner')));
  
!                       $history_values = 
$GLOBALS['phpgw']->historylog->return_array(array(),array('O'),'history_timestamp','ASC',$GLOBALS['phpgw']->db->f('ticket_id'));
!                       
$GLOBALS['phpgw']->template->set_var('tts_t_timestampopened',$GLOBALS['phpgw']->common->show_date($history_values[0]['datetime']));
  
!                       if ($GLOBALS['phpgw']->db->f('ticket_status') == 'X')
                        {
!                               $history_values = 
$GLOBALS['phpgw']->historylog->return_array(array(),array('X'),'history_timestamp','DESC',$GLOBALS['phpgw']->db->f('ticket_id'));
!                               
$GLOBALS['phpgw']->template->set_var('tts_t_timestampclosed',$GLOBALS['phpgw']->common->show_date($history_values[0]['datetime']));
                                
$GLOBALS['phpgw']->template->parse('tts_col_status','tts_col_ifviewall',False);
                        }
                        elseif ($filter != 'viewopen')
                        {
! //                            if 
($GLOBALS['phpgw']->db->f('ticket_assignedto') != -1)
! //                            {
! //                                    $assigned_to = lang('Not assigned');
! //                            }
! //                            else
! //                            {
! //                                    $assigned_to = 
$GLOBALS['phpgw']->accounts->id2name($GLOBALS['phpgw']->db->f('ticket_assignedto'));
! //                            }
! //                            
$GLOBALS['phpgw']->template->set_var('tts_t_timestampclosed',$assigned_to);
!                               
$GLOBALS['phpgw']->template->set_var('tts_t_timestampclosed','Open');
                                
$GLOBALS['phpgw']->template->parse('tts_col_status','tts_col_ifviewall',False);
                        }
***************
*** 269,271 ****
  
        $GLOBALS['phpgw']->common->phpgw_footer();
! ?>
\ No newline at end of file
--- 270,272 ----
  
        $GLOBALS['phpgw']->common->phpgw_footer();
! ?>