[Fmsystem-commits] [16761] more on helpdesk

[sigurdne]

Revision: 16761
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16761
Author:   sigurdne
Date:     2017-05-20 14:04:45 -0400 (Sat, 20 May 2017)
Log Message:
-----------
more on helpdesk

Modified Paths:
--------------
    trunk/helpdesk/inc/class.botts.inc.php
    trunk/helpdesk/inc/class.uitts.inc.php
    trunk/helpdesk/setup/phpgw_no.lang
    trunk/helpdesk/templates/base/config.tpl

Modified: trunk/helpdesk/inc/class.botts.inc.php
===================================================================
--- trunk/helpdesk/inc/class.botts.inc.php      2017-05-20 04:43:29 UTC (rev 
16760)
+++ trunk/helpdesk/inc/class.botts.inc.php      2017-05-20 18:04:45 UTC (rev 
16761)
@@ -702,7 +702,7 @@
                        if ((isset($data['send_mail']) && $data['send_mail']) 
|| (isset($this->config->config_data['mailnotification']) && 
$this->config->config_data['mailnotification'])
                        )
                        {
-                               $receipt_mail = 
$this->mail_ticket($receipt['id'], false, $receipt, $data['location_code'], 
false, isset($data['send_mail']) && $data['send_mail'] ? true : false);
+                               $receipt_mail = 
$this->mail_ticket($receipt['id'], false, $receipt, false, 
isset($data['send_mail']) && $data['send_mail'] ? true : false);
                        }
 
                        reset($custom_functions);
@@ -768,7 +768,7 @@
                        return $address_element;
                }
 
-               function mail_ticket($id, $fields_updated, $receipt = 
array(),$location_code='', $get_message = false)
+               function mail_ticket($id, $fields_updated, $receipt = array(), 
$get_message = false)
                {
                        $log_recipients = array();
                        $this->send                     = 
CreateObject('phpgwapi.send');
@@ -789,7 +789,7 @@
                        $group_name= 
$GLOBALS['phpgw']->accounts->id2name($ticket['group_id']);
 
                        // build subject
-                       $subject = '['.lang('Ticket').' #'.$id.'] : ' . 
$location_code .' ' .$this->get_category_name($ticket['cat_id']) . '; ' 
.$ticket['subject'];
+                       $subject = '['.lang('Ticket').' #'.$id.'] : ' . 
$this->get_category_name($ticket['cat_id']) . '; ' .$ticket['subject'];
 
                        $prefs_user = 
$this->bocommon->create_preferences('helpdesk',$ticket['user_id']);
 
@@ -815,12 +815,22 @@
                        {
                                $GLOBALS['phpgw_info']['server']['enforce_ssl'] 
= true;
                        }
+
+                       $link_text = lang('Ticket') . ' #' . $id ;
+
+                       $messages_sendt = 
$this->historylog->return_array(array(),array('M'),'history_timestamp','DESC',$id);
+
+                       if(!$get_message && 
!empty($this->config->config_data['update_message']) && $messages_sendt)
+                       {
+                               $link_text = 
"<H2>{$this->config->config_data['update_message']}</H2>";
+                       }
+
                        $body = '<a href ="' . 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'helpdesk.uitts.view',
-                                       'id' => $id), false, true) . '">' . 
lang('Ticket') . ' #' . $id . '</a>' . "\n";
+                                       'id' => $id), false, true) . '">' . 
$link_text . '</a>' . "\n";
 
                        $body .= "<table>";
                        $body .= '<tr><td>'. lang('Date 
Opened').'</td><td>:&nbsp;'.$entry_date."</td></tr>";
-                       $body .= '<tr><td>'. 
lang('status').'</td><td>:&nbsp;'.$status_text[$ticket['status']]."</td></tr>";
+                       $body .= '<tr><td>'. 
lang('status').'</td><td>:&nbsp;<b>'.$status_text[$ticket['status']]."</b></td></tr>";
                        $body .= '<tr><td>'. 
lang('Category').'</td><td>:&nbsp;'. 
$this->get_category_name($ticket['cat_id']) ."</td></tr>";
 
                        $body .= '<tr><td>'. lang('Assigned 
To').'</td><td>:&nbsp;'.$GLOBALS['phpgw']->accounts->id2name($ticket['assignedto'])."</td></tr>";

Modified: trunk/helpdesk/inc/class.uitts.inc.php
===================================================================
--- trunk/helpdesk/inc/class.uitts.inc.php      2017-05-20 04:43:29 UTC (rev 
16760)
+++ trunk/helpdesk/inc/class.uitts.inc.php      2017-05-20 18:04:45 UTC (rev 
16761)
@@ -313,7 +313,7 @@
                        $GLOBALS['phpgw_info']['flags']['xslt_app'] = false;
                        $id = phpgw::get_var('id', 'int');
 
-                       $ticket_html = $this->bo->mail_ticket($id, 
$fields_updated = true, $receipt = array(), $location_code = '', $get_message = 
true);
+                       $ticket_html = $this->bo->mail_ticket($id, 
$fields_updated = true, $receipt = array(), $get_message = true);
 
                        $ticket = $this->bo->read_single($id);
 
@@ -1688,7 +1688,7 @@
                                        )
                                )
                                {
-                                       $receipt = $this->bo->mail_ticket($id, 
$this->bo->fields_updated, $receipt, '', false, isset($values['send_mail']) && 
$values['send_mail'] ? true : false);
+                                       $receipt = $this->bo->mail_ticket($id, 
$this->bo->fields_updated, $receipt, false, isset($values['send_mail']) && 
$values['send_mail'] ? true : false);
                                }
 
                                //--------- files

Modified: trunk/helpdesk/setup/phpgw_no.lang
===================================================================
--- trunk/helpdesk/setup/phpgw_no.lang  2017-05-20 04:43:29 UTC (rev 16760)
+++ trunk/helpdesk/setup/phpgw_no.lang  2017-05-20 18:04:45 UTC (rev 16761)
@@ -201,4 +201,5 @@
 sent   helpdesk        no      Sendt
 generic        helpdesk        no      Generelt
 reverse        helpdesk        no      Revers tildeling
-owned by       helpdesk        no      Eies av
\ No newline at end of file
+owned by       helpdesk        no      Eies av
+update message helpdesk        no      Oppdateringsmelding
\ No newline at end of file

Modified: trunk/helpdesk/templates/base/config.tpl
===================================================================
--- trunk/helpdesk/templates/base/config.tpl    2017-05-20 04:43:29 UTC (rev 
16760)
+++ trunk/helpdesk/templates/base/config.tpl    2017-05-20 18:04:45 UTC (rev 
16761)
@@ -20,6 +20,10 @@
                        <td><input name="newsettings[app_name]" 
value="{value_app_name}"></td>
                </tr>
                <tr>
+                       <td>{lang_update_message}: </td>
+                       <td><input name="newsettings[update_message]" 
value="{value_update_message}"></td>
+               </tr>
+               <tr>
                        <td>{lang_from_email}: <br>
                        <td><input name="newsettings[from_email]" 
value="{value_from_email}"></td>
                </tr>