Adds "Google Calendar for Google Apps" as a calendar handling app for icals.

[platal.git] / classes / corelogger.php

diff --git a/classes/corelogger.php b/classes/corelogger.php
index c4b909b..8d06056 100644 (file)
--- a/classes/corelogger.php
+++ b/classes/corelogger.php
@@ -22,19 +22,24 @@
 class CoreLogger
 {
     /** user id */
-    private $uid;
+    public $uid;
     /** id of the session */
     private $session;
     /** list of available actions */
     private $actions;
 
+    public $ip;
+    public $host;
+    public $proxy_ip;
+    public $proxy_host;
+
     /** The constructor, creates a new entry in the sessions table
      *
      * @param $uid the id of the logged user
      * @param $suid the id of the administrator who has just su'd to the user
      * @return VOID
      */
-    public function __construct($uid, $suid = null)
+    public function __construct($uid, $suid = 0)
     {
         // write the session entry
         $this->uid     = $uid;
@@ -49,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
      */
-    private function writeSession($uid, $suid = null)
+    private function writeSession($uid, $suid = 0)
     {
         $ip      = $_SERVER['REMOTE_ADDR'];
         $host    = strtolower(gethostbyaddr($_SERVER['REMOTE_ADDR']));
@@ -72,7 +77,16 @@ 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);
+                     $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();
     }