Code style VPN IPsec

author: Phil Davis <phil.davis@inf.org> 2015-05-23 14:49:03 +0545
committer: Phil Davis <phil.davis@inf.org> 2015-05-23 14:49:03 +0545
commit: a1d55e814bea04d37eb92799ad55363b474085ec (patch)
tree: d229470312c992f35e96179af87b55a445c6af59 /usr/local/www/vpn_ipsec_keys.php
parent: 88cbd0049b78bd731648be68c13e08161e5e943c (diff)
download: pfsense-a1d55e814bea04d37eb92799ad55363b474085ec.zip
pfsense-a1d55e814bea04d37eb92799ad55363b474085ec.tar.gz
1 files changed, 117 insertions, 94 deletions
diff --git a/usr/local/www/vpn_ipsec_keys.php b/usr/local/www/vpn_ipsec_keys.php
index ebddcc9..8c30d6b 100644
--- a/usr/local/www/vpn_ipsec_keys.php
+++ b/usr/local/www/vpn_ipsec_keys.php
@@ -3,21 +3,21 @@
 	vpn_ipsec_keys.php
 	part of m0n0wall (http://m0n0.ch/wall)
 	part of pfSense
-	
+
 	Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>.
 	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
@@ -61,8 +61,9 @@ if (isset($_POST['apply'])) {
 	/* reload the filter in the background */
 	filter_configure();
 	$savemsg = get_std_save_message($retval);
-	if (is_subsystem_dirty('ipsec'))
+	if (is_subsystem_dirty('ipsec')) {
 		clear_subsystem_dirty('ipsec');
+	}
 }
 
 if ($_GET['act'] == "del") {
@@ -85,16 +86,17 @@ include("head.inc");
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 <?php include("fbegin.inc"); ?>
 <form action="vpn_ipsec_keys.php" method="post">
-<?php 
-if ($savemsg)
+<?php
+if ($savemsg) {
 	print_info_box($savemsg);
-if (is_subsystem_dirty('ipsec'))
+}
+if (is_subsystem_dirty('ipsec')) {
 	print_info_box_np(gettext("The IPsec tunnel configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));
-
+}
 ?>
 </form>
 <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="vpn ipsec keys">
-  <tr><td class="tabnavtbl">
+	<tr><td class="tabnavtbl">
 <?php
 	$tab_array = array();
 	$tab_array[0] = array(gettext("Tunnels"), false, "vpn_ipsec.php");
@@ -103,92 +105,113 @@ if (is_subsystem_dirty('ipsec'))
 	$tab_array[3] = array(gettext("Advanced Settings"), false, "vpn_ipsec_settings.php");
 	display_top_tabs($tab_array);
 ?>
-  </td></tr>
-  <tr> 
-    <td>
-	<div id="mainarea">
-              <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="main area">
-                <tr> 
-                  <td class="listhdrr"><?=gettext("Identifier"); ?></td>
-                  <td class="listhdrr"><?=gettext("Type"); ?></td>
-                  <td class="listhdr"><?=gettext("Pre-Shared Key"); ?></td>
-                  <td class="list">
-			<table border="0" cellspacing="0" cellpadding="1" summary="add key">
-			    <tr>
-			        <td width="20" height="17"></td>
-				<td><a href="vpn_ipsec_keys_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add key"); ?>" width="17" height="17" border="0" alt="add" /></a></td>
-			    </tr>
-			</table>
-		  </td>
-		</tr>
-			  <?php $i = 0; foreach ($userkeys as $secretent): ?>
-		<tr>
-		<td class="listlr gray">
-			<?php
-				if ($secretent['ident'] == 'allusers')
-					echo gettext("ANY USER");
-				else
-					echo htmlspecialchars($secretent['ident']);
-			?>
-		</td>
-		<td class="listlr gray">
-			<?php
-				if (empty($secretent['type']))
-					echo 'PSK';
-				else
-					echo htmlspecialchars($secretent['type']);
-			?>
-		</td>
-		<td class="listr gray">
-			<?=htmlspecialchars($secretent['pre-shared-key']);?>
-		</td>
-		<td class="list nowrap">
-			<form action="system_usermanager.php" method="post" name="form_edit_key">
-				<input type="hidden" name="act" value="edit" />
-				<input type="hidden" name="userid" value="<?=$secretent['id'];?>" />
-				<input type="image" name="edituser[]" width="17" height="17" border="0"
-					src="/themes/<?=$g['theme'];?>/images/icons/icon_e.gif"
-					title="<?=gettext("edit");?>" />
-			</form>
-		&nbsp;</td>
+	</td></tr>
+	<tr>
+		<td>
+			<div id="mainarea">
+			<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="main area">
+				<tr>
+					<td class="listhdrr"><?=gettext("Identifier"); ?></td>
+					<td class="listhdrr"><?=gettext("Type"); ?></td>
+					<td class="listhdr"><?=gettext("Pre-Shared Key"); ?></td>
+					<td class="list">
+						<table border="0" cellspacing="0" cellpadding="1" summary="add key">
+							<tr>
+								<td width="20" height="17"></td>
+								<td>
+									<a href="vpn_ipsec_keys_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add key"); ?>" width="17" height="17" border="0" alt="add" /></a>
+								</td>
+							</tr>
+						</table>
+					</td>
 				</tr>
-			  <?php $i++; endforeach; ?>
-
-			  <?php $i = 0; foreach ($a_secret as $secretent): ?>
-                <tr> 
-                  <td class="listlr">
-                    <?=htmlspecialchars($secretent['ident']);?>
-                  </td>
-		<td class="listlr">
-			<?php
-				if (empty($secretent['type']))
-					echo 'PSK';
-				else
-					echo htmlspecialchars($secretent['type']);
-			?>
-		</td>
-                  <td class="listr">
-                    <?=htmlspecialchars($secretent['pre-shared-key']);?>
-                  </td>
-                  <td class="list nowrap"><a href="vpn_ipsec_keys_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit key"); ?>" width="17" height="17" border="0" alt="edit" /></a>
-                     &nbsp;<a href="vpn_ipsec_keys.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this Pre-Shared Key?"); ?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" title="<?=gettext("delete key"); ?>" width="17" height="17" border="0" alt="delete" /></a></td>
+<?php
+	$i = 0;
+	foreach ($userkeys as $secretent):
+?>
+				<tr>
+					<td class="listlr gray">
+						<?php
+							if ($secretent['ident'] == 'allusers') {
+								echo gettext("ANY USER");
+							} else {
+								echo htmlspecialchars($secretent['ident']);
+							}
+						?>
+					</td>
+					<td class="listlr gray">
+						<?php
+							if (empty($secretent['type'])) {
+								echo 'PSK';
+							} else {
+								echo htmlspecialchars($secretent['type']);
+							}
+						?>
+					</td>
+					<td class="listr gray">
+						<?=htmlspecialchars($secretent['pre-shared-key']);?>
+					</td>
+					<td class="list nowrap">
+						<form action="system_usermanager.php" method="post" name="form_edit_key">
+							<input type="hidden" name="act" value="edit" />
+							<input type="hidden" name="userid" value="<?=$secretent['id'];?>" />
+							<input type="image" name="edituser[]" width="17" height="17" border="0"
+								src="/themes/<?=$g['theme'];?>/images/icons/icon_e.gif"
+								title="<?=gettext("edit");?>" />
+						</form>
+						&nbsp;
+					</td>
+				</tr>
+<?php
+		$i++;
+	endforeach;
+?>
+
+<?php
+	$i = 0;
+	foreach ($a_secret as $secretent):
+?>
+				<tr>
+					<td class="listlr">
+						<?=htmlspecialchars($secretent['ident']);?>
+					</td>
+					<td class="listlr">
+						<?php
+							if (empty($secretent['type'])) {
+								echo 'PSK';
+							} else {
+								echo htmlspecialchars($secretent['type']);
+							}
+						?>
+					</td>
+					<td class="listr">
+						<?=htmlspecialchars($secretent['pre-shared-key']);?>
+					</td>
+					<td class="list nowrap"><a href="vpn_ipsec_keys_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit key"); ?>" width="17" height="17" border="0" alt="edit" /></a>
+						&nbsp;<a href="vpn_ipsec_keys.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this Pre-Shared Key?"); ?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" title="<?=gettext("delete key"); ?>" width="17" height="17" border="0" alt="delete" /></a>
+					</td>
+				</tr>
+<?php
+		$i++;
+	endforeach;
+?>
+				<tr>
+					<td class="list" colspan="3"></td>
+					<td class="list">
+						<table border="0" cellspacing="0" cellpadding="1" summary="add key">
+							<tr>
+								<td width="20" height="17"></td>
+								<td>
+									<a href="vpn_ipsec_keys_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add key"); ?>" width="17" height="17" border="0" alt="add" /></a>
+								</td>
+							</tr>
+						</table>
+					</td>
 				</tr>
