Changeset 374

Timestamp:

Nov 4, 2018, 11:18:18 AM (6 years ago)

Author:

g7moreau

Message:

• Clean code

File:

• trunk/nagios-velvice/velvice.cgi (modified) (5 diffs)

trunk/nagios-velvice/velvice.cgi

@@ -17 +17 @@
 use strict;
 use warnings;
-use version; our $VERSION = version->declare('0.10.2');
+use version; our $VERSION = version->declare('0.10.3');
 
 use CGI;
@@ -166 +166 @@
 $mon++;
 my $date_sec = nosbreak(sprintf '%04i-%02i-%02i %02i:%02i:%02i', $year, $mon, $mday, $hour, $min, $sec);
-my $date = nosbreak(sprintf '%04i-%02i-%02i %02i:%02i', $year, $mon, $mday, $hour, $min);
+my $date_min = nosbreak(sprintf '%04i-%02i-%02i %02i:%02i',      $year, $mon, $mday, $hour, $min);
 
 my $htmlpage;
@@ -192 +192 @@
  <link rel="shortcut icon" type="image/ico" href="$config->{'nagios-server'}{'image'}/favicon.ico">
  <script type="text/javascript">
-   // var first_loop  = 0;
    var refresh_sec = 900; // 15 min = 900 s
    var refresh_interval;
    function refresh() {
-      // if (first_loop == 0) {
-      //    first_loop++;
-      //    console.log("Jump First Loop");
-      //    return;
-      //    }
       var req = new XMLHttpRequest();
       console.log("Grabbing Value");
-      // req.onreadystatechange = function () {
-      //    if (req.readyState == 4 && req.status == 200) {
-      //       document.getElementById('master-body').innerText = req.responseXML.getElementById('master-body').innerText;
-      //       }
-      //    }
-      // req.overrideMimeType('text/xml');
       req.open("GET", '$cgi_script_name?only=body', true); // Grabs whatever you've written in this file
       req.onload = function () {
          if (req.status == 200) {
             document.getElementById('master-body').innerHTML = req.responseXML.getElementById('master-body').innerHTML;
-            // document.getElementById('master-body').outerHTML = req.responseXML.getElementById('master-body').outerHTML;
             console.log("Update Page: ", $date_sec);
-            // console.log("Update Page ", req.responseXML.getElementById('master-body').outerHTML);
 
             refresh_next = req.responseXML.getElementById('master-body').getAttribute("refresh");
@@ -234 +220 @@
 
    function init() { // This is the function the browser first runs when it's loaded.
-      // refresh() // Then runs the refresh function for the first time.
       refresh_sec = document.getElementById('master-body').getAttribute("refresh");
       if (refresh_sec < 60 && refresh_sec != 0) {
@@ -252 +237 @@
   <ul>
     <li>Nagios Velvice Alert Panel : <a href="$config->{'nagios-server'}{'portal-url'}">Core Server</a></li>
-    <li><small><a id="refresh" href="$cgi_script_name">$date</a></small></li>
+    <li><small><a id="refresh" href="$cgi_script_name">$date_min</a></small></li>
   </ul>
  </h1>