[Phpgroupware-cvs] felamimail/inc class.bopreferences.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    felamimail
Changes by:     Sigurd Nes <sigurdne>   07/02/09 11:23:01

Modified files:
        inc            : class.bopreferences.inc.php 

Log message:
        notice

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.bopreferences.inc.php?cvsroot=phpgroupware&r1=1.9&r2=1.10

Patches:
Index: class.bopreferences.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bopreferences.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- class.bopreferences.inc.php 19 Dec 2006 21:36:26 -0000      1.9
+++ class.bopreferences.inc.php 9 Feb 2007 11:23:01 -0000       1.10
@@ -11,7 +11,7 @@
        * Free Software Foundation; either version 2 of the License, or (at 
your    *
        * option) any later version.                                            
    *
        
\***************************************************************************/
-       /* $Id: class.bopreferences.inc.php,v 1.9 2006/12/19 21:36:26 sigurdne 
Exp $ */
+       /* $Id: class.bopreferences.inc.php,v 1.10 2007/02/09 11:23:01 sigurdne 
Exp $ */
 
        class bopreferences
        {
@@ -59,7 +59,7 @@
                        #print "<hr>";
                        
                        // set values to the global values
-                       $data['imapServerAddress']      = 
$GLOBALS['phpgw_info']['server']['mail_server'];
+                       $data['imapServerAddress']      = 
isset($GLOBALS['phpgw_info']['server']['mail_server']) ? 
$GLOBALS['phpgw_info']['server']['mail_server'] : '';
                        $data['key']                    = 
$GLOBALS['phpgw_info']['user']['passwd'];
                        if ($felamimailConfig["mailLoginType"] == 'vmailmgr')
                                $data['username']               = 
$GLOBALS['phpgw_info']['user']['userid']."@".$felamimailConfig["mailSuffix"];
@@ -69,7 +69,7 @@
                        $data['realname']               = 
$GLOBALS['phpgw_info']['user']['fullname'];
                        $data['defaultDomainname']      = 
$GLOBALS['phpgw_info']["server"]["mail_suffix"];
 
-                       $data['smtpServerAddress']      = 
$GLOBALS['phpgw_info']["server"]["smtp_server"];
+                       $data['smtpServerAddress']      = 
isset($GLOBALS['phpgw_info']["server"]["smtp_server"]) ? 
$GLOBALS['phpgw_info']["server"]["smtp_server"] : '';
                        $data['smtpPort']               = 
(isset($GLOBALS['phpgw_info']["server"]["smtp_port"])?$GLOBALS['phpgw_info']["server"]["smtp_port"]:'');
                        
                        // check for felamimail specific settings