From 92d02bb2df76670fef46d2fd04cdc289b7c2b279 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 8 Jun 2006 05:37:18 +0000
Subject: [PATCH] Updated NTP && FOnserver

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3700 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 plugins/admin/systems/class_goFonServer.inc | 12 ++++++++----
 plugins/admin/systems/class_goNtpServer.inc |  2 +-
 plugins/admin/systems/goFonServer.tpl       |  6 +++---
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/plugins/admin/systems/class_goFonServer.inc b/plugins/admin/systems/class_goFonServer.inc
index cdb123bde..3094cc3a5 100644
--- 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 fa6e11c07..b7577f202 100644
--- 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 f303abb8a..b6bc344bd 100644
--- 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>
-- 
2.30.2