[Phpgroupware-cvs] CVS: tts/inc functions.inc.php,1.37.2.2,1.37.2.3

[Mark A Peters <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        functions.inc.php 
Log Message:
GNU Patch #267.

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/tts/inc/functions.inc.php,v
retrieving revision 1.37.2.2
retrieving revision 1.37.2.3
diff -C2 -r1.37.2.2 -r1.37.2.3
*** functions.inc.php   12 Apr 2002 14:45:42 -0000      1.37.2.2
--- functions.inc.php   21 Apr 2002 16:48:17 -0000      1.37.2.3
***************
*** 40,56 ****
                        $group_id = $GLOBALS['phpgw']->db->f('ticket_group');
                        $group_name = 
$GLOBALS['phpgw']->accounts->id2name($group_id);
                        
                        // build subject
!                       $subject = '[TTS #'.$ticket_id.' '.$group_name.'] 
'.(($GLOBALS['phpgw']->db->f('ticket_status')!='X')?'Updated':'Closed').': 
'.$GLOBALS['phpgw']->db->f('ticket_subject');
  
                        // build body
                        $body  = '';
!                       $body .= 'TTS #'.$ticket_id."\n";
!                       $body .= 'Subject: 
'.$GLOBALS['phpgw']->db->f('ticket_subject')."\n";
!                       $body .= 'Assigned To: 
'.$GLOBALS['phpgw']->accounts->id2name($GLOBALS['phpgw']->db->f('ticket_assignedto'))."\n";
!                       $body .= 'Priority: 
'.$GLOBALS['phpgw']->db->f('ticket_priority')."\n";
!                       $body .= 'Group: '.$group_name."\n";
!                       $body .= 'Opened By: 
'.$GLOBALS['phpgw']->accounts->id2name($GLOBALS['phpgw']->db->f('ticket_owner'))."\n\n";
!                       $body .= "Latest Note Added:\n";
                        
/**************************************************************\
                        * Display latest note                                   
      *
--- 40,60 ----
                        $group_id = $GLOBALS['phpgw']->db->f('ticket_group');
                        $group_name = 
$GLOBALS['phpgw']->accounts->id2name($group_id);
+                       $t_subject = $GLOBALS['phpgw']->db->f('ticket_subject');
+                       $t_assigned = 
$GLOBALS['phpgw']->db->f('ticket_assignedto');
+                       $t_assigned_name = 
$GLOBALS['phpgw']->accounts->id2name($t_assignedto);
+                       $t_owner_name = 
$GLOBALS['phpgw']->accounts->id2name($GLOBALS['phpgw']->db->f('ticket_owner'));
                        
                        // build subject
!                       $subject = '['.lang('Ticket'.' #'.$ticket_id.' 
'.$group_name.'] 
'.lang(($GLOBALS['phpgw']->db->f('ticket_status')!='X')?'Updated':'Closed').': 
'.$GLOBALS['phpgw']->db->f('ticket_subject');
  
                        // build body
                        $body  = '';
!                       $body .= lang('Ticket').' #'.$ticket_id."\n";
!                       $body .= lang('Subject').': '.$t_subject."\n";
!                       $body .= lang('Assigned To').': '.$t_assigned_name."\n";
!                       $body .= lang('Priority').': 
'.$GLOBALS['phpgw']->db->f('ticket_priority')."\n";
!                       $body .= lang('Group').': '.$group_name."\n";
!                       $body .= lang('Opened By').': '.$t_owner_name."\n\n";
!                       $body .= lang('Latest Note Added').":\n";
                        
/**************************************************************\
                        * Display latest note                                   
      *
***************
*** 74,83 ****
                        if (! count($history_array))
                        {
!                               $latest_note="No notes for this ticket.\n";
                        }
                        
                        $body .= $latest_note;
  
!                       $body .= "\n\nOriginal Ticket 
Details:\n".$GLOBALS['phpgw']->db->f('ticket_details')."\n\n";
  
  
--- 78,87 ----
                        if (! count($history_array))
                        {
!                               $latest_note=lang('No notes for this 
ticket').".\n;
                        }
                        
                        $body .= $latest_note;
  
!                       $body .= "\n\n".lang('Original Ticket 
Details').":\n".$GLOBALS['phpgw']->db->f('ticket_details')."\n\n";
  
  
***************
*** 109,113 ****
                        {
                                // add assigned to recipients
!                               $members[] = array('account_id' => 
$GLOBALS['phpgw']->accounts->name2id($GLOBALS['phpgw']->db->f('t_assignedto')), 
'account_name' => $GLOBALS['phpgw']->db->f('t_assignedto'));
                        }
  
--- 113,117 ----
                        {
                                // add assigned to recipients
!                               $members[] = array('account_id' => $t_assigned, 
'account_name' => $t_assigned_name);
                        }
  
***************
*** 139,144 ****
                        if (!$rc)
                        {
!                               echo  'Your message could <B>not</B> be 
sent!<BR>'."\n"
!                                       . 'The mail server returned:<BR>'
                                        . "err_code: 
'".$GLOBALS['phpgw']->send->err['code']."';<BR>"
                                        . "err_msg: 
'".htmlspecialchars($GLOBALS['phpgw']->send->err['msg'])."';<BR>\n"
--- 143,148 ----
                        if (!$rc)
                        {
!                               echo  lang('Your message could <B>not</B> be 
sent!<BR>')."\n"
!                                       . lang('the mail server 
returned').':<BR>'
                                        . "err_code: 
'".$GLOBALS['phpgw']->send->err['code']."';<BR>"
                                        . "err_msg: 
'".htmlspecialchars($GLOBALS['phpgw']->send->err['msg'])."';<BR>\n"