adjusted http large timeout for long apis

1 files changed, 356 insertions, 429 deletions

diff --git a/www/js/app.js b/www/js/app.js
index da984cac..43873675 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -24,31 +24,31 @@ angular.module('zmApp', [
 //-----------------------------------------------
 
 .constant('zm', {
-    httpTimeout:15000,
-    largeHttpTimeout:60000,
-    logFile:'zmNinjaLog.txt',
-    authoremail:'pliablepixels+zmNinja@gmail.com',
+    httpTimeout: 15000,
+    largeHttpTimeout: 60000,
+    logFile: 'zmNinjaLog.txt',
+    authoremail: 'pliablepixels+zmNinja@gmail.com',
     logFileMaxSize: 10000, // after this limit log gets reset
-    loginInterval:300000, //5m*60s*1000 - ZM auto login after 5 mins
-    loadingTimeout:15000,
-    safeMontageLimit:10,
-    maxFPS:30,
-    defaultFPS:3,
-    maxMontageQuality:70,
-    defaultMontageQuality:50,
-    progressIntervalCheck:5000, // used for progress indicator on event playback
-    graphFillColor:'rgba(151,187,205,0.5)',
+    loginInterval: 300000, //5m*60s*1000 - ZM auto login after 5 mins
+    loadingTimeout: 15000,
+    safeMontageLimit: 10,
+    maxFPS: 30,
+    defaultFPS: 3,
+    maxMontageQuality: 70,
+    defaultMontageQuality: 50,
+    progressIntervalCheck: 5000, // used for progress indicator on event playback
+    graphFillColor: 'rgba(151,187,205,0.5)',
     graphStrokeColor: 'rgba(151,187,205,0.8)',
     graphHighlightFill: 'rgba(0,163,124,0.5)',
-    monitorCheckingColor:'#03A9F4',
+    monitorCheckingColor: '#03A9F4',
     monitorNotRunningColor: '#F44336',
     monitorPendingColor: '#FF9800',
     monitorRunningColor: '#4CAF50',
     monitorErrorColor: '#795548',
-    montageScaleFrequency:300,
-    eventsListDetailsHeight:200,
-    eventsListScrubHeight:300,
-    loginScreenString:"var currentView = 'login'" // oh shit. Isn't there a better way?
+    montageScaleFrequency: 300,
+    eventsListDetailsHeight: 200,
+    eventsListScrubHeight: 300,
+    loginScreenString: "var currentView = 'login'" // oh shit. Isn't there a better way?
 
 
 
@@ -65,7 +65,7 @@ angular.module('zmApp', [
             imageLoading = val;
             //console.log ("** IMAGE  LOADING **"+val);
         },
-        'get': function() {
+        'get': function () {
 
             return imageLoading;
         }
@@ -99,8 +99,8 @@ angular.module('zmApp', [
 // This directive is adapted from https://github.com/paveisistemas/ionic-image-lazy-load
 // I've removed lazyLoad and only made it show a spinner when an image is loading
 //--------------------------------------------------------------------------------------------
-.directive('imageSpinnerSrc', ['$document',  '$compile','imageLoadingDataShare',
-    function ($document , $compile, imageLoadingDataShare) {
+.directive('imageSpinnerSrc', ['$document', '$compile', 'imageLoadingDataShare',
+    function ($document, $compile, imageLoadingDataShare) {
         return {
             restrict: 'A',
             scope: {
@@ -109,41 +109,41 @@ angular.module('zmApp', [
             link: function ($scope, $element, $attributes) {
 
                 if ($attributes.imageSpinnerLoader) {
-                   // console.log ("DIRECTIVE: IMAGE SPINNER");
+                    // console.log ("DIRECTIVE: IMAGE SPINNER");
                     var loader = $compile('<div class="image-loader-container"><ion-spinner style="position:fixed;top:5%;left:5%" class="image-loader" icon="' + $attributes.imageSpinnerLoader + '"></ion-spinner></div>')($scope);
                     $element.after(loader);
                 }
-                    imageLoadingDataShare.set(1);
-                    loadImage();
-                
-                    $attributes.$observe('imageSpinnerSrc', function(value){
+                imageLoadingDataShare.set(1);
+                loadImage();
+
+                $attributes.$observe('imageSpinnerSrc', function (value) {
                     //console.log ("DIRECTIVE SOURCE CHANGED");
                     imageLoadingDataShare.set(1);
-                     loadImage();
-                 //deregistration();
+                    loadImage();
+                    //deregistration();
 
                 });
-                
 
-                     // show an image-missing image 
-                $element.bind('error',function () {
-                   // console.log ("DIRECTIVE: IMAGE ERROR");
+
+                // show an image-missing image 
+                $element.bind('error', function () {
+                    // console.log ("DIRECTIVE: IMAGE ERROR");
                     loader.remove();
-                         imageLoadingDataShare.set(0);
-  
+                    imageLoadingDataShare.set(0);
+
                     var url = 'img/novideo.png';
                     $element.prop('src', url);
-            });
+                });
 
                 function loadImage() {
                     $element.bind("load", function (e) {
                         if ($attributes.imageSpinnerLoader) {
-                        // console.log ("DIRECTIVE: IMAGE LOADED");
+                            // console.log ("DIRECTIVE: IMAGE LOADED");
                             loader.remove();
                             imageLoadingDataShare.set(0);
                         }
                     });
-                   
+
 
 
 
@@ -156,7 +156,7 @@ angular.module('zmApp', [
                             $element[0].style.backgroundImage = 'url(' + $attributes.imageSpinnerSrc + ')'; // set style attribute on element (it will load image)
                         };
                         bgImg.src = $attributes.imageSpinnerSrc;
-                       //console.log ("DIRECTIVE: BGIMAGE SRC SET TO " + $attributes.imageSpinnerSrc);
+                        //console.log ("DIRECTIVE: BGIMAGE SRC SET TO " + $attributes.imageSpinnerSrc);
                     } else {
                         $element[0].src = $attributes.imageSpinnerSrc; // set src attribute on element (it will load image)
                         //console.log ("DIRECTIVE: IMAGE SRC SET TO "+$attributes.imageSpinnerSrc);
@@ -164,13 +164,13 @@ angular.module('zmApp', [
                 }
 
                 function isInView() {
-		    return true;
+                    return true;
                 }
 
                 $element.on('$destroy', function () {
-                   // console.log ("**************** DIRECTIVE DESTROY IMAGE: " + $element[0].src);
+                    // console.log ("**************** DIRECTIVE DESTROY IMAGE: " + $element[0].src);
                 });
-                $element[0].src="img/novideo.png";
+               // $element[0].src = "img/novideo.png";
 
             }
         };
@@ -185,50 +185,44 @@ angular.module('zmApp', [
 // That way the user can try again, and won't get stuck
 // Also remember you need to add it to .config
 //------------------------------------------------------------------
-.factory('timeoutHttpIntercept', function ($rootScope, $q,zm) {
+.factory('timeoutHttpIntercept', function ($rootScope, $q, zm) {
     var zmCookie = "";
 
     return {
         'request': function (config) {
-           // config.withCredentials = true;
-            if (zmCookie)
-            {
-               // console.log ("** ADDING COOKIE TO REQUEST "+zmCookie);
-               config.headers.Cookie = "ZMSESSID="+zmCookie;
+            // config.withCredentials = true;
+            if (zmCookie) {
+              config.headers.Cookie = "ZMSESSID=" + zmCookie;
             }
-            if ( !(config.url.indexOf("/api/states/change/") > -1 ||
-                config.url.indexOf("getDiskPercent.json") > -1 ))
-            {
-               config.timeout = 15000;
-            }
-            else
+            if ((config.url.indexOf("/api/states/change/") > -1)  ||
+                (config.url.indexOf("getDiskPercent.json") > -1) ||
+                (config.url.indexOf("daemonCheck.json") > -1)    ||
+                (config.url.indexOf("getLoad.json") > -1 ))
+                
+                
             {
-                //console.log ("HTTP INTERCEPT:Skipping HTTP timeout for "+config.url);
+                // these can take time, so lets bump up timeout
+                config.timeout = zm.largeHttpTimeout;
+                
+            } else {
+                config.timeout = zm.httpTimeout;
             }
             return config;
         },
 
-        'response': function (response)
-        {
-            //console.log ("******** WHOA RESPONSE CAUGHT ************");
+        'response': function (response) {
             var cookies = response.headers("Set-Cookie");
-            if (cookies !=null)
-            {
+            if (cookies != null) {
 
-                var zmSess=cookies.match("ZMSESSID=(.*?);");
-                
-                if (zmSess)
-                {
-                    if (zmSess[1])
-                    {
-                        //console.log ("***RESPONSE HEADER COOKIE " + zmSess[1]);
-                       // console.log ("WHOLE STRING " + cookies);
-                        zmCookie=zmSess[1];
+                var zmSess = cookies.match("ZMSESSID=(.*?);");
+
+                if (zmSess) {
+                    if (zmSess[1]) {
+
+                        zmCookie = zmSess[1];
                     }
-                }
-                else
-                {
-                   //  console.log ("WHOLE STRING " + cookies);
+                } else {
+                    //  console.log ("WHOLE STRING " + cookies);
                 }
             }
             return response;
@@ -242,29 +236,28 @@ angular.module('zmApp', [
 // This service automatically logs into ZM at periodic intervals
 //------------------------------------------------------------------
 
-.factory('zmAutoLogin', function($interval, ZMDataModel, $http,zm, $browser,$timeout,$q, $rootScope, $ionicLoading, $ionicPopup, $state, $ionicContentBanner)  {
+.factory('zmAutoLogin', function ($interval, ZMDataModel, $http, zm, $browser, $timeout, $q, $rootScope, $ionicLoading, $ionicPopup, $state, $ionicContentBanner) {
     var zmAutoLoginHandle;
-    
-//------------------------------------------------------------------
-// doLogin() emits this when there is an auth error in the portal
-//------------------------------------------------------------------
-    
-    $rootScope.$on ("auth-error", function()
-    {
-        console.log ("**** ZM LOGIN ERROR INTERCEPT");
-        
+
+    //------------------------------------------------------------------
+    // doLogin() emits this when there is an auth error in the portal
+    //------------------------------------------------------------------
+
+    $rootScope.$on("auth-error", function () {
+        console.log("**** ZM LOGIN ERROR INTERCEPT");
+
         var contentBannerInstance = $ionicContentBanner.show({
-          text: ['ZoneMinder authentication failed', 'Please check settings'],
-          interval: 2000,
-          type: 'error',
-          transition: 'vertical'
+            text: ['ZoneMinder authentication failed', 'Please check settings'],
+            interval: 2000,
+            type: 'error',
+            transition: 'vertical'
         });
-        
-        $timeout (function() {
+
+        $timeout(function () {
             contentBannerInstance();
-        },6000);
-                  
-        
+        }, 6000);
+
+
         /*var alertPopup = $ionicPopup.alert(
             {
                 title: 'Zoneminder authentication failed',
@@ -277,179 +270,157 @@ angular.module('zmApp', [
             alertPopup.close();
         },5000);*/
 
-            
-        
+
     });
-    
-//------------------------------------------------------------------
-// doLogin() emits this when our auth credentials work
-//------------------------------------------------------------------
-    
-
-     $rootScope.$on ("auth-success", function()
-     {
-         var contentBannerInstance = $ionicContentBanner.show({
-          text: ['ZoneMinder authentication success'],
-          interval: 2000,
-          type: 'info',
-          transition: 'vertical'
+
+    //------------------------------------------------------------------
+    // doLogin() emits this when our auth credentials work
+    //------------------------------------------------------------------
+
+
+    $rootScope.$on("auth-success", function () {
+        var contentBannerInstance = $ionicContentBanner.show({
+            text: ['ZoneMinder authentication success'],
+            interval: 2000,
+            type: 'info',
+            transition: 'vertical'
         });
-        
-        $timeout (function() {
+
+        $timeout(function () {
             contentBannerInstance();
-        },2000);
-        console.log ("**** ZM LOGIN SUCCESS INTERCEPT");
+        }, 2000);
+        console.log("**** ZM LOGIN SUCCESS INTERCEPT");
     });
-    
-    
-//------------------------------------------------------------------
-// doLogin() is the function that tries to login to ZM
-// it also makes sure we are not back to the same page
-// which actually means auth failed, but ZM treats it as a success
-//------------------------------------------------------------------
-    
-    function doLogin(str)
-    {
+
+
+    //------------------------------------------------------------------
+    // doLogin() is the function that tries to login to ZM
+    // it also makes sure we are not back to the same page
+    // which actually means auth failed, but ZM treats it as a success
+    //------------------------------------------------------------------
+
+    function doLogin(str) {
         var d = $q.defer();
         var ld = ZMDataModel.getLogin();
-        if (ld.isUseAuth == "0")
-        {
+        if (ld.isUseAuth == "0") {
             $ionicLoading.hide();
-            ZMDataModel.zmLog ("Authentication is disabled. Skipping login");
+            ZMDataModel.zmLog("Authentication is disabled. Skipping login");
             d.resolve("Login success - no auth");
             return d.promise;
         }
 
-        console.log ("**** ZM AUTO LOGIN CALLED");
+        console.log("**** ZM AUTO LOGIN CALLED");
         ZMDataModel.zmLog("zmAutologin called");
-        
-        if (str)
-        {
-             $ionicLoading.show({
+
+        if (str) {
+            $ionicLoading.show({
                 template: str,
                 noBackdrop: true,
                 duration: zm.httpTimeout
             });
         }
-        
-        
+
+
         var loginData = ZMDataModel.getLogin();
         $http({
-            method:'POST',
-             //withCredentials: true,
-            url:loginData.url + '/index.php',
-            headers:{
-                'Content-Type': 'application/x-www-form-urlencoded',
-               'Accept': 'application/json',
-            },
-            transformRequest: function (obj) {
-                var str = [];
-                for (var p in obj)
-                    str.push(encodeURIComponent(p) + "=" +
-                        encodeURIComponent(obj[p]));
-                var foo = str.join("&");
-                //console.log("****RETURNING " + foo);
-                return foo;
-            },
+                method: 'POST',
+                //withCredentials: true,
+                url: loginData.url + '/index.php',
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded',
+                    'Accept': 'application/json',
+                },
+                transformRequest: function (obj) {
+                    var str = [];
+                    for (var p in obj)
+                        str.push(encodeURIComponent(p) + "=" +
+                            encodeURIComponent(obj[p]));
+                    var foo = str.join("&");
+                    //console.log("****RETURNING " + foo);
+                    return foo;
+                },
+
+                data: {
+                    username: loginData.username,
+                    password: loginData.password,
+                    action: "login",
+                    view: "console"
+                }
+            })
+            .success(function (data, status, headers) {
+                $ionicLoading.hide();
+
+                // Coming here does not mean success
+                // it could also be a bad login, but
+                // ZM returns you to login.php and returns 200 OK
+                // so we will check if the data has
+                // <title>ZM - Login</title> -- it it does then its the login page
+
+
+                if (data.indexOf(zm.loginScreenString) == -1) {
+
+                    $rootScope.loggedIntoZm = 1;
+                    console.log("**** ZM Login OK");
+                    ZMDataModel.zmLog("zmAutologin successfully logged into Zoneminder");
+
+                    d.resolve("Login Success");
+
+                    $rootScope.$emit('auth-success', data);
+                    $rootScope.rand = Math.floor((Math.random() * 100000) + 1);
+                } else //  this means login error
+                {
+                    $rootScope.loggedIntoZm = -1;
+                    console.log("**** ZM Login FAILED");
+                    ZMDataModel.zmLog("zmAutologin Error: Bad Credentials ", "error");
+                    $rootScope.$emit('auth-error', "incorrect credentials");
+
+                    d.reject("Login Error");
+                }
+
+
+                return (d.promise);
+
+            })
+            .error(function (error) {
+                $ionicLoading.hide();
+                $rootScope.loggedIntoZm = -1;
+                console.log("**** ZM Login FAILED");
+                ZMDataModel.zmLog("zmAutologin Error " + JSON.stringify(error), "error, but not calling auth-error emit");
+               // bad urls etc come here
+                $rootScope.$emit('auth-error', error);
 
-            data: {
-                username:loginData.username,
-                password:loginData.password,
-                action:"login",
-                view:"console"
-            }
-        })
-        .success(function(data,status,headers)
-        {
-            $ionicLoading.hide();
-            
-            // Coming here does not mean success
-            // it could also be a bad login, but
-            // ZM returns you to login.php and returns 200 OK
-            // so we will check if the data has
-            // <title>ZM - Login</title> -- it it does then its the login page
-            
-            
-            if (data.indexOf(zm.loginScreenString) == -1 )
-            {
-            
-                $rootScope.loggedIntoZm = 1;
-                console.log ("**** ZM Login OK");
-                ZMDataModel.zmLog("zmAutologin successfully logged into Zoneminder");
-            
-                d.resolve("Login Success");
-            
-                $rootScope.$emit('auth-success', data);
-                $rootScope.rand = Math.floor((Math.random() * 100000) + 1);
-            }
-            else    //  this means login error
-            {
-                  $rootScope.loggedIntoZm = -1;
-                  console.log ("**** ZM Login FAILED");
-                ZMDataModel.zmLog ("zmAutologin Error: Bad Credentials ", "error");
-                $rootScope.$emit('auth-error', "incorrect credentials");
- 
                 d.reject("Login Error");
-            }
-            
-          
-            //$timeout( function() {console.log ("***** ALL COOKIES:" + JSON.stringify(  $browser.cookies()));},1000);
-           
-            
-            
-            return (d.promise);
-            
-        })
-        .error(function(error)
-        {
-            $ionicLoading.hide();
-             $rootScope.loggedIntoZm = -1;
-            console.log ("**** ZM Login FAILED");
-            ZMDataModel.zmLog ("zmAutologin Error " + JSON.stringify(error), "error, but not calling auth-error emit");
-            // FIXME should I really emit here? This usually does not mean bad login
-            // that is handled in success. But looks like bad urls etc come here
-           $rootScope.$emit('auth-error', error);
- 
-            d.reject("Login Error");
-            return d.promise;
-        });
+                return d.promise;
+            });
         return d.promise;
-        
+
     }
 
-    function start()
-    {
+    function start() {
         var ld = ZMDataModel.getLogin();
-        if (ld.isUseAuth == '1')
-        {
+        if (ld.isUseAuth == '1') {
             $rootScope.loggedIntoZm = 0;
             $interval.cancel(zmAutoLoginHandle);
             //doLogin();
-            zmAutoLoginHandle = $interval(function()
-            {
+            zmAutoLoginHandle = $interval(function () {
                 doLogin("");
 
-            },zm.loginInterval); // Auto login every 5 minutes
-                          // PHP timeout is around 10 minutes
-                          // should be ok?
-        }
-        else
-        {
-            ZMDataModel.zmLog ("Authentication not enabled. Skipping Timer");
+            }, zm.loginInterval); // Auto login every 5 minutes
+            // PHP timeout is around 10 minutes
+            // should be ok?
+        } else {
+            ZMDataModel.zmLog("Authentication not enabled. Skipping Timer");
         }
     }
-    function stop()
-    {
+
+    function stop() {
         var ld = ZMDataModel.getLogin();
-        if (ld.isUseAuth == '1')
-        {
+        if (ld.isUseAuth == '1') {
             $interval.cancel(zmAutoLoginHandle);
             $rootScope.loggedIntoZm = 0;
             ZMDataModel.zmLog("Cancelling zmAutologin timer");
-        }
-        else
-        {
-            ZMDataModel.zmLog ("No need to cancel zmAutologin timer. Auth is off");
+        } else {
+            ZMDataModel.zmLog("No need to cancel zmAutologin timer. Auth is off");
         }
     }
 
@@ -461,236 +432,191 @@ angular.module('zmApp', [
 })
 
 
+//------------------------------------------------------------------
+// First run in ionic
+//------------------------------------------------------------------
 
-             
-             
-
+.run(function ($ionicPlatform, $ionicPopup, $rootScope, zm, $state, $stateParams, ZMDataModel, $cordovaSplashscreen, $http, $interval, zmAutoLogin, $fileLogger, $timeout, $ionicHistory, $window, $ionicSideMenuDelegate) {
 
+        $rootScope.zmGlobalCookie = "";
+        $rootScope.isEventFilterOn = false;
+        $rootScope.fromDate = "";
+        $rootScope.fromTime = "";
+        $rootScope.toDate = "";
+        $rootScope.toTime = "";
+        $rootScope.fromString = "";
+        $rootScope.toString = "";
+        $rootScope.loggedIntoZm = 0;
 
-/* For future use - does not work with img src intercepts
-.factory ('httpAuthIntercept', function ($rootScope, $q)
-{
-    return {
-    requestError: function (response) {
-      console.log ("**** REJECT REQUEST: "+JSON.stringify(response));
-      return $q.reject(response);
-    },
-
-    responseError: function (response) {
-      console.log ("**** REJECT RESPONSE: "+JSON.stringify(response));
-      return $q.reject(response);
-    },
-    response: function (response)
-        {
-            console.log("*******RESPONSE with status: "+response.status+"****************");
-            if (response.status == 500)
-            {
-             console.log ("**** RESPONSE: "+JSON.stringify(response));
-            }
-                return (response);
-        }
-  };
-})
-*/
+        ZMDataModel.init();
+        // for making sure we canuse $state.go with ng-click
+        // needed for views that use popovers
+        $rootScope.$state = $state;
+        $rootScope.$stateParams = $stateParams;
 
-//------------------------------------------------------------------
-// First run in ionic
-//------------------------------------------------------------------
+        var loginData = ZMDataModel.getLogin();
 
-.run(function ($ionicPlatform, $ionicPopup, $rootScope, zm, $state, $stateParams, ZMDataModel, $cordovaSplashscreen, $http, $interval, zmAutoLogin, $fileLogger,$timeout, $ionicHistory, $window, $ionicSideMenuDelegate)
-{
-
-    $rootScope.zmGlobalCookie="";
-    $rootScope.isEventFilterOn = false;
-    $rootScope.fromDate = "";
-    $rootScope.fromTime= "";
-    $rootScope.toDate = "";
-    $rootScope.toTime="";
-    $rootScope.fromString="";
-    $rootScope.toString="";
-    $rootScope.loggedIntoZm = 0;
-
-    ZMDataModel.init();
-    // for making sure we canuse $state.go with ng-click
-    // needed for views that use popovers
-    $rootScope.$state = $state;
-    $rootScope.$stateParams = $stateParams;
-
-    var loginData = ZMDataModel.getLogin();
-
-    
-
-    // This code takes care of trapping the Android back button
-    // and takes it to the menu.
-    $ionicPlatform.registerBackButtonAction(function(e) {
-        e.preventDefault();
-        if (!$ionicSideMenuDelegate.isOpenLeft()) {
-            $ionicSideMenuDelegate.toggleLeft();
-            console.log ("Status of SIDE MENU IS : " + $ionicSideMenuDelegate.isOpen());
-        } else {
-            navigator.app.exitApp();
-        }
-    }, 1000);
 
 
-    // this works reliably on both Android and iOS. The "onorientation" seems to reverse w/h in Android. Go figure.
-    // http://stackoverflow.com/questions/1649086/detect-rotation-of-android-phone-in-the-browser-with-javascript
+        // This code takes care of trapping the Android back button
+        // and takes it to the menu.
+        $ionicPlatform.registerBackButtonAction(function (e) {
+            e.preventDefault();
+            if (!$ionicSideMenuDelegate.isOpenLeft()) {
+                $ionicSideMenuDelegate.toggleLeft();
+                console.log("Status of SIDE MENU IS : " + $ionicSideMenuDelegate.isOpen());
+            } else {
+                navigator.app.exitApp();
+            }
+        }, 1000);
 
-    var checkOrientation = function () {
-        var pixelRatio = window.devicePixelRatio || 1;
-        $rootScope.devWidth = ((window.innerWidth > 0) ? window.innerWidth : screen.width);
-        $rootScope.devHeight = ((window.innerHeight > 0) ? window.innerHeight : screen.height);
-        console.log("********NEW Computed Dev Width & Height as" + $rootScope.devWidth + "*" + $rootScope.devHeight);
 
+        // this works reliably on both Android and iOS. The "onorientation" seems to reverse w/h in Android. Go figure.
+        // http://stackoverflow.com/questions/1649086/detect-rotation-of-android-phone-in-the-browser-with-javascript
 
+        var checkOrientation = function () {
+            var pixelRatio = window.devicePixelRatio || 1;
+            $rootScope.devWidth = ((window.innerWidth > 0) ? window.innerWidth : screen.width);
+            $rootScope.devHeight = ((window.innerHeight > 0) ? window.innerHeight : screen.height);
+            console.log("********NEW Computed Dev Width & Height as" + $rootScope.devWidth + "*" + $rootScope.devHeight);
 
 
-        //ZMDataModel.zmLog("Device orientation change: "+$rootScope.devWidth + "*" + $rootScope.devHeight);
     };
 
-    window.addEventListener("resize", checkOrientation, false);
+        window.addEventListener("resize", checkOrientation, false);
 
-    $rootScope.$on('$stateChangeStart', function (event, toState, toParams) {
-        var requireLogin = toState.data.requireLogin;
+        $rootScope.$on('$stateChangeStart', function (event, toState, toParams) {
+            var requireLogin = toState.data.requireLogin;
 
-        if (ZMDataModel.isLoggedIn()) {
-            console.log("State transition is authorized");
-            return;
-        }
-
-        if (requireLogin) {
+            if (ZMDataModel.isLoggedIn()) {
+                console.log("State transition is authorized");
+                return;
+            }
 
-            console.log("**** STATE from " + "**** STATE TO " + toState.name);
+            if (requireLogin) {
 
-            $ionicPopup.alert({
-                title: "Credentials Required",
-                template: "Please provide your ZoneMinder credentials"
-            });
-            // for whatever reason, .go was resulting in digest loops.
-            // if you don't prevent, states will stack
-            event.preventDefault();
-            $state.transitionTo('login');
-        }
+                $ionicPopup.alert({
+                    title: "Credentials Required",
+                    template: "Please provide your ZoneMinder credentials"
+                });
+                // for whatever reason, .go was resulting in digest loops.
+                // if you don't prevent, states will stack
+                event.preventDefault();
+                $state.transitionTo('login');
+            }
 
-    });
+        });
 
 
-    
-    
-    $ionicPlatform.ready(function () {
 
-        // generates and error in desktops but works fine
-        ZMDataModel.zmLog("Device is ready");
-        console.log("**** DEVICE READY ***");
+        $ionicPlatform.ready(function () {
 
-        $fileLogger.checkFile().then(function(resp) {
-            if (parseInt(resp.size) > zm.logFileMaxSize)
-            {
-                console.log ("Deleting old log file as it exceeds " + zm.logFileMaxSize+" bytes");
-                $fileLogger.deleteLogfile().then(function()
-                {
-                console.log('Logfile deleted');
-                });
-            }
-            else
-            {
-                console.log ("Log file size is " + resp.size + " bytes");
-            }
+            // generates and error in desktops but works fine
+            ZMDataModel.zmLog("Device is ready");
+            console.log("**** DEVICE READY ***");
 
+            $fileLogger.checkFile().then(function (resp) {
+                if (parseInt(resp.size) > zm.logFileMaxSize) {
+                    console.log("Deleting old log file as it exceeds " + zm.logFileMaxSize + " bytes");
+                    $fileLogger.deleteLogfile().then(function () {
+                        console.log('Logfile deleted');
+                    });
+                } else {
+                    console.log("Log file size is " + resp.size + " bytes");
+                }
 
-        });
 
-         //fileLogger is an excellent cross platform library
-         // that allows you to manage log files without worrying about
-        // paths etc.https://github.com/pbakondy/filelogger
-         $fileLogger.setStorageFilename(zm.logFile);
-        // easier tz reading
-        $fileLogger.setTimestampFormat('medium');
-
-         if (window.cordova)
-         {
-            // getAppVersion is a handy library
-            // that lets you extract the app version in config.xml
-            // given that you are always changing versions while
-            // uploading to app/play stores, this is very useful
-            // to keep in sync and use within your app
-
-            cordova.getAppVersion(function(version) {
-                appVersion = version;
-                ZMDataModel.zmLog ("zmNinja Version: " + appVersion);
-                ZMDataModel.setAppVersion(appVersion);
             });
 
-         }
+            //fileLogger is an excellent cross platform library
+            // that allows you to manage log files without worrying about
+            // paths etc.https://github.com/pbakondy/filelogger
+            $fileLogger.setStorageFilename(zm.logFile);
+            // easier tz reading
+            $fileLogger.setTimestampFormat('medium');
+
+            if (window.cordova) {
+                // getAppVersion is a handy library
+                // that lets you extract the app version in config.xml
+                // given that you are always changing versions while
+                // uploading to app/play stores, this is very useful
+                // to keep in sync and use within your app
+
+                cordova.getAppVersion(function (version) {
+                    appVersion = version;
+                    ZMDataModel.zmLog("zmNinja Version: " + appVersion);
+                    ZMDataModel.setAppVersion(appVersion);
+                });
 
-        setTimeout(function () {
-            if (window.cordova)
-            {
-                $cordovaSplashscreen.hide();
             }
-            }, 2000);
-
-        /*if(window.navigator && window.navigator.splashscreen) {
-            window.navigator.splashscreen.hide();
-            console.log ("Unlocking portrait mode after splash");
-            window.plugins.orientationLock.unlock();
-        }*/
 
-        var pixelRatio = window.devicePixelRatio || 1;
-        $rootScope.devWidth = ((window.innerWidth > 0) ? window.innerWidth : screen.width);
-        $rootScope.devHeight = ((window.innerHeight > 0) ? window.innerHeight : screen.height);
-
-        console.log("********Computed Dev Width & Height as" + $rootScope.devWidth + "*" + $rootScope.devHeight);
+            setTimeout(function () {
+                if (window.cordova) {
+                    $cordovaSplashscreen.hide();
+                }
+            }, 2000);
 
-        // What I noticed is when I moved the app to the device
-        // the montage screens were not redrawn after resuming from background mode
-        // Everything was fine if I switched back to the montage screen
-        // so as a global hack I'm just reloading the current state if you switch
-        // from foreground to background and back
-        document.addEventListener("resume", function () {
-            console.log("****The application is resuming from the background");
-            ZMDataModel.zmLog("App is resuming from background");
-            $rootScope.rand = Math.floor((Math.random() * 100000) + 1);
-            //$scope.rand = Math.floor((Math.random() * 100000) + 1);
-            console.log("** generated Random of " + $rootScope.rand);
-            zmAutoLogin.stop(); //safety
-            zmAutoLogin.start();
-            zmAutoLogin.doLogin("authenticating ...");
+            /*if(window.navigator && window.navigator.splashscreen) {
+                window.navigator.splashscreen.hide();
+                console.log ("Unlocking portrait mode after splash");
+                window.plugins.orientationLock.unlock();
+            }*/
+
+            var pixelRatio = window.devicePixelRatio || 1;
+            $rootScope.devWidth = ((window.innerWidth > 0) ? window.innerWidth : screen.width);
+            $rootScope.devHeight = ((window.innerHeight > 0) ? window.innerHeight : screen.height);
+
+            console.log("********Computed Dev Width & Height as" + $rootScope.devWidth + "*" + $rootScope.devHeight);
+
+            // What I noticed is when I moved the app to the device
+            // the montage screens were not redrawn after resuming from background mode
+            // Everything was fine if I switched back to the montage screen
+            // so as a global hack I'm just reloading the current state if you switch
+            // from foreground to background and back
+            document.addEventListener("resume", function () {
+                console.log("****The application is resuming from the background");
+                ZMDataModel.zmLog("App is resuming from background");
+                $rootScope.rand = Math.floor((Math.random() * 100000) + 1);
+                //$scope.rand = Math.floor((Math.random() * 100000) + 1);
+                console.log("** generated Random of " + $rootScope.rand);
+                zmAutoLogin.stop(); //safety
+                zmAutoLogin.start();
+                zmAutoLogin.doLogin("authenticating ...");
 
 
-        }, false);
+            }, false);
 
 
-        document.addEventListener("pause", function () {
-            console.log("****The application is going into  background");
-            ZMDataModel.zmLog("App is going into background");
-             zmAutoLogin.stop();
+            document.addEventListener("pause", function () {
+                console.log("****The application is going into  background");
+                ZMDataModel.zmLog("App is going into background");
+                zmAutoLogin.stop();
 
-        }, false);
+            }, false);
 
 
-        if (window.cordova && window.cordova.plugins.Keyboard) {
-            cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true);
-            // solves screen bouncing on form input
-            // since I am using JS Scroll
-            cordova.plugins.Keyboard.disableScroll(true);
-        }
-        if (window.StatusBar) {
-            // org.apache.cordova.statusbar required
-            StatusBar.styleDefault();
-        }
+            if (window.cordova && window.cordova.plugins.Keyboard) {
+                cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true);
+                // solves screen bouncing on form input
+                // since I am using JS Scroll
+                cordova.plugins.Keyboard.disableScroll(true);
+            }
+            if (window.StatusBar) {
+                // org.apache.cordova.statusbar required
+                StatusBar.styleDefault();
+            }
 
 
 
-    }); //platformReady
+        }); //platformReady
 
 
-    // lets POST so we get a session ID right hre
+        // lets POST so we get a session ID right hre
 
-    console.log ("Setting up POST LOGIN timer");
-    zmAutoLogin.start();
+        console.log("Setting up POST LOGIN timer");
+        zmAutoLogin.start();
 
-}) //run
+    }) //run
 
 //------------------------------------------------------------------
 // Route configuration
@@ -701,8 +627,6 @@ angular.module('zmApp', [
     // If you do this, Allow Origin can't be *
     //$httpProvider.defaults.withCredentials = true;
     $httpProvider.interceptors.push('timeoutHttpIntercept');
-    //$httpProvider.interceptors.push('httpAuthIntercept');
-
 
     $stateProvider
         .state('login', {
@@ -725,11 +649,11 @@ angular.module('zmApp', [
         })
 
     .state('app', {
-      url: '/',
-      abstract: true,
-      templateUrl: 'index.html',
-        cache:false,
-      //controller: 'AppCtrl'
+        url: '/',
+        abstract: true,
+        templateUrl: 'index.html',
+        cache: false,
+        //controller: 'AppCtrl'
     })
 
 
@@ -775,7 +699,7 @@ angular.module('zmApp', [
     })
 
 
-     .state('events-date-time-filter', {
+    .state('events-date-time-filter', {
         data: {
             requireLogin: true
         },
@@ -802,7 +726,7 @@ angular.module('zmApp', [
         controller: 'zmApp.DevOptionsCtrl',
     })
 
-        .state('timeline', {
+    .state('timeline', {
         data: {
             requireLogin: true
         },
@@ -826,8 +750,8 @@ angular.module('zmApp', [
         templateUrl: "templates/log.html",
         controller: 'zmApp.LogCtrl',
     })
-    
-     .state('zm-portal-login', {
+
+    .state('zm-portal-login', {
         data: {
             requireLogin: false
         },
@@ -841,16 +765,19 @@ angular.module('zmApp', [
             requireLogin: true
         },
         resolve: {
-                message: function (ZMDataModel) {
+            message: function (ZMDataModel) {
                 console.log("Inside app.events resolve");
                 return ZMDataModel.getMonitors(0);
-                }
-            
+            }
+
         },
         url: "/montage",
         templateUrl: "templates/montage.html",
         controller: 'zmApp.MontageCtrl',
-        params: {minimal:false, isRefresh:false}
+        params: {
+            minimal: false,
+            isRefresh: false
+        }
 
     });
 
@@ -869,8 +796,8 @@ angular.module('zmApp', [
 
     $urlRouterProvider.otherwise(function ($injector, $location) {
         var $state = $injector.get("$state");
-        console.log ("** PORTAL LOGIN STATE");
+        console.log("** PORTAL LOGIN STATE");
         $state.go("zm-portal-login");
     });
 
-}); //config
+}); //config
\ No newline at end of file