Changeset 178

Timestamp:

Jun 22, 2006 9:27:31 PM (18 years ago)

Author:

scdev

Message:

Q - update FormValidator? so err() prints a different class type depending on error type.

Location:

trunk/lib

Files:

• ACL.inc.php (modified) (2 diffs)
• FormValidator.inc.php (modified) (3 diffs)

trunk/lib/ACL.inc.php

@@ -529 +529 @@
         
         $db->query("REPLACE INTO acl_tbl VALUES ('$aro_id', '$aco_id', '$axo_id', '$allow', NOW())");
+        $app->logMsg(sprintf('Set %s: %s -> %s -> %s.', $allow, $aro, $aco, $axo), LOG_DEBUG, __FILE__, __LINE__);
         
         return true;
@@ -582 +583 @@
         if (substr_count($final_where, 'IS NOT NULL') == 3) {
             // Null on all three tables will delete ALL entries including the root -> root -> root = deny.
-            $app->logMsg(sprintf('Cannot allow deletion of all acl entries.', null), LOG_NOTICE, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Cannot allow deletion of ALL acl entries.', null), LOG_NOTICE, __FILE__, __LINE__);
             return false;
         }

trunk/lib/FormValidator.inc.php

@@ -43 +43 @@
     var $errors = array();
     
-    // Default error marker.
-    var $marker = ' sc-msg-error ';
-
     /**
      * Return the current list of errors.
@@ -92 +89 @@
             foreach ($this->errors as $err) {
                 if ($err['name'] == $form_name) {
-                    return true;
+                    return $err['type'];
                 }
             }
@@ -160 +157 @@
     function err($form_name, $marker=null)
     {
-        if ($this->anyErrors($form_name)) {
+        if (false !== ($type = $this->anyErrors($form_name))) {
             if (isset($marker)) {
                 echo $marker;
             } else {
-                echo $this->marker;
+                switch ($type) {
+                case MSG_ERR:
+                default:
+                    echo ' sc-msg-error ';
+                    break;
+
+                case MSG_WARNING:
+                    echo ' sc-msg-warning ';
+                    break;
+
+                case MSG_SUCCESS:
+                    echo ' sc-msg-success ';
+                    break;
+
+                case MSG_NOTICE:
+                    echo ' sc-msg-notice ';
+                    break;
+                }
             }
         }