Merge pull request #871 from phildd/master

Dynamic DNS: List GWGs in Interface to send update from

1 files changed, 23 insertions, 7 deletions

diff --git a/usr/local/www/services_dyndns_edit.php b/usr/local/www/services_dyndns_edit.php
index ac5ada6..67da1ad 100644
--- a/usr/local/www/services_dyndns_edit.php
+++ b/usr/local/www/services_dyndns_edit.php
@@ -254,6 +254,7 @@ function _onTypeChange(type){
 							echo "selected";
 						echo ">{$ifdesc}</option>\n";
 					}
+					unset($iflist);
 					$grouplist = return_gateway_groups_array();
 				   	foreach ($grouplist as $name => $group) {
 						echo "<option value=\"{$name}\"";
@@ -261,19 +262,34 @@ function _onTypeChange(type){
 							echo "selected";
 						echo ">GW Group {$name}</option>\n";
 					}
+					unset($grouplist);
 				?>
 					</select>
 					</td>
 					</td>
 				</tr>	
 				<tr id="_requestiftr">
-				   <td width="22%" valign="top" class="vncellreq"><?=gettext("Interface to send update from");?></td>  
-				   <td width="78%" class="vtable">
-				   <select name="requestif" class="formselect" id="requestif">
-				   <?php $iflist = get_configured_interface_with_descr();
-				   		foreach ($iflist as $if => $ifdesc):?>
-							<option value="<?=$if;?>" <?php if ($pconfig['requestif'] == $if) echo "selected";?>><?=$ifdesc;?></option>
-					<?php endforeach; ?>
+					<td width="22%" valign="top" class="vncellreq"><?=gettext("Interface to send update from");?></td>  
+					<td width="78%" class="vtable">
+					<select name="requestif" class="formselect" id="requestif">
+				<?php
+					$iflist = get_configured_interface_with_descr();					
+					foreach ($iflist as $if => $ifdesc) {
+						echo "<option value=\"{$if}\"";
+						if ($pconfig['requestif'] == $if)
+							echo "selected";
+						echo ">{$ifdesc}</option>\n";
+					}
+					unset($iflist);
+					$grouplist = return_gateway_groups_array();
+					foreach ($grouplist as $name => $group) {
+						echo "<option value=\"{$name}\"";
+						if ($pconfig['requestif'] == $name)
+							echo "selected";
+						echo ">GW Group {$name}</option>\n";
+					}
+					unset($grouplist);
+				?>
 					</select>
 					<br/><?= gettext("Note: This is almost always the same as the Interface to Monitor.");?>
 					</td>