From 2b287cacbabc4eda1eadceb2009caf0799f5c265 Mon Sep 17 00:00:00 2001
From: mjollnir_ <mjollnir_>
Date: Thu, 29 Sep 2005 23:40:14 +0000
Subject: [PATCH] Merged from MOODLE_15_STABLE : Much better namespace
 collision fix to apacheloguser thing

---
 lib/setup.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/setup.php b/lib/setup.php
index cda0a6825a4..263364472ef 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -427,26 +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);
-        $userid = $USER->id;
+        $apachelog_username = clean_filename($USER->username);
+        $apachelog_name = clean_filename($USER->firstname. " ".$USER->lastname);
+        $apachelog_userid = $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);
-                $userid = clean_filename($realuser->id." as ".$userid);
+                $apachelog_username = clean_filename($realuser->username." as ".$apachelog_username);
+                $apachelog_name = clean_filename($realuser->firstname." ".$realuser->lastname ." as ".$apachelog_name);
+                $apachelog_userid = clean_filename($realuser->id." as ".$apachelog_userid);
             }
         }
         switch ($CFG->apacheloguser) {
             case 3:
-                $logname = $username;
+                $logname = $apachelog_username;
                 break;
             case 2:
-                $logname = $name;
+                $logname = $apachelog_name;
                 break;
             case 1:
             default:
-                $logname = $userid;
+                $logname = $apachelog_userid;
                 break;
         }
         apache_note('MOODLEUSER', $logname);