[Fmsystem-commits] [16468] helpdesk: correct notification

[sigurdne]

Revision: 16468
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16468
Author:   sigurdne
Date:     2017-03-23 10:33:03 -0400 (Thu, 23 Mar 2017)
Log Message:
-----------
helpdesk: correct notification

Modified Paths:
--------------
    trunk/helpdesk/inc/class.botts.inc.php

Modified: trunk/helpdesk/inc/class.botts.inc.php
===================================================================
--- trunk/helpdesk/inc/class.botts.inc.php      2017-03-23 03:24:27 UTC (rev 
16467)
+++ trunk/helpdesk/inc/class.botts.inc.php      2017-03-23 14:33:03 UTC (rev 
16468)
@@ -802,6 +802,13 @@
                        //-----------from--------
 
                        $current_prefs_user = 
$this->bocommon->create_preferences('helpdesk',$GLOBALS['phpgw_info']['user']['account_id']);
+
+                       if(!$current_prefs_user['email'])
+                       {
+                               $email_domain = 
!empty($GLOBALS['phpgw_info']['server']['email_domain']) ? 
$GLOBALS['phpgw_info']['server']['email_domain'] : 'bergen.kommune.no';
+                               $current_prefs_user['email'] = 
"{$GLOBALS['phpgw_info']['user']['account_lid'address@hidden";
+                       }
+
                        $current_user_address = 
"{$GLOBALS['phpgw_info']['user']['fullname']}<{$current_prefs_user['email']}>";
 
                        //-----------from--------
@@ -943,7 +950,7 @@
 
                        $notify_list = execMethod('property.notify.read', array
                                (
-                               'location_id' => 
$GLOBALS['phpgw']->locations->get_id('property', $this->acl_location),
+                               'location_id' => 
$GLOBALS['phpgw']->locations->get_id('helpdesk', $this->acl_location),
                                'location_item_id' => $id
                                )
                        );