Skip to content

Commit

Permalink
merge by the-joker
Browse files Browse the repository at this point in the history 
git-svn-id: svn://svn.dd-wrt.com/DD-WRT@49421 52c4871e-980c-0410-b1e0-e73912ce01f8
  • Loading branch information
@BrainSlayer
BrainSlayer committed Jul 6, 2022
1 parent 7f48b3c commit 2f2c54a
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 62 deletions.
30 changes: 13 additions & 17 deletions src/router/kromo/dd-wrt/Management.asp
View file
Expand Up @@ -22,10 +22,9 @@ function port_enable_disable(F,I) {
if(F._http_enable.checked == false)
if(F._https_enable)
if(F._https_enable.checked == true) {
if (F._remote_mgt_https)
{
choose_disable(F._remote_mgt_https);
F._remote_mgt_https.checked = true;
if (F._remote_mgt_https) {
choose_disable(F._remote_mgt_https);
F._remote_mgt_https.checked = true;
}
}
if(F._https_enable)
Expand Down Expand Up @@ -60,16 +59,13 @@ function valid_password(F) {
F.http_passwdConfirm.select();
return false;
}
return true;
}
function handle_https(F)
{
function handle_https(F) {
if(F._https_enable.checked == true && F.remote_management[0].checked == true) {
choose_enable(F._remote_mgt_https);
}
else {
} else {
F._remote_mgt_https.checked = false;
choose_disable(F._remote_mgt_https);
}
Expand Down Expand Up @@ -168,12 +164,12 @@ function submitcheck(F) {
return true;
}
function to_submit(F) {
if (submitcheck(F))
apply(F);
if (submitcheck(F))
apply(F);
}
function to_apply(F) {
if (submitcheck(F))
applytake(F);
if (submitcheck(F))
applytake(F);
}
var update;
Expand All @@ -184,7 +180,7 @@ addEvent(window, "load", function() {
selSSH("<% nvg("sshd_enable"); %>", 1);
if (document.setup.remote_mgt_telnet)
selTelnet("<% nvg("telnetd_enable"); %>", 1);
show_layer_ext(document.setup.remote_mgt_ssh, 'idssh', <% nvem("remote_mgt_ssh", "1", "1", "0"); %> == 1);
show_layer_ext(document.setup.remote_mgt_telnet, 'idtelnet', <% nvem("remote_mgt_telnet", "1", "1", "0"); %> == 1);
show_layer_ext(document.setup.remote_ip_any, 'idremip', <% nvem("remote_ip_any", "1", "0", "1"); %> == 1);
Expand All @@ -195,15 +191,13 @@ addEvent(window, "load", function() {
show_layer_ext(document.setup.enable_jffs2, 'idjffs2', <% nvem("enable_jffs2", "1", "1", "0"); %> == 1);
show_layer_ext(document.setup.mmc_enable0, 'idmmc', <% nvem("mmc_enable0", "1", "1", "0"); %> == 1);
show_layer_ext(document.setup.mmc_gpio, 'idmmcgpio', <% nvem("mmc_gpio", "1", "1", "0"); %> == 1);
update = new StatusbarUpdate();
update.start();
});
addEvent(window, "unload", function() {
update.stop();
});
//]]>
Expand Down Expand Up @@ -251,6 +245,8 @@ addEvent(window, "unload", function() {
<dd class="definition"><% tran("hmanagement.right2"); %></dd>
<dt class="term"><% tran("hmanagement.right3"); %></dt>
<dd class="definition"><% tran("hmanagement.right4"); %></dd>
<dt class="term"><% tran("hmanagement.right5"); %></dt>
<dd class="definition"><% tran("hmanagement.right6"); %></dd>
</dl><br />
<a href="javascript:openHelpWindow<% ifdef("EXTHELP","Ext"); %>('HManagement.asp');"><% tran("share.more"); %></a>
</div>
Expand Down
46 changes: 20 additions & 26 deletions src/router/kromo/dd-wrt/Status_Lan.asp
View file
Expand Up @@ -38,18 +38,17 @@ function setPPTPTable() {
return;
}
for(var i = 0; i < val.length; i = i + 5) {
var row = table.insertRow(-1);
row.style.height = "15px";
row.insertCell(-1).innerHTML = val[i]; // interface
row.insertCell(-1).innerHTML = val[i+1]; // peer name
row.insertCell(-1).innerHTML = val[i+2]; // local ip
row.insertCell(-1).innerHTML = val[i+3]; // remote ip
var cell = row.insertCell(-1);
cell.title = errmsg.err581;
cell.align = "center";
Expand All @@ -69,25 +68,22 @@ function setPPPOETable() {
return;
}
for(var i = 0; i < val.length; i = i + 4) {
var row = table.insertRow(-1);
row.style.height = "15px";
row.insertCell(-1).innerHTML = val[i]; // interface
row.insertCell(-1).innerHTML = val[i+1]; // peer name
row.insertCell(-1).innerHTML = val[i+2]; // local ip
var cell = row.insertCell(-1);
cell.title = errmsg.err581;
cell.align = "center";
cell.innerHTML = "<input class=\"remove\" type=\"button\" aria-label=\"" + sbutton.del + "\" onclick=\"deletepptp('" + val[i + 3] + "')\" />";
}
}
function setDHCPTable() {
var val = arguments;
var table = document.getElementById("dhcp_leases_table");
Expand All @@ -100,14 +96,13 @@ function setDHCPTable() {
return;
}
for(var i = 0; i < val.length; i = i + 7) {
var row = table.insertRow(-1);
row.style.height = "15px";
row.insertCell(-1).innerHTML = val[i];
row.insertCell(-1).innerHTML = val[i+1];
var cellmac = row.insertCell(-1);
cellmac.title = share.oui;
cellmac.style.cursor = "pointer";
Expand All @@ -130,13 +125,14 @@ function setDHCPTable() {
}
function getSize(size) {
var prefix=new Array("","k","M","G","T","P","E","Z"); var base=1000;
var pos=0;
while (size>base) {
size/=base; pos++;
}
if (pos > 2) precision=100; else precision = 1;
return (Math.round(size*precision)/precision)+prefix[pos];}
var prefix=new Array("","k","M","G","T","P","E","Z"); var base=1000;
var pos=0;
while (size>base) {
size/=base; pos++;
}
if (pos > 2) precision=100; else precision = 1;
return (Math.round(size*precision)/precision)+prefix[pos];
}
function setARPTable() {
var table = document.getElementById("active_clients_table");
Expand Down Expand Up @@ -236,13 +232,12 @@ addEvent(window, "load", function() {
addEvent(window, "unload", function() {
update.stop();
});
//]]>
</script>
</head>

<body class="gui">

<div id="wrapper">
<div id="content">
<div id="header">
Expand All @@ -256,7 +251,7 @@ addEvent(window, "unload", function() {
<input type="hidden" name="action" />
<input type="hidden" name="change_action" />
<input type="hidden" name="submit_type" value="delete" />

<input type="hidden" name="del_if" />
<input type="hidden" name="del_ip" />
<input type="hidden" name="del_mac" />
Expand All @@ -265,7 +260,7 @@ addEvent(window, "unload", function() {
<input type="hidden" name="hostname" />
<input type="hidden" name="ip" />
<input type="hidden" name="mac" />

<h2><% tran("status_lan.h2"); %></h2>
<fieldset>
<legend><% tran("status_lan.legend"); %></legend>
Expand All @@ -292,7 +287,6 @@ addEvent(window, "unload", function() {
<span id="lan_dns"><% nvg("sv_localdns"); %></span>&nbsp;
</div>
</fieldset><br />

<fieldset>
<legend><% tran("status_lan.legend4"); %></legend>
<table class="table" cellspacing="5" id="active_clients_table" summary="active clients in arp table">
Expand Down
8 changes: 0 additions & 8 deletions src/router/kromo/dd-wrt/Status_Router.asp
View file
Expand Up @@ -62,7 +62,6 @@ addEvent(window, "unload", function() {
</head>

<body class="gui">

<div id="wrapper">
<div id="content">
<div id="header">
Expand All @@ -76,9 +75,7 @@ addEvent(window, "unload", function() {
<input type="hidden" name="action" value="Apply" />
<input type="hidden" name="change_action" />
<input type="hidden" name="submit_type" />

<h2><% tran("status_router.h2"); %></h2>

<fieldset>
<legend><% tran("status_router.legend"); %></legend>
<div class="setting">
Expand Down Expand Up @@ -129,7 +126,6 @@ addEvent(window, "unload", function() {
</div>
<% show_voltage(); %>
</fieldset><br />

<fieldset>
<legend><% tran("status_router.legend2"); %></legend>
<div class="setting">
Expand All @@ -151,7 +147,6 @@ addEvent(window, "unload", function() {
</div>
<% show_cpu_temperature(); %>
</fieldset><br />

<fieldset>
<legend><% tran("status_router.legend3"); %></legend>
<div class="setting">
Expand Down Expand Up @@ -183,7 +178,6 @@ addEvent(window, "unload", function() {
<span id="mem_inactive"></span>&nbsp;
</div>
</fieldset><br />

<fieldset>
<legend><% tran("status_router.legend6"); %></legend>
<div class="setting">
Expand Down Expand Up @@ -224,7 +218,6 @@ addEvent(window, "unload", function() {
</div>
<% ifndef("MMC", "-->"); %>
</fieldset><br />

<fieldset>
<legend><% tran("status_router.legend4"); %></legend>
<div class="setting">
Expand All @@ -241,7 +234,6 @@ addEvent(window, "unload", function() {
</script>&nbsp;
</div>
</fieldset><br />

<div class="submitFooter">
<script type="text/javascript">
//<![CDATA[
Expand Down
2 changes: 1 addition & 1 deletion src/router/kromo/dd-wrt/common_style/common.css
View file
Expand Up @@ -392,7 +392,7 @@ table[summary='ports forwarding table'] input[size='10'] {
.message {
border-radius: 4px;
max-width: 72.464em;
margin: 0 auto;
margin: 2em auto;
padding: 1.812em .906em .906em;
font-weight: bold;
text-align: center;
Expand Down
2 changes: 1 addition & 1 deletion src/router/kromo/dd-wrt/elegant/fresh-dark.css
View file
Expand Up @@ -87,7 +87,7 @@ body input[name='reset_button']:focus-visible {
}
body input[name='reboot_button'],
body input[name='reboot_button']:disabled:hover {
background #c00;
background: #c00;
border-color: #c00;
color: #f8f8f8;
}
Expand Down
1 change: 0 additions & 1 deletion src/router/kromo/dd-wrt/help/HManagement.asp
View file
Expand Up @@ -26,7 +26,6 @@
<% tran("hmanagement.page9"); %>
<dt><% tran("management.net_legend"); %></dt>
<% tran("hmanagement.page10"); %>
<% tran("hmanagement.page11"); %>
</dl>
</div>
<div class="also">
Expand Down
18 changes: 10 additions & 8 deletions src/router/kromo/dd-wrt/lang_pack/english.js
View file
Expand Up @@ -1530,22 +1530,24 @@ management.boot_fail_keepip="Keep IP after Bootfail";

//help container
var hmanagement=new Object();
hmanagement.right1="Auto Refresh:";
hmanagement.right1=management.web_refresh + ":";
hmanagement.right2="Adjust the Web interface refresh interval. Enter a value of <b>0</b> to disable this feature.<br/>The default value is <b>3</b> seconds.";
hmanagement.right3=management.jffs_legend + ":";
hmanagement.right4="When you first <b>" + management.jffs_srv + "</b>, it is necessary to enable <b>" + management.jffs_clean + "</b> in order to prepare the flash file system for usage.";
hmanagement.right5=management.net_legend + ":";
hmanagement.right6="Advanced users can use the sysctl tab to further tune the network stack beyond the limited set of options available here. Any settings available on sysctl should be handled with caution, ensure you have a current backup before proceeding in case changes have undesired results.";

//help page
hmanagement.page1="<dd>On this page the router's secure and remote access can be configured as well as other base functions.</dd>";
hmanagement.page2="<dd>The new password must not exceed 63 characters in length or include any spaces. Enter the new password a second time to confirm it.<br /><br /><div class=\"note\"><h4>Note:</h4><div>The default SSH/Telnet username is <tt>root</tt><br />It is strongly recommended that you change the factory default username and password of the router, which is <tt>admin</tt>. At each new session the router's Web interface or the <i>Setup Wizard</i> is accessed, you will be prompted to enter the router's credentials you have previously setup.</div></div></dd>";
hmanagement.page3="<dd>This feature allows you to manage the router from a remote location, via the Internet. To disable this feature, keep the default setting, <em>Disable</em>. To enable this feature, select <em>Enable</em>, and use the specified port (default is 8080) on your device to remotely manage the router. You must also change the router's default password to one of your own, if you haven't already.<br /><br />To remotely manage the router, enter <tt>http:\/\/xxx.xxx.xxx.xxx:8080</tt> (the x's represent the router's Internet IP address, and 8080 represents the specified port) in your Web browser's address field. You will be asked for the router's password.<br /><br />If you use HTTPS you need to specify the URL as <tt>https:\/\/xxx.xxx.xxx.xxx:8080</tt> (not all DD-WRT firmwares does support this without rebuilding with SSL support).<br /><br />You can also enable <em>SSH</em>&nbsp; to remotely access the router by Secure Shell. Note that SSH daemon needs to be enable in <a href=\"HServices.asp\">";
hmanagement.page4="</a> page.<br /><br /><div class=\"note\"><h4>Note:</h4><div>If the router remote access feature is enabled, anyone who knows the router's Internet IP address and password will be able to alter the router's settings.</div></div></dd>";
hmanagement.page5="<dd>This feature allows you to manage the router using either HTTP protocol or the HTTPS protocol. If you choose to disable this feature, a manual reboot will be required.<br />You can also activate or not the router information Web page. It is now possible to password protect this page (same username and password than above).<br />MAC Masking allows you to truncate MAC addresses in the Web interface.<br /><br /><div class=\"note\"><h4>Note:</h4><div>If MAC Masking is enabled, all the MAC addresses will be posted in this format: xx:xx:xx:xx:AA:BB. MAC masking only applies to the Sys-Info page.</div></div></dd>";
hmanagement.page3="<dd>This feature allows you to manage the router from a remote location via the Internet. To disable this feature, keep the default setting, <em>Disable</em>. To enable this feature, select <em>Enable</em>, and use the specified port (default is 8080).<br /><br />To remotely manage the router, enter <tt>http:\/\/xxx.xxx.xxx.xxx:8080</tt> (the x's represent the router's Internet IP address, and :8080 represents the specified port) in your Web browser's address bar. You will be asked to enter the router's password.<br /><br />For HTTPS you need to specify the URL as <tt>https:\/\/xxx.xxx.xxx.xxx:8080</tt> (not supported in all DD-WRT firmware versions without rebuilding with SSL support).<br /><br />You can also enable <em>SSH</em>&nbsp; to remotely access the router via a Secure Shell. The SSH daemon needs to be enabled in <a href=\"HServices.asp\"></a> page.";
hmanagement.page4="<br /><br /><div class=\"note\"><h4>Note:</h4><div>If the router remote access feature is enabled, anyone who knows the router's Internet IP address and password will be able to alter the router's settings.</div></div></dd>";
hmanagement.page5="<dd>This feature allows you to manage the router using either the HTTP or the HTTPS protocol. If you choose to disable this feature, a reboot will be required.<br />The router's information Web page can also be activated. It is now possible to password protect this page using the login credentials currently setup.<br />The Info Site MAC Masking option truncates the first four octets of the MAC addresses on the Info page, this is helpful in case the page is not password protected.<br /><br /><div class=\"note\"><h4>Note:</h4><div>When Info Site MAC Masking is enabled, all the MAC addresses will be shown in the following format: xx:xx:xx:xx:AA:BB. Info Site MAC Masking only applies to the Sys Info page.</div></div></dd>";
hmanagement.page6="<dd>Boot Wait introduces a short delay while booting (5 seconds). During this delay you can initiate a TFTP upload of a new firmware if the current flash ROM contents are damaged. This is only necessary if you can no longer reflash using the Web interface when the installed firmware e.g. will not boot. Form more information see the relevant DD-WRT documentation for your router.<br /><br /><div class=\"note\"><h4>Note:</h4><div>It is recommended that you enable the Boot Wait feature. This will help you recover in the future should you flash your router improperly.</div></div></dd>";
hmanagement.page7="<dd>The cron subsystem schedules execution of Linux commands. You will need to use the command line or startup scripts to actually use this.</dd>";
hmanagement.page7="<dd>The cron subsystem schedules execution of Linux commands. You can use the command line or a startup script to extend this functionality.<br /><br /><div class=\"note\"><h4>Note:</h4><div>NTP should be enabled and working, cron and certain system services rely on accurate time to function normally.</div></div></dd>";
hmanagement.page8="<dd>Enable / disable the loopback interface. The loopback interface makes your internal clients appear as if they are external. This is useful for testing things like DynDNS names. The loopback is an option because enabling it will break PPTP and Windows machine browsing by wireless clients.</dd>";
hmanagement.page9="<dd>This feature controls the resetbuttond process. The reset button initiates actions depending on how long you press it.<ul><li>Short press – Reset the router (reboot)</li><li>Long press (&gt;5s) – Reboot and restore the factory default configuration.</li></ul></dd>";
hmanagement.page10="<dd>The TCP Congestion Control algorithm availability is router dependant and provided by the kernel. When router is the endpoint, the Transmission Bitorrent client, Webserver (lighttpd) or VPN connections e.g. PPPoE etc..., can be affected by the selected congestion control algorithm</dd><br /><br /><div class=\"note\"><h4>Note:</h4><div>The selected congestion control algorithm will benefit mostly slow links or slower low end routers to prevent network congestion occuring in case of traffic overloading and it will <b>not</b> increase link speed.</div></div>";
hmanagement.page11="<dd>For peer-to-peer (P2P) applications running on the network/router, dependant on your router hardware capabilities, either increase or decrease the maximum connections number and lower the TCP / UDP timeout. This may help maintain router stability since peer-to-peer applications open many connections and do not close them properly. Consider using these for old low end routers:<ul><li>Maximum Connections: 4096/32768</li><li>TCP Timeout: 300&nbsp;seconds</li><li>UDP Timeout: 60&nbsp;seconds</li></ul></dd><dd>Check all values and click the <em>" + sbutton.save +"</em> button to save your settings. Click the <em>" + sbutton.cancel + "</em> button to cancel your unsaved changes. Click the <em>" + sbutton.reboot + "</em> button to reboot your router immediately.</dd>";
hmanagement.page10="<dd>The TCP Congestion Control algorithm availability is router dependant and provided by the kernel. When the router is the endpoint, and if enabled the Transmission Bitorrent client, Webserver (lighttpd) or VPN connections e.g. PPPoE etc..., can be affected by the selected congestion control algorithm.<br /><br /><div class=\"note\"><h4>Note:</h4><div>The selected congestion control algorithm will benefit mostly slow links or slower low end routers to prevent network congestion occuring in case of traffic overloading and it will <b>not</b> increase link speed.</div></div><br />For peer-to-peer (P2P) applications running on the network/router, dependant on your router hardware capabilities, either increase or decrease the maximum connections number and lower the TCP / UDP timeout. This may help maintain router stability since peer-to-peer applications open many connections and do not close them properly. Consider using these for old low end routers:<ul><li>Maximum Connections: 4096/32768</li><li>TCP Timeout: 300&nbsp;seconds</li><li>UDP Timeout: 60&nbsp;seconds</li></ul></dd><dd>Check all values and click the <em>" + sbutton.save +"</em> button to save your settings. Click the <em>" + sbutton.cancel + "</em> button to cancel your unsaved changes. Click the <em>" + sbutton.reboot + "</em> button to reboot your router immediately.</dd>";

// ************ Port_Services.asp (used by Filters.asp and QoS.asp, QOSPort_Services.asp not used anymore) *****************************************//
var portserv=new Object();
Expand Down Expand Up @@ -2393,7 +2395,7 @@ status_router.cores="CPU Cores";
status_router.features="CPU Features";
status_router.clock="CPU Clock";
status_router.legend3="Memory";
status_router.mem_tot="Total / Available";
status_router.mem_tot="Total Memory";
status_router.mem_free="Free";
status_router.mem_used="Used";
status_router.mem_buf="Buffers";
Expand Down

0 comments on commit 2f2c54a

Please sign in to comment.