[Fmsystem-commits] [6468] Property: mail notification

[Sigurd Nes]

Revision: 6468
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6468
Author:   sigurdne
Date:     2010-10-11 11:25:35 +0000 (Mon, 11 Oct 2010)
Log Message:
-----------
Property: mail notification

Modified Paths:
--------------
    trunk/property/inc/class.uiproject.inc.php
    trunk/property/inc/class.uiworkorder.inc.php

Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php  2010-10-11 09:12:28 UTC (rev 
6467)
+++ trunk/property/inc/class.uiproject.inc.php  2010-10-11 11:25:35 UTC (rev 
6468)
@@ -1156,7 +1156,10 @@
 
                                                if 
(isset($receipt['notice_owner']) && is_array($receipt['notice_owner']) )
                                                {
-                                                       
if($this->account!=$values['coordinator'] && 
$config->config_data['mailnotification'])
+                                                       
if($this->account!=$values['coordinator']
+                                                        && 
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['notify_project_owner'])
 && 
$GLOBALS['phpgw_info']['user']['preferences']['property']['notify_project_owner']
+//                                                      && 
$config->config_data['mailnotification']
+                                                         )
                                                        {
                                                                
$prefs_coordinator = 
$this->bocommon->create_preferences('property',$values['coordinator']);
                                                                $to = 
$prefs_coordinator['email'];

Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php        2010-10-11 09:12:28 UTC 
(rev 6467)
+++ trunk/property/inc/class.uiworkorder.inc.php        2010-10-11 11:25:35 UTC 
(rev 6468)
@@ -1046,8 +1046,9 @@
                                        
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=> 
'property.uiworkorder.view', 'id'=>$id));
                                }
                                if (isset($receipt['notice_owner']) && 
is_array($receipt['notice_owner'])
-                                && $config->config_data['mailnotification'])
-//                              && 
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['notify_project_owner'])
 && 
$GLOBALS['phpgw_info']['user']['preferences']['property']['notify_project_owner'])
+//                                             && 
$config->config_data['mailnotification'])
+                                               && 
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['notify_project_owner'])
 && 
$GLOBALS['phpgw_info']['user']['preferences']['property']['notify_project_owner']
+                                       )
                                {
                                        
if($this->account!=$project['coordinator'] && 
$config->config_data['workorder_approval'])
                                        {