enfin, le logger est basculé, non sans mal, mais il torche !

diff --git a/etat_migration b/etat_migration
index bfaebcc..98b1c03 100644 (file)
--- a/etat_migration
+++ b/etat_migration
@@ -94,9 +94,6 @@ Etat  | Ancien nom                                                              | Nouveau nom
 ;        | trombipromo.php                                                       | 
 ;        | x.php                                                                         | 
 ------+-[ admin ]---------------------------------+----------------
-;!       | admin/logger.php                                              | 
-;!       | admin/logger_events.php                                       | 
-;!       | admin/logger_user.php                                         | 
 ------+-[ news ]----------------------------------+----------------
 ;!       | news/abonnements.php                                          | \
 ;!       | news/article.php                                              |  |
@@ -137,6 +134,7 @@ xx    | admin/gerer_skins.php                                         | -
 xx       | admin/graph_promo.php                                         | stats/graph_promo.php
 xx       | admin/index.php                                                       | -
 xx       | admin/logger_actions.php                              | -
+xx       | admin/logger.php                                              | -
 xx       | admin/newsletter_archi.php                            | -
 xx       | admin/newsletter_pattecassee.php              | -
 xx       | admin/newsletter_prep.php                             | -
@@ -196,6 +194,8 @@ xx    | trezo/gere_operations.php                             | -
 xx       | trezo/index.php                                                       | -
 xx       | vcard.php                                                             | -
 ------+-------------------------------------------+----------------
+x!!      | admin/logger_events.php                                       | géré par logger.php
+x!!      | admin/logger_user.php                                         | géré par logger.php
 x!!      | admin/newsletter_form.inc.php                         | -
 x!!      | admin/statut_antispam.php                             | inutilisée et même pas en var superglobales ...
 x!!      | aide.php                                                              | --> faq.php

diff --git a/htdocs/admin/logger.php b/htdocs/admin/logger.php
new file mode 100644 (file)
index 0000000..4cb6fcf
--- /dev/null
+++ b/htdocs/admin/logger.php
@@ -0,0 +1,10 @@
+<?php
+require("auto.prepend.inc.php");
+new_admin_page('logger-view.tpl');
+require('diogenes.logger-view.inc.php');
+
+$logview = new DiogenesLoggerView;
+$logview->run($page,'logger-view.tpl',false);
+
+$page->run();
+?>

diff --git a/htdocs/css/default.css b/htdocs/css/default.css
index b62476d..69d9300 100644 (file)
--- a/htdocs/css/default.css
+++ b/htdocs/css/default.css
@@ -228,7 +228,7 @@ div.long td.rt { width: 65%; }
 #dev {
     position: fixed;
     top     : 32px;
-    left    : 14px;
+    right   : 14px;
     width   : 128px;
     z-index : 1;
     
@@ -330,4 +330,4 @@ div.long td.rt { width: 65%; }
     vertical-align: top;
 }
 /* vim: set et ts=4 sts=4 sw=4: */
-/* $Id: default.css,v 1.21 2004-02-19 19:35:00 x2000habouzit Exp $ */
+/* $Id: default.css,v 1.22 2004-02-20 01:46:22 x2000habouzit Exp $ */

diff --git a/include/xorg.globals.inc.php b/include/xorg.globals.inc.php
index c0884c3..c3ec384 100644 (file)
--- a/include/xorg.globals.inc.php
+++ b/include/xorg.globals.inc.php
@@ -11,5 +11,7 @@ class XorgGlobals extends DiogenesCoreGlobals {
   var $table_log_sessions = 'logger.sessions';
   var $table_log_events = 'logger.events';
 
+  var $tauth = array('native'=>"auth_user_md5");
+  var $tlabel = array('native'=>"X.Org");
 }
 ?>

diff --git a/scripts/migration.sql b/scripts/migration.sql
new file mode 100644 (file)
index 0000000..471faa6
--- /dev/null
+++ b/scripts/migration.sql
@@ -0,0 +1,16 @@
+ALTER TABLE `logger.sessions` ADD `auth` ENUM( 'native' ) DEFAULT 'native' NOT NULL AFTER `id`;
+ALTER TABLE `logger.sessions` ADD `sauth` ENUM( 'native' ) DEFAULT 'native' NOT NULL AFTER `host`;
+
+ALTER TABLE `x4dat.skins` ADD COLUMN `skin_tpl` VARCHAR(32) AFTER `id`;
+
+USE logger;
+ALTER TABLE `events` DROP `id` ;
+ALTER TABLE `sessions` ADD INDEX ( `uid` );
+ALTER TABLE `sessions` ADD INDEX ( `uid` );
+ALTER TABLE `events` ADD INDEX ( `session` );
+
+USE diogenes;
+ALTER TABLE `diogenes_logevents` DROP `id` ;
+ALTER TABLE `diogenes_logsessions` ADD INDEX ( `uid` );
+ALTER TABLE `diogenes_logsessions` ADD INDEX ( `start` );
+ALTER TABLE `diogenes_logevents` ADD INDEX ( `session` );

