MDL-15249 whitespaces and comments cleanup, no other changes

This commit is contained in:
skodak 2009-05-26 09:56:35 +00:00
parent 8580535b81
commit 00be19165f

View file

@ -23,22 +23,22 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/ */
/// Check that config.php exists, if not then call the install script // Check that config.php exists, if not then call the install script
if (!file_exists('../config.php')) { if (!file_exists('../config.php')) {
header('Location: ../install.php'); header('Location: ../install.php');
die; die;
} }
/// Check that PHP is of a sufficient version as soon as possible // Check that PHP is of a sufficient version as soon as possible
if (version_compare(phpversion(), "5.2.0") < 0) { if (version_compare(phpversion(), "5.2.0") < 0) {
$phpversion = phpversion(); $phpversion = phpversion();
// do NOT localise - lang strings would not work here and we CAN not move it to later palce // do NOT localise - lang strings would not work here and we CAN NOT move it to later place
echo "Sorry, Moodle 2.0 requires PHP 5.2.8 or later (currently using version $phpversion). "; echo "Sorry, Moodle 2.0 requires PHP 5.2.8 or later (currently using version $phpversion). ";
echo "Please upgrade your server software or use latest Moodle 1.9.x instead."; echo "Please upgrade your server software or use latest Moodle 1.9.x instead.";
die; die;
} }
/// try to flush everything all the time // try to flush everything all the time
@ob_implicit_flush(true); @ob_implicit_flush(true);
while(@ob_end_clean()); // ob_end_flush prevents sending of headers while(@ob_end_clean()); // ob_end_flush prevents sending of headers
@ -53,7 +53,7 @@
$confirmplugins = optional_param('confirmplugincheck', 0, PARAM_BOOL); $confirmplugins = optional_param('confirmplugincheck', 0, PARAM_BOOL);
$agreelicense = optional_param('agreelicense', 0, PARAM_BOOL); $agreelicense = optional_param('agreelicense', 0, PARAM_BOOL);
/// Check some PHP server settings // Check some PHP server settings
$documentationlink = '<a href="http://docs.moodle.org/en/Installation">Installation docs</a>'; $documentationlink = '<a href="http://docs.moodle.org/en/Installation">Installation docs</a>';
@ -73,15 +73,15 @@
print_error('phpfloatproblem', 'admin', '', $documentationlink); print_error('phpfloatproblem', 'admin', '', $documentationlink);
} }
/// Check settings in config.php // Check settings in config.php
$dirroot = dirname(realpath("../index.php")); $dirroot = dirname(realpath("../index.php"));
/// Check correct dirroot, ignoring slashes (though should be always forward slashes). MDL-18195 // Check correct dirroot, ignoring slashes (though should be always forward slashes). MDL-18195
if (!empty($dirroot) and str_replace('\\', '/', $dirroot) != str_replace('\\', '/', $CFG->dirroot)) { if (!empty($dirroot) and str_replace('\\', '/', $dirroot) != str_replace('\\', '/', $CFG->dirroot)) {
print_error('fixsetting', 'debug', '', (object)array('current'=>$CFG->dirroot, 'found'=>str_replace('\\', '/', $dirroot))); print_error('fixsetting', 'debug', '', (object)array('current'=>$CFG->dirroot, 'found'=>str_replace('\\', '/', $dirroot)));
} }
/// Set some necessary variables during set-up to avoid PHP warnings later on this page // Set some necessary variables during set-up to avoid PHP warnings later on this page
if (!isset($CFG->framename)) { if (!isset($CFG->framename)) {
$CFG->framename = "_top"; $CFG->framename = "_top";
} }
@ -101,7 +101,7 @@
print_error('withoutversion', 'debug'); // without version, stop print_error('withoutversion', 'debug'); // without version, stop
} }
/// Check if the main tables have been installed yet or not. // Check if the main tables have been installed yet or not.
if (!$tables = $DB->get_tables() ) { // No tables yet at all. if (!$tables = $DB->get_tables() ) { // No tables yet at all.
$maintables = false; $maintables = false;
@ -123,14 +123,14 @@
$CFG->xmlstrictheaders = false; $CFG->xmlstrictheaders = false;
if (!$maintables) { if (!$maintables) {
/// hide errors from headers in case debug enabled in config.php // hide errors from headers in case debug enabled in config.php
/// fake some settings // fake some settings
$CFG->docroot = 'http://docs.moodle.org'; $CFG->docroot = 'http://docs.moodle.org';
$strinstallation = get_string('installation', 'install'); $strinstallation = get_string('installation', 'install');
/// remove current session content completely // remove current session content completely
session_get_instance()->terminate_current(); session_get_instance()->terminate_current();
if (empty($agreelicense)) { if (empty($agreelicense)) {
@ -184,8 +184,8 @@
} }
/// Check version of Moodle code on disk compared with database // Check version of Moodle code on disk compared with database
/// and upgrade if possible. // and upgrade if possible.
$stradministration = get_string('administration'); $stradministration = get_string('administration');
$PAGE->set_context(get_context_instance(CONTEXT_SYSTEM)); $PAGE->set_context(get_context_instance(CONTEXT_SYSTEM));
@ -257,7 +257,7 @@
notify("WARNING!!! The code you are using is OLDER than the version that made these databases!"); notify("WARNING!!! The code you are using is OLDER than the version that made these databases!");
} }
/// Updated human-readable release version if necessary // Updated human-readable release version if necessary
if ($release <> $CFG->release) { // Update the release version if ($release <> $CFG->release) { // Update the release version
set_config("release", $release); set_config("release", $release);
} }
@ -265,7 +265,7 @@
// upgrade all plugins and other parts // upgrade all plugins and other parts
upgrade_noncore(true); upgrade_noncore(true);
/// indicate that this site is fully configured except the admin password // indicate that this site is fully configured except the admin password
if (empty($CFG->rolesactive)) { if (empty($CFG->rolesactive)) {
set_config('rolesactive', 1); set_config('rolesactive', 1);
set_config('adminsetuppending', 1); set_config('adminsetuppending', 1);
@ -273,8 +273,8 @@
upgrade_finished("index.php?sessionstarted=1&amp;lang=$CFG->lang"); upgrade_finished("index.php?sessionstarted=1&amp;lang=$CFG->lang");
} }
/// make sure admin user is created - this is the last step because we need // make sure admin user is created - this is the last step because we need
/// session to be working properly in order to edit admin account // session to be working properly in order to edit admin account
if (!empty($CFG->adminsetuppending)) { if (!empty($CFG->adminsetuppending)) {
$sessionstarted = optional_param('sessionstarted', 0, PARAM_BOOL); $sessionstarted = optional_param('sessionstarted', 0, PARAM_BOOL);
if (!$sessionstarted) { if (!$sessionstarted) {
@ -310,7 +310,7 @@
} }
} else { } else {
/// just make sure upgrade logging is properly terminated // just make sure upgrade logging is properly terminated
upgrade_finished('upgradesettings.php'); upgrade_finished('upgradesettings.php');
} }
@ -318,12 +318,12 @@
$CFG->xmlstrictheaders = $origxmlstrictheaders; $CFG->xmlstrictheaders = $origxmlstrictheaders;
unset($origxmlstrictheaders); unset($origxmlstrictheaders);
/// Check for valid admin user - no guest autologin // Check for valid admin user - no guest autologin
require_login(0, false); require_login(0, false);
$context = get_context_instance(CONTEXT_SYSTEM); $context = get_context_instance(CONTEXT_SYSTEM);
require_capability('moodle/site:config', $context); require_capability('moodle/site:config', $context);
/// check that site is properly customized // check that site is properly customized
$site = get_site(); $site = get_site();
if (empty($site->shortname)) { if (empty($site->shortname)) {
// probably new installation - lets return to frontpage after this step // probably new installation - lets return to frontpage after this step
@ -332,36 +332,36 @@
redirect('upgradesettings.php?return=site'); redirect('upgradesettings.php?return=site');
} }
/// Check if we are returning from moodle.org registration and if so, we mark that fact to remove reminders // Check if we are returning from moodle.org registration and if so, we mark that fact to remove reminders
if (!empty($id) and $id == $CFG->siteidentifier) { if (!empty($id) and $id == $CFG->siteidentifier) {
set_config('registered', time()); set_config('registered', time());
} }
/// setup critical warnings before printing admin tree block // setup critical warnings before printing admin tree block
$insecuredataroot = is_dataroot_insecure(true); $insecuredataroot = is_dataroot_insecure(true);
$SESSION->admin_critical_warning = ($insecuredataroot==INSECURE_DATAROOT_ERROR); $SESSION->admin_critical_warning = ($insecuredataroot==INSECURE_DATAROOT_ERROR);
$adminroot = admin_get_root(); $adminroot = admin_get_root();
/// Check if there are any new admin settings which have still yet to be set // Check if there are any new admin settings which have still yet to be set
if (any_new_admin_settings($adminroot)){ if (any_new_admin_settings($adminroot)){
redirect('upgradesettings.php'); redirect('upgradesettings.php');
} }
/// Everything should now be set up, and the user is an admin // Everything should now be set up, and the user is an admin
/// Print default admin page with notifications. // Print default admin page with notifications.
admin_externalpage_setup('adminnotifications'); admin_externalpage_setup('adminnotifications');
admin_externalpage_print_header(); admin_externalpage_print_header();
/// Deprecated database! Warning!! // Deprecated database! Warning!!
if (!empty($CFG->migrated_to_new_db)) { if (!empty($CFG->migrated_to_new_db)) {
print_box(print_string('dbmigrationdeprecateddb', 'admin'), 'generalbox adminwarning'); print_box(print_string('dbmigrationdeprecateddb', 'admin'), 'generalbox adminwarning');
} }
/// Check for any special upgrades that might need to be run // Check for any special upgrades that might need to be run
if (!empty($CFG->upgrade)) { if (!empty($CFG->upgrade)) {
print_box(get_string("upgrade$CFG->upgrade", "admin", "$CFG->wwwroot/$CFG->admin/upgrade$CFG->upgrade.php")); print_box(get_string("upgrade$CFG->upgrade", "admin", "$CFG->wwwroot/$CFG->admin/upgrade$CFG->upgrade.php"));
} }
@ -377,7 +377,7 @@
print_box(get_string('displayerrorswarning', 'admin'), 'generalbox adminwarning'); print_box(get_string('displayerrorswarning', 'admin'), 'generalbox adminwarning');
} }
/// If no recently cron run // If no recently cron run
$lastcron = $DB->get_field_sql('SELECT MAX(lastcron) FROM {modules}'); $lastcron = $DB->get_field_sql('SELECT MAX(lastcron) FROM {modules}');
if (time() - $lastcron > 3600 * 24) { if (time() - $lastcron > 3600 * 24) {
$strinstallation = get_string('installation', 'install'); $strinstallation = get_string('installation', 'install');
@ -385,12 +385,12 @@
print_box(get_string('cronwarning', 'admin')."&nbsp;".$helpbutton, 'generalbox adminwarning'); print_box(get_string('cronwarning', 'admin')."&nbsp;".$helpbutton, 'generalbox adminwarning');
} }
/// Print multilang upgrade notice if needed // Print multilang upgrade notice if needed
if (empty($CFG->filter_multilang_converted)) { if (empty($CFG->filter_multilang_converted)) {
print_box(get_string('multilangupgradenotice', 'admin'), 'generalbox adminwarning'); print_box(get_string('multilangupgradenotice', 'admin'), 'generalbox adminwarning');
} }
/// Alert if we are currently in maintenance mode // Alert if we are currently in maintenance mode
if (file_exists($CFG->dataroot.'/1/maintenance.html')) { if (file_exists($CFG->dataroot.'/1/maintenance.html')) {
print_box(get_string('sitemaintenancewarning', 'admin'), 'generalbox adminwarning'); print_box(get_string('sitemaintenancewarning', 'admin'), 'generalbox adminwarning');
} }