Merge branch 'master' into setup

Conflicts:
	core/setup.php

diff --cc core/setup/controller.php
index 679efee81bf5004807b670d3e3987b754f009d82,0000000000000000000000000000000000000000..0c87103138b83bca222d5dbfd1d495bdf5bd9c11
mode 100644,000000..100644
--- 1/core/setup/controller.php
--- /dev/null
+++ b/core/setup/controller.php
@@@ -1,96 -1,0 +1,111 @@@
-                       $post['install'] = 'true';
 +<?php
 +/**
 + * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
 + * This file is licensed under the Affero General Public License version 3 or
 + * later.
 + * See the COPYING-README file.
 + */
 +
 +namespace OC\Core\Setup;
 +
 +class Controller {
 +      public function run($post) {
 +              // Check for autosetup:
 +              $post = $this->loadAutoConfig($post);
 +              $opts = $this->getSystemInfo();
 +
 +              if(isset($post['install']) AND $post['install']=='true') {
 +                      // We have to launch the installation process :
 +                      $e = \OC_Setup::install($post);
 +                      $errors = array('errors' => $e);
 +
 +                      if(count($e) > 0) {
 +                              $options = array_merge($post, $opts, $errors);
 +                              $this->display($options);
 +                      }
 +                      else {
 +                              $this->finishSetup();
 +                      }
 +              }
 +              else {
 +                      $this->display($opts);
 +              }
 +      }
 +
 +      public function display($post) {
++
++              \OC_Util::addScript( '3rdparty', 'strengthify/jquery.strengthify' );
++              \OC_Util::addStyle( '3rdparty', 'strengthify/strengthify' );
 +              \OC_Util::addScript('setup');
 +              \OC_Template::printGuestPage('', 'installation', $post);
 +      }
 +
 +      public function finishSetup() {
 +              header( 'Location: '.\OC_Helper::linkToRoute( 'post_setup_check' ));
 +              exit();
 +      }
 +
 +      public function loadAutoConfig($post) {
++              $dbIsSet = isset($post['dbtype']);
++              $directoryIsSet = isset($post['directory']);
++              $adminAccountIsSet = isset($post['adminlogin']);
++
 +              $autosetup_file = \OC::$SERVERROOT.'/config/autoconfig.php';
 +              if( file_exists( $autosetup_file )) {
 +                      \OC_Log::write('core', 'Autoconfig file found, setting up owncloud...', \OC_Log::INFO);
 +                      include $autosetup_file;
-                       @unlink($autosetup_file);
 +                      $post = array_merge ($post, $AUTOCONFIG);
 +              }
++
++              if ($dbIsSet AND $directoryIsSet AND $adminAccountIsSet) {
++                      $post['install'] = 'true';
++                      if( file_exists( $autosetup_file )) {
++                              unlink($autosetup_file);
++                      }
++              }
++              $post['dbIsSet'] = $dbIsSet;
++              $post['directoryIsSet'] = $directoryIsSet;
++
 +              return $post;
 +      }
 +
 +      public function getSystemInfo() {
 +              $hasSQLite = class_exists('SQLite3');
 +              $hasMySQL = is_callable('mysql_connect');
 +              $hasPostgreSQL = is_callable('pg_connect');
 +              $hasOracle = is_callable('oci_connect');
 +              $hasMSSQL = is_callable('sqlsrv_connect');
 +              $datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT.'/data');
 +              $vulnerableToNullByte = false;
 +              if(@file_exists(__FILE__."\0Nullbyte")) { // Check if the used PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)
 +                      $vulnerableToNullByte = true;
 +              } 
 +
 +              $errors = array();
 +
 +              // Protect data directory here, so we can test if the protection is working
 +              \OC_Setup::protectDataDirectory();
 +              try {
 +                      $htaccessWorking = \OC_Util::isHtAccessWorking();
 +              } catch (\OC\HintException $e) {
 +                      $errors[] = array(
 +                              'error' => $e->getMessage(),
 +                              'hint' => $e->getHint()
 +                      );
 +                      $htaccessWorking = false;
 +              }
 +
 +              return array(
 +                      'hasSQLite' => $hasSQLite,
 +                      'hasMySQL' => $hasMySQL,
 +                      'hasPostgreSQL' => $hasPostgreSQL,
 +                      'hasOracle' => $hasOracle,
 +                      'hasMSSQL' => $hasMSSQL,
 +                      'directory' => $datadir,
 +                      'secureRNG' => \OC_Util::secureRNGAvailable(),
 +                      'htaccessWorking' => $htaccessWorking,
 +                      'vulnerableToNullByte' => $vulnerableToNullByte,
 +                      'errors' => $errors,
 +              );
 +      }
 +}

diff --cc lib/base.php
Simple merge

diff --cc lib/private/util.php
Simple merge