From bb18deadab637b35b18b3113691d0b9b65068365 Mon Sep 17 00:00:00 2001
From: Dominique Fournier <dominique@fournier38.fr>
Date: Tue, 20 May 2014 17:03:44 +0000
Subject: [PATCH] Adding support of operationnal errors in form

git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@1305 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
---
 form.php | 53 +++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/form.php b/form.php
index 98b25f9..d1c6980 100644
--- a/form.php
+++ b/form.php
@@ -112,7 +112,8 @@ class form
       @param string|null $method The method to use to transmit the form (POST,
                                  GET)
       @param array|null $values The default values of the fields */
-  public function printHTML ($method = 'post', $values = NULL)
+  public function printHTML ($method = 'post', $values = NULL,
+                             $errors = array())
   {
     // TODO : textarea, file
     $res = "";
@@ -137,8 +138,8 @@ class form
         // No $field->multiple
         // values !
         $res .= "<div class='form-group";
-        if (isset ($field->error))
-          $res .= " has-".key ($field->error);
+        if (isset ($errors[$field->name]))
+          $res .= " has-".$errors[$field->name][0];
         $res .= "'>\n";
         $res .= "    <label class='col-sm-2 control-label' for='".
                 $this->formName."_".
@@ -172,9 +173,9 @@ class form
           $res .= "$val\n";
         }
 
-        if (isset ($field->error))
-          $res .= "      <span class='help-block'>".reset ($field->error).
-          "</span>\n";
+        if (isset ($errors[$field->name]))
+          $res .= "      <span class='help-block'>".$errors[$field->name][1].
+                  "</span>\n";
         $res .= "    </div>\n"; // End controls
         $res .= "  </div>\n"; // End form-group
         break;
@@ -196,8 +197,8 @@ class form
       case "password":
         // No $field->multiple
         $res .= "<div class='form-group";
-        if (isset ($field->error))
-          $res .= " has-".key ($field->error);
+        if (isset ($errors[$field->name]))
+          $res .= " has-".$errors[$field->name][0];
         $res .= "'>\n";
         $res .= "    <label class='col-sm-2 control-label' for='".
                 $this->formName."_".
@@ -219,9 +220,9 @@ class form
           $res .= " readonly='readonly'";
         $res .= " class='form-control'";
         $res .= "/>\n";
-        if (isset ($field->error))
-          $res .= "      <span class='help-block'>".reset ($field->error).
-          "</span>\n";
+        if (isset ($errors[$field->name]))
+          $res .= "      <span class='help-block'>".$errors[$field->name][1].
+                  "</span>\n";
         $res .= "    </div>\n"; // End controls
         $res .= "  </div>\n"; // End form-group
         break;
@@ -229,8 +230,8 @@ class form
       case "radio":
         // No $field->multiple
         $res .= "<div class='form-group";
-        if (isset ($field->error))
-          $res .= " has-".key ($field->error);
+        if (isset ($errors[$field->name]))
+          $res .= " has-".$errors[$field->name][0];
         $res .= "'>\n";
         $res .= "    <label class='col-sm-2 control-label' for='".
                 $this->formName."_".
@@ -267,9 +268,9 @@ class form
           $res .= "</label>\n"; // End label radio
         }
 
-        if (isset ($field->error))
-          $res .= "      <span class='help-block'>".reset ($field->error).
-          "</span>\n";
+        if (isset ($errors[$field->name]))
+          $res .= "      <span class='help-block'>".$errors[$field->name][1].
+                  "</span>\n";
         $res .= "    </div>\n"; // End controls
         $res .= "  </div>\n"; // End form-group
         break;
@@ -277,8 +278,8 @@ class form
       case "select":
         // $values->$field
         $res .= "<div class='form-group";
-        if (isset ($field->error))
-          $res .= " has-".key ($field->error);
+        if (isset ($errors[$field->name]))
+          $res .= " has-".$errors[$field->name][0];
         $res .= "'>\n";
         $res .= "    <label class='col-sm-2 control-label' for='".
                 $this->formName."_".
@@ -333,9 +334,9 @@ class form
           }
 
           $res .= "      </select>\n";
-          if (isset ($field->error))
-            $res .= "      <span class='help-block'>".reset ($field->error).
-            "</span>\n";
+          if (isset ($errors[$field->name])) 
+            $res .= "      <span class='help-block'>".$errors[$field->name][1].
+                    "</span>\n";
         }
         else
         {
@@ -365,8 +366,8 @@ class form
       default:
         // No $field->multiple, $field->titles
         $res .= "<div class='form-group";
-        if (isset ($field->error))
-          $res .= " has-".key ($field->error);
+        if (isset ($errors[$field->name]))
+          $res .= " has-".$errors[$field->name][0];
         $res .= "'>\n";
         $res .= "    <label class='col-sm-2 control-label' for='".
                 $this->formName."_".
@@ -388,9 +389,9 @@ class form
           $res .= " readonly='readonly'";
         $res .= " class='form-control'";
         $res .= "/>\n";
-        if (isset ($field->error))
-          $res .= "      <span class='help-block'>".reset ($field->error).
-          "</span>\n";
+        if (isset ($errors[$field->name]))
+          $res .= "      <span class='help-block'>".$errors[$field->name][1].
+                  "</span>\n";
         $res .= "    </div>\n"; // End controls
         $res .= "  </div>\n"; // End form-group
         break;