[Fmsystem-commits] [9341] property: notify by changes

[Sigurd Nes]

Revision: 9341
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9341
Author:   sigurdne
Date:     2012-05-09 13:05:04 +0000 (Wed, 09 May 2012)
Log Message:
-----------
property: notify by changes

Modified Paths:
--------------
    trunk/property/inc/class.uitts.inc.php
    trunk/property/inc/hook_settings.inc.php

Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php      2012-05-09 12:45:33 UTC (rev 
9340)
+++ trunk/property/inc/class.uitts.inc.php      2012-05-09 13:05:04 UTC (rev 
9341)
@@ -2368,9 +2368,14 @@
 
                                if ( (isset($values['send_mail']) && 
$values['send_mail']) 
                                        || 
(isset($this->bo->config->config_data['mailnotification'])
-                                       && 
$this->bo->config->config_data['mailnotification']
-                                       && $this->bo->fields_updated
-                               ))
+                                               && 
$this->bo->config->config_data['mailnotification']
+                                               && $this->bo->fields_updated
+                                               )
+                                       || 
(isset($GLOBALS['phpgw_info']['user']['preferences']['property']['tts_notify_me'])
+                                               && 
$GLOBALS['phpgw_info']['user']['preferences']['property']['tts_notify_me']==1
+                                               && $this->bo->fields_updated
+                                               )
+                               )
                                {
                                        $receipt = $this->bo->mail_ticket($id, 
$this->bo->fields_updated, $receipt);
                                }

Modified: trunk/property/inc/hook_settings.inc.php
===================================================================
--- trunk/property/inc/hook_settings.inc.php    2012-05-09 12:45:33 UTC (rev 
9340)
+++ trunk/property/inc/hook_settings.inc.php    2012-05-09 13:05:04 UTC (rev 
9341)
@@ -181,7 +181,7 @@
                '2' => 'No'
        );
 
-       create_select_box('Notify me by mail when assigned a 
ticket','tts_notify_me',$yes_and_no,'');
+       create_select_box('Notify me by mail when ticket is assigned or 
altered','tts_notify_me',$yes_and_no,'');
        create_select_box('Send e-mail from 
TTS','tts_user_mailnotification',$yes_and_no,'Send e-mail from TTS as default');
        create_input_box('Refresh TTS every (seconds)','refreshinterval','The 
intervall for Helpdesk refresh - cheking for new tickets');