From 5078fe4bc9be94a62804f49f7b2ba922df3b2281 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 18 May 2011 12:07:26 +0000 Subject: [PATCH] Removed debug output git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@20858 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../TemplateEngine/class_TemplateWidget.inc | 6 ++++-- .../admin/newConfigManagement/class_newConfigManagement.inc | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gosa-plugins/goto-ng/admin/newConfigManagement/TemplateEngine/class_TemplateWidget.inc b/gosa-plugins/goto-ng/admin/newConfigManagement/TemplateEngine/class_TemplateWidget.inc index bc66f8f0a..b5e48a5a6 100644 --- a/gosa-plugins/goto-ng/admin/newConfigManagement/TemplateEngine/class_TemplateWidget.inc +++ b/gosa-plugins/goto-ng/admin/newConfigManagement/TemplateEngine/class_TemplateWidget.inc @@ -130,8 +130,10 @@ class TemplateWidget if($this->required && empty($this->value)){ return(array(msgPool::required($this->display))); } - if(!empty($this->value) && !empty($this->syntax) && !preg_match("/".$this->syntax."/", $this->value)){ - return(array(msgPool::invalid($this->display, $this->value, "/".$this->syntax."/"))); + if(!empty($this->value) && + !empty($this->syntax) && + !empty($this->syntax) && !preg_match($this->syntax, $this->value)){ + return(array(msgPool::invalid($this->display, $this->value, $this->syntax))); } return(array()); } diff --git a/gosa-plugins/goto-ng/admin/newConfigManagement/class_newConfigManagement.inc b/gosa-plugins/goto-ng/admin/newConfigManagement/class_newConfigManagement.inc index a04056ce1..4168b3643 100644 --- a/gosa-plugins/goto-ng/admin/newConfigManagement/class_newConfigManagement.inc +++ b/gosa-plugins/goto-ng/admin/newConfigManagement/class_newConfigManagement.inc @@ -727,8 +727,8 @@ class newConfigManagement extends plugin } if(in_array($values['name'],$usedNames)){ $msgs[] = msgPool::duplicated(_("Name")); - }elseif(preg_match("/[^a-z0-9\.]/i",$values['name'])){ - $msgs[] = msgPool::invalid(_("Name"), $values['name'], '/[a-z0-9\.]/'); + #}elseif(preg_match("/[^a-z0-9\.]/i",$values['name'])){ + # $msgs[] = msgPool::invalid(_("Name"), $values['name'], '/[a-z0-9\.]/'); } } -- 2.30.2