wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #11226 from owncloud/kill-postsetupcheck-master

Browse source 
remove post setup check
This commit is contained in:
Vincent Petry 2014-09-23 10:33:50 +02:00
commit fc42a64e6c
3 changed files with 4 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/routes.php
View file

@ -20,9 +20,6 @@ $application->registerRoutes($this, array('routes' => array(
// Post installation check
/** @var $this OCP\Route\IRouter */
$this->create('post_setup_check', '/post-setup-check')
->action('OC_Setup', 'postSetupCheck');
// Core ajax actions
// Search
$this->create('search_ajax_search', '/search/ajax/search.php')

9
core/setup/controller.php
View file

@ -22,12 +22,10 @@ class Controller {
if(count($e) > 0) {
$options = array_merge($opts, $post, $errors);
$this->display($options);
}
else {
} else {
$this->finishSetup();
}
}
else {
} else {
$options = array_merge($opts, $post);
$this->display($options);
}
@ -53,8 +51,7 @@ class Controller {
}
public function finishSetup() {
header( 'Location: '.\OC_Helper::linkToRoute( 'post_setup_check' ));
exit();
\OC_Util::redirectToDefaultPage();
}
public function loadAutoConfig($post) {

22
lib/private/setup.php
View file

@ -1,7 +1,6 @@
<?php
class DatabaseSetupException extends \OC\HintException
{
class DatabaseSetupException extends \OC\HintException {
}
class OC_Setup {
@ -162,23 +161,4 @@ class OC_Setup {
file_put_contents(OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data').'/.htaccess', $content);
file_put_contents(OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data').'/index.html', '');
}
/**
* Post installation checks
*/
public static function postSetupCheck($params) {
// setup was successful -> webdav testing now
$l = self::getTrans();
if (OC_Util::isWebDAVWorking()) {
header("Location: ".OC::$WEBROOT.'/');
} else {
$error = $l->t('Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken.');
$hint = $l->t('Please double check the <a href=\'%s\'>installation guides</a>.',
\OC_Helper::linkToDocs('admin-install'));
OC_Template::printErrorPage($error, $hint);
exit();
}
}
}