diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-04-23 17:08:45 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-04-23 17:08:45 -0400 |
| commit | 8bb754fb65c4d707a03120d1599127e4783c915e (patch) | |
| tree | 6f3d24c76f7447d0c8cfb353eb6616bd5fa5db5c | |
| parent | b0d17c151851cc48aa56c837cc89ae26eb5a705e (diff) | |
fix situation where user is logged in, but changes login URL and does not put in a protocol #231
Former-commit-id: edddf1935aa9e6b7d0b51d46491eb29be7412612
| -rw-r--r-- | www/js/LoginCtrl.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index 82742497..bf383320 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -286,6 +286,10 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r .then (function (data) { // coming here means we were able to login + $scope.loginData.url = addhttp($scope.loginData.url); + if ($scope.loginData.useSSL) + $scope.loginData.url = $scope.loginData.url.replace("http:", "https:"); + var c=URI.parse($scope.loginData.url); var p1,p2,p3,text; p1 =""; |