L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
stronk7
2009-02-09 19:35:57 +00:00
parent 797ffad0c7
commit 768408e8dd
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install.php
+9 -3
View File
@@ -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";
lib/installlib.php
+1 -14
View File
@@ -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);