aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaZderMind2015-03-03 11:20:45 +0100
committerMaZderMind2015-03-03 11:20:45 +0100
commit9f9fe26bdde914ea5d090755b30c39fc1d6a468a (patch)
tree80fa4e61a458d186b96718dc010b6896d87e91a9
parent7d0d4db2e41b1850cb1005c0a0bfde8967d4c3b2 (diff)
Fix Canonical-URL when deployed in a Folder
-rw-r--r--index.php1
-rw-r--r--lib/helper.php11
-rw-r--r--template/page.phtml2
3 files changed, 12 insertions, 2 deletions
diff --git a/index.php b/index.php
index 07bac59..e4b4417 100644
--- a/index.php
+++ b/index.php
@@ -2,6 +2,7 @@
$route = @$_GET['route'];
$route = rtrim($route, '/');
+$GLOBALS['ROUTE'] = $route;
require_once('config.php');
require_once('lib/helper.php');
diff --git a/lib/helper.php b/lib/helper.php
index 4beef4d..91583d1 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -86,11 +86,20 @@ function baseurl()
$base = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']) ? 'https://' : 'http://';
$base .= $_SERVER['HTTP_HOST'];
- $base .= rtrim(dirname($_SERVER['SCRIPT_NAME']), '/').'/';
+ $base .= forceslash(dirname($_SERVER['SCRIPT_NAME']));
return $base;
}
+function forceslash($url)
+{
+ $url = rtrim($url, '/');
+ if(strlen($url) > 0)
+ $url .= '/';
+
+ return $url;
+}
+
function strtoduration($str)
{
$parts = explode(':', $str);
diff --git a/template/page.phtml b/template/page.phtml
index 498036a..9af5d7b 100644
--- a/template/page.phtml
+++ b/template/page.phtml
@@ -27,7 +27,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<base href="<?=h($baseurl)?>" />
- <link href="<?=h($baseurl.ltrim($_SERVER['REQUEST_URI'], '/'))?>" rel="canonical" />
+ <link href="<?=h($baseurl.forceslash($GLOBALS['ROUTE']))?>" rel="canonical" />
<link href="assets/img/apple-touch-icon/76x76.png" rel="apple-touch-icon" />
<link href="assets/img/apple-touch-icon/76x76.png" rel="apple-touch-icon" sizes="76x76" />