diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2012-08-11 17:07:35 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2012-08-11 17:07:35 +0200 |
| commit | 0d8df3f55cfeda735e561409405060934240e4fe (patch) | |
| tree | b5c8375cb9f99a4c6ab698f96e8e68a5a0dc099c /lib | |
| parent | 465767670bef61572bb38cabce901935d9e23e7b (diff) | |
| download | nextcloud-server-0d8df3f55cfeda735e561409405060934240e4fe.tar.gz nextcloud-server-0d8df3f55cfeda735e561409405060934240e4fe.zip | |
Revert "Combine install checks in lib/base.php"
This reverts commit aa9fbf6639e2ce2fa2e8549d2d82d54a745d5327.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/lib/base.php b/lib/base.php index 2cbce82677d..b4f3e667133 100644 --- a/lib/base.php +++ b/lib/base.php @@ -173,25 +173,11 @@ class OC{ public static function checkInstalled() { // Redirect to installer if not installed - if (!OC_Config::getValue('installed', false)) { - if (OC::$SUBURI != '/index.php') { - if(!OC::$CLI){ - $url = 'http://'.$_SERVER['SERVER_NAME'].OC::$WEBROOT.'/index.php'; - header("Location: $url"); - } - exit(); - } - // Check for autosetup: - $autosetup_file = OC::$SERVERROOT."/config/autoconfig.php"; - if( file_exists( $autosetup_file )){ - OC_Log::write('core','Autoconfig file found, setting up owncloud...', OC_Log::INFO); - include( $autosetup_file ); - $_POST['install'] = 'true'; - $_POST = array_merge ($_POST, $AUTOCONFIG); - unlink($autosetup_file); + if (!OC_Config::getValue('installed', false) && OC::$SUBURI != '/index.php') { + if(!OC::$CLI){ + $url = 'http://'.$_SERVER['SERVER_NAME'].OC::$WEBROOT.'/index.php'; + header("Location: $url"); } - OC_Util::addScript('setup'); - require_once('setup.php'); exit(); } } @@ -328,10 +314,10 @@ class OC{ stream_wrapper_register('static', 'OC_StaticStreamWrapper'); stream_wrapper_register('close', 'OC_CloseStreamWrapper'); - self::initTemplateEngine(); self::checkInstalled(); self::checkSSL(); self::initSession(); + self::initTemplateEngine(); self::checkUpgrade(); $errors=OC_Util::checkServer(); @@ -401,6 +387,20 @@ class OC{ * @brief Handle the request */ public static function handleRequest() { + if (!OC_Config::getValue('installed', false)) { + // Check for autosetup: + $autosetup_file = OC::$SERVERROOT."/config/autoconfig.php"; + if( file_exists( $autosetup_file )){ + OC_Log::write('core','Autoconfig file found, setting up owncloud...',OC_Log::INFO); + include( $autosetup_file ); + $_POST['install'] = 'true'; + $_POST = array_merge ($_POST, $AUTOCONFIG); + unlink($autosetup_file); + } + OC_Util::addScript('setup'); + require_once('setup.php'); + exit(); + } // Handle WebDAV if($_SERVER['REQUEST_METHOD']=='PROPFIND'){ header('location: '.OC_Helper::linkToRemote('webdav')); |