From 21412559df9461ae7395d8abe1a4c6850dadfad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 22 Sep 2014 19:43:55 +0200
Subject: [PATCH] remove post setup check
---
core/routes.php | 3 ---
core/setup/controller.php | 9 +++------
lib/private/setup.php | 22 +---------------------
3 files changed, 4 insertions(+), 30 deletions(-)
diff --git a/core/routes.php b/core/routes.php
index fac67f23175..a9d5387bc14 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -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')
diff --git a/core/setup/controller.php b/core/setup/controller.php
index 5da94e83ccc..02226ad9e42 100644
--- a/core/setup/controller.php
+++ b/core/setup/controller.php
@@ -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) {
diff --git a/lib/private/setup.php b/lib/private/setup.php
index 95e908d10ec..ccf996460d0 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -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();
- }
- }
}
--
GitLab