Fixed #5028

Restored correct delcert action

2 files changed, 90 insertions, 51 deletions

diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php
index f9f2702..6ee5fbb 100644
--- a/src/usr/local/www/system_certmanager.php
+++ b/src/usr/local/www/system_certmanager.php
@@ -1,32 +1,59 @@
 <?php
 /*
 	system_certmanager.php
-
-	Copyright (C) 2008 Shrew Soft Inc.
-	Copyright (C) 2013-2015 Electric Sheep Fencing, LP
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
 */
+/* ====================================================================
+ *	Copyright (c)  2004-2015  Electric Sheep Fencing, LLC. All rights reserved.
+ *	Copyright (c)  2004, 2005 Scott Ullrich
+ *	Copyright (c)  2008 Shrew Soft Inc.
+ *
+ *	Redistribution and use in source and binary forms, with or without modification,
+ *	are permitted provided that the following conditions are met:
+ *
+ *	1. Redistributions of source code must retain the above copyright notice,
+ *		this list of conditions and the following disclaimer.
+ *
+ *	2. Redistributions in binary form must reproduce the above copyright
+ *		notice, this list of conditions and the following disclaimer in
+ *		the documentation and/or other materials provided with the
+ *		distribution.
+ *
+ *	3. All advertising materials mentioning features or use of this software
+ *		must display the following acknowledgment:
+ *		"This product includes software developed by the pfSense Project
+ *		 for use in the pfSense software distribution. (http://www.pfsense.org/).
+ *
+ *	4. The names "pfSense" and "pfSense Project" must not be used to
+ *		 endorse or promote products derived from this software without
+ *		 prior written permission. For written permission, please contact
+ *		 coreteam@pfsense.org.
+ *
+ *	5. Products derived from this software may not be called "pfSense"
+ *		nor may "pfSense" appear in their names without prior written
+ *		permission of the Electric Sheep Fencing, LLC.
+ *
+ *	6. Redistributions of any form whatsoever must retain the following
+ *		acknowledgment:
+ *
+ *	"This product includes software developed by the pfSense Project
+ *	for use in the pfSense software distribution (http://www.pfsense.org/).
+ *
+ *	THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY
+ *	EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ *	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ *	PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE pfSense PROJECT OR
+ *	ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *	SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *	NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ *	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ *	STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ *	OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *	====================================================================
+ *
+ */
 /*
 	pfSense_MODULE: certificate_manager
 */
@@ -962,10 +989,12 @@ $section = new Form_Section('Choose an Existing Certificate');
 $section->addClass('toggle-existing collapse');
 
 $existCerts = array();
