From 26bbafd451da564adc2eb302db679bd4f4eecac5 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Fri, 16 Dec 2016 10:10:53 +0100
Subject: [PATCH] views: fix base url to omit scheme for when we connect
 through a https gateway

---
 app/views/alert.phtml        |  4 ++--
 app/views/github/index.phtml |  6 +++---
 app/views/github/repo.phtml  |  8 ++++----
 app/views/layout.phtml       |  6 +++---
 app/views/modal/hook.phtml   |  4 ++--
 app/views/navbar.phtml       | 12 ++++++------
 app/views/pages/index.phtml  |  4 ++--
 app/views/pages/wiki.phtml   |  2 +-
 8 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/views/alert.phtml b/app/views/alert.phtml
index 8a5a45a..c8c527f 100644
--- a/app/views/alert.phtml
+++ b/app/views/alert.phtml
@@ -3,10 +3,10 @@
 	<strong><?= nl2br($this->e($exception->getMessage())) ?></strong>
 	(<?= $exception->getCode() ?>)<br>
 	<?php if ($exception instanceof \app\Github\Exception\TokenException) : ?>
-		You might want to try to <a href="<?= $baseUrl->mod("./github/signin") ?>">renew your token</a>!
+		You might want to try to <a href="<?= $baseUrl->mod(":./github/signin") ?>">renew your token</a>!
 	<?php endif; ?>
 	<?php if ($exception instanceof \app\Github\Exception\StateException) : ?>
-		You might want to try to <a href="<?= $baseUrl->mod("./github/signin") ?>">try again</a>!
+		You might want to try to <a href="<?= $baseUrl->mod(":./github/signin") ?>">try again</a>!
 	<?php endif; ?>
 </div>
 
diff --git a/app/views/github/index.phtml b/app/views/github/index.phtml
index 070db76..ba0170f 100644
--- a/app/views/github/index.phtml
+++ b/app/views/github/index.phtml
@@ -28,7 +28,7 @@
 				<?php endif; ?>
 			</td>
 			<th>
-				<a href="<?= $baseUrl->mod("./github/repo/".$repo->full_name) ?>">
+				<a href="<?= $baseUrl->mod(":./github/repo/".$repo->full_name) ?>">
 					<big class="text-primary" title="<?= $this->e($repo->description) ?>"><?= $this->e($repo->name) ?></big>
 				</a>
 				<br>
@@ -37,7 +37,7 @@
 			<td class="text-right"><time datetime="<?= $this->e($repo->pushed_at) ?>"><?= $this->e($this->utc($repo->pushed_at)->format("Y-m-d H:i T")) ?></time></td>
 			<td class="text-center">
 				<?php if ($this->check($repo)) : ?>
-				<form class="form" style="display: inline-block" method="post" action="<?= $baseUrl->mod("./github/repo/". $repo->full_name ."/hook/del") ?>"> 
+				<form class="form" style="display: inline-block" method="post" action="<?= $baseUrl->mod(":./github/repo/". $repo->full_name ."/hook/del") ?>">
 					<input type="hidden" name="returnback" value="1">
 					<button type="submit" class="btn btn-block btn-danger">
 						<span class="glyphicon glyphicon-remove"></span>
@@ -45,7 +45,7 @@
 					</button>
 				</form>
 				<?php else : ?>
-				<form class="form-inline" style="display: inline-block" method="post" action="<?= $baseUrl->mod("./github/repo/". $repo->full_name ."/hook/add") ?>">
+				<form class="form-inline" style="display: inline-block" method="post" action="<?= $baseUrl->mod(":./github/repo/". $repo->full_name ."/hook/add") ?>">
 						<div class="checkbox">
 							<label for="hook-tag">
 								<input id="hook-tag" type="checkbox" name="tag" value="1" checked>
diff --git a/app/views/github/repo.phtml b/app/views/github/repo.phtml
index fff952d..21d640c 100644
--- a/app/views/github/repo.phtml
+++ b/app/views/github/repo.phtml
@@ -1,4 +1,4 @@
-<?php $this->layout("layout", ["title" => "Github: {$repo->name}"]) ?>
+<?php $this->layout("layout", ["title" => "Github: ". (isset($repo) ? $repo->name : $name)]) ?>
 
 <div class="page-header">
 	<h1>
