Fix Canonical-URL when deployed in a Folder

This commit is contained in:
MaZderMind 2015-03-03 11:20:45 +01:00
parent 7d0d4db2e4
commit 9f9fe26bdd
3 changed files with 12 additions and 2 deletions

View file

@ -2,6 +2,7 @@
$route = @$_GET['route'];
$route = rtrim($route, '/');
$GLOBALS['ROUTE'] = $route;
require_once('config.php');
require_once('lib/helper.php');

View file

@ -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);

View file

@ -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" />