diff options
author | Renato Botelho <garga@FreeBSD.org> | 2013-11-25 16:24:33 -0200 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2013-11-25 16:24:33 -0200 |
commit | d251a8d44f19ca6953f046aaafd0c906817d40d5 (patch) | |
tree | d601e16aa43c02283a1bd2eb63552fdf354caba9 /usr/local/www/system_gateways.php | |
parent | 4550880337c9be2fc944bd4954343559643bb21f (diff) | |
download | pfsense-d251a8d44f19ca6953f046aaafd0c906817d40d5.zip pfsense-d251a8d44f19ca6953f046aaafd0c906817d40d5.tar.gz |
Fix whitespaces and indent
Diffstat (limited to 'usr/local/www/system_gateways.php')
-rwxr-xr-x | usr/local/www/system_gateways.php | 232 |
1 files changed, 132 insertions, 100 deletions
diff --git a/usr/local/www/system_gateways.php b/usr/local/www/system_gateways.php index 5fdec7f..7523b7e 100755 --- a/usr/local/www/system_gateways.php +++ b/usr/local/www/system_gateways.php @@ -51,7 +51,7 @@ foreach ($a_gateways as $gw) $a_gateways = $a_gateways_arr; if (!is_array($config['gateways']['gateway_item'])) - $config['gateways']['gateway_item'] = array(); + $config['gateways']['gateway_item'] = array(); $a_gateway_item = &$config['gateways']['gateway_item']; @@ -90,7 +90,7 @@ if ($_GET['act'] == "del") { $remove = false; break; } - + } } } @@ -105,13 +105,13 @@ if ($_GET['act'] == "del") { } if ($remove == true) { /* NOTE: Cleanup static routes for the monitor ip if any */ - if (!empty($a_gateways[$_GET['id']]['monitor']) && $a_gateways[$_GET['id']]['monitor'] != "dynamic" && is_ipaddr($a_gateways[$_GET['id']]['monitor']) && - $a_gateways[$_GET['id']]['monitor'] != $a_gateways[$_GET['id']]['monitor'] && $a_gateways[$_GET['id']]['gateway'] != $a_gateways[$_GET['id']]['monitor']) { - if (is_ipaddrv4($a_gateways[$_GET['id']]['monitor'])) - mwexec("/sbin/route delete " . escapeshellarg($a_gateways[$_GET['id']]['monitor'])); - else - mwexec("/sbin/route delete -inet6 " . escapeshellarg($a_gateways[$_GET['id']]['monitor'])); - } + if (!empty($a_gateways[$_GET['id']]['monitor']) && $a_gateways[$_GET['id']]['monitor'] != "dynamic" && is_ipaddr($a_gateways[$_GET['id']]['monitor']) && + $a_gateways[$_GET['id']]['monitor'] != $a_gateways[$_GET['id']]['monitor'] && $a_gateways[$_GET['id']]['gateway'] != $a_gateways[$_GET['id']]['monitor']) { + if (is_ipaddrv4($a_gateways[$_GET['id']]['monitor'])) + mwexec("/sbin/route delete " . escapeshellarg($a_gateways[$_GET['id']]['monitor'])); + else + mwexec("/sbin/route delete -inet6 " . escapeshellarg($a_gateways[$_GET['id']]['monitor'])); + } if ($config['interfaces'][$a_gateways[$_GET['id']]['friendlyiface']]['gateway'] == $a_gateways[$_GET['id']]['name']) unset($config['interfaces'][$a_gateways[$_GET['id']]['friendlyiface']]['gateway']); @@ -137,14 +137,13 @@ include("head.inc"); <?php include("fbegin.inc"); ?> <?php if ($input_errors) print_input_errors($input_errors); ?> <form action="system_gateways.php" method="post"> -<input type="hidden" name="y1" value="1" /> <?php if ($savemsg) print_info_box($savemsg); ?> <?php if (is_subsystem_dirty('staticroutes')): ?><p> <?php print_info_box_np(gettext("The gateway configuration has been changed.") . "<br/>" . gettext("You must apply the changes in order for them to take effect."));?><br/></p> <?php endif; ?> <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="system gatewyas"> <tr> - <td> + <td> <?php $tab_array = array(); $tab_array[0] = array(gettext("Gateways"), true, "system_gateways.php"); @@ -152,98 +151,131 @@ include("head.inc"); $tab_array[2] = array(gettext("Groups"), false, "system_gateway_groups.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 width="15%" class="listhdrr"><?=gettext("Name"); ?></td> - <td width="15%" class="listhdrr"><?=gettext("Interface"); ?></td> - <td width="20%" class="listhdrr"><?=gettext("Gateway"); ?></td> - <td width="20%" class="listhdrr"><?=gettext("Monitor IP"); ?></td> - <td width="30%" class="listhdr"><?=gettext("Description"); ?></td> - <td width="10%" class="list"> - <table border="0" cellspacing="0" cellpadding="1" summary="add"> - <tr> - <td width="17"></td> - <td><a href="system_gateways_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td> - </tr> - </table> - </td> - </tr> - <?php $i = 0; foreach ($a_gateways as $gateway): ?> - <tr> - <td class="listlr" ondblclick="document.location='system_gateways_edit.php?id=<?=$i;?>';"> - <?php - echo $gateway['name']; - if(isset($gateway['defaultgw'])) - echo " <strong>(default)</strong>"; - ?> - </td> - <td class="listr" ondblclick="document.location='system_gateways_edit.php?id=<?=$i;?>';"> - <?php - echo htmlspecialchars(convert_friendly_interface_to_friendly_descr($gateway['friendlyiface'])); - ?> - </td> - <td class="listr" ondblclick="document.location='system_gateways_edit.php?id=<?=$i;?>';"> - <?php - echo $gateway['gateway'] . " "; - ?> - </td> - <td class="listr" ondblclick="document.location='system_gateways_edit.php?id=<?=$i;?>';"> - <?php - echo htmlspecialchars($gateway['monitor']) . " "; - ?> - </td> - <?php if (is_numeric($gateway['attribute'])) : ?> - <td class="listbg" ondblclick="document.location='system_gateways_edit.php?id=<?=$i;?>';"> - <?php else : ?> - <td class="listbgns" ondblclick="document.location='system_gateways_edit.php?id=<?=$i;?>';"> - <?php endif; ?> - <?=htmlspecialchars($gateway['descr']);?> - </td> - - <td valign="middle" class="list nowrap"> - <table border="0" cellspacing="0" cellpadding="1" summary="icons"> - <tr> - <td><a href="system_gateways_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /></a></td> - <?php - if (is_numeric($gateway['attribute'])) : ?> - <td> - <a href="system_gateways.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this gateway?"); ?>')"> - <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /> - </a> - </td> - <?php else : ?> - <td width='17'></td> - <?php endif; ?> - </tr> - <tr> - <td width="17"></td> - <td><a href="system_gateways_edit.php?dup=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td> - </tr> - </table> </td> </tr> - <?php $i++; endforeach; ?> - <tr> - <td class="list" colspan="5"></td> - <td class="list"> - <table border="0" cellspacing="0" cellpadding="1" summary="edit"> - <tr> - <td width="17"></td> - <td><a href="system_gateways_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="edit" /></a></td> - </tr> - </table> - </td> - </tr> - </table> - </div> + <tr> + <td> + <div id="mainarea"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="main area"> + <tr> + <td width="15%" class="listhdrr"><?=gettext("Name"); ?></td> + <td width="15%" class="listhdrr"><?=gettext("Interface"); ?></td> + <td width="20%" class="listhdrr"><?=gettext("Gateway"); ?></td> + <td width="20%" class="listhdrr"><?=gettext("Monitor IP"); ?></td> + <td width="30%" class="listhdr"><?=gettext("Description"); ?></td> + <td width="10%" class="list"> + <table border="0" cellspacing="0" cellpadding="1" summary="add"> + <tr> + <td width="17"></td> + <td> + <a href="system_gateways_edit.php"> + <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /> + </a> + </td> + </tr> + </table> + </td> + </tr> +<?php + $i = 0; + foreach ($a_gateways as $gateway): +?> + <tr> + <td class="listlr" ondblclick="document.location='system_gateways_edit.php?id=<?=$i;?>';"> +<?php + echo $gateway['name']; + if(isset($gateway['defaultgw'])) + echo " <strong>(default)</strong>"; +?> + </td> + <td class="listr" ondblclick="document.location='system_gateways_edit.php?id=<?=$i;?>';"> +<?php + echo htmlspecialchars(convert_friendly_interface_to_friendly_descr($gateway['friendlyiface'])); +?> + </td> + <td class="listr" ondblclick="document.location='system_gateways_edit.php?id=<?=$i;?>';"> +<?php + echo $gateway['gateway'] . " "; +?> + </td> + <td class="listr" ondblclick="document.location='system_gateways_edit.php?id=<?=$i;?>';"> +<?php + echo htmlspecialchars($gateway['monitor']) . " "; +?> + </td> +<?php + if (is_numeric($gateway['attribute'])): +?> + <td class="listbg" ondblclick="document.location='system_gateways_edit.php?id=<?=$i;?>';"> +<?php + else: +?> + <td class="listbgns" ondblclick="document.location='system_gateways_edit.php?id=<?=$i;?>';"> +<?php + endif; +?> + <?=htmlspecialchars($gateway['descr']);?> + </td> + <td valign="middle" class="list nowrap"> + <table border="0" cellspacing="0" cellpadding="1" summary="icons"> + <tr> + <td> + <a href="system_gateways_edit.php?id=<?=$i;?>"> + <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /> + </a> + </td> +<?php + if (is_numeric($gateway['attribute'])): +?> + <td> + <a href="system_gateways.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this gateway?"); ?>')"> + <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /> + </a> + </td> +<?php + else: +?> + <td width='17'></td> +<?php + endif; +?> + </tr> + <tr> + <td width="17"></td> + <td> + <a href="system_gateways_edit.php?dup=<?=$i;?>"> + <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /> + </a> + </td> + </tr> + </table> + </td> + </tr> +<?php + $i++; + endforeach; +?> + <tr> + <td class="list" colspan="5"></td> + <td class="list"> + <table border="0" cellspacing="0" cellpadding="1" summary="edit"> + <tr> + <td width="17"></td> + <td> + <a href="system_gateways_edit.php"> + <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="edit" /> + </a> + </td> + </tr> + </table> + </td> + </tr> + </table> + </div> </td> - </tr> - </table> - </form> + </tr> + </table> +</form> <?php include("fend.inc"); ?> </body> </html> |