@@ -116,7 +116,7 @@
 
 	<div class="col-sm-6">
 		<div class="row">
-			<form method="post" action="<?= $baseUrl->mod("./github/repo/". $repo->full_name ."/hook/" . (!empty($hook) ? "upd" : "add")) ?>">
+			<form method="post" action="<?= $baseUrl->mod(":./github/repo/". $repo->full_name ."/hook/" . (!empty($hook) ? "upd" : "add")) ?>">
 				<div class="col-sm-6">
 					<h4>PHARext Options:</h4>
 					<div class="checkbox">
@@ -166,7 +166,7 @@
 			<!-- column wrapping! -->
 			<?php if ($this->check($repo)) : ?>
 			<div class="col-sm-6">
-				<form method="post" action="<?= $baseUrl->mod("./github/repo/". $repo->full_name ."/hook/del") ?>"> 
+				<form method="post" action="<?= $baseUrl->mod(":./github/repo/". $repo->full_name ."/hook/del") ?>">
 				<button class="btn btn-lg btn-block btn-danger">
 					<span class="glyphicon glyphicon-remove-circle"></span>
 					Remove Hook
@@ -240,7 +240,7 @@
 					<?php endforeach; ?>
 				</ul>
 			<?php else: ?>
-				<form class="form-inline pull-right" method="post" action="<?= $baseUrl->mod("./github/repo/". $repo->full_name ."/release") ?>">
+				<form class="form-inline pull-right" method="post" action="<?= $baseUrl->mod(":./github/repo/". $repo->full_name ."/release") ?>">
 					<input type="hidden" name="tag" value="<?= $this->e($v->tag->name) ?>">
 					<div class="checkbox">
 						<label for="hook-zend">
diff --git a/app/views/layout.phtml b/app/views/layout.phtml
index 6bf5eb4..e8e4057 100644
--- a/app/views/layout.phtml
+++ b/app/views/layout.phtml
@@ -10,8 +10,8 @@
 		</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
 		<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">
-		<link rel="stylesheet" href="<?= $baseUrl->mod("./octicons/octicons.css") ?>">
-		<link rel="stylesheet" href="<?= $baseUrl->mod("./index.css") ?>">
+		<link rel="stylesheet" href="<?= $baseUrl->mod(":./octicons/octicons.css") ?>">
+		<link rel="stylesheet" href="<?= $baseUrl->mod(":./index.css") ?>">
 		
 		<?php if (!empty($styles)) : ?>
 			<?php foreach($styles as $style) : ?>
@@ -52,7 +52,7 @@
 			</div>
 		</footer>
 		<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
-		<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
+		<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 		<script>$(".modal").modal("show")</script>
 		<?php if (!empty($scripts)) : ?>
 			<?php foreach ($scripts as $script) : ?>
diff --git a/app/views/modal/hook.phtml b/app/views/modal/hook.phtml
index 6a6df0d..68bb5ed 100644
--- a/app/views/modal/hook.phtml
+++ b/app/views/modal/hook.phtml
@@ -12,12 +12,12 @@
       </div>
       <div class="modal-footer">
 		<?php if ($action === "add") : ?>
-		<form method="post" action="<?= $baseUrl->mod("./github/repo/". $repo->full_name ."/hook/add") ?>"> 
+		<form method="post" action="<?= $baseUrl->mod(":./github/repo/". $repo->full_name ."/hook/add") ?>">
 	        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
 			<button type="submit" class="btn btn-primary">Enable Hook</button>
 		</form>
 		<?php elseif ($action === "del") : ?>
-		<form method="post" action="<?= $baseUrl->mod("./github/repo/". $repo->full_name ."/hook/del") ?>"> 
+		<form method="post" action="<?= $baseUrl->mod(":./github/repo/". $repo->full_name ."/hook/del") ?>">
 	        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
 			<button type="submit" class="btn btn-primary">Disable Hook</button>
 		</form>
