MDL-18198 installer - change distro to distrolib.php and delete distro hack from...

diff --git a/install.php b/install.php
index 7cee92d2e806d228c9dfda67cf0470f3c4bc9b17..ed8060ad370cd994da376c4135bf0574882b11a3 100644 (file)
--- a/install.php
+++ b/install.php
@@ -42,8 +42,11 @@ require dirname(__FILE__).'/lib/installlib.php';
 
 // distro specific customisation
 $distro = null;
-if (file_exists('install/distro.php')) {
-    include('install/distro.php');
+if (file_exists('install/distrolib.php')) {
+    require_once('install/distrolib.php');
+    if (function_exists('distro_get_config')) {
+        $distro = distro_get_config();
+    }
 }
 
 $config = new stdClass();
@@ -187,7 +190,10 @@ if ($config->stage == INSTALL_SAVE) {
     if (!$database->driver_installed()) {
         $config->stage = INSTALL_DATABASETYPE;
     } else {
-        $hint_database = install_db_validate($database, $config->dbhost, $config->dbuser, $config->dbpass, $config->dbname, $config->prefix, array('dbpersit'=>0, 'dbsocket'=>$config->dbsocket), $distro);
+        if (function_exists('distro_pre_create_db')) { /// Hook for distros needing to do something before DB creation
+            $distro = distro_pre_create_db($database, $config->dbhost, $config->dbuser, $config->dbpass, $config->dbname, $config->prefix, array('dbpersit'=>0, 'dbsocket'=>$config->dbsocket), $distro);
+        }
+        $hint_database = install_db_validate($database, $config->dbhost, $config->dbuser, $config->dbpass, $config->dbname, $config->prefix, array('dbpersit'=>0, 'dbsocket'=>$config->dbsocket));
 
         if ($hint_database === '') {
             $configphp = '<?php  /// Moodle Configuration File ' . "\r\n\r\n";

diff --git a/lib/installlib.php b/lib/installlib.php
index 51ad35f0b60f51281bce607731b9f14015fc6aec..57d4db73d601164818724920ac81702f9a374aa3 100644 (file)
--- a/lib/installlib.php
+++ b/lib/installlib.php
@@ -56,22 +56,9 @@ function install_helpbutton($url, $title='') {
     echo "</a>\n";
 }
 
-function install_db_validate($database, $dbhost, $dbuser, $dbpass, $dbname, $prefix, $dboptions, $distro) {
+function install_db_validate($database, $dbhost, $dbuser, $dbpass, $dbname, $prefix, $dboptions) {
     // this is in function because we want the /install.php to parse in PHP4
 
-    if ($database->get_dbfamily() === 'mysql' and !empty($distro->setdbrootpassword) and $dbpass !== '') {
-        // distro hack - set root password
-        try {
-            if ($database->connect($dbhost, $dbuser, '', $dbname, $prefix, $dboptions)) {
-                $sql = "UPDATE user SET password=password(?) WHERE user='root'";
-                $params = array($dbpass);
-                $database->execute($sql, $params);
-                return '';
-            }
-        } catch (Exception $ignored) {
-        }
-    }
-
     try {
         try {
             $database->connect($dbhost, $dbuser, $dbpass, $dbname, $prefix, $dboptions);