[Pkg-owncloud-commits] [owncloud] 134/258: remove post setup check

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 838c849a5ad38a182f1e51e4a7a190f4bca0c5a9
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Mon Sep 22 19:43:55 2014 +0200

    remove post setup check
    
    Backport of 21412559df9461ae7395d8abe1a4c6850dadfad3 from master
---
 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 d08bd10..c8fda2e 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -19,9 +19,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 e764b23..c046bd5 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 4c9fb66..d79f6b4 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 {
@@ -157,23 +156,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();
-		}
-	}
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git