modules/admin-full: fix another html escape issue on interface overview page

[project/luci.git] / modules / admin-full / luasrc / view / admin_network / lease_status.htm

diff --git a/modules/admin-full/luasrc/view/admin_network/lease_status.htm b/modules/admin-full/luasrc/view/admin_network/lease_status.htm
index 1d7c916..bf5a5c2 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_network/lease_status.htm
+++ b/modules/admin-full/luasrc/view/admin_network/lease_status.htm
@@ -1,85 +1,49 @@
-<script type="text/javascript"><![CDATA[
-       var stxhr = new XHR();
-       var update_status = function() {
-               stxhr.get('<%=luci.dispatcher.build_url("admin", "network", "dhcplease_status")%>', null,
-                       function(x, st)
+<script type="text/javascript">//<![CDATA[
+       XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "dhcplease_status")%>', null,
+               function(x, st)
+               {
+                       var tb = document.getElementById('lease_status_table');
+                       if (st && tb)
                        {
-                               var tb = document.getElementById('lease_status_table');
-                               if (st && tb)
+                               /* clear all rows */
+                               while( tb.rows.length > 1 )
+                                       tb.deleteRow(1);
+
+                               for( var i = 0; i < st.length; i++ )
                                {
-                                       /* clear all rows */
-                                       while( tb.rows.length > 1 )
-                                               tb.rows[1].parentNode.removeChild(tb.rows[1]);
+                                       var timestr;
 
-                                       for( var i = 0; i < st.length; i++ )
+                                       if (st[i].expires <= 0)
                                        {
-                                               var timestr;
-
-                                               if (st[i].expires <= 0)
-                                               {
-                                                       timestr = '<em><%:expired%></em>';
-                                               }
-                                               else
-                                               {
-                                                       var d = 0;
-                                                       var h = 0;
-                                                       var m = 0;
-                                                       var s = st[i].expires;
-
-                                                       if (s > 60) {
-                                                               m = Math.floor(s / 60);
-                                                               s = (s % 60);
-                                                       }
-
-                                                       if (m > 60) {
-                                                               h = Math.floor(m / 60);
-                                                               m = (m % 60);
-                                                       }
-
-                                                       if (h > 24) {
-                                                               d = Math.floor(h / 24);
-                                                               h = (h % 24);
-                                                       }
-
-                                                       timestr = (d > 0)
-                                                               ? String.format('%dd %dh %dm %ds', d, h, m, s)
-                                                               : String.format('%dh %dm %ds', h, m, s);
-                                               }
-
-                                               var tr = document.createElement('tr');
-                                                       tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1);
-
-                                               tr.innerHTML = String.format(
-                                                       '<td class="cbi-section-table-cell">%s</td>' +
-                                                       '<td class="cbi-section-table-cell">%s</td>' +
-                                                       '<td class="cbi-section-table-cell">%s</td>' +
-                                                       '<td class="cbi-section-table-cell">%s</td>',
-                                                               st[i].hostname ? st[i].hostname : '?',
-                                                               st[i].ipaddr,
-                                                               st[i].macaddr,
-                                                               timestr
-                                               );
-
-                                               tb.rows[0].parentNode.appendChild(tr);
+                                               timestr = '<em><%:expired%></em>';
                                        }
-
-                                       if( tb.rows.length == 1 )
+                                       else
                                        {
-                                               var tr = document.createElement('tr');
-                                                       tr.className = 'cbi-section-table-row';
-                                                       tr.innerHTML = '<td colspan="4"><em><br /><%:There are no active leases.%></em></td>';
-
-                                               tb.rows[0].parentNode.appendChild(tr);
+                                               timestr = String.format('%t', st[i].expires);
                                        }
+
+                                       var tr = tb.insertRow(-1);
+                                               tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1);
+
+                                       tr.insertCell(-1).innerHTML = st[i].hostname ? st[i].hostname : '?';
+                                       tr.insertCell(-1).innerHTML = st[i].ipaddr;
+                                       tr.insertCell(-1).innerHTML = st[i].macaddr;
+                                       tr.insertCell(-1).innerHTML = timestr;
                                }
 
-                               window.setTimeout(update_status, 5000);
-                       }
-               )
-       };
+                               if( tb.rows.length == 1 )
+                               {
+                                       var tr = tb.insertRow(-1);
+                                               tr.className = 'cbi-section-table-row';
 
-       update_status();
-]]></script>
+                                       var td = tr.insertCell(-1);
+                                               td.colSpan = 4;
+                                               td.innerHTML = '<em><br /><%:There are no active leases.%></em>';
+                               }
+                       }
+               }
+       );
+//]]></script>
 
 <fieldset class="cbi-section">
        <legend><%:Active Leases%></legend>