Remove hack on auth-groupex to force X.org admins to be group admins.

[platal.git] / classes / corelogger.php

diff --git a/classes/corelogger.php b/classes/corelogger.php
index 5797236..8d06056 100644 (file)
--- a/classes/corelogger.php
+++ b/classes/corelogger.php
@@ -19,13 +19,19 @@
  */
 
 
-class CoreLogger {
+class CoreLogger
+{
     /** user id */
-    var $uid;
+    public $uid;
     /** id of the session */
-    var $session;
+    private $session;
     /** list of available actions */
-    var $actions;
+    private $actions;
+
+    public $ip;
+    public $host;
+    public $proxy_ip;
+    public $proxy_host;
 
     /** The constructor, creates a new entry in the sessions table
      *
@@ -33,7 +39,8 @@ class CoreLogger {
      * @param $suid the id of the administrator who has just su'd to the user
      * @return VOID
      */
-    function CoreLogger($uid, $suid='') {
+    public function __construct($uid, $suid = 0)
+    {
         // write the session entry
         $this->uid     = $uid;
         $this->session = $this->writeSession($uid, $suid);
@@ -47,12 +54,12 @@ class CoreLogger {
     }
 
     /** Creates a new session entry in database and return its ID.
-     * 
+     *
      * @param $uid the id of the logged user
      * @param $suid the id of the administrator who has just su'd to the user
      * @return session the session id
      */
-    function writeSession($uid, $suid = null)
+    private function writeSession($uid, $suid = 0)
     {
         $ip      = $_SERVER['REMOTE_ADDR'];
         $host    = strtolower(gethostbyaddr($_SERVER['REMOTE_ADDR']));
@@ -69,8 +76,17 @@ class CoreLogger {
         }
 
         XDB::execute("INSERT INTO logger.sessions
-                     SET uid={?}, host={?}, ip={?}, forward_ip={?}, forward_host={?}, browser={?}, suid={?}, flags={?}",
-                     $uid, $host, $ip, $forward_ip, $forward_host, $browser, $suid, $proxy);
+                         SET uid={?}, host={?}, ip={?}, forward_ip={?}, forward_host={?}, browser={?}, suid={?}, flags={?}",
+                     $uid, $host, ip_to_uint($ip), ip_to_uint($forward_ip), $forward_host, $browser, $suid, $proxy);
+        if ($forward_ip) {
+            $this->proxy_ip = $ip;
+            $this->proxy_host = $host;
+            $this->ip = $forward_ip;
+            $this->host = $forward_host;
+        } else {
+            $this->ip = $ip;
+            $this->host = $host;
+        }
 
         return XDB::insertId();
     }
@@ -79,18 +95,20 @@ class CoreLogger {
     /** Logs an action and its related data.
      *
      * @param $action le type d'action
-     * @param $data les données (id de liste, etc.)
+     * @param $data les données (id de liste, etc.)
      * @return VOID
      */
-    function log($action, $data = null) {
+    public function log($action, $data = null)
+    {
         if (isset($this->actions[$action])) {
             XDB::execute("INSERT INTO logger.events
-                         SET session={?}, action={?}, data={?}",
+                             SET session={?}, action={?}, data={?}",
                          $this->session, $this->actions[$action], $data);
         } else {
-            echo "unknown action : $action<br />";
+            trigger_error("CoreLogger: unknown action, $action", E_USER_WARNING);
         }
     }
 }
 
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>