From 96e19e7b675b67da3fd985f21ac8d383ffa52eb4 Mon Sep 17 00:00:00 2001
From: mjollnir_ <mjollnir_>
Date: Tue, 27 Sep 2005 05:25:23 +0000
Subject: [PATCH] Merged from MOODLE_15_STABLE: Logging apache user now takes
 into account loginas

---
 lib/setup.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/setup.php b/lib/setup.php
index e976da312f1..c28b08d3bd6 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -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);