From: hzerres Date: Fri, 10 Sep 2010 11:48:07 +0000 (+0000) Subject: added email check ... activated date checks. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8f911b84ee31d6bcdaa1e0aa9df1728a97c13d6c;p=gosa.git added email check ... activated date checks. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19601 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/groupware/personal/groupware/class_groupware.inc b/gosa-plugins/groupware/personal/groupware/class_groupware.inc index eb546abce..1ff1160e4 100644 --- a/gosa-plugins/groupware/personal/groupware/class_groupware.inc +++ b/gosa-plugins/groupware/personal/groupware/class_groupware.inc @@ -135,7 +135,6 @@ class groupware extends plugin function init() { // Detect feature availability and enable/disable services correspondingly. - echo "init Plugin:"; $this->groupwareDao = new groupware_dao($this); $features = array(); @@ -206,7 +205,7 @@ class groupware extends plugin "dropOwnMails"=>0 ); $response = array_merge( $response, $compResponse); - $this->groupwareDao->debug("Merged Comp Array:", $response); + $this->mapComprehensiveUserData($response); $this->initially_was_account = $this->is_account = $status; @@ -709,11 +708,10 @@ class groupware extends plugin //required vacationEnabled if($this->vacationEnabled){ if(tests::is_date($this->vacationStart)){ - msgPool::invalid(_("von"),$this->vacationStart , "", _("Example of date : 01.13.2010")); + $messages[] = msgPool::invalid(_("von"),$this->vacationStart , "", _("Example of date : 01.03.2010")); } if(tests::is_date($this->vacationStop)){ - msgPool::invalid(_("bis"),$this->vacationStop , "", _("Example of date : 01.13.2010")); - + $messages[] = msgPool::invalid(_("bis"),$this->vacationStop , "", _("Example of date : 01.03.2010")); } $diff = tests::compareDate($this->vacationStart, $this->vacationStop); @@ -722,10 +720,12 @@ class groupware extends plugin $messages[] = msgPool::invalid(_("vacation dates"), $this->vacationStart." - ".$this->vacationStop, "", _("Enddate before Start or the same.")); } } + if(!tests::is_email ($this->mailAddress)){ + $messages[] = msgPool::invalid(_("Email"),$this->mailAddress , "", _("Example: user@excom.intranet.gonicus.de")); + } return($messages); } - /*! \brief Adapt from template, using 'dn' */ function adapt_from_template($dn, $skip= array()) @@ -795,12 +795,6 @@ class groupware extends plugin $this->localDeliveryOnly = $callBackMap["localDeliveryOnly"]; $this->dropOwnMails = $callBackMap["dropOwnMails"]; - /* - * TODO: Remove the line to check on every call.. - * - * The check will be called on "OK" or "APPLY" - */ - $this->check(); } } @@ -812,7 +806,7 @@ class groupware_dao{ /* * TODO: Remove the debug */ - private $debug = false; + private $debug = true; /* * TODO: fill the following vars on init. */ @@ -881,7 +875,6 @@ class groupware_dao{ */ public function init(){ - $this->availableMethods = $this->groupwarePluginRef->rpcExec('gwGetCapabilities'); //$this->availableProperties = $this->groupwarePluginRef->rpcExec('gwGetSupportedProperties'); //$this->debug("availableProperties on init:", $this->availableProperties); @@ -970,7 +963,20 @@ class groupware_dao{ //$vacMessage = $this->get("vacationMessage", array($uid)); - $resultArr["vacationMessage"] = "dummy Vacation message"; + $resultArr["vacationMessage"] = "dummy Vacation message - (getOutOfOfficeReply currently throws errors )"; + } + else{ + echo "vacationMessage not enabled."; + } + /* + * this function seems to be broken on the server. + * addding dummy + */ + if($this->groupwarePluginRef->isFeatureEnabled("quotaSize")){ + + //$quotMessage = $this->get("quotaSize", array($uid)); + + $resultArr["quotaSize"] = 123456789; } else{ echo "vacationMessage not enabled.";