aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMaZderMind2016-12-10 18:22:34 +0100
committerMaZderMind2016-12-10 18:22:34 +0100
commitf6c0270d40f6730fe1e1820f2866b08792df1db6 (patch)
treef0da1effc9f55f2f75dc57fe1ba17419d559b45b /lib
parentb227ac0ee80f6de300fed10a34e7393847227cfc (diff)
rewrite data-model so that every configuration option is accessed through the conference
Diffstat (limited to '')
-rw-r--r--lib/helper.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/helper.php b/lib/helper.php
index 4fce91e..df7f329 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -18,14 +18,20 @@ function baseurl()
if(startswith('//', $base))
$base = proto().':'.$base;
- return forceslash(forceslash($base).@$GLOBALS['MANDATOR']);
+ return forceslash($base);
}
$base = ssl() ? 'https://' : 'http://';
$base .= $_SERVER['HTTP_HOST'];
$base .= forceslash(dirname($_SERVER['SCRIPT_NAME']));
- return forceslash(forceslash($base).@$GLOBALS['MANDATOR']);
+ return forceslash($base);
+}
+
+function joinpath($parts)
+{
+ $parts = array_map('forceslash', $parts);
+ return rtrim(implode('', $parts), '/');
}
function forceslash($url)