From 1c667b86832b91cfcd9cf4eff8bf6459d172db97 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Wed, 13 Jul 2016 12:39:00 -0400
Subject: slightly cleaner url guessing between api/streaming/portal

Former-commit-id: e0f190985ed843785dca9087adbe992e063caa88
---
 www/js/LoginCtrl.js | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

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

diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js
index e67867fe..5c81b102 100644
--- a/www/js/LoginCtrl.js
+++ b/www/js/LoginCtrl.js
@@ -332,10 +332,21 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
         if (/^https:\/\//i.test($scope.loginData.url)) {
             $scope.loginData.useSSL = true;
         }
+        else
+        {$scope.loginData.useSSL = false;}
    
-        $scope.loginData.streamingurl = $scope.loginData.url;
-
-        $scope.loginData.apiurl = $scope.loginData.url + "/api";
+        if ($scope.loginData.url.slice(-1)=='/')
+        {
+            $scope.loginData.apiurl = $scope.loginData.url + "api";
+            $scope.loginData.streamingurl = $scope.loginData.url + "cgi-bin";
+        }
+        else
+        {
+            $scope.loginData.apiurl = $scope.loginData.url + "/api";
+            $scope.loginData.streamingurl = $scope.loginData.url + "/cgi-bin";
+        }
+            
+            
     };
     //-------------------------------------------------------------------------------
     // Adds http to url if not present
-- 
cgit v1.2.3