removed several console logs

15 files changed, 93 insertions, 91 deletions

diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index f9a294f9..0e6e4e63 100755
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -1625,7 +1625,7 @@ angular.module('zmApp.controllers')
                               }
 
                               monitors[i].Monitor.streamingURL = st2;
-                              console.log ("NO SERVER MATCH CONSTRUCTED STREAMING PATH="+st2);
+                              //console.log ("NO SERVER MATCH CONSTRUCTED STREAMING PATH="+st2);
                             monitors[i].Monitor.baseURL = loginData.url;
                             monitors[i].Monitor.imageMode = (versionCompare($rootScope.apiVersion, "1.30") == -1) ? "path" : "fid";
 
@@ -1635,7 +1635,7 @@ angular.module('zmApp.controllers')
                               monitors[i].Monitor.imageMode = 'path';
                             }
 
-                            debug("API " + $rootScope.apiVersion + ": Monitor " + monitors[i].Monitor.Id + " will use " + monitors[i].Monitor.imageMode + " for direct image access");
+                           // debug("API " + $rootScope.apiVersion + ": Monitor " + monitors[i].Monitor.Id + " will use " + monitors[i].Monitor.imageMode + " for direct image access");
                           }
                         }
                         // now get packery hide if applicable
@@ -1726,9 +1726,9 @@ angular.module('zmApp.controllers')
             d.reject("not implemented");
             return d.promise;
           }