-			  <?php $i++; endforeach; ?>
-                <tr> 
-                  <td class="list" colspan="3"></td>
-                  <td class="list">
-			<table border="0" cellspacing="0" cellpadding="1" summary="add key">
-			    <tr>
-			        <td width="20" height="17"></td>
-				<td><a href="vpn_ipsec_keys_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add key"); ?>" width="17" height="17" border="0" alt="add" /></a></td>
-			    </tr>
 			</table>
-		  </td>
-		</tr>
-              </table>
-	</div>
-      </td>
-    </tr>
+			</div>
+		</td>
+	</tr>
 	<tr>
 		<td colspan="4">
 			<p>
author	Phil Davis <phil.davis@inf.org>	2015-05-23 14:49:03 +0545
committer	Phil Davis <phil.davis@inf.org>	2015-05-23 14:49:03 +0545
commit	a1d55e814bea04d37eb92799ad55363b474085ec (patch)
tree	d229470312c992f35e96179af87b55a445c6af59 /usr/local/www/vpn_ipsec_keys.php
parent	88cbd0049b78bd731648be68c13e08161e5e943c (diff)
download	pfsense-a1d55e814bea04d37eb92799ad55363b474085ec.zip pfsense-a1d55e814bea04d37eb92799ad55363b474085ec.tar.gz