diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-01-27 07:36:15 -0500 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-01-27 07:36:15 -0500 |
| commit | 27b3de78db191c9ef2e68d8fc8b8f3d97ce5f71b (patch) | |
| tree | ee7ce1b0c4bc812e222e283f3ce6b1a7636645cc /www | |
| parent | 02596e5821ba01672763b5faf5375de415de3bf4 (diff) | |
remove ssl toggle #589
Diffstat (limited to 'www')
| -rwxr-xr-x | www/js/DataModel.js | 2 | ||||
| -rw-r--r-- | www/js/LoginCtrl.js | 4 | ||||
| -rw-r--r-- | www/templates/login.html | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index f63e6c8a..8aa3e6ea 100755 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -103,7 +103,7 @@ angular.module('zmApp.controllers') 'singleImageQuality': "100", // event single streaming quality in % 'monSingleImageQuality': "100", // live view quality 'montageHistoryQuality': "50", - 'useSSL': false, // "1" if HTTPS + 'useSSL': false, // "1" if HTTPS --> not used #589 'keepAwake': true, // don't dim/dim during live view 'isUseAuth': true, // true if user wants ZM auth 'isUseEventServer': false, // true if you configure the websocket event server diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index 7956950b..36c139b1 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -593,7 +593,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r $scope.loginData.streamingurl = addhttp($scope.loginData.streamingurl); $scope.loginData.eventServer = addWsOrWss($scope.loginData.eventServer); - if ($scope.loginData.useSSL) + /* if ($scope.loginData.useSSL) { // replace all http with https $scope.loginData.url = $scope.loginData.url.replace("http:", "https:"); @@ -609,7 +609,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r $scope.loginData.apiurl = $scope.loginData.apiurl.replace("https:", "http:"); $scope.loginData.streamingurl = $scope.loginData.streamingurl.replace("https:", "http:"); // don't do it for WSS - lets mandate that - } + }*/ var apiurl = $scope.loginData.apiurl + '/host/getVersion.json'; var portalurl = $scope.loginData.url + '/index.php'; diff --git a/www/templates/login.html b/www/templates/login.html index d35faeb8..36f216b4 100644 --- a/www/templates/login.html +++ b/www/templates/login.html @@ -71,9 +71,9 @@ <ion-toggle ng-model="loginData.usePin" ng-change="pinPrompt();" ng-checked="{{loginData.usePin}}" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kPassword' | translate}} {{'kProtect'|translate}}</span></ion-toggle> </label> </div> - <label> + <!--<label> <ion-toggle ng-model="loginData.useSSL" ng-checked="{{loginData.useSSL}}" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kUseSSL' | translate}}</span></ion-toggle> - </label> + </label>--> <div ng-if="$root.platformOS != 'desktop'"> <label> <ion-toggle ng-model="loginData.keepAwake" ng-checked="{{loginData.keepAwake}}" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kAwake1'|translate}} |