mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-29 19:50:14 +01:00
Code Issues Projects Releases Wiki Activity

Merged recent fixes to FULLME in stable

Browse Source
This commit is contained in:
moodler 2004-12-12 06:49:26 +00:00
parent 6b94a807d2
commit f9f4d999fe
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
admin/cron.php
View File

@ -11,9 +11,12 @@
/// eg wget -q -O /dev/null 'http://moodle.somewhere.edu/admin/cron.php'
/// or php /web/moodle/admin/cron.php
$FULLME = "cron";
$starttime = microtime();
/// The following is a hack necessary to allow this script to work well
/// from the command line.
define('FULLME', 'cron');
/// The current directory in PHP version 4.3.0 and above isn't necessarily the
/// directory of the script when run from the command line. The require_once()

4
lib/moodlelib.php
View File

@ -2279,7 +2279,7 @@ function setup_and_print_groups($course, $groupmode, $urlroot) {
*/
function email_to_user($user, $from, $subject, $messagetext, $messagehtml='', $attachment='', $attachname='', $usetrueaddress=true) {
global $CFG, $_SERVER;
global $CFG, $FULLME;
global $course; // This is a bit of an ugly hack to be gotten rid of later
if (!empty($course->lang)) { // Course language is defined
@ -2382,7 +2382,7 @@ function email_to_user($user, $from, $subject, $messagetext, $messagehtml='', $a
return true;
} else {
mtrace('ERROR: '. $mail->ErrorInfo);
add_to_log(SITEID, 'library', 'mailer', $_SERVER['REQUEST_URI'], 'ERROR: '. $mail->ErrorInfo);
add_to_log(SITEID, 'library', 'mailer', $FULLME, 'ERROR: '. $mail->ErrorInfo);
return false;
}
}

5
lib/setup.php
View File

@ -284,8 +284,9 @@ global $THEME;
$USER = &$_SESSION['USER'];
}
if (isset($FULLME)) {
$ME = $FULLME;
if (defined('FULLME')) { // Usually in command-line scripts like admin/cron.php
$FULLME = FULLME;
$ME = FULLME;
} else {
$FULLME = qualified_me();
$ME = strip_querystring($FULLME);