From 0414cca2c96187ad59e642cc6129f87fbd2fe4f1 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 23 Jun 2005 07:58:19 +0000 Subject: [PATCH] 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 --- plugins/gofon/macro/class_gofonMacroParameters.inc | 4 ++-- plugins/gofon/phoneaccount/class_phoneAccount.inc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/gofon/macro/class_gofonMacroParameters.inc b/plugins/gofon/macro/class_gofonMacroParameters.inc index 74b0a6b72..d563ecfa2 100755 --- 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 2659d43e8..3b3a00f81 100644 --- 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']); } } } -- 2.30.2