Allow for a general form error to be set rather than using empty string errors...

Allow for a general form error to be set rather than using empty string errors on the submit element

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

htdocs/contact.php

@@ -129,8 +129,7 @@ function contactus_validate(Pieform $form, $values) {
         if (!empty($emailcontact)) {
             $msg .= ' ' . get_string('formerroremail', 'mahara', $emailcontact, $emailcontact);
         }
-        $SESSION->add_error_msg($msg);
-        $form->set_error('submit', '');
+        $form->set_error(null, $msg);
     }
 }
 

htdocs/lib/pieforms/pieform.php

@@ -626,6 +626,9 @@ class Pieform {/*{{{*/
             $result .= ' enctype="multipart/form-data"';
         }
         $result .= '>';
+        if (!empty($this->error)) {
+            $result .= '<div class="error">' . $this->error . '</div>';
+        }
         return $result;
     }/*}}}*/
 
@@ -945,6 +948,10 @@ EOF;
      * @throws PieformException  If the element could not be found
      */
     public function set_error($name, $message) {/*{{{*/
+        if (is_null($name) && !empty($message)) {
+            $this->error = $message;
+            return;
+        }
         foreach ($this->data['elements'] as $key => &$element) {
             if ($element['type'] == 'fieldset') {
                 foreach ($element['elements'] as &$subelement) {
@@ -975,7 +982,7 @@ EOF;
                 return true;
             }
         }
-        return false;
+        return isset($this->error);
     }/*}}}*/
 
     /**

htdocs/register.php

@@ -302,8 +302,8 @@ function register_validate(Pieform $form, $values) {
         if (!empty($emailcontact)) {
             $msg .= ' ' . get_string('formerroremail', 'mahara', $emailcontact, $emailcontact);
         }
-        $SESSION->add_error_msg($msg);
-        $form->set_error('submit', '');
+        $form->set_error(null, $msg);
+        return;
     }
 
     $institution = $values['institution'];