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

[Sigurd Nes]

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

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

Modified: trunk/property/inc/class.botts.inc.php
===================================================================
--- trunk/property/inc/class.botts.inc.php      2012-05-09 13:05:04 UTC (rev 
9341)
+++ trunk/property/inc/class.botts.inc.php      2012-05-09 13:22:20 UTC (rev 
9342)
@@ -932,7 +932,10 @@
 
                        if ( (isset($ticket['send_mail']) && 
$ticket['send_mail']) 
                                || 
(isset($this->config->config_data['mailnotification'])
-                               && 
$this->config->config_data['mailnotification'])
+                                       && 
$this->config->config_data['mailnotification'])
+                               || 
(isset($GLOBALS['phpgw_info']['user']['preferences']['property']['tts_notify_me'])
+                                       && 
$GLOBALS['phpgw_info']['user']['preferences']['property']['tts_notify_me']==1
+                               )
                        )
                        {
                                $receipt_mail = 
$this->mail_ticket($receipt['id'],false,$receipt,$ticket['location_code']);

Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php      2012-05-09 13:05:04 UTC (rev 
9341)
+++ trunk/property/inc/class.uitts.inc.php      2012-05-09 13:22:20 UTC (rev 
9342)
@@ -296,7 +296,12 @@
                        }
 
                        $receipt        = 
$this->bo->update_status(array('status'=>$new_status),$id);
-                       if 
(isset($this->bo->config->config_data['mailnotification']) && 
$this->bo->config->config_data['mailnotification'])
+                       if 
((isset($this->bo->config->config_data['mailnotification']) && 
$this->bo->config->config_data['mailnotification'])
+                               || 
(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);
                        }
@@ -316,7 +321,12 @@
                        $ticket = $this->bo->read_single($id);
 
                        $receipt        = 
$this->bo->update_priority(array('priority'=>$new_priority),$id);
-                       if 
(isset($this->bo->config->config_data['mailnotification']) && 
$this->bo->config->config_data['mailnotification'])
+                       if 
((isset($this->bo->config->config_data['mailnotification']) && 
$this->bo->config->config_data['mailnotification'])
+                                       || 
(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);
                        }
@@ -3266,7 +3276,12 @@
                                $so     = CreateObject('property.sotts');
                                $so->acl_location       = '.ticket.external';
                                $receipt = $so->update_ticket($values,$id);
-                               if 
(isset($this->bo->config->config_data['mailnotification']) && 
$this->bo->config->config_data['mailnotification'])
+                               if 
((isset($this->bo->config->config_data['mailnotification']) && 
$this->bo->config->config_data['mailnotification'])
+                                       || 
(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, 
$so->fields_updated, $receipt);
                                }