From: hickert Date: Wed, 28 Apr 2010 08:15:17 +0000 (+0000) Subject: Fixed copy & paste for mailAccounts X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4dec53024ed128b2f645395197d146317cc0ad59;p=gosa.git Fixed copy & paste for mailAccounts -Vacation start/stop were initialized incorrectly git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17895 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/mail/personal/mail/class_mailAccount.inc b/gosa-plugins/mail/personal/mail/class_mailAccount.inc index b1c99d315..b57f35ad7 100644 --- a/gosa-plugins/mail/personal/mail/class_mailAccount.inc +++ b/gosa-plugins/mail/personal/mail/class_mailAccount.inc @@ -1147,7 +1147,7 @@ class mailAccount extends plugin $smarty->assign("isModifyableMail" , $this->mailMethod->isModifyableMail()); $smarty->assign("initially_was_account", $this->initially_was_account); - $str = $smarty->fetch(get_template_path("copypaste.tpl",TRUE, dirname(__FILE__))); + $str = $smarty->fetch(get_template_path("copypaste.tpl",TRUE, dirname(__FILE__))); $ret = array(); $ret['status'] = ""; @@ -1189,6 +1189,14 @@ class mailAccount extends plugin $this->mailDomainParts[] = $this->mailDomainPart; } } + + // Initialize Vacation start/stop times + // This value is set to 'dd.mm.YYYY' if no times are set in the source object. + // But if they are set, then this values contain timestamps. + if(isset($source['gosaVacationStart'][0])){ + $this->gosaVacationStart= date('d.m.Y', $source['gosaVacationStart'][0]); + $this->gosaVacationStop= date('d.m.Y', $source['gosaVacationStop'][0]); + } }