From 2db5f9c23c7158b61f839d1679bde3ad3f135bdf Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Fri, 18 Oct 2013 11:26:03 -0300
Subject: Fix #3242 and some code cleanup:

- Only explode '/' and set address_subnet when address is a subnet, it
  fixes issue reported at #3242
- While I'm here, do some cleanup on the way addresses are treated
  - Remove unecessary variable $tracker, we already have $counter set
    with the same value
  - Use if:endif and while:endwhile where there is html block inside the
    block
  - Use more meaning names for variables instead of item, item2, item3
    and item4
  - Use while($counter <= $count()) instead of using foreach referencing
    array using $counter inside
---
 usr/local/www/firewall_aliases_edit.php | 36 ++++++++++++++-------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php
index 5e9e5a5..772df89 100755
--- a/usr/local/www/firewall_aliases_edit.php
+++ b/usr/local/www/firewall_aliases_edit.php
@@ -685,30 +685,24 @@ if (empty($tab)) {
 
 					<?php
 					$counter = 0;
-					$address = $pconfig['address'];
-					if ($address <> "") {
-						$item = explode(" ", $address);
-						$item3 = explode("||", $pconfig['detail']);
-						foreach($item as $ww) {
-							$address = $item[$counter];
-							$address_subnet = "";
-							$item2 = explode("/", $address);
-							foreach($item2 as $current) {
-								if($item2[1] <> "") {
-									$address = $item2[0];
-									$address_subnet = $item2[1];
-								}
-
+					if ($pconfig['address'] <> ""):
+						$addresses = explode(" ", $pconfig['address']);
+						$details = explode("||", $pconfig['detail']);
+						while ($counter < count($addresses)):
+							if (is_subnet($addresses[$counter])) {
+								list($address, $address_subnet) = explode("/", $addresses[$counter]);
+							} else {
+								$address = $addresses[$counter];
+								$address_subnet = "";
 							}
-							$item4 = $item3[$counter];
-							$tracker = $counter;
+							$detail = $details[$counter];
 					?>
 					<tr>
 						<td>
-							<input autocomplete="off" name="address<?php echo $tracker; ?>" type="text" class="formfldalias ipv4v6" id="address<?php echo $tracker; ?>" size="30" value="<?=htmlspecialchars($address);?>" />
+							<input autocomplete="off" name="address<?php echo $counter; ?>" type="text" class="formfldalias ipv4v6" id="address<?php echo $counter; ?>" size="30" value="<?=htmlspecialchars($address);?>" />
 						</td>
 						<td>
-							<select name="address_subnet<?php echo $tracker; ?>" class="formselect ipv4v6" id="address_subnet<?php echo $tracker; ?>">
+							<select name="address_subnet<?php echo $counter; ?>" class="formselect ipv4v6" id="address_subnet<?php echo $counter; ?>">
 								<option></option>
 								<?php for ($i = 128; $i >= 1; $i--): ?>
 									<option value="<?=$i;?>" <?php if (($i == $address_subnet) || ($i == $pconfig['updatefreq'])) echo "selected=\"selected\""; ?>><?=$i;?></option>
@@ -716,7 +710,7 @@ if (empty($tab)) {
 							</select>
 						</td>
 						<td>
-							<input name="detail<?php echo $tracker; ?>" type="text" class="formfld unknown" id="detail<?php echo $tracker; ?>" size="50" value="<?=$item4;?>" />
+							<input name="detail<?php echo $counter; ?>" type="text" class="formfld unknown" id="detail<?php echo $counter; ?>" size="50" value="<?=$detail;?>" />
 						</td>
 						<td>
 							<a onclick="removeRow(this); return false;" href="#"><img border="0" src="/themes/<?echo $g['theme'];?>/images/icons/icon_x.gif" alt="" title="<?=gettext("remove this entry"); ?>" /></a>
@@ -725,8 +719,8 @@ if (empty($tab)) {
 					<?php
 						$counter++;
 
-						} // end foreach
-					} // end if
+						endwhile;
+					endif;
 					?>
 				</tbody>
 			</table>
-- 
cgit v1.1