moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-10275 moving all installation time environment tests into /admin/index.php - this will simplify install.php a LOT and will make installation/upgrade more consistent + fixed a bug in enviroment if docroot not set

Browse source
This commit is contained in:
skodak 2009-02-01 12:52:30 +00:00
parent cd3acbf27e
commit 9050958240
3 changed files with 43 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/environmentlib.php
View file

@ -122,6 +122,8 @@ function check_moodle_environment($version, &$environment_results, $print_table=
* @param array environment_results array of results gathered
*/
function print_moodle_environment($result, $environment_results) {
global $CFG;
/// Get some strings
$strname = get_string('name');
$strinfo = get_string('info');
@ -159,6 +161,7 @@ function print_moodle_environment($result, $environment_results) {
foreach ($environment_results as $environment_result) {
$errorline = false;
$warningline = false;
$stringtouse = '';
if ($continue) {
$type = $environment_result->getPart();
$info = $environment_result->getInfo();
@ -227,7 +230,11 @@ function print_moodle_environment($result, $environment_results) {
if (!empty($info)){
$linkparts[] = $info;
}
$report = doc_link(join($linkparts, '/'), get_string($stringtouse, 'admin', $rec));
if (empty($CFG->docroot)) {
$report = get_string($stringtouse, 'admin', $rec);
} else {
$report = doc_link(join($linkparts, '/'), get_string($stringtouse, 'admin', $rec));
}
/// Format error or warning line
@ -430,7 +437,6 @@ function get_environment_for_version($version) {
* @return array array of results encapsulated in one environment_result object
*/
function environment_check($version) {
global $CFG;
/// Normalize the version requested
@ -439,7 +445,7 @@ function environment_check($version) {
$results = array(); //To store all the results
/// Only run the moodle versions checker on upgrade, not on install
if (empty($CFG->running_installer)) {
if (!empty($CFG->version)) {
$results[] = environment_check_moodle($version);
}
$results[] = environment_check_unicode($version);

9
lib/upgradelib.php
View file

@ -817,6 +817,15 @@ function upgrade_setup_debug($starting) {
}
}
function print_upgrade_reload($url) {
global $CFG;
echo "<br />";
echo '<div class="continuebutton">';
echo '<a href="'.$url.'" title="'.get_string('reload').'" ><img src="'.$CFG->pixpath.'/i/reload.gif" alt="" /> '.get_string('reload').'</a>';
echo '</div><br />';
}
function print_upgrade_separator() {
if (!CLI_SCRIPT) {
echo '<hr />';