From f2a86ca96fb8e49d978679dab4cfad6ce2f0d9f4 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Tue, 19 Oct 2010 14:19:44 -0400
Subject: Rename 'name' to 'descr' for CA, Certificates, and CRLs, to gain
 CDATA protection and standardize field names. Ticket #320.

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

(limited to 'usr/local/www/wizard.php')

diff --git a/usr/local/www/wizard.php b/usr/local/www/wizard.php
index 3ccf662..9a4a8fe 100755
--- a/usr/local/www/wizard.php
+++ b/usr/local/www/wizard.php
@@ -518,7 +518,7 @@ function showchange() {
                                 echo "<option value='" . $field['add_to_certca_selection'] . "'" . $SELECTED . ">" . $field['add_to_certca_selection'] . "</option>\n";
                         }
 			foreach($config['ca'] as $ca) {
-				$name = htmlspecialchars($ca['name']);
+				$name = htmlspecialchars($ca['descr']);
                           $SELECTED = "";
                           if ($value == $name) $SELECTED = " SELECTED";
                           $to_echo = "<option value='" . $ca['refid'] . "'" . $SELECTED . ">" . $name . "</option>\n";
@@ -556,9 +556,9 @@ function showchange() {
                                 echo "<option value='" . $field['add_to_cert_selection'] . "'" . $SELECTED . ">" . $field['add_to_cert_selection'] . "</option>\n";
                         }
                         foreach($config['cert'] as $ca) {
-				if (stristr($ca['name'], "webconf"))
+				if (stristr($ca['descr'], "webconf"))
 					continue;
-                                $name = htmlspecialchars($ca['name']);
+                                $name = htmlspecialchars($ca['descr']);
                           $SELECTED = "";
                           if ($value == $name) $SELECTED = " SELECTED";
                           $to_echo = "<option value='" . $ca['refid'] . "'" . $SELECTED . ">" . $name . "</option>\n";
-- 
cgit v1.1