Add missing variable declarations in JavaScript code

This fixes errors reported by LGTM.

Signed-off-by: Stefan Weil <sw@weilnetz.de>

diff --git a/applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm b/applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm
index b14cca228f77a518e0921f5f2f5097305e9ff4b5..66db6ce5500e4b71e3db6918cf6939af07a4a91e 100644 (file)
--- a/applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm
+++ b/applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm
@@ -24,7 +24,7 @@ function randomString(len) {
        var $chars = 'abcdefghijklmnopqrstuvwxyz1234567890';
        var maxPos = $chars.length;
        var pwd = '';
-       for (i = 0; i < len; i++) {
+       for (var i = 0; i < len; i++) {
                pwd += $chars.charAt(Math.floor(Math.random() * maxPos));
        }
        return pwd;
@@ -41,6 +41,7 @@ function showRPCURL() {
        var newTextNode = document.getElementById("aria2rpcpath");
        var auth_method = document.getElementById("cbid.aria2.main.rpc_auth_method");
        var auth_port = document.getElementById("cbid.aria2.main.rpc_listen_port");
+       var auth_port_value;
        if (auth_port.value == "") {
                auth_port_value = "6800"
        } else {

diff --git a/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js b/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js
index e7d2eca39c90267ea2b956336b14a84b0171f4b5..4b8cc2bd04b128351ba4a1b2103a92ee4c8d3c17 100644 (file)
--- a/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js
+++ b/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js
@@ -33,7 +33,7 @@ function edit_server() {
        $("#server").className = '';
        $("#server").onclick = null;
 
-       button_set = document.createElement("input");
+       var button_set = document.createElement("input");
        button_set.type = "button";
        button_set.value = "Save";
        button_set.name = "button_set";
@@ -111,7 +111,7 @@ function ubus_call(command, argument, params, variable) {
        request_data.id = ubus_counter;
        request_data.method = "call";
        request_data.params = [ data.ubus_rpc_session, command, argument, params ]
-       request_json = JSON.stringify(request_data)
+       var request_json = JSON.stringify(request_data)
        ubus_counter++;
        var request = new XMLHttpRequest();
        request.open("POST", ubus_url, true);
@@ -179,7 +179,7 @@ function upgrade_check_callback(request_text) {
        }
        if(request_json.upgrades != undefined) {
                info_output += "<h3>Package upgrades available</h3>"
-               for (upgrade in request_json.upgrades) {
+               for (var upgrade in request_json.upgrades) {
                        info_output += "<b>" + upgrade + "</b>: " + request_json.upgrades[upgrade][1] + " to " + request_json.upgrades[upgrade][0] + "<br />"
                }
        }
@@ -231,7 +231,7 @@ function upgrade_request_callback(request) {
        var filename_split = data.sysupgrade_url.split("/")
        data.filename = filename_split[filename_split.length - 1]
 
-       info_output = 'Firmware created: <a href="' + data.sysupgrade_url + '"><b>' + data.filename + '</b></a>'
+       var info_output = 'Firmware created: <a href="' + data.sysupgrade_url + '"><b>' + data.filename + '</b></a>'
        if(data.advanced_mode == 1) {
                info_output += '<br /><a target="_blank" href="' + data.sysupgrade_url + '.log">Build log</a>'
        }
@@ -320,6 +320,7 @@ function download_image() {
 }
 
 function server_request(request_dict, path, callback) {
+       var request_json;
        request_dict.distro = data.release.distribution;
        request_dict.target = data.release.target.split("\/")[0];
        request_dict.subtarget = data.release.target.split("\/")[1];
@@ -332,7 +333,7 @@ function server_request(request_dict, path, callback) {
                show("#server_div");
        }
        request.addEventListener('load', function(event) {
-               request_text = request.responseText;
+               var request_text = request.responseText;
                if (request.status === 200) {
                        callback(request_text)
 
@@ -378,7 +379,7 @@ function server_request(request_dict, path, callback) {
                } else if (request.status === 500) {
                        request_json = JSON.parse(request_text)
 
-                       error_box_content = "<b>Internal server error</b><br />"
+                       var error_box_content = "<b>Internal server error</b><br />"
                        error_box_content += request_json.error
                        if(request_json.log != undefined) {
                                data.log_url = request_json.log

diff --git a/applications/luci-app-ddns/luasrc/view/ddns/overview_status.htm b/applications/luci-app-ddns/luasrc/view/ddns/overview_status.htm
index b409ed0728a83f9db01914ca8c2ee058eecb8501..f3f45e0d04a5460396d84a4965103cead3071232 100644 (file)
--- a/applications/luci-app-ddns/luasrc/view/ddns/overview_status.htm
+++ b/applications/luci-app-ddns/luasrc/view/ddns/overview_status.htm
@@ -14,7 +14,7 @@
        // called by XHR.poll and onclick_startstop
        function _data2elements(data) {
                // Service sections
-               for( i = 1; i < data.length; i++ )
+               for( var i = 1; i < data.length; i++ )
                {
                        var section = data[i].section   // Section to handle
                        var cbx = document.getElementById("cbid.ddns." + section + ".enabled");         // Enabled
@@ -141,7 +141,7 @@
                                if (x.responseText == "_uncommitted_") {
                                        // we need a trick to display Ampersand "&" in stead of "&#38;" or "&amp;"
                                        // after translation
-                                       txt="<%:Please [Save & Apply] your changes first%>";
+                                       var txt="<%:Please [Save & Apply] your changes first%>";
                                        alert( txt.replace(new RegExp("<%:&%>", "g"), "&") );
                                } else {
                                        // should have data because status changed

diff --git a/applications/luci-app-ddns/luasrc/view/ddns/system_status.htm b/applications/luci-app-ddns/luasrc/view/ddns/system_status.htm
index 615b6b4336a24d31e0dae611448bd4150bc1a31f..41799cd4da4cc018286a9ab6edf129d429cf78dc 100644 (file)
--- a/applications/luci-app-ddns/luasrc/view/ddns/system_status.htm
+++ b/applications/luci-app-ddns/luasrc/view/ddns/system_status.htm
@@ -20,7 +20,7 @@
                                                        '<a class="cbi-button cbi-button-action important" type="button" href="' + data[0].url_up + '"><%:enable here%></a></strong>'
                                                        ]);
                                } else {
-                                       for( j = 1; j < data.length; j++ )
+                                       for(var j = 1; j < data.length; j++ )
                                        {
                                                
                                                rows.push([
@@ -57,4 +57,4 @@
                </div>
        </div>
 </fieldset>
-<!-- ++ END ++ Dynamic DNS ++ system_status.htm ++ -->
\ No newline at end of file
+<!-- ++ END ++ Dynamic DNS ++ system_status.htm ++ -->

diff --git a/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz.js b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz.js
index 60a103adfba1173b96a097ad2b7a038cb959a80b..81eb78fb024ac7f1beb8d2b0070767151921db59 100644 (file)
--- a/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz.js
+++ b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz.js
@@ -103,15 +103,15 @@ function edge(n1,n2){
                        return "";
                }
 
-               x = this.n1.x*scale;
-               y = this.n1.y*scale;
-               dx = this.n2.x*scale - x;
-               dy = this.n2.y*scale - y;
+               var x = this.n1.x*scale;
+               var y = this.n1.y*scale;
+               var dx = this.n2.x*scale - x;
+               var dy = this.n2.y*scale - y;
 
                x += xoff*scale + 75;
                y += yoff*scale + 15;
 
-               imgtag = "<img src='/luci-static/resources/olsr-viz/dot_"
+               var imgtag = "<img src='/luci-static/resources/olsr-viz/dot_"
                if (this.etx > 0 && this.etx < 2) {
                        imgtag += "good.gif'";
                }
@@ -126,9 +126,9 @@ function edge(n1,n2){
                }
                imgtag += " alt='ETX: " + this.etx + "' title='ETX: " + this.etx + "' ";
 
-               d = Math.sqrt(dx*dx+dy*dy);
+               var d = Math.sqrt(dx*dx+dy*dy);
 
-               for (j = 0; j < d; j += 15) {
+               for (var j = 0; j < d; j += 15) {
                        nh += imgtag + "style='top:"
                        + parseInt(y+dy * j / d) + "px; left:"
                        + parseInt(x+dx * j / d) + "px; "
@@ -182,7 +182,7 @@ function edge(n1,n2){
 
 function getEdgeKey(ip1,ip2)
 {
-       key = "";
+       var key = "";
        if(ip1 > ip2) {
                key = ip2 + "-" + ip1;
        }
@@ -215,7 +215,7 @@ function node(ip) {
                        return "";
                }
                var igw = 0;
-               for(h in this.hna) {
+               for(var h in this.hna) {
                        if(h == "0.0.0.0") {
                                igw = 1;
                                break;
@@ -285,7 +285,7 @@ function node(ip) {
 }
 
 function touch_node(ip) {
-       n = nodes[ip];
+       var n = nodes[ip];
        if(!n) {
                n = new node(ip);
                nodes[ip] = n;
@@ -298,19 +298,22 @@ function touch_node(ip) {
 
 function place_new_nodes() {
        var nc = 0;
-       for(i = 0;i<newnodes.length;i++){
-               n = newnodes[i];
+       for(var i = 0;i<newnodes.length;i++){
+               var n = newnodes[i];
                if(n.placed){continue;}
+               var sp;
                if(sp = getCookie("node_"+n.ip)) {
-                       xy = sp.split("x");
+                       var xy = sp.split("x");
                        debug_writeln("sp: "+sp+" xy[0]: "+xy[0]+" xy[1]: "+xy[1]);
                        n.x = parseFloat(xy[0]);
                        n.y = parseFloat(xy[1]);
                }
                else if(n.weight>1){
-                       // see if we find allredy placed nodes
-                       ox=0,oy=0;dx=0,dy=0;c=0;
-                       for(e in n.edges){
+                       // see if we find already placed nodes
+                       var ox=0, oy=0;
+                       var dx=0, dy=0;
+                       var c=0;
+                       for(var e in n.edges){
                                if(nodes[e] && nodes[e].placed){
                                        if(!ox && !oy) {
                                                ox = nodes[e].x;
@@ -349,7 +352,7 @@ function hna(gw,net,mask) {
 }
 
 function touch_hna(node,net,mask) {
-       h = node.hna[net];
+       var h = node.hna[net];
        if(!h) {
                h = new hna(node.ip,net,mask);
                node.hna[net] = h;
@@ -379,17 +382,20 @@ function viz_setup(iframeid,maindivid,nodedivid,edgedivid) {
        edgediv=document.getElementById(edgedivid);
 
        // autosave on exit?
+       var autosave;
        if((autosave = getCookie("prefs_autosave"))) {
                auto_save = parseInt(autosave);
        }
        viz_autosave(auto_save);
 
        // maximum metric of surrounding nodes
+       var mmx;
        if(mmx = getCookie("prefs_maxmetric")) {
                set_maxmetric(mmx,true,true);
        }
 
        // scale of view
+       var savescale;
        if((savescale = getCookie("prefs_scale")) &&
                 (savescale = parseFloat(savescale))) {
                        set_scale(savescale,true);
@@ -414,10 +420,10 @@ function viz_setup(iframeid,maindivid,nodedivid,edgedivid) {
 function viz_save()
 {
        // let cookie survive a month
-       exp = new Date();
+       var exp = new Date();
        exp.setTime(exp.getTime() + 2592000000);
        // save node positions
-       for(ip in nodes)
+       for(var ip in nodes)
        {
                if(nodes[ip].metric > maxmetric) {
                        continue;
@@ -451,10 +457,10 @@ function viz_autosave(autosave)
 function viz_reset()
 {
        deleteAllCookies();
-       for(ip in nodes) {
+       for(var ip in nodes) {
                delete nodes[ip];
        }
-       for(e in edges) {
+       for(var e in edges) {
                delete edges[e];
        }
        viz_update();
@@ -571,6 +577,10 @@ function fa(x) {
 var dclTimer = 0;
 var declump_running = false;
 function declump(t) {
+       var dx;
+       var dy;
+       var d;
+
        // clear declump timer
        if(dclTimer) {
                clearTimeout(dclTimer);
@@ -581,7 +591,7 @@ function declump(t) {
        declump_running = true;
 
        // nodes
-       nc = 0;
+       var nc = 0;
        for (var ip1 in nodes) {
                nodes[ip1].fr_x=0;
                nodes[ip1].fr_y=0;
@@ -595,7 +605,7 @@ function declump(t) {
                if(nodes[ip1].metric > maxmetric || nodes[ip1].pinned) {
                        continue;
                }
-               for (ip2 in nodes) {
+               for (var ip2 in nodes) {
                        if (nodes[ip2].metric > maxmetric || ip1 == ip2) {
                                continue;
                        }
@@ -611,14 +621,14 @@ function declump(t) {
                dx = nodes[ip1].fr_x;
                dy = nodes[ip1].fr_y;
                d = Math.sqrt(dx*dx+dy*dy);
-               md = Math.min(d,iel/nodes[ip1].weight);
+               var md = Math.min(d,iel/nodes[ip1].weight);
                nodes[ip1].x_next += (dx / d) * md;
                nodes[ip1].y_next += (dy / d) * md;
                nc++;
        }
 
        // edges
-       ec = 0;
+       var ec = 0;
        for (var e in edges) {
                if (!edges[e].n1 || !edges[e].n2 ||
                        edges[e].n1.metric > maxmetric || edges[e].n2.metric > maxmetric) {
@@ -637,7 +647,11 @@ function declump(t) {
        }
 
        // displacement
-       xmin=-20;ymin=-20;xmax=20;ymax=20;dsum=0;
+       var xmin=-20;
+       var ymin=-20;
+       var xmax=20;
+       var ymax=20;
+       var dsum=0;
        for (var ip in nodes) {
                if(nodes[ip].metric > maxmetric || nodes[ip].pinned) {
                        continue;
@@ -713,7 +727,7 @@ function dragstart(element) {
        dragx = posx - element.offsetLeft;
        dragy = posy - element.offsetTop;
 
-       n = nodes[dragip];
+       var n = nodes[dragip];
        if(n) {
                n.pinned = true;
        }
@@ -723,7 +737,7 @@ function dragstart(element) {
 function dragstop() {
        //Wird aufgerufen, wenn ein Objekt nicht mehr bewegt werden soll.
 
-       n = nodes[dragip];
+       var n = nodes[dragip];
        if(n) {
                n.pinned = false;
        }
@@ -738,12 +752,12 @@ function drag(ereignis) {
        posx = document.all ? window.event.clientX : ereignis.pageX;
        posy = document.all ? window.event.clientY : ereignis.pageY;
        if(dragip != null) {
-               n = nodes[dragip];
+               var n = nodes[dragip];
                if(n) {
                        n.x = (posx - dragx)/scale - xoff;
                        n.y = (posy - dragy)/scale - yoff;
                }
-               e = document.getElementById('node_'+dragip);
+               var e = document.getElementById('node_'+dragip);
                e.style.left = parseInt((n.x+xoff)*scale) + "px";
                e.style.top = parseInt((n.y+yoff)*scale) + "px";
        }
@@ -811,8 +825,8 @@ function deleteCookie(name, path, domain) {
 }
 
 function deleteAllCookies() {
-       cookies = document.cookie.split("; ");
-       for(i=0;i<cookies.length;i++) {
+       var cookies = document.cookie.split("; ");
+       for(var i=0;i<cookies.length;i++) {
                deleteCookie(cookies[i].split("=")[0]);
        }
 }

diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/common_js.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/common_js.htm
index 1ee763e119578a232f293a55cc622a25a69b94c7..213013f22c82d6fc92958af265238b91c9a90e12 100644 (file)
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/common_js.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/common_js.htm
@@ -9,7 +9,7 @@ function css(selector, property, value) {
 }
 
 window.onload = function() {
-  buttons = '<input type="button" name="show-proto-4" id="show-proto-4" class="cbi-button cbi-button-apply" style="margin-right: 5px" value="<%:Hide IPv4%>">'
+  var buttons = '<input type="button" name="show-proto-4" id="show-proto-4" class="cbi-button cbi-button-apply" style="margin-right: 5px" value="<%:Hide IPv4%>">'
   buttons += '<input type="button" name="show-proto-6" id="show-proto-6" class="cbi-button cbi-button-apply" value="<%:Hide IPv6%>">'
 
   document.getElementById('togglebuttons').innerHTML = buttons;

diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm
index 1c178f18103c017757af2cbb21013f67422d0fa7..f04d926918f0e556185c04c92342418addaee6f1 100644 (file)
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm
@@ -47,12 +47,14 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
                                linkgw = '<a href="http://' + hna.gateway + '/cgi-bin-status.html">' + hna.gateway + '</a>'
                        }
 
+                       var validity;
                        if (hna.validityTime != undefined) {
                                validity = hna.validityTime + 's'
                        } else {
                                validity = '-'
                        }
 
+                       var hostname;
                        if (hna.hostname != undefined) {
                                hostname = ' / <a href="http://' + hna.hostname + '/cgi-bin-status.html">' + hna.hostname + '</a>'
                        } else {

diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm
index 9afd367d1fc6f7caabbc10e39bf3d020db32685d..46cc27dec67d253ac5ab4277e29088f6929c5d5c 100644 (file)
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm
@@ -55,6 +55,7 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
                for (var idx = 0; idx < info.length; idx++)
                {
                        var smartgw = info[idx];
+                       var linkgw;
                        s += '<div class="tr cbi-section-table-row cbi-rowstyle-'+(1 + (idx % 2))+' proto-' + smartgw.proto + '">'
                        if (smartgw.proto == '6') {
                                linkgw = '<a href="http://[' + smartgw.ipAddress + ']/cgi-bin-status.html">' + smartgw.ipAddress + '</a>'

diff --git a/modules/luci-base/htdocs/luci-static/resources/cbi.js b/modules/luci-base/htdocs/luci-static/resources/cbi.js
index f4bf0f40fa673cfd2598139a69440c00fc649d2b..c27cc8264ee66d6c9244913ccc248d20c7b992ff 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/cbi.js
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi.js
@@ -2071,7 +2071,7 @@ function cbi_dropdown_init(sb) {
 cbi_dropdown_init.prototype = CBIDropdown;
 
 function cbi_update_table(table, data, placeholder) {
-       target = isElem(table) ? table : document.querySelector(table);
+       var target = isElem(table) ? table : document.querySelector(table);
 
        if (!isElem(target))
                return;

diff --git a/modules/luci-mod-freifunk/htdocs/luci-static/resources/osm.js b/modules/luci-mod-freifunk/htdocs/luci-static/resources/osm.js
index cae0cd66f7b90fea380e520b593f299bdfcb97fe..48ae91cd81e2510c1f44a4adf50bc06bc1515827 100644 (file)
--- a/modules/luci-mod-freifunk/htdocs/luci-static/resources/osm.js
+++ b/modules/luci-mod-freifunk/htdocs/luci-static/resources/osm.js
@@ -53,8 +53,8 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, {
 
        trigger: function(e) {
                var lonlat = map.getLonLatFromViewPortPx(e.xy); 
-               lat=merc2lat(lonlat.lat);
-               lon=merc2lon(lonlat.lon);
+               var lat=merc2lat(lonlat.lat);
+               var lon=merc2lon(lonlat.lon);
                if(parent.document.getElementById(latfield_id)==null){
                        latfield=document.getElementById('osmlat');
                }else{
@@ -92,7 +92,7 @@ function init(){
 
 function drawmap() {
        OpenLayers.Lang.setCode('de'); 
-       mapdiv=document.getElementById('map');
+       var mapdiv=document.getElementById('map');
        mapdiv.style.height=window.innerHeight+"px";
        mapdiv.style.width=window.innerWidth+"px";
        map = new OpenLayers.Map('map', {

diff --git a/modules/luci-mod-status/luasrc/view/admin_status/wireless.htm b/modules/luci-mod-status/luasrc/view/admin_status/wireless.htm
index 8ec43cb0e63418b0f57105e9d2cdbe7085fae926..03ea2bef01c4a8fbd80eae520b5551bd8d0d6a98 100644 (file)
--- a/modules/luci-mod-status/luasrc/view/admin_status/wireless.htm
+++ b/modules/luci-mod-status/luasrc/view/admin_status/wireless.htm
@@ -61,6 +61,7 @@
        var label_rate_peak;
 
        var label_scale;
+       var label_scale_2;
 
 
        /* wait for SVG */

diff --git a/themes/luci-theme-material/htdocs/luci-static/material/js/script.js b/themes/luci-theme-material/htdocs/luci-static/material/js/script.js
index 583d66d91f531c01686f41a3a467c0b3b15146fb..27bb5ac0387953ff29beb6afd926c85f1f2a050a 100755 (executable)
--- a/themes/luci-theme-material/htdocs/luci-static/material/js/script.js
+++ b/themes/luci-theme-material/htdocs/luci-static/material/js/script.js
@@ -35,6 +35,7 @@
 
     var nodeUrl = "";
     (function(node){
+        var luciLocation;
         if (node[0] == "admin"){
             luciLocation = [node[1], node[2]];
         }else{