Fix javascript error and apn id so not duplicate id in html.

2 files changed, 8 insertions, 9 deletions

diff --git a/usr/local/www/interfaces_ppps_edit.php b/usr/local/www/interfaces_ppps_edit.php
index ba13052..4254fde 100644
--- a/usr/local/www/interfaces_ppps_edit.php
+++ b/usr/local/www/interfaces_ppps_edit.php
@@ -617,10 +617,10 @@ $types = array("select" => "Select", "ppp" => "PPP", "pppoe" => "PPPoE", "pptp"
 			<td width="22%" valign="top" class="vncell"><?= gettext("Phone Number"); ?></td>
 			<td width="78%" class="vtable">
 				<input name="phone" type="text" class="formfld unknown" id="phone" size="40" value="<?=htmlspecialchars($pconfig['phone']);?>">
-				<br/><span class="vexpl"><?= gettext("Note: Typically (*99# or *99***# or *99***1#) for GSM networks and *777 for CDMA networks"); ?></span>
+				<br/><span class="vexpl"><?= gettext("Note: Typically (*99# for GSM networks and *777 for CDMA networks"); ?></span>
 			</td>
 		</tr>
-		<tr style="display:none" name="apn" id="apn">
+		<tr style="display:none" name="apn_" id="apn_">
 			<td width="22%" valign="top" class="vncell"><?= gettext("Access Point Name (APN)"); ?></td>
 			<td width="78%" class="vtable">
 				<input name="apn" type="text" class="formfld unknown" id="apn" size="40" value="<?=htmlspecialchars($pconfig['apn']);?>">
@@ -750,15 +750,14 @@ $types = array("select" => "Select", "ppp" => "PPP", "pppoe" => "PPPoE", "pptp"
 				<?php for ($i = 31; $i > 0; $i--): ?>
 					<option value="<?=$i;?>"<?php if ($i == $pconfig['subnet'][$j]) echo " selected"; ?>><?=$i;?></option>
 				<?php endfor; ?>
-				</select> Leave blank to use DHCP to configure <?=strtoupper($pconfig['type']); ?> Local IP.
-				<br><span class="vexpl"><?= gettext("Note: Leave blank to retrieve local IP by DHCP for PPtP/L2TP. Local IP is automatically assigned for PPP links if this field is empty."); ?></span>
+				</select> <?= gettext("IP Address (Leave empty to enable DHCP)"); ?>
+				
 			</td>
 		</tr>
 		<tr style="display:none" id="ip_fields<?=$j;?>">
 			<td width="22%" id="gatewaylabel<?=$j;?>" valign="top" class="vncell"></td>
 			<td width="78%" class="vtable">
 				<input name="gateway[]" type="text" class="formfld unknown" id="gateway<?=$j;?>" size="20" value="<?=htmlspecialchars($pconfig['gateway'][$j]);?>"><?= gettext("IP Address OR Hostname"); ?>
-				<br><span class="vexpl"><?= gettext("Note: This is where the packets will be routed. Remote IP OR Hostname is required for PPTP connections. Remote IP is automatically assigned for PPP links if this field is empty."); ?></span>
 			</td>
 		</tr><?php endfor; ?>
 
diff --git a/usr/local/www/javascript/interfaces_ppps_edit/ppps_edit.js b/usr/local/www/javascript/interfaces_ppps_edit/ppps_edit.js
index 1156e0f..fe435fb 100644
--- a/usr/local/www/javascript/interfaces_ppps_edit/ppps_edit.js
+++ b/usr/local/www/javascript/interfaces_ppps_edit/ppps_edit.js
@@ -108,7 +108,7 @@ function updateType(t){
 	show_advanced('0');
 	switch(t) {
 		case "select": {
-			$('ppp','pppoe','ppp_provider','phone_num','apn').invoke('hide');
+			$('ppp','pppoe','ppp_provider','phone_num','apn_').invoke('hide');
 			select_list.length = 0;
 			select_list[0] = new Option("Select Link Type First","");
 			break;
@@ -116,19 +116,19 @@ function updateType(t){
 		case "ppp": {
 			update_select_list(serialports, select_list);
 			$('select','pppoe').invoke('hide');
-			$('ppp_provider','phone_num','apn').invoke('show');
+			$('ppp_provider','phone_num','apn_').invoke('show');
 			country_list();
 			break;
 		}
 		case "pppoe": {
 			update_select_list(ports, select_list);
-			$('select','ppp','ppp_provider','phone_num','apn').invoke('hide');
+			$('select','ppp','ppp_provider','phone_num','apn_').invoke('hide');
 			break;
 		}
 		case "l2tp":
 		case "pptp": {
 			update_select_list(ports, select_list);
-			$('select','ppp','pppoe','ppp_provider','phone_num','apn').invoke('hide');
+			$('select','ppp','pppoe','ppp_provider','phone_num','apn_').invoke('hide');
 			break;
 		}
 		default: