Updated NTP && FOnserver

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

diff --git a/plugins/admin/systems/class_goFonServer.inc b/plugins/admin/systems/class_goFonServer.inc
index cdb123bde763191c7e70db472b3b409743a6ffcf..3094cc3a583c0a7671325d70c146426ac169d5d5 100644 (file)
--- a/plugins/admin/systems/class_goFonServer.inc
+++ b/plugins/admin/systems/class_goFonServer.inc
@@ -117,10 +117,14 @@ class goFonServer extends plugin{
   function check()
   { 
     $message = plugin::check();
-    foreach (array("goFonAdmin", "goFonAreaCode", "goFonCountryCode") as $attr){
-      if ($this->$attr == "" || preg_match("/ /", $this->$attr)){
-        $message[]= sprintf(_("The attribute '%s' is empty or contains invalid characters."), $attr);
-      }
+    if (empty($this->goFonAdmin)){
+      $message[]= sprintf(_("The attribute DB user is empty or contains invalid characters."), $attr);
+    }
+    if (empty($this->goFonAreaCode)){
+      $message[]= sprintf(_("The attribute local dial prefix is empty or contains invalid characters."), $attr);
+    }
+    if (empty($this->goFonCountryCode)){
+      $message[]= sprintf(_("The attribute country dial prefix is empty or contains invalid characters."), $attr);
     }
     return($message);
   }

diff --git a/plugins/admin/systems/class_goNtpServer.inc b/plugins/admin/systems/class_goNtpServer.inc
index fa6e11c072eddfef8b5f9071b937bfa7f227f118..b7577f202c4af287ff917fcbec2a38cd6d9b611e 100644 (file)
--- a/plugins/admin/systems/class_goNtpServer.inc
+++ b/plugins/admin/systems/class_goNtpServer.inc
@@ -48,7 +48,7 @@ class goNtpServer extends plugin{
     }
 
     /* Deleting an Entry, is a bit more complicated than adding one*/
-    if(isset($_POST['DelNTPEnt'])) {
+    if((isset($_POST['DelNTPEnt'])) && (isset($_POST['goTimeSource']))) {
       foreach ($_POST['goTimeSource'] as $entry){
         if (isset($this->goTimeSource[$entry])){
           unset($this->goTimeSource[$entry]);

diff --git a/plugins/admin/systems/goFonServer.tpl b/plugins/admin/systems/goFonServer.tpl
index f303abb8a4b6f551c6957365fa92079f817d7d31..b6bc344bdedd1c5909a412881b71bb47ae79ae2c 100644 (file)
--- a/plugins/admin/systems/goFonServer.tpl
+++ b/plugins/admin/systems/goFonServer.tpl
@@ -1,7 +1,7 @@
 <h2><img class="center" alt="" align="middle" src="images/rightarrow.png" /> {t}VoIP database information{/t}</h2>
   <table summary="">
     <tr>
-     <td>{t}Asterisk DB user{/t}</td>
+     <td>{t}Asterisk DB user{/t}{$must}</td>
      <td><input name="goFonAdmin" size=30 maxlength=60 id="goFonAdmin" {$goFonAdminACL} value="{$goFonAdmin}"></td>
     </tr>
     <tr>
@@ -9,11 +9,11 @@
      <td><input type=password name="goFonPassword" id="goFonPassword" size=30 maxlength=60 {$goFonPasswordACL}   value="{$goFonPassword}"></td>
     </tr>
     <tr>
-     <td>{t}Country dial prefix{/t}</td>
+     <td>{t}Country dial prefix{/t}{$must}</td>
      <td><input name="goFonCountryCode" size=10 maxlength=30 id="goFonCountryCode" {$goFonCountryCodeACL}   value="{$goFonCountryCode}"></td>
     </tr>
     <tr>
-     <td>{t}Local dial prefix{/t}</td>
+     <td>{t}Local dial prefix{/t}{$must}</td>
      <td><input name="goFonAreaCode" size=10 maxlength=30 id="goFonAreaCode" {$goFonAreaCodeACL}   value="{$goFonAreaCode}"></td>
     </tr>
    </table>