v0.3-dev

js/nmaprincesspi.js

@@ -2,6 +2,9 @@
     Princess Pi's Magical Standard Code!
 */
 
+// globals
+var pollInterval = null;
+
 function getID(ID) {
     return document.getElementById(ID);
 }
@@ -90,18 +93,17 @@ function xhrRunNmapScan(xhrRet) {
     // let xhrResponseText = xhrRet.target.responseText;
     xhrJson = JSON.parse(xhrRet.target.responseText);
 
-    getID('link').innerHTML = '<a href="'+xhrJson.webName+'">Scan Report ('+xhrJson.webName+')</a>';
+    if(pollInterval !== null && typeof pollInterval !== 'undefined') {
-    getID('link').style.display = "inline";
-
-    if(typeof pollInterval !== 'undefined') {
         clearInterval(pollInterval);
     }
 
+    getID('link').innerHTML = '<a href="'+xhrJson.webName+'">Scan Report ('+xhrJson.webName+')</a>';
+    getID('link').style.display = "inline";
+
     getID('progress').innerHTML = '';
     getID('progress').style.display = 'none';
 
     pollFile(xhrJson.runningLog);
-
 }
 
 function xhrPollFile(xhrRet) {
@@ -111,7 +113,7 @@ function xhrPollFile(xhrRet) {
 }
 
 function pollFile(runningLog) {
-    var pollInterval = setInterval(function() {
+    pollInterval = setInterval(function() {
         doXhr(runningLog, xhrPollFile);
     }, 1000);
 }

todo.txt

@@ -3,6 +3,7 @@ x add random number to file to prevent enumeration
 x move and edit scripts
 x status/notify when done
 x   polling xml file?
+x bug on second scan in progress pre
 error handling
     nmap fail
     php script fail