diff --git a/app/views/navbar.phtml b/app/views/navbar.phtml
index 310ab53..0b0a598 100644
--- a/app/views/navbar.phtml
+++ b/app/views/navbar.phtml
@@ -9,7 +9,7 @@
 				<span class="icon-bar"></span>
 				<span class="icon-bar"></span>
 			</button>
-			<a class="navbar-brand" href="<?=$baseUrl->mod("./")?>">PHARext</a>
+			<a class="navbar-brand" href="<?=$baseUrl->mod(":./")?>">PHARext</a>
 		</div>
 
 		<!-- Collect the nav links, forms, and other content for toggling -->
@@ -22,25 +22,25 @@
 						data-toggle="dropdown"
 						role="button"
 						aria-expand="false"
-						href="<?=$baseUrl->mod("./pages/Home")?>">
+						href="<?=$baseUrl->mod(":./pages/Home")?>">
 						About
 						<span class="caret"></span>
 					</a>
 					<ul class="dropdown-menu" role="menu">
 						<?php foreach ($pages as $page) : ?>
-						<li><a href="<?= $baseUrl->mod("./pages/". rawurlencode($page)) ?>">
+						<li><a href="<?= $baseUrl->mod(":./pages/". rawurlencode($page)) ?>">
 							<?= $this->e($page) ?></a></li>
 						<?php endforeach; ?>
 					</ul>
 				</li>
 				<?php else : ?>
-				<li><a href="<?=$baseUrl->mod("./pages/Home")?>">About</a></li>
+				<li><a href="<?=$baseUrl->mod(":./pages/Home")?>">About</a></li>
 				<?php endif; ?>
 				<li
 					<?php if ($location == "github") : ?>
 					class="active"
 					<?php endif; ?>
-					><a href="<?=$baseUrl->mod("./github")?>">Github</a>
+					><a href="<?=$baseUrl->mod(":./github")?>">Github</a>
 				</li>
 			</ul>
 			<?php if (isset($session)) : ?>
@@ -60,7 +60,7 @@
 						</a>
 						<ul class="dropdown-menu" role="menu">
 							<li>
-								<a href="<?= $baseUrl->mod("./reset") ?>">
+								<a href="<?= $baseUrl->mod(":./reset") ?>">
 									Signout
 								</a>
 							</li>
diff --git a/app/views/pages/index.phtml b/app/views/pages/index.phtml
index 119da52..a9a777b 100644
--- a/app/views/pages/index.phtml
+++ b/app/views/pages/index.phtml
@@ -14,7 +14,7 @@
 				<p>
 					Distribute your PHP extensions as self-installing PHAR archives.<sup><a id="ref-unix" href="#fn-unix">1</a>)</sup>
 				</p>
-				<p><a href="<?= $baseUrl->mod("./pages/Home") ?>" class="btn btn-primary btn-lg btn-block">
+				<p><a href="<?= $baseUrl->mod(":./pages/Home") ?>" class="btn btn-primary btn-lg btn-block">
 					Learn more about <em>pharext</em>!
 				</a>
 				</p>
@@ -26,7 +26,7 @@
 				<p>
 					Manage automatic pharext builds of your PHP extensions.
 				</p>
-				<a href="<?= $baseUrl->mod("./github") ?>" class="btn btn-primary btn-lg btn-block">
+				<a href="<?= $baseUrl->mod(":./github") ?>" class="btn btn-primary btn-lg btn-block">
 				Start right with your <em>Github</em> repos!
 				</a>
 			</div>
diff --git a/app/views/pages/wiki.phtml b/app/views/pages/wiki.phtml
index b154fad..f60864e 100644
--- a/app/views/pages/wiki.phtml
+++ b/app/views/pages/wiki.phtml
@@ -22,7 +22,7 @@
 			</li>
 			<?php foreach ($pages as $page) : ?>
 			<li>
-				<a href="<?= $baseUrl->mod("./pages/". rawurlencode($page)) ?>">
+				<a href="<?= $baseUrl->mod(":./pages/". rawurlencode($page)) ?>">
 				<?= $this->e($page) ?>
 				</a>
 			</li>
-- 
2.30.2