From 099b92fc62909e63f61bd1367a553a557743ba95 Mon Sep 17 00:00:00 2001 From: x2000habouzit Date: Mon, 31 Jul 2006 18:34:44 +0000 Subject: [PATCH 1/1] more simplifications git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@752 839d8a87-29fc-0310-9880-83ba4fa771e5 --- classes/LoggerView.php | 33 ++++----------------------------- classes/Page.php | 16 ---------------- modules/admin.php | 1 - templates/logger-view.tpl | 40 ++++++++++++++++++---------------------- 4 files changed, 22 insertions(+), 68 deletions(-) diff --git a/classes/LoggerView.php b/classes/LoggerView.php index 59f8d90..b0d1967 100644 --- a/classes/LoggerView.php +++ b/classes/LoggerView.php @@ -39,7 +39,7 @@ class LoggerView { global $globals; // give a 'no filter' option - $days[0] = __("all"); + $months[0] = "----"; if ($year && $month) { $day_max = Array(-1, 31, checkdate(2, 29, $year) ? 29 : 28 , 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); @@ -82,7 +82,7 @@ class LoggerView { global $globals; // give a 'no filter' option - $months[0] = __("all"); + $months[0] = "----"; if ($year) { $res = XDB::query("SELECT YEAR (MAX(start)), YEAR (MIN(start)), @@ -137,7 +137,7 @@ class LoggerView { global $globals; // give a 'no filter' option - $years[0] = __("all"); + $years[0] = "----"; // retrieve available years $res = XDB::query("select YEAR(MAX(start)), YEAR(MIN(start)) FROM {$globals->table_log_sessions}"); @@ -286,22 +286,14 @@ class LoggerView { $res = XDB::iterator($select); $sessions = array(); - $odd = false; while ($mysess = $res->next()) { $mysess['username'] = $this->_getUsername($mysess['auth'], $mysess['uid']); // pretty label for auth method $mysess['lauth'] = $auths[$mysess['auth']]; // summary of events $mysess['events'] = array(); - // actions - $mysess['actions'] = array( - array(__("view session"), "admin/logger?logsess={$mysess['id']}"), - array(__("user's log"), "admin/logger?logauth={$mysess['auth']}&loguser={$mysess['username']}") - ); - $mysess['class'] = $odd ? "odd" : "even"; $sessions[$mysess['id']] = $mysess; - $odd = !$odd; } array_reverse($sessions); @@ -318,27 +310,10 @@ class LoggerView { } $page->assign_by_ref('sessions', $sessions); } else { - $page->assign('msg_nofilters', __("Please select a year and/or a user.")); + $page->assign('msg_nofilters', "Sélectionner une annuée et/ou un utilisateur"); } } - // translations - $page->assign('msg_session_properties', __("session properties")); - $page->assign('msg_user', __("user")); - $page->assign('msg_host', __("host")); - $page->assign('msg_browser', __("browser")); - $page->assign('msg_date', __("date")); - $page->assign('msg_action', __("action")); - $page->assign('msg_data', __("data")); - $page->assign('msg_filter_by', __("filter by")); - $page->assign('msg_start', __("start")); - $page->assign('msg_summary', __("summary")); - $page->assign('msg_actions', __("actions")); - $page->assign('msg_year', __("year")); - $page->assign('msg_month', __("month")); - $page->assign('msg_day', __("day")); - $page->assign('msg_submit', __("Submit")); - // if requested, assign the content to be displayed if (!empty($outputvar)) { $page->assign($outputvar, $page->fetch($template)); diff --git a/classes/Page.php b/classes/Page.php index 1f45385..1b76701 100644 --- a/classes/Page.php +++ b/classes/Page.php @@ -62,22 +62,6 @@ class PlatalPage extends Smarty } // }}} - // {{{ function fakeDiogenes() - - function fakeDiogenes() - { - require_once 'diogenes/diogenes.core.page.inc.php'; - $this->register_function("extval","diogenes_func_extval"); - $this->register_function("flags","diogenes_func_flags"); - $this->register_function("a","diogenes_func_a"); - $this->register_function("checkbox","diogenes_func_checkbox"); - $this->register_function("diff","diogenes_func_diff"); - $this->register_function("menu_item","diogenes_func_menu_item"); - $this->register_function("tag","diogenes_func_tag"); - $this->register_function("toolbar","diogenes_func_toolbar"); - } - - // }}} // {{{ function changeTpl() function changeTpl($tpl, $type = SKINNED) diff --git a/modules/admin.php b/modules/admin.php index 3259b9d..d905cc5 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -103,7 +103,6 @@ class AdminModule extends PLModule $logview = new LoggerView; $logview->run($page); - $page->fakeDiogenes(); $page->assign('xorg_title','Polytechnique.org - Administration - Logs des sessions'); } diff --git a/templates/logger-view.tpl b/templates/logger-view.tpl index f20a2d3..34a40b5 100644 --- a/templates/logger-view.tpl +++ b/templates/logger-view.tpl @@ -26,19 +26,19 @@ - + - + - + - +
{$msg_session_properties}Propriétés de la session
{$msg_user}utilisateur {$session.username} {if $session.suer}(suid by {$session.suer}){/if} [user's log]
{$msg_host}Hôte {$session.host} IP: {$session.ip}
{$msg_browser}Navigateur {$session.browser}
@@ -47,9 +47,9 @@ - - - + + + {foreach from=$events item=myevent} @@ -65,31 +65,28 @@
{$msg_date}{$msg_action}{$msg_data}dateactiondonnée
- - - - +
{$msg_filter_by}
{$msg_date} - {$msg_year} + Année -  {$msg_month} +  Mois -  {$msg_day} +  Jour
{$msg_user}Utilisateur {html_options name="logauth" options=$auths selected=$logauth} - +
@@ -100,10 +97,10 @@ - - - - + + + + {foreach from=$sessions item=mysess} @@ -113,9 +110,8 @@ {foreach from=$mysess.events item=myevent}{$myevent}
{/foreach} {/foreach} -- 2.1.4
{$msg_start}{$msg_user}{$msg_summary}{$msg_actions}débututilisateurrésuméactions
-{foreach from=$mysess.actions item=myaction} - {a lnk=$myaction} -{/foreach} + session + user's log