'xorg.js' is not in plat/al-core.

[platal.git] / classes / s.php

diff --git a/classes/s.php b/classes/s.php
index 7ba3b24..9be89a7 100644 (file)
--- a/classes/s.php
+++ b/classes/s.php
@@ -77,7 +77,7 @@ class S
         if (!S::has('log')) {
             if (S::has('suid')) {
                 $suid = S::v('suid');
-                S::set('log', new PlLogger(S::v('uid'), $suid['uid']));
+                S::set('log', new PlLogger(S::v('uid', $uid), $suid['uid']));
             } else if (S::has('uid') || $uid) {
                 S::set('log', new PlLogger(S::v('uid', $uid)));
             }
@@ -85,6 +85,23 @@ class S
         return S::v('log');
     }
 
+    /** User object storage and accessor. The user object (an instance of the
+     * local subclass of PlUser) is currently stored as a S class variable, and
+     * not as a session variable, so as to avoid bloating the global on-disk
+     * session.
+     * TODO: When all the codebase will use S::user() as the only source for
+     * user ids, fullname/displayname, and forlife/bestalias, S::$user should
+     * move into the php session (and data it helds should be removed from
+     * the php session). */
+    private static $user = null;
+    public static function &user()
+    {
+        if (self::$user == null) {
+            self::$user = User::getSilentWithValues(S::i('uid'), $_SESSION);
+        }
+        return self::$user;
+    }
+
     public static function has_perms()
     {
         return Platal::session()->checkPerms(PERMS_ADMIN);