diff --git a/templates/logger-view.tpl b/templates/logger-view.tpl
new file mode 100644 (file)
index 0000000..d2bbb2d
--- /dev/null
+++ b/templates/logger-view.tpl
@@ -0,0 +1,107 @@
+{* $Id: logger-view.tpl,v 1.1 2004-02-20 01:46:23 x2000habouzit Exp $ *}
+
+{dynamic}
+
+{if $smarty.request.logsess}
+
+<table class="bicol">
+<tr>
+  <th colspan="2">Propri&eacute;t&eacute;s de la session</th>
+</tr>
+<tr>
+  <td><strong>user</strong></td>
+  <td>{$session.username} {if $session.suer}(suid by {$session.suer}){/if} [<a href="?logauth={$session.auth}&amp;loguser={$session.username}">user's log</a>]</td>
+</tr>
+<tr>
+  <td><strong>hote</strong></td>
+  <td>{$session.host} / {$session.ip}</td>
+</tr>
+<tr>
+  <td><strong>browser</strong></td>
+  <td>{$session.browser}</td>
+</tr>
+</table>
+
+<br />
+
+<table class="bicol">
+<tr>
+  <th>stamp</th>
+  <th>action</th>
+  <th>data</th>
+</tr>
+{foreach from=$events item=myevent}
+<tr class="{cycle values="impair,pair"}">
+  <td style="font-size:90%;">{$myevent.stamp|date_format:"%Y-%m-%d %H:%M:%S"}</td>
+  <td><strong>{$myevent.text}</strong></td>
+  <td>{$myevent.data|escape}</td>
+</tr>
+{/foreach}
+</table>
+
+
+{else}
+
+<form method="post" action="{$smarty.server.PHP_SELF}">
+<table class="bicol">
+<tr>
+  <th colspan="2">filter by..</th>
+</tr>
+<tr>
+  <td>..<strong>date</strong></td>
+  <td>
+    year
+    <select name="year" onchange="this.form.submit()">
+      {html_options options=$years selected=$year}
+    </select>
+    &nbsp;month
+    <select name="month" onchange="this.form.submit()">
+      {html_options options=$months selected=$month}
+    </select>
+    &nbsp;day
+    <select name="day" onchange="this.form.submit()">
+      {html_options options=$days selected=$day}
+    </select>
+  </td>
+</tr>
+<tr>
+  <td>..<strong>user</strong></td>
+  <td>
+    <input type="text" name="loguser" value="{$loguser}" />
+    {html_options name="logauth" options=$auths selected=$logauth}
+    <input type="submit" />
+  </td>
+</tr>
+</table>
+
+</form>
+
+<br />
+
+<table class="bicol" style="font-size: 90%">
+  <tr>
+    <th>start</th>
+    <th>user</th>
+    <th>summary</th>
+    <th>actions</th>
+  </tr>
+{foreach from=$sessions item=mysess}
+  <tr class="{cycle values="impair,pair"}">
+    <td>{$mysess.start|date_format:"%Y-%m-%d %H:%M:%S"}</td>
+    <td><strong>{$mysess.username}</strong> <span class="smaller">({$mysess.lauth})</span></td>
+    <td>
+      {foreach from=$mysess.events item=myevent}{$myevent}<br />{/foreach}
+    </td>
+    <td class="action">
+{foreach from=$mysess.actions item=myaction}
+      {a lnk=$myaction}
+{/foreach}
+    </td>
+  </tr>
+{/foreach}
+</table>
+{/if}
+
+{/dynamic}
+
+{* vim:set et sw=2 sts=2 sws=2: *}

diff --git a/templates/table-editor.tpl b/templates/table-editor.tpl
index 46d3921..3f372ea 100644 (file)
--- a/templates/table-editor.tpl
+++ b/templates/table-editor.tpl
@@ -1,3 +1,5 @@
+{* $Id: table-editor.tpl,v 1.2 2004-02-20 01:46:23 x2000habouzit Exp $ *}
+
 {dynamic}
 
 <div class="rubrique">
@@ -124,3 +126,5 @@
 {/if}
 
 {/dynamic}
+
+{* vim:set et sw=2 sts=2 sws=2: *}