From 0d97c784d140bcaa03374265420c613888351141 Mon Sep 17 00:00:00 2001
From: Josh North <josh.north@point808.com>
Date: Fri, 7 May 2021 14:04:10 -0400
Subject: [PATCH] Fix login/logout http/https links

---
 inc/header.inc.php | 2 +-
 login.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/header.inc.php b/inc/header.inc.php
index abea6cd..0a7cace 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.php
@@ -164,7 +164,7 @@
                     <ul class="navbar-nav mr-sm-2">
                         <li class="nav-item"><a class="nav-link<?php $sname=$SiteInfo->getSite($siteid, "0", "0", "0")[0]["sites_name"]; if($sname=="NOSITE") { echo " btn btn-sm btn-outline-warning"; } else { echo " btn btn-sm btn-outline-secondary"; }; ?>" href="#" data-toggle="modal" data-target="#sitetimeModal"><i class="fas fa-map-marker-alt"></i> <?php if ($sname=="NOSITE") {echo $transLang['NOSITE'];} else { echo $sname; } ?></a></li>
                         <?php if (Registry::AUTHMETHOD == 'SAML') { ?>
-                        <li class="nav-item<?php if ($app_current_pagename==$transLang['LOGOUT']): echo " active"; endif; ?>"><a class="nav-link btn btn-sm btn-outline-danger" href="https://lobbysio.point808.com/simplesaml/module.php/core/as_logout.php?AuthId=default-sp&ReturnTo=https%3A%2F%2Flobbysio.point808.com%2F"><span class="badge badge-light"><?php echo $session_user["0"]["users_username"];?></span> <i class="fas fa-ban"></i> <?php echo $transLang['LOGOUT']; ?></a></li>
+                        <li class="nav-item<?php if ($app_current_pagename==$transLang['LOGOUT']): echo " active"; endif; ?>"><a class="nav-link btn btn-sm btn-outline-danger" href="<?php echo str_replace("http%3A%2F%2F","https%3A%2F%2F",$auth->getLogoutURL()); ?>"><span class="badge badge-light"><?php echo $session_user["0"]["users_username"];?></span> <i class="fas fa-ban"></i> <?php echo $transLang['LOGOUT']; ?></a></li>
                         <?php } else { ?>
                         <li class="nav-item<?php if ($app_current_pagename==$transLang['LOGOUT']): echo " active"; endif; ?>"><a class="nav-link btn btn-sm btn-outline-danger" href="logout.php"><span class="badge badge-light"><?php echo $session_user["0"]["users_username"];?></span> <i class="fas fa-ban"></i> <?php echo $transLang['LOGOUT']; ?></a></li>
                         <?php } ?>
diff --git a/login.php b/login.php
index 6d28fcf..83234de 100644
--- a/login.php
+++ b/login.php
@@ -121,7 +121,7 @@ endif;
             <button class="btn btn-success btn-block" type="submit" id="button-addon2" name="login"><?php echo $transLang['LOGIN']; ?></button>
           </div>
           <?php } else { ?>
-          <a class="btn btn-success btn-block" id="button-addon2" name="login" href="<?php echo $auth->getLoginURL(); ?>"><?php echo $transLang['LOGIN']; ?></a>
+          <a class="btn btn-success btn-block" id="button-addon2" name="login" href="<?php echo str_replace("http%3A%2F%2F","https%3A%2F%2F",$auth->getLoginURL()); ?>"><?php echo $transLang['LOGIN']; ?></a>
           <?php } ?>
         </div>
       </form>