From 6fcf7ab52b7465400ce4cac8b5775093b0f6dd66 Mon Sep 17 00:00:00 2001 From: MaZderMind Date: Sat, 14 Nov 2015 12:18:49 +0100 Subject: move base-url & timezone out of per-conference config support ssl on conference selection page --- config.php | 13 +++++++++ configs/conferences/31c3/config.php | 12 -------- configs/conferences/cccamp15/config.php | 11 ------- configs/conferences/chaosradio/config.php | 12 -------- configs/conferences/datengarten/config.php | 12 -------- configs/conferences/gpn15/config.php | 9 ------ configs/conferences/nixcon15/config.php | 9 ------ configs/conferences/ppw15b/config.php | 9 ------ index.php | 46 +++++++++++++++--------------- 9 files changed, 36 insertions(+), 97 deletions(-) create mode 100644 config.php diff --git a/config.php b/config.php new file mode 100644 index 0000000..3a13e84 --- /dev/null +++ b/config.php @@ -0,0 +1,13 @@ +set(array( + 'baseurl' => forceslash(baseurl()), + 'route' => $route, + 'canonicalurl' => forceslash(baseurl()).forceslash($route), + 'assemblies' => 'template/assemblies/', + 'assets' => 'assets/', + + 'conference' => new GenericConference(), + )); + + if(startswith('//', @$GLOBALS['CONFIG']['BASEURL'])) + { + $tpl->set(array( + 'httpsurl' => forceslash(forceslash('https:'.$GLOBALS['CONFIG']['BASEURL']).@$GLOBALS['MANDATOR']).forceslash($route), + 'httpurl' => forceslash(forceslash('http:'. $GLOBALS['CONFIG']['BASEURL']).@$GLOBALS['MANDATOR']).forceslash($route), + )); + } + + // GLOBAL ROUTES if($route == 'gen/main.css') { @@ -43,19 +65,6 @@ try { exit; } - - // generic template - $tpl = new PhpTemplate('template/page.phtml'); - $tpl->set(array( - 'baseurl' => forceslash(baseurl()), - 'route' => $route, - 'canonicalurl' => forceslash(baseurl()).forceslash($route), - 'assemblies' => './template/assemblies/', - 'assets' => 'assets/', - - 'conference' => new GenericConference(), - )); - @list($mandator, $route) = explode('/', $route, 2); if(!$mandator) { @@ -109,12 +118,11 @@ catch(Exception $e) $GLOBALS['MANDATOR'] = $mandator; $conference = new Conference(); -$tpl = new PhpTemplate('template/page.phtml'); +// update template information $tpl->set(array( 'baseurl' => forceslash(baseurl()), 'route' => $route, 'canonicalurl' => forceslash(baseurl()).forceslash($route), - 'assemblies' => './template/assemblies/', 'assets' => '../assets/', 'conference' => $conference, @@ -122,14 +130,6 @@ $tpl->set(array( 'schedule' => new Schedule(), )); -if(startswith('//', @$GLOBALS['CONFIG']['BASEURL'])) -{ - $tpl->set(array( - 'httpsurl' => forceslash(forceslash('https:'.$GLOBALS['CONFIG']['BASEURL']).@$GLOBALS['MANDATOR']).forceslash($route), - 'httpurl' => forceslash(forceslash('http:'. $GLOBALS['CONFIG']['BASEURL']).@$GLOBALS['MANDATOR']).forceslash($route), - )); -} - ob_start(); try { -- cgit v1.2.3