diff options
| author | Georg Ehrke <georg.stefan.germany@googlemail.com> | 2011-10-10 14:07:45 +0400 |
|---|---|---|
| committer | Georg Ehrke <georg.stefan.germany@googlemail.com> | 2011-10-10 14:07:45 +0400 |
| commit | c48fbd3609f2d300d66f70278b9bba59ee33db16 (patch) | |
| tree | 38c01f9444081b33e802535742668b546071cfef | |
| parent | f49ecee24ccd6d607a2d9945bb1bd765d965793b (diff) | |
| parent | e710bcb6d329a67f4e73b2cb05a78aabf50a8755 (diff) | |
Merge branch 'master' of gitorious.org:owncloud/owncloud
| -rw-r--r-- | index.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/index.php b/index.php index 2e55827a62a..4e1f5bcc8d6 100644 --- a/index.php +++ b/index.php @@ -27,8 +27,16 @@ require_once('lib/base.php'); // Setup required : $not_installed = !OC_Config::getValue('installed', false); -$install_called = (isset($_POST['install']) AND $_POST['install']=='true'); if($not_installed) { + // Check for autosetup: + $autosetup_file = OC::$SERVERROOT."/config/autoconfig.php"; + if( file_exists( $autosetup_file )){ + error_log("Autoconfig file found, setting up owncloud..."); + include( $autosetup_file ); + $_POST['install'] = 'true'; + $_POST = array_merge ($_POST, $AUTOCONFIG); + unlink($autosetup_file); + } OC_Util::addScript('setup'); require_once('setup.php'); exit(); |