Parameters are sorted now

[gosa.git] / plugins / gofon / macro / class_gofonMacroParameters.inc

diff --git a/plugins/gofon/macro/class_gofonMacroParameters.inc b/plugins/gofon/macro/class_gofonMacroParameters.inc
index 74b0a6b7271af3d033b4cf513b2eeeaea731c9ed..3aaa420f37ded51e8c64c6fdb73fda37e5f196ac 100755 (executable)
--- a/plugins/gofon/macro/class_gofonMacroParameters.inc
+++ b/plugins/gofon/macro/class_gofonMacroParameters.inc
@@ -170,9 +170,11 @@ class macroParameter extends plugin
     }
 
     /*generate Table which shows als parameters */
-
     $FonParas = $this->check_paras($content,$this->goFonMacroParameter); 
 
+    /* Sort by Parameterid, and keep keys */    
+    ksort($FonParas);
+    
     foreach($FonParas as $key=>$para)  {
 
       /* Select correct item of combobox */
@@ -265,11 +267,11 @@ 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");
+        case 'bool'   :   $possible = array("","0","1");
                           if(!in_array($val['default'],$possible)) {
                             $message[] = sprintf(_("The parameter %s has incorrect value for type bool."),$val['name']);
                           };break;