Implementation of the logger here.

WARNING: This breaks compatibility with sessions created by previous
versions of plat/al.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/classes/platallogger.php b/classes/platallogger.php
new file mode 100644 (file)
index 0000000..a7a8d02
--- /dev/null
+++ b/classes/platallogger.php
@@ -0,0 +1,119 @@
+<?php
+/*
+ * Copyright (C) 2003-2004 Polytechnique.org
+ * http://opensource.polytechnique.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+class PlatalLogger extends PlLogger
+{
+    /** user id */
+    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 = 0)
+    {
+        // write the session entry
+        $this->uid     = $uid;
+        $this->session = $this->writeSession($uid, $suid);
+
+        // retrieve available actions
+        $res = XDB::iterRow("SELECT id, text FROM logger.actions");
+
+        while (list($action_id, $action_text) = $res->next()) {
+            $this->actions[$action_text] = $action_id;
+        }
+    }
+
+    /** 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 = 0)
+    {
+        $ip      = $_SERVER['REMOTE_ADDR'];
+        $host    = strtolower(gethostbyaddr($_SERVER['REMOTE_ADDR']));
+        $browser = (isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '');
+
+        @list($forward_ip,) = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
+        $forward_host = $forward_ip;
+        if ($forward_host) {
+            $forward_host = strtolower(gethostbyaddr($forward_host));
+        }
+        $proxy = '';
+        if ($forward_ip || @$_SERVER['HTTP_VIA']) {
+            $proxy = 'proxy';
+        }
+
+        XDB::execute("INSERT INTO logger.sessions
+                         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;
+        }
+
+        $id = XDB::insertId();
+        if ($uid and !$suid) {
+            XDB::execute('REPLACE INTO  logger.last_sessions (uid, id)
+                                VALUES  ({?}, {?})',
+                         $uid, $id);
+        }
+        return $id;
+    }
+
+
+    /** Logs an action and its related data.
+     *
+     * @param $action le type d'action
+     * @param $data les données (id de liste, etc.)
+     * @return VOID
+     */
+    public function log($action, $data = null)
+    {
+        if (isset($this->actions[$action])) {
+            XDB::execute("INSERT INTO logger.events
+                             SET session={?}, action={?}, data={?}",
+                         $this->session, $this->actions[$action], $data);
+        } else {
+            trigger_error("PlLogger: unknown action, $action", E_USER_WARNING);
+        }
+    }
+}
+
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+?>

diff --git a/core b/core
index 7f10bc6..b9ca23a 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 7f10bc6153e899a781fb1244c6681252b16887b2
+Subproject commit b9ca23a38990f158ce74f13cc4413bb436ced541

diff --git a/include/xnet.inc.php b/include/xnet.inc.php
index a8431e3..0247b26 100644 (file)
--- a/include/xnet.inc.php
+++ b/include/xnet.inc.php
@@ -20,6 +20,7 @@
  ***************************************************************************/
 
 define('PL_GLOBALS_CLASS', 'PlatalGlobals');
+define('PL_LOGGER_CLASS', 'PlatalLogger');
 define('PL_SESSION_CLASS', 'XnetSession');
 define('PL_PAGE_CLASS', 'XnetPage');
 

diff --git a/include/xorg.inc.php b/include/xorg.inc.php
index b67126b..75f9af5 100644 (file)
--- a/include/xorg.inc.php
+++ b/include/xorg.inc.php
@@ -20,6 +20,7 @@
  ***************************************************************************/
 
 define('PL_GLOBALS_CLASS', 'PlatalGlobals');
+define('PL_LOGGER_CLASS', 'PlatalLogger');
 define('PL_SESSION_CLASS', 'XorgSession');
 define('PL_PAGE_CLASS', 'XorgPage');