added check for use of !# as content

(!# are used as delimiter)

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

diff --git a/plugins/gofon/macro/class_gofonMacroParameters.inc b/plugins/gofon/macro/class_gofonMacroParameters.inc
index 74b0a6b7271af3d033b4cf513b2eeeaea731c9ed..d563ecfa2ada185f88e53f26ab389ba820f5ae0f 100755 (executable)
--- a/plugins/gofon/macro/class_gofonMacroParameters.inc
+++ b/plugins/gofon/macro/class_gofonMacroParameters.inc
@@ -265,8 +265,8 @@ class macroParameter extends plugin
 
 
     foreach($this->goFonMacroParameter as $key=>$val){
-      if(strstr($val['default'],"!")) {
-        $message[] = sprintf(_("The parameter %s contains invalid char. '!' is used as delimiter"),$val['name']);
+      if((strstr($val['default'],"!"))||(strstr($val['default'],"#"))) {
+        $message[] = sprintf(_("The parameter %s contains invalid char. '!,#' is used as delimiter"),$val['name']);
       }
       switch($val['type']){
         case 'bool'   :   $possible = array("","0","1","true","false");

diff --git a/plugins/gofon/phoneaccount/class_phoneAccount.inc b/plugins/gofon/phoneaccount/class_phoneAccount.inc
index 2659d43e8e4f57e825cd4fdfd96e54703be75c2e..3b3a00f818c05996a80dac85fe2a83d7ec66ff4a 100644 (file)
--- a/plugins/gofon/phoneaccount/class_phoneAccount.inc
+++ b/plugins/gofon/phoneaccount/class_phoneAccount.inc
@@ -487,12 +487,12 @@ class phoneAccount extends plugin
         $message[]= sprintf(_("The timeout '%s' contains invalid characters!"), $timeout);
       }
     }
-
+    
     /* check for ! in any parameter setting*/
     if(isset($this->macroarray[$this->macro])){
       foreach($this->macroarray[$this->macro] as $val){
-        if(strstr("!",$val['choosen'])){
-          $message[] = sprintf(_("The parameter %s contains invalid char. '!' is used as delimiter"),$val['name']);
+        if((strstr($val['choosen'],"!"))||(strstr($val['choosen'],"#"))){
+          $message[] = sprintf(_("The parameter %s contains invalid char. '!,#' is used as delimiter"),$val['name']);
         }
       }
     }