diff options
| author | MaZderMind | 2015-07-13 14:03:13 +0200 |
|---|---|---|
| committer | MaZderMind | 2015-07-13 14:03:13 +0200 |
| commit | a3becf276c03ed21e7a3a5a18b8698a90dbe6fa3 (patch) | |
| tree | f0a6a56794170abcc0a46a395a8b5cef4dd12c40 | |
| parent | f581ebf00c7443c7b346b2085279fe60438e8954 (diff) | |
Prepare URLs in index
| -rw-r--r-- | index.php | 10 | ||||
| -rw-r--r-- | template/assemblies/header.phtml | 2 | ||||
| -rw-r--r-- | template/page.phtml | 4 |
3 files changed, 12 insertions, 4 deletions
@@ -28,8 +28,9 @@ $conference = new Conference(); $tpl = new PhpTemplate('template/page.phtml'); $tpl->set(array( - 'baseurl' => baseurl(), + 'baseurl' => forceslash(baseurl()), 'route' => $route, + 'canonicalurl' => forceslash(baseurl()).forceslash($route), 'assemblies' => './template/assemblies/', 'conference' => $conference, @@ -37,6 +38,13 @@ $tpl->set(array( 'schedule' => new Schedule(), )); +if(startswith('//', @$GLOBALS['CONFIG']['BASEURL'])) +{ + $tpl->set(array( + 'httpsurl' => forceslash('https:'.$GLOBALS['CONFIG']['BASEURL']).forceslash($route), + 'httpurl' => forceslash('http:'. $GLOBALS['CONFIG']['BASEURL']).forceslash($route), + )); +} ob_start(); try { diff --git a/template/assemblies/header.phtml b/template/assemblies/header.phtml index 9043c82..68f4b6d 100644 --- a/template/assemblies/header.phtml +++ b/template/assemblies/header.phtml @@ -9,7 +9,7 @@ <div class="nav navbar-form navbar-right button-wrapper"> <? if(startswith('//', @$GLOBALS['CONFIG']['BASEURL'])): ?> - <a class="form-control btn btn-ssl btn-<?= ssl() ? 'success' : 'warning' ?>" href="<?=h( (ssl() ? 'http:' : 'https:').$GLOBALS['CONFIG']['BASEURL'])?>"> + <a class="form-control btn btn-ssl btn-<?= ssl() ? 'success' : 'warning' ?>" href="<?=h(ssl() ? $httpurl : $httpsurl)?>"> <span class="fa fa-<?= ssl() ? 'lock' : 'unlock-alt' ?>"></span> TLS </a> diff --git a/template/page.phtml b/template/page.phtml index f5808ab..7fb29e4 100644 --- a/template/page.phtml +++ b/template/page.phtml @@ -26,8 +26,8 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <base href="<?=h(forceslash($baseurl))?>" /> - <link href="<?=h(forceslash($baseurl).forceslash($route))?>" rel="canonical" /> + <base href="<?=h($baseurl)?>" /> + <link href="<?=h($canonicalurl)?>" rel="canonical" /> <link href="assets/img/apple-touch-icon.png" rel="apple-touch-icon" /> <link href="assets/img/favicon.png" rel="icon" type="image/png" /> |