From 27319e173b475f00e70a7256bb6ee47e6f376689 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Wed, 20 Oct 2010 20:59:07 -0400
Subject: Add a patch to wizard.php to support input_errors from sullrich (with
 some modifications).

---
 usr/local/www/wizard.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'usr')

diff --git a/usr/local/www/wizard.php b/usr/local/www/wizard.php
index 9a4a8fe..14a1802 100755
--- a/usr/local/www/wizard.php
+++ b/usr/local/www/wizard.php
@@ -92,7 +92,7 @@ if($pkg['step'][$stepid]['stepsubmitbeforesave']) {
 	eval($pkg['step'][$stepid]['stepsubmitbeforesave']);
 }
 
-if ($_POST) {
+if ($_POST && !$input_errors) {
     foreach ($pkg['step'][$stepid]['fields']['field'] as $field) {
         if(!empty($field['bindstofield']) and $field['type'] <> "submit") {
 		$fieldname = $field['name'];
@@ -116,7 +116,8 @@ if ($_POST) {
     if($pkg['step'][$stepid]['stepsubmitphpaction'] <> "") {
 		eval($pkg['step'][$stepid]['stepsubmitphpaction']);
     }
-	write_config();
+	if (!$input_errors)
+		write_config();
     $stepid++;
     if($stepid > $totalsteps)
 	$stepid = $totalsteps;
@@ -322,6 +323,8 @@ function showchange() {
 <p>
 <div style="width:800px;background-color:#ffffff" id="roundme">
 <?php
+	if ($input_errors)
+		print_input_errors($input_errors);
 	if ($savemsg)
 		print_info_box($savemsg);
 	if ($_GET['message'] != "")
@@ -942,4 +945,3 @@ function is_timezone($elt) {
 
 </body>
 </html>
-
-- 
cgit v1.1