From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 20 May 2010 10:52:38 +0000 (+0000)
Subject: Added more verbose error messages
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e32205eeaea2b42ed2d25d67bbf408890e1aba4c;p=gosa.git

Added more verbose error messages


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

diff --git a/gosa-core/include/class_configRegistry.inc b/gosa-core/include/class_configRegistry.inc
index 1261f1778..a196a2ab6 100644
--- a/gosa-core/include/class_configRegistry.inc
+++ b/gosa-core/include/class_configRegistry.inc
@@ -315,7 +315,10 @@ class gosaProperty
 
         // Display the reason for failing this check.         
         if($message && ! $match){
-            msg_dialog::display(_("Warning"), msgPool::invalid($name,$value,"",_("Use 'true', 'false' or empty if allowed")), WARNING_DIALOG);
+            msg_dialog::display(_("Warning"), 
+                    sprintf(_("The value '%s' specified for '%s:%s' is invalid. A bool value is required here!"), 
+                        bold($value),bold($class),bold($name)), 
+                    WARNING_DIALOG);
         }
     
         return($match);
@@ -327,7 +330,10 @@ class gosaProperty
     
         // Display the reason for failing this check.         
         if($message && ! $match){
-            msg_dialog::display(_("Warning"), msgPool::invalid($name), WARNING_DIALOG);
+            msg_dialog::display(_("Warning"), 
+                    sprintf(_("The value '%s' specified for '%s:%s' is invalid. A string value is required here!"), 
+                        bold($value),bold($class),bold($name)), 
+                    WARNING_DIALOG);
         }
 
         return($match);
@@ -339,7 +345,10 @@ class gosaProperty
 
         // Display the reason for failing this check.         
         if($message && ! $match){
-            msg_dialog::display(_("Warning"), msgPool::invalid($name, $value,'/[0-9]/'), WARNING_DIALOG);
+            msg_dialog::display(_("Warning"), 
+                    sprintf(_("The value '%s' specified for '%s:%s' is invalid. A numeric value is required here!"), 
+                        bold($value),bold($class),bold($name)), 
+                    WARNING_DIALOG);
         }
 
         return($match);
@@ -347,27 +356,57 @@ class gosaProperty
 
     static function isPath($message,$class,$name,$value, $type)
     {
-        $match = TRUE;
+        $match = preg_match("#^(/[^/]*/){1}#", $value);
     
         // Display the reason for failing this check.         
         if($message && ! $match){
-            msg_dialog::display(_("Warning"), msgPool::invalid($name), WARNING_DIALOG);
+            msg_dialog::display(_("Warning"), 
+                    sprintf(_("The path '%s' specified for '%s:%s' is invalid!"), 
+                        bold($value),bold($class),bold($name)), 
+                    WARNING_DIALOG);
         }
 
         return($match);
     }
 
-    static function isWriteablePath($message,$class,$name,$value, $type)
+    static function isReadablePath($message,$class,$name,$value, $type)
     {
         $match = !empty($value)&&is_dir($value)&&is_writeable($value);
-    
+   
         // Display the reason for failing this check.         
         if($message && ! $match){
+            if(!is_dir($value)){
+                msg_dialog::display(_("Warning"), 
+                        sprintf(_("The folder '%s' specified for '%s:%s' does not exists!"), 
+                            bold($value),bold($class),bold($name)), 
+                        WARNING_DIALOG);
+            }elseif(!is_readable($value)){
+                msg_dialog::display(_("Warning"), 
+                        sprintf(_("The folder '%s' specified for '%s:%s' cannot be used for reading!"), 
+                            bold($value),bold($class),bold($name)), 
+                        WARNING_DIALOG);
+            }
+        }
 
+        return($match);
+    }
+
+    static function isWriteablePath($message,$class,$name,$value, $type)
+    {
+        $match = !empty($value)&&is_dir($value)&&is_writeable($value);
+   
+        // Display the reason for failing this check.         
+        if($message && ! $match){
             if(!is_dir($value)){
-                msg_dialog::display(_("Warning"), sprintf(_("The specified folder does not exists '%s'."), $value), WARNING_DIALOG);
+                msg_dialog::display(_("Warning"), 
+                        sprintf(_("The folder '%s' specified for '%s:%s' does not exists!"), 
+                            bold($value),bold($class),bold($name)), 
+                        WARNING_DIALOG);
             }elseif(!is_writeable($value)){
-                msg_dialog::display(_("Warning"), sprintf(_("The specified folder cannot be used for writing '%s'."), $value), WARNING_DIALOG);
+                msg_dialog::display(_("Warning"), 
+                        sprintf(_("The folder '%s' specified for '%s:%s' cannot be used for writing!"), 
+                            bold($value),bold($class),bold($name)), 
+                        WARNING_DIALOG);
             }
         }
 
@@ -382,9 +421,15 @@ class gosaProperty
         if($message && ! $match){
                 
             if(!is_file($value)){
-                msg_dialog::display(_("Warning"), sprintf(_("The specified file does not exists '%s'."), $value), WARNING_DIALOG);
+                msg_dialog::display(_("Warning"), 
+                        sprintf(_("The file '%s' specified for '%s:%s' does not exists!"), 
+                            bold($value),bold($class),bold($name)), 
+                        WARNING_DIALOG);
             }elseif(!is_readable($value)){
-                msg_dialog::display(_("Warning"), sprintf(_("The specified file cannot be used for reading '%s'."), $value), WARNING_DIALOG);
+                msg_dialog::display(_("Warning"), 
+                        sprintf(_("The file '%s' specified for '%s:%s' cannot be read!"), 
+                            bold($value),bold($class),bold($name)), 
+                        WARNING_DIALOG);
             }
         }
 
@@ -397,7 +442,10 @@ class gosaProperty
 
         // Display the reason for failing this check.         
         if($message && ! $match){
-            msg_dialog::display(_("Warning"), msgPool::cmdinvalid($name,$value),  WARNING_DIALOG);
+            msg_dialog::display(_("Warning"), 
+                    sprintf(_("The command '%s' specified for '%s:%s' is invalid!"), 
+                        bold($value),bold($class),bold($name)), 
+                    WARNING_DIALOG);
         }
         
         return($match);
@@ -409,7 +457,10 @@ class gosaProperty
 
         // Display the reason for failing this check.         
         if($message && ! $match){
-            msg_dialog::display(_("Warning"), msgPool::invalid($name,$value,'','cn=user,ou=people,dc=example,dc=de'),  WARNING_DIALOG);
+            msg_dialog::display(_("Warning"), 
+                    sprintf(_("The dn '%s' specified for '%s:%s' is invalid!"), 
+                        bold($value),bold($class),bold($name)), 
+                    WARNING_DIALOG);
         }
         
         return($match);
@@ -421,7 +472,10 @@ class gosaProperty
 
         // Display the reason for failing this check.         
         if($message && ! $match){
-            msg_dialog::display(_("Warning"), msgPool::invalid($name,$value,'','ou=people,'),  WARNING_DIALOG);
+            msg_dialog::display(_("Warning"), 
+                    sprintf(_("The rdn '%s' specified for '%s:%s' is invalid!"), 
+                        bold($value),bold($class),bold($name)), 
+                    WARNING_DIALOG);
         }
         
         return($match);