mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

autoconfig.php only to be deleted on successful installation

This commit is contained in:
Thomas Müller 2014-11-18 23:47:00 +01:00
parent 6fb2477fb7
commit b68c07d687
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
View File

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