From b4e6524c16f396264e026dc006b4f467be0f1921 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Wed, 1 Sep 2010 15:26:50 -0400
Subject: CA/CERT Move

---
 usr/local/www/system_advanced_admin.php      |  2 +-
 usr/local/www/system_camanager.php           | 12 ++++++------
 usr/local/www/system_certmanager.php         | 12 ++++++------
 usr/local/www/system_usermanager.php         |  6 +++---
 usr/local/www/system_usermanager_addcert.php |  6 +++---
 usr/local/www/vpn_ipsec_phase1.php           |  4 ++--
 usr/local/www/vpn_openvpn_client.php         |  4 ++--
 usr/local/www/vpn_openvpn_server.php         |  4 ++--
 8 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'usr/local')

diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php
index e7ae297..c53cc7c 100644
--- a/usr/local/www/system_advanced_admin.php
+++ b/usr/local/www/system_advanced_admin.php
@@ -62,7 +62,7 @@ $pconfig['enablesshd'] = $config['system']['enablesshd'];
 $pconfig['sshport'] = $config['system']['ssh']['port'];
 $pconfig['sshdkeyonly'] = isset($config['system']['ssh']['sshdkeyonly']);
 
-$a_cert =& $config['system']['cert'];
+$a_cert =& $config['cert'];
 
 $certs_available = false;
 if (is_array($a_cert) && count($a_cert))
diff --git a/usr/local/www/system_camanager.php b/usr/local/www/system_camanager.php
index 369f7b6..17f7bd8 100644
--- a/usr/local/www/system_camanager.php
+++ b/usr/local/www/system_camanager.php
@@ -52,15 +52,15 @@ $id = $_GET['id'];
 if (isset($_POST['id']))
 	$id = $_POST['id'];
 
-if (!is_array($config['system']['ca']))
-	$config['system']['ca'] = array();
+if (!is_array($config['ca']))
+	$config['ca'] = array();
 
-$a_ca =& $config['system']['ca'];
+$a_ca =& $config['ca'];
 
-if (!is_array($config['system']['cert']))
-	$config['system']['cert'] = array();
+if (!is_array($config['cert']))
+	$config['cert'] = array();
 
-$a_cert =& $config['system']['cert'];
+$a_cert =& $config['cert'];
 
 $act = $_GET['act'];
 if ($_POST['act'])
diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php
index 4fd51e7..79f2c88 100644
--- a/usr/local/www/system_certmanager.php
+++ b/usr/local/www/system_certmanager.php
@@ -53,15 +53,15 @@ $id = $_GET['id'];
 if (isset($_POST['id']))
 	$id = $_POST['id'];
 
-if (!is_array($config['system']['ca']))
-	$config['system']['ca'] = array();
+if (!is_array($config['ca']))
+	$config['ca'] = array();
 
-$a_ca =& $config['system']['ca'];
+$a_ca =& $config['ca'];
 
-if (!is_array($config['system']['cert']))
-	$config['system']['cert'] = array();
+if (!is_array($config['cert']))
+	$config['cert'] = array();
 
-$a_cert =& $config['system']['cert'];
+$a_cert =& $config['cert'];
 
 $internal_ca_count = 0;
 foreach ($a_ca as $ca)
diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php
index c0105db..9345e12 100644
--- a/usr/local/www/system_usermanager.php
+++ b/usr/local/www/system_usermanager.php
@@ -674,8 +674,8 @@ function sshkeyClicked(obj) {
 						</tr>
 
 						<?php else : ?>
-						<?php 	if (is_array($config['system']['ca']) && count($config['system']['ca']) > 0): ?>
-						<?php		$i = 0; foreach( $config['system']['ca'] as $ca) {
+						<?php 	if (is_array($config['ca']) && count($config['ca']) > 0): ?>
+						<?php		$i = 0; foreach( $config['ca'] as $ca) {
                                                                         	if (!$ca['prv'])
                                                                                 	continue;
 										$i++;
@@ -706,7 +706,7 @@ function sshkeyClicked(obj) {
                                                         	<td width="78%" class="vtable">
                                                                 	<select name='caref' id='caref' class="formselect" onChange='internalca_change()'>
                                                                 <?php
-                                                                        foreach( $config['system']['ca'] as $ca):
+                                                                        foreach( $config['ca'] as $ca):
                                                                         if (!$ca['prv'])
                                                                                 continue;
                                                                 ?>
diff --git a/usr/local/www/system_usermanager_addcert.php b/usr/local/www/system_usermanager_addcert.php
index 125904b..1584bc2 100644
--- a/usr/local/www/system_usermanager_addcert.php
+++ b/usr/local/www/system_usermanager_addcert.php
@@ -53,10 +53,10 @@ if (!is_array($config['system']['user']))
 
 $a_user =& $config['system']['user'];
 
-if (!is_array($config['system']['ca']))
-	$config['system']['ca'] = array();
+if (!is_array($config['ca']))
+	$config['ca'] = array();
 
-$a_ca =& $config['system']['ca'];
+$a_ca =& $config['ca'];
 
 $internal_ca_count = 0;
 foreach ($a_ca as $ca)
diff --git a/usr/local/www/vpn_ipsec_phase1.php b/usr/local/www/vpn_ipsec_phase1.php
index 7c3300c..7ac7383 100644
--- a/usr/local/www/vpn_ipsec_phase1.php
+++ b/usr/local/www/vpn_ipsec_phase1.php
@@ -702,7 +702,7 @@ function dpdchkbox_change() {
 						<td width="78%" class="vtable">
 							<select name='certref' class="formselect">
 							<?php
-								foreach ($config['system']['cert'] as $cert):
+								foreach ($config['cert'] as $cert):
 									$selected = "";
 									if ($pconfig['certref'] == $cert['refid'])
 										$selected = "selected";
@@ -721,7 +721,7 @@ function dpdchkbox_change() {
 						<td width="78%" class="vtable">
 							<select name='caref' class="formselect">
 							<?php
-								foreach ($config['system']['ca'] as $ca):
+								foreach ($config['ca'] as $ca):
 									$selected = "";
 									if ($pconfig['caref'] == $ca['refid'])
 										$selected = "selected";
diff --git a/usr/local/www/vpn_openvpn_client.php b/usr/local/www/vpn_openvpn_client.php
index 1b6dc72..422e3c3 100644
--- a/usr/local/www/vpn_openvpn_client.php
+++ b/usr/local/www/vpn_openvpn_client.php
@@ -610,7 +610,7 @@ function autotls_change() {
 							<td width="78%" class="vtable">
 							<select name='caref' class="formselect">
 							<?php
-								foreach ($config['system']['ca'] as $ca):
+								foreach ($config['ca'] as $ca):
 									$selected = "";
 									if ($pconfig['caref'] == $ca['refid'])
 										$selected = "selected";
@@ -625,7 +625,7 @@ function autotls_change() {
 							<td width="78%" class="vtable">
 							<select name='certref' class="formselect">
 							<?php
-								foreach ($config['system']['cert'] as $cert):
+								foreach ($config['cert'] as $cert):
 									$selected = "";
 									if ($pconfig['certref'] == $cert['refid'])
 										$selected = "selected";
diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php
index 222ed51..4eec76d 100644
--- a/usr/local/www/vpn_openvpn_server.php
+++ b/usr/local/www/vpn_openvpn_server.php
@@ -698,7 +698,7 @@ function netbios_change() {
 							<td width="78%" class="vtable">
 							<select name='caref' class="formselect">
 							<?php
-								foreach ($config['system']['ca'] as $ca):
+								foreach ($config['ca'] as $ca):
 									$selected = "";
 									if ($pconfig['caref'] == $ca['refid'])
 										$selected = "selected";
@@ -713,7 +713,7 @@ function netbios_change() {
 							<td width="78%" class="vtable">
 							<select name='certref' class="formselect">
 							<?php
-								foreach ($config['system']['cert'] as $cert):
+								foreach ($config['cert'] as $cert):
 									$selected = "";
 									if (strstr($cert['name'], "webConfigurator"))
 										continue;
-- 
cgit v1.1