diff options
Diffstat (limited to 'frontend/include/setup.php')
| -rw-r--r-- | frontend/include/setup.php | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/frontend/include/setup.php b/frontend/include/setup.php index 6e9e9e9..2239c6c 100644 --- a/frontend/include/setup.php +++ b/frontend/include/setup.php @@ -12,21 +12,12 @@ $S=array_merge($S, array( 'head_scripts' => array(), 'debug' => null, 'debugrow' => 0, - 'root' => null, 'cookie_dir' => null, 'start' => microtime(true), 'sql' => null )); unset($_REQUEST['req'], $_GET['req']); -if (isset($conf['rootDir'])) { // What on Earth is going on here? - $cDir=substr($cDir, strpos($cDir, '/', 8)); // Cuts the http://, the domain name - $S['cookie_dir']=$cDir.'/'; - $S['root']=$conf['rootDir']; -} else { - $cDir=dirname($_SERVER['PHP_SELF']); // We're assumed to always be running /index.php - $S['cookie_dir']=$cDir; - $S['root']=rtrim('http://'.$_SERVER['HTTP_HOST'].($_SERVER['SERVER_PORT']==(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']?443:80)?'':':'.$_SERVER['SERVER_PORT']).$cDir, '/'); -} +$S['cookie_dir']=substr($conf['url'], strpos($conf['url'], '/', 8)).'/'; require_once(SHARED.'/include/dbinit.php'); if (isset($_COOKIE[$conf['cookiename']])) { $cookie=$_COOKIE[$conf['cookiename']]; |