Code

corrected translation to vacationstart vacationstop ... was ambiguous
authorhzerres <hzerres@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 13 Sep 2010 09:38:28 +0000 (09:38 +0000)
committerhzerres <hzerres@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 13 Sep 2010 09:38:28 +0000 (09:38 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19617 594d385d-05f5-0310-b6e9-bd551577e9d8

gosa-plugins/groupware/personal/groupware/class_groupware.inc

index 4c33d27b2e6bf55b7b7bbca6895b038380b5da4f..dc8dc4b90a5ca29ea6ece263023a9e414b28a1b2 100644 (file)
@@ -311,7 +311,7 @@ class groupware extends plugin
                 }
             }
         }
-               $this->check();
+               
         /****************
           Forward addresses 
          ****************/
@@ -720,10 +720,10 @@ class groupware extends plugin
         //required vacationEnabled
                if($this->vacationEnabled){
                if(!tests::is_date($this->vacationStart)){
-                       $messages[] = msgPool::invalid(_("von"),$this->vacationStart , "", _("Example of date : 01.03.2010"));
+                       $messages[] = msgPool::invalid(_("vacationstart"),$this->vacationStart , "", _("Example of date : 01.03.2010"));
                }
                if(!tests::is_date($this->vacationStop)){
-                       $messages[] = msgPool::invalid(_("bis"),$this->vacationStop , "", _("Example of date : 01.03.2010"));
+                       $messages[] = msgPool::invalid(_("vacationstop"),$this->vacationStop , "", _("Example of date : 01.03.2010"));
                }
                $diff = tests::compareDate($this->vacationStart, $this->vacationStop);
               
@@ -746,6 +746,13 @@ class groupware extends plugin
                                }
                        }
                }
+               if(isset($this->alternateAddresses) && is_array($this->alternateAddresses)){
+                       foreach($this->alternateAddresses as $fAddress){
+                               if(!tests::is_email ($fAddress)){
+                                       $messages[] = msgPool::invalid(_("Email"),$fAddress, "", _("Example: user@excom.intranet.gonicus.de"));
+                               }
+                       }
+               }
                
         return($messages);
     }