From: Michael Wallner <mike@php.net>
Date: Fri, 16 Dec 2016 09:11:42 +0000 (+0100)
Subject: controllers: fix base url to omit scheme for when we connect through a https gateway
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=5664731d8825ce074a5232190f2f8ec61d921782;p=pharext%2Fpharext.org

controllers: fix base url to omit scheme for when we connect through a https gateway
---

diff --git a/app/Controller/Github.php b/app/Controller/Github.php
index 7b7bdf6..7ec3094 100644
--- a/app/Controller/Github.php
+++ b/app/Controller/Github.php
@@ -68,6 +68,7 @@ abstract class Github implements Controller
 			return true;
 		}
 		$this->app->redirect($this->app->getBaseUrl()->mod([
+			"scheme" => null,
 			"path" => "github/signin",
 			"query" => new QueryString(["returnto" => $this->session->current])
 		]));
diff --git a/app/Controller/Github/Callback.php b/app/Controller/Github/Callback.php
index fcd814f..bd8c0e5 100644
--- a/app/Controller/Github/Callback.php
+++ b/app/Controller/Github/Callback.php
@@ -35,7 +35,7 @@ class Callback extends Github
 				$this->app->redirect($returnto);
 			} else {
 				$this->app->redirect(
-					$this->app->getBaseUrl()->mod("./github"));
+					$this->app->getBaseUrl()->mod(":./github"));
 			}
 		}
 		$this->app->display("github/callback");