sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12414 from owncloud/delay-autoconfig-kill-2 

autoconfig.php only to be deleted on successful installation
remotes/origin/fix-10825
Morris Jobke 2014-11-26 11:05:23 +07:00
parent c749570a06 b68c07d687
commit 4ed0a418a0
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/setup/controller.php
Unescape Escape View File

@ -12,13 +12,21 @@ namespace OC\Core\Setup;
use OCP\IConfig;
class Controller {
/** @var \OCP\IConfig */
/**
* @var \OCP\IConfig
*/
protected $config;
/**
* @var string
*/
private $autoConfigFile;
/**
* @param IConfig $config
*/
function __construct(IConfig $config) {
$this->autoConfigFile = \OC::$SERVERROOT.'/config/autoconfig.php';
$this->config = $config;
}
@ -64,15 +72,17 @@ class Controller {
}
public function finishSetup() {
if( file_exists( $this->autoConfigFile )) {
unlink($this->autoConfigFile);
}
\OC_Util::redirectToDefaultPage();
}
public function loadAutoConfig($post) {
$autosetup_file = \OC::$SERVERROOT.'/config/autoconfig.php';
if( file_exists( $autosetup_file )) {
if( file_exists($this->autoConfigFile)) {
\OC_Log::write('core', 'Autoconfig file found, setting up owncloud...', \OC_Log::INFO);
$AUTOCONFIG = array();
include $autosetup_file;
include $this->autoConfigFile;
$post = array_merge ($post, $AUTOCONFIG);
}
@ -82,9 +92,6 @@ class Controller {
if ($dbIsSet AND $directoryIsSet AND $adminAccountIsSet) {
$post['install'] = 'true';
if( file_exists( $autosetup_file )) {
unlink($autosetup_file);
}
}
$post['dbIsSet'] = $dbIsSet;
$post['directoryIsSet'] = $directoryIsSet;