www: Clean and add new features for ddns and minidlna.

Victek · May 8, 2014 · 7195dfa · 7195dfa
1 parent fe9f0c6
commit 7195dfa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/release/src/router/www/advanced-vlan.asp b/release/src/router/www/advanced-vlan.asp
@@ -50,7 +50,7 @@
 <script type='text/javascript' src='wireless.jsx?_http_id=<% nv(http_id); %>'></script>
 <script type='text/javascript' src='interfaces.js'></script>
 <script type='text/javascript'>
-<% nvram ("vlan0ports,vlan1ports,vlan2ports,vlan3ports,vlan4ports,vlan5ports,vlan6ports,vlan7ports,vlan8ports,vlan9ports,vlan10ports,vlan11ports,vlan12ports,vlan13ports,vlan14ports,vlan15ports,vlan0hwname,vlan1hwname,vlan2hwname,vlan3hwname,vlan4hwname,vlan5hwname,vlan6hwname,vlan7hwname,vlan8hwname,vlan9hwname,vlan10hwname,vlan11hwname,vlan12hwname,vlan13hwname,vlan14hwname,vlan15hwname,wan_ifnameX,manual_boot_nv,boardtype,boardflags,trunk_vlan_so,lan_ifname,lan_ifnames,lan1_ifname,lan1_ifnames,lan2_ifname,lan2_ifnames,lan3_ifname,lan3_ifnames,boardrev,boardnum,vlan0tag,vlan0vid,vlan1vid,vlan2vid,vlan3vid,vlan4vid,vlan5vid,vlan6vid,vlan7vid,vlan8vid,vlan9vid,vlan10vid,vlan11vid,vlan12vid,vlan13vid,vlan14vid,vlan15vid,odmpid");%>
+<% nvram ("vlan0ports,vlan1ports,vlan2ports,vlan3ports,vlan4ports,vlan5ports,vlan6ports,vlan7ports,vlan8ports,vlan9ports,vlan10ports,vlan11ports,vlan12ports,vlan13ports,vlan14ports,vlan15ports,vlan0hwname,vlan1hwname,vlan2hwname,vlan3hwname,vlan4hwname,vlan5hwname,vlan6hwname,vlan7hwname,vlan8hwname,vlan9hwname,vlan10hwname,vlan11hwname,vlan12hwname,vlan13hwname,vlan14hwname,vlan15hwname,wan_ifnameX,manual_boot_nv,boardtype,boardflags,trunk_vlan_so,lan_ifname,lan_ifnames,lan1_ifname,lan1_ifnames,lan2_ifname,lan2_ifnames,lan3_ifname,lan3_ifnames,boardrev,boardnum,vlan0tag,vlan0vid,vlan1vid,vlan2vid,vlan3vid,vlan4vid,vlan5vid,vlan6vid,vlan7vid,vlan8vid,vlan9vid,vlan10vid,vlan11vid,vlan12vid,vlan13vid,vlan14vid,vlan15vid,model");%>
 
 var port_vlan_supported = 0;
 var trunk_vlan_supported = 0;
@@ -78,7 +78,7 @@ switch(nvram['boardtype']) {
   case '0x052b':  // WNR3500L v2
   case '0x05d8':  // Tenda W1800R
   case '0x058e':  // E900, E800
-  case '0x0646':  // RT-AC56U and RT-AC68U
+  case '0x0646':  // RT-AC56U and RT-AC68U/RT-AC68R
     trunk_vlan_supported = 1;
     break;
   default:
@@ -92,15 +92,15 @@ switch(nvram['boardtype']) {
 // http://wiki.openwrt.org/toh/start
 switch(nvram['boardtype']) {
 	case '0x0646':  // RT-AC56 && RT-AC68
-		if ((nvram['boardrev'] == '0x1100') && (nvram['odmpid'] == 'RT-AC56U')) { //RT-AC56U
+		if ((nvram['boardrev'] == '0x1100') && (nvram['model'] == 'RT-AC56U')) { //RT-AC56U
 	COL_P0N = '0';
 	COL_P1N = '1';
 	COL_P2N = '2';
 	COL_P3N = '3';
 	COL_P4N = '4';
 		break;
     	}
-		if ((nvram['boardrev'] == '0x1100') && (nvram['odmpid'] == 'RT-AC68U')) { //RT-AC68U
+		if (((nvram['boardrev'] == '0x1100') && (nvram['model'] == 'RT-AC68U')) || (nvram['model'] == 'RT-AC68R'))  { //RT-AC68U or RT-AC68R
 	COL_P0N = '4';
 	COL_P1N = '3';
 	COL_P2N = '2';

diff --git a/release/src/router/www/basic-ddns.asp b/release/src/router/www/basic-ddns.asp
@@ -71,6 +71,8 @@ var services = [
 	['tzo', 'TZO', 'http://www.tzo.com/', 'uh', 'Email Address', 'Password'],
 	['zoneedit', 'ZoneEdit', 'http://www.zoneedit.com/', 'uh'],
 	['szoneedit', 'ZoneEdit (https)', 'http://www.zoneedit.com/', 'uh'],
+	['pairnic', 'pairNIC', 'http://www.pairnic.com/', 'uh'],
+	['spairnic', 'pairNIC (https)', 'http://www.pairnic.com/', 'uh'],
 	['custom', 'Custom URL', '', 'c']];
 
 var opendns = ['208.67.222.222', '208.67.220.220'];

diff --git a/release/src/router/www/nas-media.asp b/release/src/router/www/nas-media.asp
@@ -118,6 +118,7 @@ function verifyFields(focused, quiet)
 
 	eLoc.disabled = (a == 0);
 	eUser.disabled = (a == 0);
+	E('_ms_port').disabled = (a == 0);
 	E('_f_ms_sas').disabled = (a == 0);
 	E('_f_ms_rescan').disabled = (a == 0);
 	E('_f_ms_tivo').disabled = (a == 0);
@@ -282,8 +283,10 @@ switch (nvram.ms_dbdir) {
 
 createFieldTable('', [
 	{ title: 'Enable', name: 'f_ms_enable', type: 'checkbox', value: nvram.ms_enable == '1' },
+	{ title: 'Port', name: 'ms_port', type: 'text', maxlen: 5, size: 6, value: nvram.ms_port, suffix: '<small>(range: 0 - 65535; default (random) set 0)</small>' },
 	{ title: 'Database Location', multi: [
 		{ name: 'f_loc', type: 'select', options: [['','RAM (Temporary)'],
+
 /* JFFS2-BEGIN */
 			['/jffs/dlna','JFFS'],
 /* JFFS2-END */