diff options
Diffstat (limited to 'usr')
21 files changed, 313 insertions, 73 deletions
diff --git a/usr/local/www/firewall_aliases.php b/usr/local/www/firewall_aliases.php index 6cd0b6b..e453200 100755 --- a/usr/local/www/firewall_aliases.php +++ b/usr/local/www/firewall_aliases.php @@ -161,7 +161,14 @@ include("head.inc"); <td width="25%" class="listhdrr">Name</td> <td width="25%" class="listhdrr">Values</td> <td width="25%" class="listhdr">Description</td> - <td width="10%" class="list"></td> + <td width="10%" class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td valign="middle" width="17"> </td> + <td valign="middle"><a href="firewall_aliases_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="add a new alias"></a></td> + </tr> + </table> + </td> </tr> <?php $i = 0; foreach ($a_aliases as $alias): ?> <tr> @@ -198,8 +205,8 @@ include("head.inc"); <td class="list"> <table border="0" cellspacing="0" cellpadding="1"> <tr> + <td valign="middle" width="17"> </td> <td valign="middle"><a href="firewall_aliases_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="add a new alias"></a></td> - <td valign="middle"> </td> </tr> </table> </td> diff --git a/usr/local/www/firewall_nat.php b/usr/local/www/firewall_nat.php index 986322e..95d0195 100755 --- a/usr/local/www/firewall_nat.php +++ b/usr/local/www/firewall_nat.php @@ -173,7 +173,14 @@ include("head.inc"); <td width="20%" class="listhdrr">NAT IP</td> <td width="20%" class="listhdrr">Int. port range</td> <td width="20%" class="listhdr">Description</td> - <td width="5%" class="list"></td> + <td width="5%" class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="17"></td> + <td><a href="firewall_nat_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> </tr> <?php $nnats = $i = 0; foreach ($a_nat as $natent): ?> <tr valign="top" id="fr<?=$nnats;?>"> @@ -252,7 +259,8 @@ include("head.inc"); <tr> <td><?php if ($nnats == 0): ?><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="delete selected rules" border="0"><?php else: ?><input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title="delete selected mappings" onclick="return confirm('Do you really want to delete the selected mappings?')"><?php endif; ?></td> </tr> - </table></td> + </table> + </td> </tr> </table> </div> diff --git a/usr/local/www/firewall_nat_1to1.php b/usr/local/www/firewall_nat_1to1.php index f061e7b..f19c9a0 100755 --- a/usr/local/www/firewall_nat_1to1.php +++ b/usr/local/www/firewall_nat_1to1.php @@ -99,7 +99,14 @@ include("head.inc"); <td width="20%" class="listhdrr">External IP</td> <td width="20%" class="listhdrr">Internal IP</td> <td width="40%" class="listhdr">Description</td> - <td width="10%" class="list"></td> + <td width="10%" class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="17"></td> + <td valign="middle"><a href="firewall_nat_1to1_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="add rule"></a></td> + </tr> + </table> + </td> </tr> <?php $i = 0; foreach ($a_1to1 as $natent): ?> <tr> @@ -137,6 +144,7 @@ include("head.inc"); <td class="list"> <table border="0" cellspacing="0" cellpadding="1"> <tr> + <td width="17"></td> <td valign="middle"><a href="firewall_nat_1to1_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="add rule"></a></td> </tr> </table> diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php index 6bc7610..640db8f 100755 --- a/usr/local/www/firewall_nat_out.php +++ b/usr/local/www/firewall_nat_out.php @@ -244,7 +244,14 @@ include("head.inc"); <td width="10%" class="listhdrr">NAT Port</td> <td width="10%" class="listhdrr">Static Port</td> <td width="25%" class="listhdr">Description</td> - <td width="5%" class="list"></td> + <td width="5%" class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="17"></td> + <td><a href="firewall_nat_out_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="add new mapping"></a></td> + </tr> + </table> + </td> </tr> <?php $nnats = $i = 0; foreach ($a_out as $natent): ?> <tr valign="top" id="fr<?=$nnats;?>"> diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php index d758610..1ffd891 100755 --- a/usr/local/www/firewall_rules.php +++ b/usr/local/www/firewall_rules.php @@ -242,8 +242,28 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript <td width="5%" class="listhdrr">Gateway</td> <td width="5%" class="listhdrr">Schedule</td> <td width="22%" class="listhdr">Description</td> - <td width="10%" class="list"></td> - </tr> + <td width="10%" class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <?php + $nrules = 0; + for ($i = 0; isset($a_filter[$i]); $i++) { + $filterent = $a_filter[$i]; + if ($filterent['interface'] != $if) + continue; + $nrules++; + } + ?> + <td> + <?php if ($nrules == 0): ?> + <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="delete selected rules" border="0"><?php else: ?> + <input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title="delete selected rules" onclick="return confirm('Do you really want to delete the selected rules?')"><?php endif; ?> + </td> + <td align="center" valign="middle"><a href="firewall_rules_edit.php?if=<?=$if;?>&after=-1"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="add new rule" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> + </tr> <?php if (($if == "wan") && isset($config['interfaces']['wan']['blockpriv'])): ?> <tr valign="top" id="frrfc1918"> <td width="3%" class="list"> </td> @@ -254,7 +274,7 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript <td class="listr" style="background-color: #e0e0e0">*</td> <td class="listr" style="background-color: #e0e0e0">*</td> <td class="listr" style="background-color: #e0e0e0">*</td> - <td class="listr" style="background-color: #e0e0e0">*</td> + <td class="listr" style="background-color: #e0e0e0">*</td> <td class="listbg" style="background-color: #990000"><font color="white">Block private networks</td> <td valign="middle" nowrap class="list"> <table border="0" cellspacing="0" cellpadding="1"> @@ -602,7 +622,7 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="delete selected rules" border="0"><?php else: ?> <input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title="delete selected rules" onclick="return confirm('Do you really want to delete the selected rules?')"><?php endif; ?> </td> - <td><a href="firewall_rules_edit.php?if=<?=$if;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="add new rule" width="17" height="17" border="0"></a></td> + <td><a href="firewall_rules_edit.php?if=<?=$if;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="add new rule" width="17" height="17" border="0"></a></td> </tr> </table> </td> diff --git a/usr/local/www/firewall_schedule.php b/usr/local/www/firewall_schedule.php index 3565157..0181bc0 100644 --- a/usr/local/www/firewall_schedule.php +++ b/usr/local/www/firewall_schedule.php @@ -87,7 +87,14 @@ include("head.inc"); <td width="25%" class="listhdrr">Name</td> <td width="35%" class="listhdrr">Time Range(s)</td> <td width="35%" class="listhdr">Description</td> - <td width="5%" class="list sort_ignore"></td> + <td width="5%" class="list sort_ignore"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="17"></td> + <td valign="middle"><a href="firewall_schedule_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add a new schedule");?>" alt="" /></a></td> + </tr> + </table> + </td> </tr> <?php $i = 0; foreach ($a_schedules as $schedule): ?> <tr> @@ -213,21 +220,18 @@ include("head.inc"); <td class="list"> <table border="0" cellspacing="0" cellpadding="1"> <tr> - <td valign="middle"> - <a href="firewall_schedule_edit.php"> - <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add a new schedule");?>" alt="" /> - </a> - </td> - </tr> - </table> - </td> - </tr> - <tr> - <td class="tabcont" colspan="3"> - <p><span class="vexpl"><span class="red"><strong>Note:<br></strong></span>Schedules act as placeholders for time ranges to be used in Firewall Rules.</span></p> - </td> - </tr> - </table> + <td width="17"></td> + <td valign="middle"><a href="firewall_schedule_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add a new schedule");?>" alt="" /></a></td> + </tr> + </table> + </td> +</tr> +<tr> + <td class="tabcont" colspan="3"> + <p><span class="vexpl"><span class="red"><strong>Note:<br></strong></span>Schedules act as placeholders for time ranges to be used in Firewall Rules.</span></p> + </td> +</tr> +</table> </form> diff --git a/usr/local/www/firewall_virtual_ip.php b/usr/local/www/firewall_virtual_ip.php index 352048b..bfd5c07 100755 --- a/usr/local/www/firewall_virtual_ip.php +++ b/usr/local/www/firewall_virtual_ip.php @@ -117,8 +117,15 @@ include("head.inc"); <td width="30%" class="listhdrr">Virtual IP address</td> <td width="10%" class="listhdrr">Type</td> <td width="40%" class="listhdr">Description</td> - <td width="10%" class="list"></td> - </tr> + <td width="10%" class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="17"></td> + <td valign="middle"><a href="firewall_virtual_ip_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> + </tr> <?php $i = 0; foreach ($a_vip as $vipent): ?> <?php if($vipent['subnet'] <> "" or $vipent['range'] <> "" or $vipent['subnet_bits'] <> "" or $vipent['range']['from'] <> ""): ?> @@ -129,6 +136,7 @@ include("head.inc"); if ($vipent['type'] == "range") echo "{$vipent['range']['from']}-{$vipent['range']['to']}"; ?> + <?php if($vipent['mode'] == "carp") echo " (vhid {$vipent['vhid']})"; ?> </td> <td class="listlr" align="center" ondblclick="document.location='firewall_virtual_ip_edit.php?id=<?=$i;?>';"> <? if($vipent['mode'] == "proxyarp") echo "<img src='./themes/".$g['theme']."/images/icons/icon_parp.gif' title='Proxy ARP'>"; elseif($vipent['mode'] == "carp") echo "<img src='./themes/".$g['theme']."/images/icons/icon_carp.gif' title='CARP'>"; elseif($vipent['mode'] == "other") echo "<img src='./themes/".$g['theme']."/images/icons/icon_other.gif' title='Other'>";?> @@ -152,6 +160,7 @@ include("head.inc"); <td class="list"> <table border="0" cellspacing="0" cellpadding="1"> <tr> + <td width="17"></td> <td valign="middle"><a href="firewall_virtual_ip_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> </tr> </table> diff --git a/usr/local/www/load_balancer_pool.php b/usr/local/www/load_balancer_pool.php index 59fcdda..6d62440 100755 --- a/usr/local/www/load_balancer_pool.php +++ b/usr/local/www/load_balancer_pool.php @@ -108,8 +108,15 @@ include("head.inc"); <td width="10%" class="listhdrr">Port</td> <td width="15%" class="listhdrr">Monitor</td> <td width="30%" class="listhdr">Description</td> - <td width="10%" class="list"></td> - </tr> + <td width="10%" class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="17"></td> + <td valign="middle"><a href="load_balancer_pool_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> + </tr> <?php $i = 0; foreach ($a_pool as $vipent): ?> <tr> <td class="listlr" ondblclick="document.location='load_balancer_pool_edit.php?id=<?=$i;?>';"> @@ -161,6 +168,7 @@ include("head.inc"); <td class="list"> <table border="0" cellspacing="0" cellpadding="1"> <tr> + <td width="17"></td> <td valign="middle"><a href="load_balancer_pool_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> </tr> </table> diff --git a/usr/local/www/load_balancer_virtual_server.php b/usr/local/www/load_balancer_virtual_server.php index f17529a..b0eb105 100755 --- a/usr/local/www/load_balancer_virtual_server.php +++ b/usr/local/www/load_balancer_virtual_server.php @@ -97,8 +97,15 @@ include("head.inc"); <td width="10%" class="listhdrr">Port</td> <td width="20%" class="listhdrr">Pool</td> <td width="30%" class="listhdr">Description</td> - <td width="10%" class="list"></td> - </tr> + <td width="10%" class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="17"></td> + <td valign="middle"><a href="load_balancer_virtual_server_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> + </tr> <?php $i = 0; foreach ($a_vs as $vsent): ?> <tr> <td class="listlr" ondblclick="document.location='load_balancer_virtual_server_edit.php?id=<?=$i;?>';"> @@ -130,6 +137,7 @@ include("head.inc"); <td class="list"> <table border="0" cellspacing="0" cellpadding="1"> <tr> + <td width="17"></td> <td valign="middle"><a href="load_balancer_virtual_server_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> </tr> </table> diff --git a/usr/local/www/services_captiveportal_filemanager.php b/usr/local/www/services_captiveportal_filemanager.php index 39b0cd3..760c1be 100755 --- a/usr/local/www/services_captiveportal_filemanager.php +++ b/usr/local/www/services_captiveportal_filemanager.php @@ -122,7 +122,14 @@ include("head.inc"); <tr> <td width="70%" class="listhdrr">Name</td> <td width="20%" class="listhdr">Size</td> - <td width="10%" class="list"></td> + <td width="10%" class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="17" heigth="17"></td> + <td><a href="services_captiveportal_filemanager.php?act=add"><img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_plus.gif" title="add file" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> </tr> <?php $i = 0; foreach ($a_element as $element): ?> <tr> @@ -153,7 +160,14 @@ include("head.inc"); <?php else: ?> <tr> <td class="list" colspan="2"></td> - <td class="list"> <a href="services_captiveportal_filemanager.php?act=add"><img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_plus.gif" title="add file" width="17" height="17" border="0"></a></td> + <td class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="17" heigth="17"></td> + <td><a href="services_captiveportal_filemanager.php?act=add"><img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_plus.gif" title="add file" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> </tr> <?php endif; ?> </table> diff --git a/usr/local/www/services_captiveportal_ip.php b/usr/local/www/services_captiveportal_ip.php index cbb8f06..50a45b3 100755 --- a/usr/local/www/services_captiveportal_ip.php +++ b/usr/local/www/services_captiveportal_ip.php @@ -96,7 +96,14 @@ include("head.inc"); <tr> <td width="30%" class="listhdrr">IP address</td> <td width="60%" class="listhdr">Description</td> - <td width="10%" class="list"></td> + <td width="10%" class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="17" heigth="17"></td> + <td><a href="services_captiveportal_ip_edit.php"><img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_plus.gif" title="add address" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> </tr> <?php $i = 0; foreach ($a_allowedips as $ip): ?> <tr> @@ -118,7 +125,14 @@ include("head.inc"); <?php $i++; endforeach; ?> <tr> <td class="list" colspan="2"> </td> - <td class="list"> <a href="services_captiveportal_ip_edit.php"><img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_plus.gif" title="add address" width="17" height="17" border="0"></a></td> + <td class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="17" heigth="17"></td> + <td><a href="services_captiveportal_ip_edit.php"><img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_plus.gif" title="add address" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> </tr> <tr> <td colspan="2" class="list"><p class="vexpl"><span class="red"><strong> diff --git a/usr/local/www/services_captiveportal_users.php b/usr/local/www/services_captiveportal_users.php index 7bdb82a..02365dc 100755 --- a/usr/local/www/services_captiveportal_users.php +++ b/usr/local/www/services_captiveportal_users.php @@ -87,7 +87,14 @@ include("head.inc"); <td width="35%" class="listhdrr">Username</td> <td width="20%" class="listhdrr">Full name</td> <td width="35%" class="listhdr">Expires</td> - <td width="10%" class="list"></td> + <td width="10%" class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="17" heigth="17"></td> + <td><a href="services_captiveportal_users_edit.php"><img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_plus.gif" title="add user" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> </tr> <?php $i = 0; foreach($a_user as $userent): ?> <tr> @@ -106,7 +113,14 @@ include("head.inc"); <?php $i++; endforeach; ?> <tr> <td class="list" colspan="3"></td> - <td class="list"> <a href="services_captiveportal_users_edit.php"><img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_plus.gif" title="add user" width="17" height="17" border="0"></a></td> + <td class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="17" heigth="17"></td> + <td><a href="services_captiveportal_users_edit.php"><img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_plus.gif" title="add user" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> </tr> </table> </td> diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php index 273876b..0f09b4e 100755 --- a/usr/local/www/services_dhcp.php +++ b/usr/local/www/services_dhcp.php @@ -545,6 +545,12 @@ function show_netboot_config() { <td width="20%" class="listhdrr">Hostname</td> <td width="30%" class="listhdr">Description</td> <td width="10%" class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td valign="middle" width="17"></td> + <td valign="middle"><a href="services_dhcp_edit.php?if=<?=$if;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> + </tr> + </table> </td> </tr> <?php if(is_array($a_maps)): ?> @@ -580,6 +586,7 @@ function show_netboot_config() { <td class="list"> <table border="0" cellspacing="0" cellpadding="1"> <tr> + <td valign="middle" width="17"></td> <td valign="middle"><a href="services_dhcp_edit.php?if=<?=$if;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> </tr> </table> diff --git a/usr/local/www/services_dnsmasq.php b/usr/local/www/services_dnsmasq.php index 9c6ab8f..0a9e132 100755 --- a/usr/local/www/services_dnsmasq.php +++ b/usr/local/www/services_dnsmasq.php @@ -172,8 +172,15 @@ function enable_change(enable_over) { <td width="25%" class="listhdrr">Domain</td> <td width="20%" class="listhdrr">IP</td> <td width="25%" class="listhdr">Description</td> - <td width="10%" class="list"></td> - </tr> + <td width="10%" class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="17"></td> + <td valign="middle"><a href="services_dnsmasq_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> + </tr> <?php $i = 0; foreach ($a_hosts as $hostent): ?> <tr> <td class="listlr" ondblclick="document.location='services_dnsmasq_edit.php?id=<?=$i;?>';"> @@ -202,6 +209,7 @@ function enable_change(enable_over) { <td class="list"> <table border="0" cellspacing="0" cellpadding="1"> <tr> + <td width="17"></td> <td valign="middle"><a href="services_dnsmasq_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> </tr> </table> @@ -221,7 +229,14 @@ function enable_change(enable_over) { <td width="35%" class="listhdrr">Domain</td> <td width="20%" class="listhdrr">IP</td> <td width="35%" class="listhdr">Description</td> - <td width="10%" class="list"></td> + <td width="10%" class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="17" heigth="17"></td> + <td><a href="services_dnsmasq_domainoverride_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> </tr> <?php $i = 0; foreach ($a_domainOverrides as $doment): ?> <tr> @@ -240,7 +255,14 @@ function enable_change(enable_over) { <?php $i++; endforeach; ?> <tr> <td class="list" colspan="3"></td> - <td class="list"> <a href="services_dnsmasq_domainoverride_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> + <td class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="17" heigth="17"></td> + <td><a href="services_dnsmasq_domainoverride_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> </tr> </table> </form> diff --git a/usr/local/www/services_wol.php b/usr/local/www/services_wol.php index 2bee1e2..6ddcf78 100755 --- a/usr/local/www/services_wol.php +++ b/usr/local/www/services_wol.php @@ -146,8 +146,15 @@ You also can wake all clients at once: <a href="services_wol.php?wakeall=true">< <td width="15%" class="listhdrr">Interface</td> <td width="25%" class="listhdrr">MAC address</td> <td width="50%" class="listhdr">Description</td> - <td width="10%" class="list"></td> - </tr> + <td width="10%" class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td valign="middle" width="17"></td> + <td valign="middle"><a href="services_wol_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> + </tr> <?php $i = 0; foreach ($a_wol as $wolent): ?> <tr> <td class="listlr" ondblclick="document.location='services_wol_edit.php?id=<?=$i;?>';"> @@ -178,11 +185,8 @@ You also can wake all clients at once: <a href="services_wol.php?wakeall=true">< <td class="list"> <table border="0" cellspacing="0" cellpadding="1"> <tr> - <td valign="middle"> - <a href="services_wol_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a> - - </td> - + <td valign="middle" width="17"></td> + <td valign="middle"><a href="services_wol_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> </tr> </table> </td> diff --git a/usr/local/www/system_routes.php b/usr/local/www/system_routes.php index 88dae61..d235b07 100755 --- a/usr/local/www/system_routes.php +++ b/usr/local/www/system_routes.php @@ -117,8 +117,15 @@ include("head.inc"); <td width="25%" class="listhdrr">Network</td> <td width="20%" class="listhdrr">Gateway</td> <td width="30%" class="listhdr">Description</td> - <td width="10%" class="list"></td> - </tr> + <td width="10%" class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="20"></td> + <td><a href="system_routes_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> + </tr> <?php $i = 0; foreach ($a_routes as $route): ?> <tr> <td class="listlr" ondblclick="document.location='system_routes_edit.php?id=<?=$i;?>';"> @@ -149,8 +156,15 @@ include("head.inc"); <?php $i++; endforeach; ?> <tr> <td class="list" colspan="4"></td> - <td class="list"> <a href="system_routes_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> - </tr> + <td class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="20"></td> + <td><a href="system_routes_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> + </tr> </table> </form> <p><b>Note:</b> Do not enter static routes for networks assigned on any interface of this firewall. Static routes are only used for networks reachable via a different router, and not reachable via your default gateway.</p> diff --git a/usr/local/www/vpn_ipsec.php b/usr/local/www/vpn_ipsec.php index d672413..08429b1 100755 --- a/usr/local/www/vpn_ipsec.php +++ b/usr/local/www/vpn_ipsec.php @@ -130,8 +130,14 @@ include("head.inc"); <td class="listhdrr">P1 Enc. Algo</td> <td class="listhdrr">P1 Hash Algo</td> <td class="listhdr">Description</td> - <td class="list"></td> - </tr> + <td class="list" > + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="17" heigth="17"></td> + <td><a href="vpn_ipsec_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="add tunnel" width="17" height="17" border="0"></a></td> + </tr> + </table> + </tr> <?php $i = 0; foreach ($a_ipsec as $ipsecent): if (isset($ipsecent['disabled'])) { $spans = "<span class=\"gray\">"; @@ -179,15 +185,32 @@ include("head.inc"); <td class="listbg" ondblclick="document.location='vpn_ipsec_edit.php?id=<?=$i;?>'"><?=$spans;?><font color="#FFFFFF"> <?=htmlspecialchars($ipsecent['descr']);?> <?=$spane;?></td> - <td valign="middle" nowrap class="list"> <a href="vpn_ipsec_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="edit tunnel" width="17" height="17" border="0"></a> - <a href="vpn_ipsec.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this tunnel?')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" title="delete tunnel" width="17" height="17" border="0"></a></td> - </tr> + <td valign="middle" nowrap class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td><a href="vpn_ipsec_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="edit tunnel" width="17" height="17" border="0"></a></td> + <td><a href="vpn_ipsec.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this tunnel?')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" title="delete tunnel" width="17" height="17" border="0"></a></td> + </tr> + <tr> + <td></td> + <td><a href="vpn_ipsec_edit.php?dup=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="add a new rule based on this one" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> + </tr> <?php $i++; endforeach; ?> <tr> <td class="list" colspan="6"></td> - <td class="list"> <a href="vpn_ipsec_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="add tunnel" width="17" height="17" border="0"></a></td> - </tr> -<td colspan="4"> + <td class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="17"></td> + <td><a href="vpn_ipsec_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="add tunnel" width="17" height="17" border="0"></a></td> + </tr> + </table> + <td> + </tr> + <td colspan="4"> <p><span class="vexpl"><span class="red"><strong>Note:<br> </strong></span>You can check your IPSEC status at <a href="diag_ipsec_sad.php">Status:IPSEC</a>.</span></p> </td> diff --git a/usr/local/www/vpn_ipsec_edit.php b/usr/local/www/vpn_ipsec_edit.php index de5083c..4cba538 100755 --- a/usr/local/www/vpn_ipsec_edit.php +++ b/usr/local/www/vpn_ipsec_edit.php @@ -41,6 +41,10 @@ $id = $_GET['id']; if (isset($_POST['id'])) $id = $_POST['id']; +if (isset($_GET['dup'])) { + $id = $_GET['dup']; +} + if (isset($id) && $a_ipsec[$id]) { $pconfig['disabled'] = isset($a_ipsec[$id]['disabled']); $pconfig['auto'] = isset($a_ipsec[$id]['auto']); @@ -109,6 +113,9 @@ if (isset($id) && $a_ipsec[$id]) { $pconfig['remotebits'] = 32; } +if (isset($_GET['dup'])) + unset($id); + if ($_POST) { if (is_specialnet($_POST['localnettype'])) { $_POST['localnet'] = $_POST['localnettype']; diff --git a/usr/local/www/vpn_ipsec_keys.php b/usr/local/www/vpn_ipsec_keys.php index a9d4b71..1d1add5 100755 --- a/usr/local/www/vpn_ipsec_keys.php +++ b/usr/local/www/vpn_ipsec_keys.php @@ -77,8 +77,15 @@ include("head.inc"); <tr> <td class="listhdrr">Identifier</td> <td class="listhdr">Pre-shared key</td> - <td class="list"></td> - </tr> + <td class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="20" heigth="17"></td> + <td><a href="vpn_ipsec_keys_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="add key" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> + </tr> <?php $i = 0; foreach ($a_secret as $secretent): ?> <tr> <td class="listlr"> @@ -93,8 +100,15 @@ include("head.inc"); <?php $i++; endforeach; ?> <tr> <td class="list" colspan="2"></td> - <td class="list"> <a href="vpn_ipsec_keys_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="add key" width="17" height="17" border="0"></a></td> - </tr> + <td class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="20" heigth="17"></td> + <td><a href="vpn_ipsec_keys_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="add key" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> + </tr> </table> </div> </td> diff --git a/usr/local/www/vpn_pppoe_users.php b/usr/local/www/vpn_pppoe_users.php index fb446e3..a8d6df6 100755 --- a/usr/local/www/vpn_pppoe_users.php +++ b/usr/local/www/vpn_pppoe_users.php @@ -95,8 +95,15 @@ include("head.inc"); <tr> <td class="listhdrr">Username</td> <td class="listhdr">IP address</td> - <td class="list"></td> - </tr> + <td class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="17"></td> + <td><a href="vpn_pppoe_users_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="add user" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> + </tr> <?php $i = 0; foreach ($a_secret as $secretent): ?> <tr> <td class="listlr"> @@ -112,8 +119,15 @@ include("head.inc"); <?php $i++; endforeach; ?> <tr> <td class="list" colspan="2"></td> - <td class="list"> <a href="vpn_pppoe_users_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="add user" width="17" height="17" border="0"></a></td> - </tr> + <td class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="17"></td> + <td><a href="vpn_pppoe_users_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="add user" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> + </tr> </table> </div> </td> diff --git a/usr/local/www/vpn_pptp_users.php b/usr/local/www/vpn_pptp_users.php index b342f0d..628652c 100755 --- a/usr/local/www/vpn_pptp_users.php +++ b/usr/local/www/vpn_pptp_users.php @@ -93,8 +93,15 @@ include("head.inc"); <tr> <td class="listhdrr">Username</td> <td class="listhdr">IP address</td> - <td class="list"></td> - </tr> + <td class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="17"></td> + <td><a href="vpn_pptp_users_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="add user" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> + </tr> <?php $i = 0; foreach ($a_secret as $secretent): ?> <tr> <td class="listlr"> @@ -109,8 +116,15 @@ include("head.inc"); <?php $i++; endforeach; ?> <tr> <td class="list" colspan="2"></td> - <td class="list"> <a href="vpn_pptp_users_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="add user" width="17" height="17" border="0"></a></td> - </tr> + <td class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="17"></td> + <td><a href="vpn_pptp_users_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="add user" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> + </tr> </table> </div> </td> |