-          console.log("inside processFastLogin");
+         // console.log("inside processFastLogin");
           if (!loginData.fastLogin) {
-            console.log("Fast login not set");
+            //console.log("Fast login not set");
             d.reject("fast login not enabled");
             debug("fast login not enabled");
             return d.promise;
@@ -1737,7 +1737,7 @@ angular.module('zmApp.controllers')
           {
             localforage.getItem("lastLogin")
               .then(function (succ) {
-                  console.log("fast login DB found");
+                  //console.log("fast login DB found");
                   var dt = moment(succ);
 
                   if (dt.isValid()) {
@@ -1750,14 +1750,14 @@ angular.module('zmApp.controllers')
                       return d.promise;
                     }
                   } else {
-                    console.log("Invalid date found");
+                    //console.log("Invalid date found");
                     d.reject("last-login invalid");
                     return d.promise;
 
                   }
                 },
                 function (e) {
-                  console.log("fastlogin DB not found");
+                  //console.log("fastlogin DB not found");
                   d.reject("last-login not found, fastlogin rejected");
                   return d.promise;
                 });
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 871051ad..6f014de2 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -163,7 +163,8 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
         // we need this timeout to avoid load interrupting
         // play -- I suppose its an angular digest foo thing
-        console.log ("*********** ON PLAY READY");
+        //console.log ("*********** ON PLAY READY");
+        NVRDataModel.debug ("On Play Ready invoked");
         handle = api;
 
         $ionicLoading.show(
@@ -186,7 +187,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
     $scope.onPlaybackUpdate = function(rate)
     {
-        console.log ("UPDATED RATE TO "+rate);
+       // console.log ("UPDATED RATE TO "+rate);
         var ld = NVRDataModel.getLogin();
         ld.videoPlaybackSpeed = rate;
         NVRDataModel.setLogin(ld);
@@ -195,7 +196,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
     $scope.onCanPlay = function()
     {
         
-        console.log ("*********** CAN PLAY");
+        //console.log ("*********** CAN PLAY");
         $ionicLoading.hide();
         NVRDataModel.debug("This video can be played");
         $scope.videoObject.config.cuepoints.points = [];
@@ -726,7 +727,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
         $scope.selectEventUrl = url;
         $scope.slideIndex = $scope.mycarousel.index;
         $scope.slideLastIndex = $scope.slides.length - 1;
-        console.log ("FRAMES LENGTH IS " +$scope.slideLastIndex );
+       // console.log ("FRAMES LENGTH IS " +$scope.slideLastIndex );
 
         // console.log ("URL TO DISPLAY " + url);
 
@@ -748,7 +749,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                         $scope.selectEventUrl = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand + "&path=" + $scope.relativePath + $scope.slides[$scope.slideIndex].img;
                         //NVRDataModel.log("selected frame is " + $scope.slideIndex);
 
-                        console.log("URL TO DISPLAY " + $scope.slides[$scope.slideIndex].img);
+                        //console.log("URL TO DISPLAY " + $scope.slides[$scope.slideIndex].img);
 
                         e.preventDefault();
                     }
@@ -762,7 +763,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                         if ($scope.slideIndex < $scope.slideLastIndex) $scope.slideIndex++;
                         $scope.selectEventUrl = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand + "&path=" + $scope.relativePath + $scope.slides[$scope.slideIndex].img;
                         //NVRDataModel.log("selected frame is " + $scope.slideIndex);
-                        console.log("URL TO DISPLAY " + $scope.slides[$scope.slideIndex].img);
+                        //console.log("URL TO DISPLAY " + $scope.slides[$scope.slideIndex].img);
                         e.preventDefault();
                     }
                 },
@@ -897,7 +898,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
     {
 
         $scope.imageFit = !$scope.imageFit;
-        console.log("Switching image style to " + $scope.imageFit);
+        //console.log("Switching image style to " + $scope.imageFit);
     };
 
     $scope.$on('$ionicView.enter', function()
@@ -1063,7 +1064,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
     $scope.$on('modal.removed', function(e, m)
     {
-        console.log("************* REMOVE CALLED");
+        //console.log("************* REMOVE CALLED");
         $interval.cancel(eventQueryHandle);
         if (m.id != 'footage')
             return;
@@ -1658,7 +1659,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                     //videoURL = "http://arjunrc.ddns.net:8888/foo2.mp4";
                     $scope.video_url = videoURL;
 
-                    console.log("************** VIDEO IS " + videoURL);
+                    //console.log("************** VIDEO IS " + videoURL);
 
                     NVRDataModel.debug("Video url passed to player is: " + videoURL);
 
diff --git a/www/js/EventServerSettingsCtrl.js b/www/js/EventServerSettingsCtrl.js
index dc88b30b..3ec702b7 100644
--- a/www/js/EventServerSettingsCtrl.js
+++ b/www/js/EventServerSettingsCtrl.js
@@ -67,7 +67,7 @@
          $scope.loginData = NVRDataModel.getLogin();
          //console.log ("Event server - before Enter, loginData is " + JSON.stringify($scope.loginData));
 
-         console.log ("BEFORE ENTER I GOT " + JSON.stringify($scope.loginData));
+         //console.log ("BEFORE ENTER I GOT " + JSON.stringify($scope.loginData));
 
 
 
@@ -223,7 +223,7 @@
          $scope.loginData.eventServerMonitors = monstring;
          $scope.loginData.eventServerInterval = intervalstring;
 
-         console.log ("SAVED: " + JSON.stringify($scope.loginData));
+        // console.log ("SAVED: " + JSON.stringify($scope.loginData));
          NVRDataModel.setLogin($scope.loginData);
 
          var pushstate = "enabled";
diff --git a/www/js/ImportantMessageCtrl.js b/www/js/ImportantMessageCtrl.js
index 0f948d7f..e4a3b86d 100644
--- a/www/js/ImportantMessageCtrl.js
+++ b/www/js/ImportantMessageCtrl.js
@@ -14,7 +14,7 @@ angular.module('zmApp.controllers').controller('zmApp.ImportantMessageCtrl', ['$
     //------------------------------------------------------------------------
     $scope.$on('$ionicView.enter', function()
     {
-        console.log("**VIEW ** LowVersion Ctrl Entered");
+       // console.log("**VIEW ** LowVersion Ctrl Entered");
         $ionicSideMenuDelegate.canDragContent(true);
         $scope.requiredVersion = zm.minAppVersion;
         $scope.currentVersion = $stateParams.ver;
diff --git a/www/js/InvalidApiCtrl.js b/www/js/InvalidApiCtrl.js
index 1c65b9fd..56a0b8b9 100644
--- a/www/js/InvalidApiCtrl.js
+++ b/www/js/InvalidApiCtrl.js
@@ -14,7 +14,7 @@ angular.module('zmApp.controllers').controller('zmApp.InvalidApiCtrl', ['$scope'
     //------------------------------------------------------------------------
     $scope.$on('$ionicView.enter', function()
     {
-        console.log("**VIEW ** InvalidAPI Ctrl Entered");
+       // console.log("**VIEW ** InvalidAPI Ctrl Entered");
         $ionicSideMenuDelegate.canDragContent(true);
     });
 
diff --git a/www/js/LogCtrl.js b/www/js/LogCtrl.js
index e3f4da35..46c1084e 100644
--- a/www/js/LogCtrl.js
+++ b/www/js/LogCtrl.js
@@ -36,7 +36,7 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo
             $scope.logEntity = $rootScope.appName;
         else
             $scope.logEntity = 'ZoneMinder';
-        console.log ("Flipped");
+        //console.log ("Flipped");
         loadLogs();
 
     };
@@ -214,9 +214,9 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo
         .then (function (success) {
             $ionicLoading.hide();
             $scope.zmMaxPage = success.data.pagination.pageCount;
-            console.log ("PAGES="+$scope.zmMaxPage);
+           // console.log ("PAGES="+$scope.zmMaxPage);
             var tLogs = "";
-            console.log (JSON.stringify(success));
+           // console.log (JSON.stringify(success));
             for (var i=0; i< success.data.logs.length; i++)
             {
                 tLogs = tLogs + moment.unix(success.data.logs[i].Log.TimeKey).format ("MM/DD/YY hh:mm:ss") +" "+
diff --git a/www/js/MomentCtrl.js b/www/js/MomentCtrl.js
index e75c3ad5..abd41d53 100644
--- a/www/js/MomentCtrl.js
+++ b/www/js/MomentCtrl.js
@@ -664,11 +664,11 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$
         NVRDataModel.log("Future date selected, ignoring");
         return;
       }
-      console.log("T=" + t.format("MMM DD,YYYY HH:mm"));
+      //console.log("T=" + t.format("MMM DD,YYYY HH:mm"));
     } else {
       t = moment(timeTo);
       t.subtract(1, "day");
-      console.log("T=" + t.format("MMM DD,YYYY HH:mm"));
+      //console.log("T=" + t.format("MMM DD,YYYY HH:mm"));
 
     }
     var newTo = t.format("YYYY-MM-DD HH:mm:ss");
@@ -833,7 +833,7 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$
       excludeMonitors = [];
     }
   
-    console.log("RETRIEVED EXCLUDE=" + JSON.stringify(excludeMonitors));
+    //console.log("RETRIEVED EXCLUDE=" + JSON.stringify(excludeMonitors));
     constructMask();
     $scope.isSubMenu = ld.enableMomentSubMenu;
 
@@ -842,7 +842,7 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$
     for (var i = 0; i < monitors.length; i++) {
       if (excludeMonitors.indexOf(monitors[i].Monitor.Id) != -1) {
         monitors[i].Monitor.listDisplay = 'noshow';
-        console.log("Marking monitor " + monitors[i].Monitor.Id + " as noshow");
+        //console.log("Marking monitor " + monitors[i].Monitor.Id + " as noshow");
       }
 
     }
diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js
index 19046da4..11281ead 100644
--- a/www/js/MonitorModalCtrl.js
+++ b/www/js/MonitorModalCtrl.js
@@ -465,11 +465,11 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
                     //t.addEventListener("mouseup",moveStop);
 
 
-                    console.log ("Found circle-"+i);   
+                    //console.log ("Found circle-"+i);   
                 }
                 else
                 {
-                    console.log ("did not find circle-"+i);
+                   // console.log ("did not find circle-"+i);
                 }
                 
             }
@@ -503,7 +503,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
 
     $scope.circleTouch = function (evt)
     {
-        console.log ("TOUCH");
+       // console.log ("TOUCH");
     };
 
     //$scope.circleOnDrag = function (evt, ndx)
@@ -513,7 +513,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
        
         // we get screen X/Y - need to translate
         // to SVG points
-        console.log ("recompute with",ax,"&",ay);
+        //console.log ("recompute with",ax,"&",ay);
         var svg=document.getElementById('zsvg');
         var pt = svg.createSVGPoint();
         pt.x = ax;
@@ -532,7 +532,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
             {
                 newPoints = newPoints  + " " +$scope.circlePoints[i].x+","+$scope.circlePoints[i].y;
             }
-            console.log ("recomputed polygon:", newPoints);
+            //console.log ("recomputed polygon:", newPoints);
         }
        // console.log ("OLD ZONE FOR:"+zi+" is "+$scope.zoneArray[zi].coords );
         //console.log ("NEW ZONE FOR:"+zi+" is "+newPoints);
@@ -557,7 +557,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
     {
         if (!_moveStart) {return;}
         
-            console.log ("CONTINUE: target id="+targetID);
+           // console.log ("CONTINUE: target id="+targetID);
             
 
             /*if(event.preventDefault) event.preventDefault();
@@ -567,7 +567,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
             var x,y;
 
             var z = $ionicScrollDelegate.$getByHandle("imgscroll").getScrollPosition().zoom;
-            console.log ("zoom is:"+z);
+           // console.log ("zoom is:"+z);
            
             //console.log(event, this, "t");
             if (event.touches)
@@ -587,7 +587,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
             }
             
           
-            console.log ("X="+x+" Y="+y + " sl="+document.body.scrollLeft+ " sy="+document.body.scrollTop);
+           // console.log ("X="+x+" Y="+y + " sl="+document.body.scrollLeft+ " sy="+document.body.scrollTop);
             $timeout (function() {recomputePolygons (x,y,targetID,1);});
 
 
@@ -596,7 +596,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
     function moveStop (event)
     {
         _moveStart = false;
-        console.log ("STOP");
+       // console.log ("STOP");
     }
 
     function moveStart(event)
@@ -604,14 +604,14 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
         
             _moveStart=true;
             targetID = event.target.id.substring(7);
-            console.log ("START: target id="+targetID);
+           // console.log ("START: target id="+targetID);
 
             if(event.preventDefault) event.preventDefault();
             if (event.gesture) event.gesture.preventDefault() ;
             if (event.gesture) event.gesture.stopPropagation();
 
             var z = $ionicScrollDelegate.$getByHandle("imgscroll").getScrollPosition().zoom;
-            console.log ("zoom is:"+z);
+            //console.log ("zoom is:"+z);
 
             var x,y;
             // perhaps event.targetTouches[0]?
@@ -629,7 +629,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
                 y = event.clientY  ;
 
             }
-            console.log ("X="+x+" Y="+y + " sl="+document.body.scrollLeft+ " sy="+document.body.scrollTop);
+            //console.log ("X="+x+" Y="+y + " sl="+document.body.scrollLeft+ " sy="+document.body.scrollTop);
 
     }
     
@@ -679,7 +679,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
         for (i=0; i < $scope.zoneArray.length; i++)
         {
             /*jshint loopfunc: true */
-            console.log ("ZONE ARRAY="+$scope.zoneArray[i].coords);
+           // console.log ("ZONE ARRAY="+$scope.zoneArray[i].coords);
              $scope.zoneArray[i].coords.split(' ')
              .forEach( function(itm) 
                 { 
@@ -723,12 +723,12 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
             hideUnhidePresets();
             return;
         }
-        console.log ("PTZ command is"+cmd);
+        //console.log ("PTZ command is"+cmd);
         controlPTZ(monitorId, cmd);
     };
 
     function hideUnhidePresets() {
-        console.log ("**********HIDEUNHIDE");
+        //console.log ("**********HIDEUNHIDE");
         $scope.ptzButtonsShown = !$scope.ptzButtonsShown;
 
         if ($scope.ptzPresets.length > 0) {
@@ -1540,7 +1540,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
                             $scope.ptzMoveCommand = "move"; // start with as move;
                             $scope.ptzStopCommand = "";
 
-                            console.log ("GOT CONTROL "+JSON.stringify(data.control.Control));
+                           // console.log ("GOT CONTROL "+JSON.stringify(data.control.Control));
 
                             if (data.control.Control.CanZoom == '1')
                             {
@@ -1573,7 +1573,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
                                 // so no prefix
                                 $scope.ptzMoveCommand = "";
                                 $scope.ptzStopCommand = "moveStop";
-                                console.log ("MoveAbs set");
+                               // console.log ("MoveAbs set");
                             }
 
                             if (data.control.Control.CanMoveAbs == '1')
@@ -1581,7 +1581,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
 
                                 $scope.ptzMoveCommand = "moveAbs";
                                 $scope.ptzStopCommand = "moveStop";
-                                console.log ("MoveAbs set");
+                              //  console.log ("MoveAbs set");
                             }
 
                             if (data.control.Control.CanMoveRel == '1')
@@ -1736,7 +1736,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
         originalZones = [];
         $http.get (api)
         .then (function (succ) {
-            console.log (JSON.stringify(succ));
+           // console.log (JSON.stringify(succ));
             for (var i=0; i < succ.data.zones.length; i++)
             {
                 originalZones.push ({
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 9c09b807..7cf5b0d5 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -34,7 +34,7 @@ angular.module('zmApp.controllers')
 
     $rootScope.$on("auth-success", function () {
          NVRDataModel.debug("REAUTH");
-        console.log ("RETAUTH");
+        //console.log ("RETAUTH");
         NVRDataModel.stopNetwork();
     });
 
@@ -303,7 +303,7 @@ angular.module('zmApp.controllers')
                                 if (isNaN(positions[j].size)) positions[j].size=20;
                                 $scope.MontageMonitors[i].Monitor.gridScale = positions[j].size;
                                 $scope.MontageMonitors[i].Monitor.listDisplay = positions[j].display;
-                                NVRDataModel.debug("Setting monitor ID: " + $scope.MontageMonitors[i].Monitor.Id + " to size: " + positions[j].size + " and display:" + positions[j].display);
+                               // NVRDataModel.debug("Setting monitor ID: " + $scope.MontageMonitors[i].Monitor.Id + " to size: " + positions[j].size + " and display:" + positions[j].display);
                             }
                             //console.log ("Index:"+positions[j].attr+ " with size: " + positions[j].size);
                         }
@@ -317,7 +317,7 @@ angular.module('zmApp.controllers')
                     //NVRDataModel.log("Force calling resize");
                     ///pckry.reloadItems();
                     ///positions is defined only if layouttype was false
-                    console.log (">>> Positions is "+ JSON.stringify(positions));
+                   // console.log (">>> Positions is "+ JSON.stringify(positions));
                     if (!layouttype) pckry.initShiftLayout(positions, "data-item-id");
                     // now do a jiggle 
                     $timeout(function()
@@ -345,7 +345,7 @@ angular.module('zmApp.controllers')
                 //console.log ("POSITIONS MAP " + JSON.stringify(positions));
                 var ld = NVRDataModel.getLogin();
                 ld.packeryPositions = JSON.stringify(positions);
-                console.log ("Saving " + ld.packeryPositions);
+              //  console.log ("Saving " + ld.packeryPositions);
                // console.log ("FULL OBJECT "+ JSON.stringify(ld));
                 ld.currentMontageProfile = "";
                 $scope.currentProfileName = $translate.instant ('kMontage');
@@ -409,15 +409,15 @@ angular.module('zmApp.controllers')
     function findNext (key,obj)
     {
 
-      console.log (" key is: "+ key);
-      console.log ("array is " + JSON.stringify (obj));
+     // console.log (" key is: "+ key);
+     // console.log ("array is " + JSON.stringify (obj));
        var keys = Object.keys(obj);
 
        var len = keys.length;
        var curindex = keys.indexOf(key);
        var modulus = (curindex +  1) % len;
 
-       console.log ("*********** len="+len+" curr="+curindex+" next="+modulus);
+       //console.log ("*********** len="+len+" curr="+curindex+" next="+modulus);
 
        //console.log ("Keys array "+ JSON.stringify(keys));
 
@@ -571,7 +571,7 @@ angular.module('zmApp.controllers')
     function loadNotifications()
     {
         if (multiPortZms) {
-            console.log ("Skipping timer as multiportZMS="+multiPortZms);
+           // console.log ("Skipping timer as multiportZMS="+multiPortZms);
             return;
         }
 
@@ -969,7 +969,7 @@ angular.module('zmApp.controllers')
             $timeout(function()
             {
                 var positions = pckry.getShiftPositions('data-item-id');
-                console.log("SAVING");
+               // console.log("SAVING");
                 var ld = NVRDataModel.getLogin();
 
                 ld.packeryPositions = JSON.stringify(positions);
@@ -1521,7 +1521,7 @@ angular.module('zmApp.controllers')
 
         }).then(function(res)
         {
-            console.log(res);
+            //console.log(res);
             if (res) // ok
             {
 
@@ -1622,10 +1622,11 @@ angular.module('zmApp.controllers')
         NVRDataModel.getZmsMultiPortSupport()
            .then ( function (data) { 
             multiPortZms = data;
-            console.log ("****** MULTIPORT="+multiPortZms);
+            //console.log ("****** MULTIPORT="+multiPortZms);
+            NVRDataModel.debug ("Multiport="+multiPortZms);
         },
         function (err) {
-            console.log ("******* SHOULD NEVER HAPPEN - MULTIPORT ERROR");
+            NVRDataModel.debug("******* SHOULD NEVER HAPPEN - MULTIPORT ERROR");
             multiPortZms = 0;
 
         }
@@ -1929,7 +1930,7 @@ angular.module('zmApp.controllers')
                 $timeout(function()
                 {
                     var positions = pckry.getShiftPositions('data-item-id');
-                    console.log("SAVING");
+                    //console.log("SAVING");
                     var ld = NVRDataModel.getLogin();
 
                     ld.packeryPositions = JSON.stringify(positions);
@@ -1957,7 +1958,7 @@ angular.module('zmApp.controllers')
 
         if ($scope.sliderChanging)
         {
-            console.log("too fast my friend");
+           // console.log("too fast my friend");
             //$scope.slider.monsize = oldSliderVal;
             return;
         }
@@ -1980,7 +1981,7 @@ angular.module('zmApp.controllers')
             var sz = elem.getAttribute("data-item-size");
             if (isNaN(sz)) sz=20;
             oldScales[id] = sz;
-            console.log("REMEMBERING " + id + ":" + sz);
+           // console.log("REMEMBERING " + id + ":" + sz);
 
         });
 
@@ -2031,7 +2032,7 @@ angular.module('zmApp.controllers')
 
         $timeout(function()
         {
-            console.log("Calling re-layout");
+            //console.log("Calling re-layout");
             //pckry.reloadItems(); 
 
             if (dirn == 1) //expand
@@ -2041,10 +2042,10 @@ angular.module('zmApp.controllers')
                     var id = elem.getAttribute("data-item-id");
                     var sz = elem.getAttribute("data-item-size");
                     if (isNaN(sz)) sz=20;
-                    console.log("NOW IT IS-> " + id + ":" + sz);
+                    //console.log("NOW IT IS-> " + id + ":" + sz);
                     if (oldScales[id] != sz)
                     {
-                        console.log("Calling FIT on " + id + " size:" + oldScales[id] + "->" + sz);
+                        //console.log("Calling FIT on " + id + " size:" + oldScales[id] + "->" + sz);
                         pckry.once('fitComplete', resizeComplete);
                         pckry.fit(elem);
 
@@ -2053,7 +2054,7 @@ angular.module('zmApp.controllers')
             }
             else //shrink
             {
-                console.log("Calling shift");
+                //console.log("Calling shift");
                 pckry.once('layoutComplete', resizeComplete);
                 pckry.shiftLayout();
 
@@ -2079,7 +2080,7 @@ angular.module('zmApp.controllers')
             $timeout(function()
             {
                 var positions = pckry.getShiftPositions('data-item-id');
-                console.log("SAVING");
+                //console.log("SAVING");
                 var ld = NVRDataModel.getLogin();
 
                 ld.packeryPositions = JSON.stringify(positions);
diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js
index 96e0690f..e1cf5343 100644
--- a/www/js/PortalLoginCtrl.js
+++ b/www/js/PortalLoginCtrl.js
@@ -47,7 +47,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
                 else if ($ionicPlatform.is('android') && loginData.usePin) {
 
                     FingerprintAuth.isAvailable(function (result) {
-                        console.log("FingerprintAuth available: " + JSON.stringify(result));
+                        NVRDataModel.debug("FingerprintAuth available: " + JSON.stringify(result));
                         if (result.isAvailable == true && result.hasEnrolledFingerprints == true) {
                             var encryptConfig = {
                                 clientId: "zmNinja",
diff --git a/www/js/StateCtrl.js b/www/js/StateCtrl.js
index 8a7a3c1d..c6fd1384 100644
--- a/www/js/StateCtrl.js
+++ b/www/js/StateCtrl.js
@@ -388,7 +388,7 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
 
     $scope.$on('$ionicView.leave', function()
     {
-        console.log("**VIEW ** State Ctrl Left");
+       // console.log("**VIEW ** State Ctrl Left");
         // FIXME not the best way...
         // If the user exits a view before its complete,
         // make sure he can come back in and redo
@@ -397,7 +397,7 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
 
     $scope.doRefresh = function()
     {
-        console.log("***Pull to Refresh");
+        //console.log("***Pull to Refresh");
         NVRDataModel.debug("StateCtrl/refresh: calling getRun/Load/Disk/CurrentState");
         getRunStatus();
         $timeout(getLoadStatus, 2000);
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js
index a7ec0c7d..81db5991 100644
--- a/www/js/TimelineCtrl.js
+++ b/www/js/TimelineCtrl.js
@@ -293,7 +293,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
         {
             $interval.cancel(updateInterval);
             timeline.destroy();
-            console.log("**Destroying Timeline");
+            //console.log("**Destroying Timeline");
 
         }
     });
@@ -421,7 +421,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
             }
             else
             {
-                console.log("From:" + $rootScope.fromString + " To:" + $rootScope.toString);
+                //console.log("From:" + $rootScope.fromString + " To:" + $rootScope.toString);
                 //console.log("FROM & TO IS CUSTOM INVALID");
 
                 if (NVRDataModel.getLogin().useLocalTimeZone)
@@ -1359,7 +1359,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
 
                             timeline.on('click', function(prop)
                             {
-                                console.log ("CLICK");
+                                //console.log ("CLICK");
                                 if ($scope.onTap==$translate.instant('kTimelineGraph'))
                                     timelineAnalyzeFrames(prop);
                                 else
@@ -1468,7 +1468,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
     }
 
     function timelineAnalyzeFrames(prop) {
-        console.log ("DOUBLE");
+       // console.log ("DOUBLE");
         dblclick = true;
         var itm = prop.item;
         //console.log ("ITEM CLICKED " + itm);
diff --git a/www/js/TimelineModalCtrl.js b/www/js/TimelineModalCtrl.js
index 76c16fb3..ef011d3b 100644
--- a/www/js/TimelineModalCtrl.js
+++ b/www/js/TimelineModalCtrl.js
@@ -108,7 +108,7 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', '
                     tcGraph.data = onlyalarm_data;
             tcGraph.update();*/
             tcGraph.destroy();
-            console.log("GRAPH TYPE IS " + btype);
+           // console.log("GRAPH TYPE IS " + btype);
             tcGraph = new Chart(ctx,
             {
                 type: btype,
@@ -126,7 +126,7 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', '
     $scope.showImage = function(p, r, f, fid, e, imode, id)
     {
         var img;
-        console.log("Image Mode " + imode);
+        //console.log("Image Mode " + imode);
         if (imode == 'path')
 
             img = "<img width='100%' ng-src='" + p + "/index.php?view=image&path=" + r + f + "'>";
diff --git a/www/js/WizardCtrl.js b/www/js/WizardCtrl.js
index 821783bd..e02258ae 100644
--- a/www/js/WizardCtrl.js
+++ b/www/js/WizardCtrl.js
@@ -312,7 +312,7 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$
                                     function(error)
                                     {
                                         $ionicLoading.hide();
-                                        console.log("No cgi-bin found: " + JSON.stringify(error));
+                                        NVRDataModel.debug("No cgi-bin found: " + JSON.stringify(error));
                                         $scope.wizard.streamingValidText = $translate.instant('kPortalCgiBinFailed');
                                         $scope.wizard.streamingColor = "#e74c3c";
                                         d.reject(false);
diff --git a/www/js/app.js b/www/js/app.js
index bc7dac2b..1a5d86bd 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -651,10 +651,10 @@ angular.module('zmApp', [
         }
 
         if ($rootScope.apiAuth) {
-          console.log("********** API AUTH");
+         // console.log("********** API AUTH");
           if (config.url.indexOf("/api/") > -1) {
             config.url = config.url + "&auth=" + $rootScope.authSession;
-            console.log("********** API AUTH muggled to:" + config.url);
+           // console.log("********** API AUTH muggled to:" + config.url);
 
           }
         }
@@ -932,7 +932,7 @@ angular.module('zmApp', [
 
           // coming here means login is needed
           function (error) {
-            console.log(">>>>>>>>>>>> FAST FAILED - THIS IS OK");
+           // console.log(">>>>>>>>>>>> FAST FAILED - THIS IS OK");
 
             var statename = $ionicHistory.currentStateName();
 
@@ -966,7 +966,7 @@ angular.module('zmApp', [
                 function (error)
                 // login to main failed, so try others
                 {
-                  console.log(">>>>>>>>>>>> Failed  first login, trying reachability");
+                  NVRDataModel.debug(">>>>>>>>>>>> Failed  first login, trying reachability");
                   NVRDataModel.getReachableConfig(true)
                     .then(function (data) {
                         proceedWithLogin()
@@ -1025,7 +1025,7 @@ angular.module('zmApp', [
 
 
 
-              console.log(">>>>>>>>>>>>>> ISRECAPTCHA");
+              //console.log(">>>>>>>>>>>>>> ISRECAPTCHA");
 
               NVRDataModel.isReCaptcha()
                 .then(function (result) {
@@ -1052,7 +1052,7 @@ angular.module('zmApp', [
                 });
 
               var loginData = NVRDataModel.getLogin();
-              console.log(">>>>>>>>>>>>>> PARALLEL POST WITH RECAPTCHA TO " + loginData.url);
+             // console.log(">>>>>>>>>>>>>> PARALLEL POST WITH RECAPTCHA TO " + loginData.url);
 
               /*  console.log ("-----------------------SECRET IS "+zm.hashSecret);
                $http.get (ld.apiurl+'/host/remoteIp.json')
@@ -1119,7 +1119,7 @@ angular.module('zmApp', [
                   }
                 })
                 .success(function (data, status, headers) {
-                  console.log(">>>>>>>>>>>>>> PARALLEL POST SUCCESS");
+                 // console.log(">>>>>>>>>>>>>> PARALLEL POST SUCCESS");
                   $ionicLoading.hide();
 
                   // Coming here does not mean success
@@ -1174,7 +1174,7 @@ angular.module('zmApp', [
                 })
                 .error(function (error, status) {
 
-                  console.log(">>>>>>>>>>>>>> PARALLEL POST ERROR");
+                 // console.log(">>>>>>>>>>>>>> PARALLEL POST ERROR");
                   $ionicLoading.hide();
 
                   //console.log("**** ZM Login FAILED");
@@ -1235,7 +1235,7 @@ angular.module('zmApp', [
 
 
     $ionicPlatform.ready(function () {
-      console.log(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>INSIDE RUN");
+      //console.log(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>INSIDE RUN");
 
       $rootScope.textScaleFactor = 1.0;
       $rootScope.apiValid = false;
@@ -1273,7 +1273,7 @@ angular.module('zmApp', [
       }
 
       function okperm() {
-        console.log("cool");
+        //console.log("cool");
         NVRDataModel.displayBanner('success', ['Storage permission acquired'], "", 4000);
       }
 
@@ -1531,14 +1531,14 @@ angular.module('zmApp', [
       };
 
       
-      console.log("Mobile acc");
+      //console.log("Mobile acc");
       if (window.cordova)
         MobileAccessibility.getTextZoom(getTextZoomCallback);
 
       // $rootScope.lastState = "events";
       //$rootScope.lastStateParam = "0";
 
-      console.log("localforage config");
+      //console.log("localforage config");
       localforage.config({
         name: zm.dbName
 
@@ -1565,7 +1565,7 @@ angular.module('zmApp', [
 
       }
 
-      console.log("forage driver");
+      //console.log("forage driver");
       localforage.defineDriver(window.cordovaSQLiteDriver).then(function () {
         return localforage.setDriver(
           // Try setting cordovaSQLiteDriver if available,
@@ -1703,7 +1703,7 @@ angular.module('zmApp', [
        // console.log("file logger");
         $fileLogger.checkFile().then(function (resp) {
           if (parseInt(resp.size) > zm.logFileMaxSize) {
-            console.log("inside file logger");
+            //console.log("inside file logger");
 
             $fileLogger.deleteLogfile().then(function () {
               NVRDataModel.log("Deleting old log file as it exceeds " + zm.logFileMaxSize + " bytes");
@@ -1784,7 +1784,7 @@ angular.module('zmApp', [
               }
               loadServices();
             }, function (err) {
-              console.log("ERR " + JSON.stringify(err));
+              //console.log("ERR " + JSON.stringify(err));
               loadServices();
             });
         } else