-foreach ($config['cert'] as $cert)
-{
-	if (isset($userid) && in_array($cert['refid'], $config['system']['user'][$userid]['cert']))
-		continue;
+
+foreach ($config['cert'] as $cert)	{
+	if(is_array($config['system']['user'][$userid]['cert'])) { // Could be MIA!
+		if (isset($userid) && in_array($cert['refid'], $config['system']['user'][$userid]['cert']))
+			continue;
+	}
 
 	$ca = lookup_ca($cert['caref']);
 	if ($ca)
@@ -979,6 +1008,7 @@ foreach ($config['cert'] as $cert)
 	$existCerts[ $cert['refid'] ] = $cert['descr'];
 }
 
+
 $section->addInput(new Form_Select(
 	'certref',
 	'Existing Certificates',
diff --git a/src/usr/local/www/system_usermanager.php b/src/usr/local/www/system_usermanager.php
index f6e8596..4493ff2 100644
--- a/src/usr/local/www/system_usermanager.php
+++ b/src/usr/local/www/system_usermanager.php
@@ -153,6 +153,21 @@ if (isset($_POST['dellall_x'])) {
 	}
 }
 
+if ($_POST['act'] == "delcert") {
+
+	if (!$a_user[$id]) {
+		pfSenseHeader("system_usermanager.php");
+		exit;
+	}
+
+	$certdeleted = lookup_cert($a_user[$id]['cert'][$_POST['certid']]);
+	$certdeleted = $certdeleted['descr'];
+	unset($a_user[$id]['cert'][$_POST['certid']]);
+	write_config();
+	$_POST['act'] = "edit";
+	$savemsg = gettext("Certificate") . " {$certdeleted} " . gettext("association removed.") . "<br />";
+}
+
 if ($_POST['save']) {
 	unset($input_errors);
 	$pconfig = $_POST;
@@ -259,15 +274,8 @@ if ($_POST['save']) {
 		if ($a_user[$id] && !empty($_POST['privid'])) {
 			foreach ($_POST['privid'] as $i)
 				unset($a_user[$id]['priv'][$i]);
-			local_user_set($a_user[$id]);
-			write_config();
-		}
-
-		// This used to be a separate act=delcert
-		if ($a_user[$id] && !empty($_POST['certid'])) {
-			foreach ($_POST['certid'] as $i)
-				unset($a_user[$id]['cert'][$i]);
 
+			local_user_set($a_user[$id]);
 			write_config();
 		}
 
@@ -392,12 +400,7 @@ function build_priv_table() {
 
 	return($privhtml);
 }
-/*
-<input type="image" name="delcert[]" width="17" height="17" border="0" src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif"
-		onclick="document.getElementById('certid').value='<?=$i;?>';
-		document.getElementById('userid').value='<?=$id;?>';
-		document.getElementById('act').value='<?php echo "delcert";?>'; " title="<?=gettext("delete cert");?>" />
-*/												
+
 function build_cert_table() {
 	global $a_user, $id;
 
@@ -407,7 +410,7 @@ function build_cert_table() {
 	$certhtml .=			'<tr>';
 	$certhtml .=				'<th>' . gettext('Name') . '</th>';
 	$certhtml .=				'<th>' . gettext('CA') . '</th>';
-	$certhtml .=                '<th></th>';
+	$certhtml .=				'<th></th>';
 	$certhtml .=			'</tr>';
 	$certhtml .=		'</thead>';
 	$certhtml .=		'<tbody>';
@@ -424,10 +427,8 @@ function build_cert_table() {
 			$certhtml .=		'<td>' . htmlspecialchars($cert['descr']) . $revokedstr . '</td>';
 			$certhtml .=		'<td>' . htmlspecialchars($ca['descr']) . '</td>';
 			$certhtml .=		'<td>';
-			$certhtml .=			'<a name="delcert[]" class="btn btn-xs btn-danger" onclick="document.getElementById(\'certid\').value=\'' . $i. '\';';
-			$certhtml .=			'document.getElementById(\'userid\').value=\'' . $i . '\';';
-			$certhtml .=			'document.getElementById(\'act\').value=\'' . 'delcert' . '\';"' .  'title="';
-			$certhtml .=            gettext('Do you really want to remove this certificate association? (Certificate will not be deleted)') . '")' . '">Delete</a>'; 
+			$certhtml .=			'<a id="delcert' . $i .'" class="btn btn-xs btn-warning" title="';
+			$certhtml .=			gettext('Remove this certificate association? (Certificate will not be deleted)') . '">Delete</a>';
 			$certhtml .=		'</td>';
 			$certhtml .=	'</tr>';
 			$i++;
@@ -451,8 +452,9 @@ include("head.inc");
 
 if ($input_errors)
 	print_input_errors($input_errors);
+
 if ($savemsg)
-	print_info_box($savemsg);
+	print_info_box($savemsg, 'success');
 
 $tab_array = array();
 $tab_array[] = array(gettext("Users"), true, "system_usermanager.php");
@@ -531,7 +533,6 @@ $form = new Form;
 
 if ($act == "new" || $act == "edit" || $input_errors):
 
-
 	$form->addGlobal(new Form_Input(
 		'act',
 		null,
@@ -876,7 +877,6 @@ events.push(function(){
 	$("#movetodisabled").prop('type','button');
 	$("#movetoenabled").prop('type','button');
 
-
 	// On click . .
 	$("#movetodisabled").click(function() {
 		moveOptions($('[name="groups[]"] option'), $('[name="sysgroups[]"]'));
@@ -894,6 +894,15 @@ events.push(function(){
 		hideInput('authorizedkeys', !this.checked);
 	});
 
+	$('[id^=delcert]').click(function(event) {
+		if(confirm(event.target.title)) {
+			$('#certid').val(event.target.id.match(/\d+$/)[0]);
+			$('#userid').val('<?=$id;?>');
+			$('#act').val('delcert');
+			$('form').submit();
+		}
+	});
+
 	// On page load . .
    hideClass('cert-options', true);
    hideInput('authorizedkeys', true);