diff options
| author | François Kubler <francois@kubler.org> | 2011-05-17 22:34:31 +0200 |
|---|---|---|
| committer | François Kubler <francois@kubler.org> | 2011-05-17 22:34:31 +0200 |
| commit | 13ddf8100f7b4aace962598a75aadbf228c4aaa7 (patch) | |
| tree | e5d3e868bb4efaf0025b405b1d593a8abb92959e /index.php | |
| parent | a8fb310d79d604ec0e4235dcd40828c3feb3a3be (diff) | |
| download | nextcloud-server-13ddf8100f7b4aace962598a75aadbf228c4aaa7.tar.gz nextcloud-server-13ddf8100f7b4aace962598a75aadbf228c4aaa7.zip | |
New installer.
* Forms have been revamped (CSS + javascript),
* Process has been improved : errors are displayed on the form page,
* Some changes in the index.php page so that everything related to installation is in lib/setup.php
* Also added a small function in OC_HELPER class to set input values.
All these should improve the installation process in terms of ergonomics.
Well, I do hope so.
Diffstat (limited to 'index.php')
| -rw-r--r-- | index.php | 66 |
1 files changed, 38 insertions, 28 deletions
diff --git a/index.php b/index.php index 0fafdc45d22..f4d6f27a3c4 100644 --- a/index.php +++ b/index.php @@ -21,45 +21,55 @@ * */ -$RUNTIME_NOAPPS=true;//no apps, yet +$RUNTIME_NOAPPS = TRUE; //no apps, yet -require_once( 'lib/base.php' ); -require_once( 'appconfig.php' ); -require_once( 'template.php' ); +require_once(dirname(__FILE__).'/lib/base.php'); +require_once('appconfig.php'); +require_once('template.php'); +$not_installed = !OC_CONFIG::getValue('installed', false); +$install_called = (isset($_POST['install']) AND $_POST['install']=='true'); -// check if the server is correctly configured for ownCloud -$errors=OC_UTIL::checkServer(); -if(count($errors)>0){ - OC_TEMPLATE::printGuestPage( "", "error", array( "errors" => $errors )); -}elseif(isset($_POST['install']) and $_POST['install']=='true'){ - require_once 'setup.php'; -}elseif (!OC_CONFIG::getValue('installed',false)) { - $hasSQLite=is_callable('sqlite_open'); - $hasMySQL=is_callable('mysql_connect'); - $datadir=OC_CONFIG::getValue('datadir',$SERVERROOT.'/data'); - OC_TEMPLATE::printGuestPage( "", "installation",array('hasSQLite'=>$hasSQLite,'hasMySQL'=>$hasMySQL,'datadir'=>$datadir)); -}elseif( OC_USER::isLoggedIn()){ - if( isset($_GET["logout"]) and ($_GET["logout"]) ){ +// First step : check if the server is correctly configured for ownCloud : +$errors = OC_UTIL::checkServer(); +if(count($errors) > 0) { + OC_TEMPLATE::printGuestPage("", "error", array("errors" => $errors)); +} + +// Setup required : +elseif($not_installed OR $install_called) { + require_once('setup.php'); +} + +// Someone is logged in : +elseif(OC_USER::isLoggedIn()) { + if(isset($_GET["logout"]) and ($_GET["logout"])) { OC_USER::logout(); - header( "Location: $WEBROOT"); + header("Location: $WEBROOT"); exit(); } - else{ - header( "Location: ".$WEBROOT.'/'.OC_APPCONFIG::getValue( "core", "defaultpage", "files/index.php" )); + else { + header("Location: ".$WEBROOT.'/'.OC_APPCONFIG::getValue("core", "defaultpage", "files/index.php")); exit(); } -}elseif(isset($_POST["user"])){ +} + +// Someone wants to log in : +elseif(isset($_POST["user"])) { OC_APP::loadApps(); - if( OC_USER::login( $_POST["user"], $_POST["password"] )){ - header( "Location: ".$WEBROOT.'/'.OC_APPCONFIG::getValue( "core", "defaultpage", "files/index.php" )); + if(OC_USER::login($_POST["user"], $_POST["password"])) { + header("Location: ".$WEBROOT.'/'.OC_APPCONFIG::getValue("core", "defaultpage", "files/index.php")); exit(); - }else{ - OC_TEMPLATE::printGuestPage( "", "login", array( "error" => true)); } -}else{ + else { + OC_TEMPLATE::printGuestPage("", "login", array("error" => true)); + } +} + +// For all others cases, we display the guest page : +else { OC_APP::loadApps(); - OC_TEMPLATE::printGuestPage( "", "login", array( "error" => false )); + OC_TEMPLATE::printGuestPage("", "login", array("error" => false)); } -?> +?>
\ No newline at end of file |