Merge pull request #4795 from owncloud/setup

Move core setup code to controller class

3 files changed, 8 insertions, 26 deletions

diff --git a/lib/base.php b/lib/base.php
index b54b2973551..f2d9251294d 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -691,7 +691,8 @@ class OC {
 
 		// Check if ownCloud is installed or in maintenance (update) mode
 		if (!OC_Config::getValue('installed', false)) {
-			require_once 'core/setup.php';
+			$controller = new OC\Core\Setup\Controller();
+			$controller->run($_POST);
 			exit();
 		}
 
diff --git a/lib/private/helper.php b/lib/private/helper.php
index 58bee9c6300..ce5708e2bb9 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -448,29 +448,6 @@ class OC_Helper {
 	 *
 	 */
 
-	//FIXME: should also check for value validation (i.e. the email is an email).
-	public static function init_var($s, $d = "") {
-		$r = $d;
-		if (isset($_REQUEST[$s]) && !empty($_REQUEST[$s])) {
-			$r = OC_Util::sanitizeHTML($_REQUEST[$s]);
-		}
-
-		return $r;
-	}
-
-	/**
-	 * returns "checked"-attribute if request contains selected radio element
-	 * OR if radio element is the default one -- maybe?
-	 *
-	 * @param string $s Name of radio-button element name
-	 * @param string $v Value of current radio-button element
-	 * @param string $d Value of default radio-button element
-	 */
-	public static function init_radio($s, $v, $d) {
-		if ((isset($_REQUEST[$s]) && $_REQUEST[$s] == $v) || (!isset($_REQUEST[$s]) && $v == $d))
-			print "checked=\"checked\" ";
-	}
-
 	/**
 	 * detect if a given program is found in the search PATH
 	 *
diff --git a/lib/private/util.php b/lib/private/util.php
index 8aa7a074d0d..0585749d615 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -788,8 +788,12 @@ class OC_Util {
 		}
 
 		$fp = @fopen($testFile, 'w');
-		@fwrite($fp, $testContent);
-		@fclose($fp);
+		if (!$fp) {
+			throw new OC\HintException('Can\'t create test file to check for working .htaccess file.',
+				'Make sure it is possible for the webserver to write to '.$testFile);
+		}
+		fwrite($fp, $testContent);
+		fclose($fp);
 
 		// accessing the file via http
 		$url = OC_Helper::makeURLAbsolute(OC::$WEBROOT.'/data'.$fileName);