From 6bb0022345cb36d510d57bcae6a52e1f5fb0174d Mon Sep 17 00:00:00 2001 From: Robin Date: Mon, 15 Mar 2010 15:40:28 +0100 Subject: [PATCH 1/3] Ask for configuration on first run --- config/config.php | 93 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 66 insertions(+), 27 deletions(-) diff --git a/config/config.php b/config/config.php index ed699d28a4f..341a1321387 100755 --- a/config/config.php +++ b/config/config.php @@ -1,43 +1,82 @@ +
+ + + + + + + + + + + + + + + + + +
owner name:
owner email:
admin name:
admin password:
retype admin password:
document root:
data directory:
site root:
force ssl:
date format:
database host:
database name:
database user:
database password:
retype database password:
+ From 35b9aabd0185b1e3dffac7a8138b3940cca64f72 Mon Sep 17 00:00:00 2001 From: Robin Date: Mon, 15 Mar 2010 15:41:53 +0100 Subject: [PATCH 2/3] do not asume owncloud is installed in the root of the webserver --- inc/lib_base.php | 23 ++++++++++++----------- inc/templates/loginform.php | 2 +- index.php | 6 +++--- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/inc/lib_base.php b/inc/lib_base.php index 20d7ef04cb6..227e616bcd1 100755 --- a/inc/lib_base.php +++ b/inc/lib_base.php @@ -57,7 +57,7 @@ class OC_USER { * check if the login button is pressed and logg the user in * */ - public static function loginlistener(){ + public static function loginlisener(){ global $CONFIG_ADMINLOGIN; global $CONFIG_ADMINPASSWORD; if(isset($_POST['loginbutton']) and isset($_POST['password']) and isset($_POST['login'])){ @@ -74,7 +74,7 @@ class OC_USER { * check if the logout button is pressed and logout the user * */ - public static function logoutlistener(){ + public static function logoutlisener(){ if(isset($_GET['logoutbutton'])){ OC_LOG::event($_SESSION['username'],2,''); if(isset($_SESSION['username'])) unset($_SESSION['username']); @@ -132,17 +132,18 @@ class OC_UTIL { * */ public static function shownavigation(){ + global $CONFIG_WEBROOT; echo(''); - echo(''); - if($_SERVER['SCRIPT_NAME']=='/index.php') echo(''); else echo(''); + echo(''); + if($_SERVER['SCRIPT_NAME']=='/index.php') echo(''); else echo(''); foreach(OC_UTIL::$NAVIGATION as $NAVI) { if($_SERVER['SCRIPT_NAME']==$NAVI['url']) echo(''); else echo(''); } - if($_SERVER['SCRIPT_NAME']=='/log/index.php') echo(''); else echo(''); - if($_SERVER['SCRIPT_NAME']=='/settings/index.php') echo(''); else echo(''); - echo(''); + if($_SERVER['SCRIPT_NAME']=='/log/index.php') echo(''); else echo(''); + if($_SERVER['SCRIPT_NAME']=='/settings/index.php') echo(''); else echo(''); + echo(''); echo('
'.$_SESSION['username'].'FilesFiles'.$_SESSION['username'].' FilesFiles'.$NAVI['name'].''.$NAVI['name'].'LogLogSettingsSettingsLogoutLogLogSettingsSettingsLogout
'); } @@ -152,7 +153,7 @@ class OC_UTIL { * */ public static function showloginform(){ - require('templates/loginform.php');; + require('templates/loginform.php'); } /** @@ -190,14 +191,14 @@ class OC_DB { $DBConnection = @new mysqli($CONFIG_DBHOST, $CONFIG_DBUSER, $CONFIG_DBPWD,$CONFIG_DBNAME); if (mysqli_connect_errno()) { @ob_end_clean(); - echo('
can not connect to database.
'); + echo('

can not connect to database.
'); exit(); } } $result = @$DBConnection->query($cmd); if (!$result) { - $entry='

DB Error: "'.$DBConnection->error.'"

'; - $entry.='

Offending command was: '.$cmd.'

'; + $entry='DB Error: "'.$DBConnection->error.'"
'; + $entry.='Offending command was: '.$cmd.'
'; echo($entry); } return $result; diff --git a/inc/templates/loginform.php b/inc/templates/loginform.php index da56f7e4e1b..d4543e25669 100755 --- a/inc/templates/loginform.php +++ b/inc/templates/loginform.php @@ -1,4 +1,4 @@ -
+ diff --git a/index.php b/index.php index 438d2fef0df..75273f73cf9 100755 --- a/index.php +++ b/index.php @@ -32,14 +32,14 @@ if(isset($_GET['file'])) { }else{ - OC_USER::loginlistener(); - OC_USER::logoutlistener(); + OC_USER::loginlisener(); + OC_USER::logoutlisener(); OC_UTIL::showheader(); OC_FILES::showbrowser($CONFIG_DATADIRECTORY,$dir); - echo('

Hint: Mount it via webdav like this: webdav://'.$_SERVER["HTTP_HOST"].'/webdav/owncloud.php

'); + echo('

Hint: Mount it via webdav like this: webdav://'.$CONFIG_SITEROOT.'/webdav/owncloud.php

'); OC_UTIL::showfooter(); From cd96e2a313047edc84b6e1010ceebebfce19ba32 Mon Sep 17 00:00:00 2001 From: Robin Date: Mon, 15 Mar 2010 15:55:50 +0100 Subject: [PATCH 3/3] fix bug where siteroot was not configuredcd --- config/config.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config/config.php b/config/config.php index 341a1321387..8470ad3f24b 100755 --- a/config/config.php +++ b/config/config.php @@ -26,7 +26,7 @@ function getConfig(){ } function writeConfig($config){ - $allowed=array('CONFIG_FOOTEROWNERNAME','CONFIG_FOOTEROWNEREMAIL','CONFIG_ADMINLOGIN','CONFIG_ADMINPASSWORD','CONFIG_DBHOST','CONFIG_DBNAME','CONFIG_DBUSER','CONFIG_DBPWD','CONFIG_DOCUMENTROOT','CONFIG_DATADIRECTORY','CONFIG_HTTPFORCESSL','CONFIG_DATEFORMAT'); + $allowed=array('CONFIG_FOOTEROWNERNAME','CONFIG_FOOTEROWNEREMAIL','CONFIG_ADMINLOGIN','CONFIG_ADMINPASSWORD','CONFIG_DBHOST','CONFIG_DBNAME','CONFIG_DBUSER','CONFIG_DBPWD','CONFIG_DOCUMENTROOT','CONFIG_DATADIRECTORY','CONFIG_HTTPFORCESSL','CONFIG_DATEFORMAT','CONFIG_SITEROOT'); $requireRetype=array('CONFIG_ADMINPASSWORD','CONFIG_DBPWD'); foreach($requireRetype as $name){ if($config[$name]!=$config[$name.'_RETYPE']){ @@ -57,6 +57,11 @@ function writeConfig($config){ //config_placeholder + + + + + if(!isset($CONFIG_ADMINLOGIN)){ if(!isset($_POST['CONFIG_FOOTEROWNERNAME'])){ getConfig();
login:
password: