Merged from MOODLE_15_STABLE: Logging apache user now takes into account loginas

This commit is contained in:
mjollnir_
2005-09-27 05:25:23 +00:00
parent 76a72c55b8
commit 96e19e7b67
+13 -3
View File
@@ -427,16 +427,26 @@ $CFG->httpswwwroot = $CFG->wwwroot;
/// Apache log intergration. In apache conf file one can use ${MOODULEUSER}n in
/// LogFormat to get the current logged in username in moodle.
if ($USER && function_exists('apache_note') && !empty($CFG->apacheloguser)) {
$username = clean_filename($USER->username);
$name = clean_filename($USER->firstname. " ".$USER->lastname);
$id = $USER->id;
if (isset($USER->realuser)) {
if ($realuser = get_record('user', 'id', $USER->realuser)) {
$username = clean_filename($realuser->username." as ".$username);
$name = clean_filename($realuser->firstname." ".$realuser->lastname ." as ".$name);
$id = clean_filename($realuser->id." as ".$id);
}
}
switch ($CFG->apacheloguser) {
case 3:
$logname = clean_filename($USER->username);
$logname = $username;
break;
case 2:
$logname = clean_filename($USER->firstname." ".$USER->lastname);
$logname = $name;
break;
case 1:
default:
$logname = $USER->id;
$logname = $id;
break;
}
apache_note('MOODLEUSER', $logname);