From acf7d6e40babb1622a9f0dddb2eff50d7fe23c48 Mon Sep 17 00:00:00 2001 From: Arjun Roychowdhury Date: Tue, 17 Nov 2015 10:43:18 -0500 Subject: #92 - let user have full control on cgi-bin path spec to cover all cases Former-commit-id: 48bd4d0ca2ee8a8b44f885f76652c86088fc2397 --- www/js/LoginCtrl.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'www/js/LoginCtrl.js') diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index 34c29eec..c8be575b 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -288,9 +288,11 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r } // strip cgi-bin if it is there but only at the end - if ($scope.loginData.streamingurl.slice(-7).toLowerCase() == 'cgi-bin') { + // Nov 17 Don't mess with this path. centos uses zm-cgi-bin of all things + + /*if ($scope.loginData.streamingurl.slice(-7).toLowerCase() == 'cgi-bin') { $scope.loginData.streamingurl = $scope.loginData.streamingurl.slice(0, -7); - } + }*/ // check for protocol and if not put it in @@ -378,7 +380,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r ZMDataModel.getPathZms() .then(function (data) { var ld = ZMDataModel.getLogin(); - ZMDataModel.zmLog("PATH_ZMS:" + data + " ,Path ZmNinja will use:" + ld.streamingurl + "/cgi-bin/nph-zms"); + ZMDataModel.zmLog("PATH_ZMS:" + data + ", Path ZmNinja will use:" + ld.streamingurl + "/nph-zms"); ZMDataModel.zmLog("If live streams are not working, make sure you check these values"); -- cgit v1.2.3