From 5d17c31867a5291f07c62956bb35989cead8a8cb Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Thu, 30 Sep 2010 13:54:25 +0000 Subject: [PATCH] catching empty serverclass in getIMAPLogin Times; taking care of new entrys while tracking changes --- emailadmin/inc/class.emailadmin_bo.inc.php | 2 +- emailadmin/inc/class.emailadmin_ui.inc.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/emailadmin/inc/class.emailadmin_bo.inc.php b/emailadmin/inc/class.emailadmin_bo.inc.php index 38d7c783b9..96d7178267 100644 --- a/emailadmin/inc/class.emailadmin_bo.inc.php +++ b/emailadmin/inc/class.emailadmin_bo.inc.php @@ -327,7 +327,7 @@ class emailadmin_bo extends so_sql 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; } diff --git a/emailadmin/inc/class.emailadmin_ui.inc.php b/emailadmin/inc/class.emailadmin_ui.inc.php index a1a3a2b8d9..c9c5d3a733 100644 --- a/emailadmin/inc/class.emailadmin_ui.inc.php +++ b/emailadmin/inc/class.emailadmin_ui.inc.php @@ -231,6 +231,7 @@ class emailadmin_ui extends emailadmin_bo 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)'),