[eGroupWare-svn] r32402 - in /trunk/emailadmin/inc: class.emailadmin_bo.inc.php class.emailadmin_ui.inc.php

[<lei...@us...>]

Author: leithoff
Date: Thu Sep 30 15:53:17 2010
New Revision: 32402

URL: http://www.egroupware.org/viewvc/egroupware?rev=32402&view=rev
Log:
catching empty serverclass in getIMAPLogin Times; taking care of new entrys while tracking changes

Modified:
    trunk/emailadmin/inc/class.emailadmin_bo.inc.php
    trunk/emailadmin/inc/class.emailadmin_ui.inc.php

Modified: trunk/emailadmin/inc/class.emailadmin_bo.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/emailadmin/inc/class.emailadmin_bo.inc.php?rev=32402&r1=32401&r2=32402&view=diff
==============================================================================
--- trunk/emailadmin/inc/class.emailadmin_bo.inc.php (original)
+++ trunk/emailadmin/inc/class.emailadmin_bo.inc.php Thu Sep 30 15:53:17 2010
@@ -291,7 +291,7 @@
 		if (!($result = parent::save()))
 		{
 			$GLOBALS['egw']->contenthistory->updateTimeStamp('emailadmin_profiles', $this->data['ea_profile_id'], $old === false ? 'add' : 'modify', time());
-			$this->tracking->track($content,$old,null,false,null,true);
+			$this->tracking->track($content,(is_array($old)?$old:array()),null,false,null,true);
 		}
 		return $result;
 	}

Modified: trunk/emailadmin/inc/class.emailadmin_ui.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/emailadmin/inc/class.emailadmin_ui.inc.php?rev=32402&r1=32401&r2=32402&view=diff
==============================================================================
--- trunk/emailadmin/inc/class.emailadmin_ui.inc.php (original)
+++ trunk/emailadmin/inc/class.emailadmin_ui.inc.php Thu Sep 30 15:53:17 2010
@@ -231,6 +231,7 @@
 
 	static function getIMAPLoginTypes($serverclass='defaultimap')
 	{
+		if (empty($serverclass)) $serverclass = 'defaultimap';
 		//error_log(__METHOD__.' called with:'.$serverclass." with capabilities:".parent::$IMAPServerType[$serverclass]['imapcapabilities']);
 		$returnval = array(
 			'standard'	=> lang('username (standard)'),