[Fmsystem-commits] [16010] use fall-back-email domain

[sigurdne]

Revision: 16010
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16010
Author:   sigurdne
Date:     2016-11-21 14:45:29 +0000 (Mon, 21 Nov 2016)
Log Message:
-----------
use fall-back-email domain

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

Modified: trunk/helpdesk/inc/class.botts.inc.php
===================================================================
--- trunk/helpdesk/inc/class.botts.inc.php      2016-11-21 14:44:42 UTC (rev 
16009)
+++ trunk/helpdesk/inc/class.botts.inc.php      2016-11-21 14:45:29 UTC (rev 
16010)
@@ -978,7 +978,9 @@
                                 */
                                if(!$entry['email'])
                                {
-                                       $entry['email'] = 
"{$entry['account_lid'address@hidden";
+                                       $email_domain = 
!empty($GLOBALS['phpgw_info']['server']['email_domain']) ? 
$GLOBALS['phpgw_info']['server']['email_domain'] : 'bergen.kommune.no';
+
+                                       $entry['email'] = 
"{$entry['account_lid'address@hidden";
                                }
 
                                if ($entry['is_active'] && 
$entry['notification_method'] == 'email' && $entry['email'])