Fixed goFaxServer

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3690 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/systems/class_divListSystemService.inc b/plugins/admin/systems/class_divListSystemService.inc
index f50af48dad5462f96c3da124877a1dcd5d9655a0..25e2ed55212717cac9c3a36f69e19be879f9a8d4 100644 (file)
--- a/plugins/admin/systems/class_divListSystemService.inc
+++ b/plugins/admin/systems/class_divListSystemService.inc
@@ -68,6 +68,7 @@ class divListSystemService extends MultiSelectWindow
 
   function setEntries($list)
   {
+    $tmp = array();
     foreach($list as $name => $entry){
       $tmp[$name] = $entry['Message']; 
     }

diff --git a/plugins/admin/systems/class_goFaxServer.inc b/plugins/admin/systems/class_goFaxServer.inc
index 2fec5525977e5dc8b7597af6dd272e88f847e070..71db436e104c1f89f2cdbe8194a03f7cce63221b 100644 (file)
--- a/plugins/admin/systems/class_goFaxServer.inc
+++ b/plugins/admin/systems/class_goFaxServer.inc
@@ -114,8 +114,11 @@ class goFaxServer extends plugin{
   function check()
   { 
     $message = plugin::check();
-    if ($this->goFaxAdmin == "" || preg_match("/ /", $this->goFaxAdmin)){
-      $message[]= sprintf(_("The attribute '%s' is empty or contains invalid characters."), "goFaxAdmin");
+    if (empty($this->goFaxAdmin)){
+      $message[]= _("The attribute user is empty or contains invalid characters.");
+    }
+    if (empty($this->goFaxPassword)){
+      $message[]= _("The attribute password is empty or contains invalid characters.");
     }
     return($message);
   }