From 6fa4b725624feba76031e7354a4d94aed5339957 Mon Sep 17 00:00:00 2001
From: PliablePixels <pliablepixels@gmail.com>
Date: Fri, 11 Sep 2015 16:21:14 +0100
Subject: make sure global replaces are done if the string is not null - avoids
 <deleted> every 2nd char when empt

---
 www/js/LogCtrl.js | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'www/js/LogCtrl.js')

diff --git a/www/js/LogCtrl.js b/www/js/LogCtrl.js
index c86b1aba..fb1fc6a6 100644
--- a/www/js/LogCtrl.js
+++ b/www/js/LogCtrl.js
@@ -57,19 +57,27 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo
 
                 // do my best to replace sensitive information
                 var loginData = ZMDataModel.getLogin();
-                var re1 = new RegExp(loginData.password, "g");
-                logstring = logstring.replace(re1, "<deleted>");
+                // if its null you will see deleted everywhere
+                if (loginData.password !="")
+                {
+                    var re1 = new RegExp(loginData.password, "g");
+                    logstring = logstring.replace(re1, "<deleted>");
+                }
                 // keep the protocol, helps to debug
                 var urlNoProtocol = loginData.url.replace(/.*?:\/\//, "");
-                var re2 = new RegExp(urlNoProtocol, "g");
-                // just replacing baseurl - that will take care of
-                // masking api but may not be cgi
-                logstring = logstring.replace(re2, "<server>");
-
+                if (urlNoProtocol != "")
+                {
+                    var re2 = new RegExp(urlNoProtocol, "g");
+                    // just replacing baseurl - that will take care of
+                    // masking api but may not be cgi
+                    logstring = logstring.replace(re2, "<server>");
+                }
                 urlNoProtocol = loginData.streamingurl.replace(/.*?:\/\//, "");
-                var re3 = new RegExp(urlNoProtocol, "g");
-                logstring = logstring.replace(re3, "<server>");
-
+                if (urlNoProtocol != "")
+                {
+                    var re3 = new RegExp(urlNoProtocol, "g");
+                    logstring = logstring.replace(re3, "<server>");
+                }
                 var email = {
                     to: zm.authoremail,
                     subject: 'zmNinja Logs',
-- 
cgit v1.2.3