From 44e8c7ed8d13d1c483bd4628c542f63a6595607f Mon Sep 17 00:00:00 2001 From: root Date: Fri, 19 Mar 2010 17:38:19 +0100 Subject: [PATCH] using base tag solves issue when owncloud installed in subdirectory --- inc/lib_base.php | 8 ++++---- inc/templates/header.php | 13 +++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/inc/lib_base.php b/inc/lib_base.php index 2516361d4d..625773e533 100755 --- a/inc/lib_base.php +++ b/inc/lib_base.php @@ -187,15 +187,15 @@ class OC_UTIL { global $WEBROOT; echo(''); echo(''); - if($_SERVER['SCRIPT_NAME']==$WEBROOT.'/index.php') echo(''); else echo(''); + if($_SERVER['SCRIPT_NAME']==$WEBROOT.'/index.php') echo(''); else echo(''); foreach(OC_UTIL::$NAVIGATION as $NAVI) { if($_SERVER['SCRIPT_NAME']==$SERVERROOT.$WEBROOT.$NAVI['url']) echo(''); else echo(''); } - if($_SERVER['SCRIPT_NAME']==$WEBROOT.'/log/index.php') echo(''); else echo(''); - if($_SERVER['SCRIPT_NAME']==$WEBROOT.'/settings/index.php') echo(''); else echo(''); - echo(''); + if($_SERVER['SCRIPT_NAME']==$WEBROOT.'/log/index.php') echo(''); else echo(''); + if($_SERVER['SCRIPT_NAME']==$WEBROOT.'/settings/index.php') echo(''); else echo(''); + echo(''); echo('
'.$_SESSION['username'].'FilesFilesFilesFiles'.$NAVI['name'].''.$NAVI['name'].'LogLogSettingsSettingsLogoutLogLogSettingsSettingsLogout
'); } diff --git a/inc/templates/header.php b/inc/templates/header.php index b5b7538f8a..25e2675e85 100755 --- a/inc/templates/header.php +++ b/inc/templates/header.php @@ -1,13 +1,14 @@ - -ownCloud - - - + + ownCloud + + + + '); +echo('

'); // check if already configured. otherwise start configuration wizard