From 94a9b0541af43e2a27abeab8174d00d4ffb89630 Mon Sep 17 00:00:00 2001 From: psc Date: Fri, 27 May 2011 11:06:36 +0000 Subject: [PATCH] Apply patch for #5598 - Use 'Device name' as string in error messages for wrong device name attributes - In the error message for an errornous description print the actual value of the description in the message and not the device name git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@20897 594d385d-05f5-0310-b6e9-bd551577e9d8 --- trunk/gosa-plugins/goto/admin/devices/class_deviceGeneric.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trunk/gosa-plugins/goto/admin/devices/class_deviceGeneric.inc b/trunk/gosa-plugins/goto/admin/devices/class_deviceGeneric.inc index cd83d097e..3f5364e1e 100644 --- a/trunk/gosa-plugins/goto/admin/devices/class_deviceGeneric.inc +++ b/trunk/gosa-plugins/goto/admin/devices/class_deviceGeneric.inc @@ -87,10 +87,10 @@ class deviceGeneric extends plugin $message = plugin::check(); if($this->cn == "" ||(preg_match("/[^a-z0-9]/i",$this->cn))){ - $message[]= msgPool::invalid(_("Name"),$this->cn,"/^[a-z0-9]*$/i"); + $message[]= msgPool::invalid(_("Device name"),$this->cn,"/^[a-z0-9]*$/i"); } if(preg_match("/[^a-z0-9!\"?.,;:-_\(\) ]/i",$this->description)){ - $message[]= msgPool::invalid(_("Description"),$this->cn,"/^[a-z0-9!\"?.,;:-_\(\) ]*$/i"); + $message[]= msgPool::invalid(_("Description"),$this->description,"/^[a-z0-9!\"?.,;:-_\(\) ]*$/i"); } /* Skip serial check if vendor and product id are given */ -- 2.30.2