From: Stéphane Jacob Date: Fri, 30 Oct 2009 15:46:48 +0000 (+0100) Subject: Merge commit 'origin/platal-0.10.1' X-Git-Tag: xorg/0.10.2~33 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=be5a4adb62c3abe6c12fb020cf321bdb244ebc4b;hp=a9f490e88d481a81c7ac86e6d3158564d6b19904;p=platal.git Merge commit 'origin/platal-0.10.1' --- diff --git a/modules/stats.php b/modules/stats.php index 06ad2d2..2a74184 100644 --- a/modules/stats.php +++ b/modules/stats.php @@ -41,7 +41,6 @@ class StatsModule extends PLModule 'stats/graph' => $this->make_hook('graph', AUTH_COOKIE), 'stats/graph/evolution' => $this->make_hook('graph_evo', AUTH_COOKIE), 'stats/promos' => $this->make_hook('promos', AUTH_COOKIE), - 'stats/profile' => $this->make_hook('profile', AUTH_COOKIE), 'stats/coupures' => $this->make_hook('coupures', AUTH_PUBLIC), ); @@ -295,30 +294,6 @@ EOF2; $page->assign('mxs', $res); } } - - function handler_profile(&$page, $period = 'overall') - { - $page->changeTpl('stats/profile.tpl'); - - $time = ''; - switch ($period) { - case 'week': case 'month': case 'year': - $time = ' AND e.stamp > DATE_SUB(CURDATE(), INTERVAL 1 ' . strtoupper($period) . ')'; - break; - } - $rows = XDB::iterator("SELECT IF(u.nom_usage != '', u.nom_usage, u.nom) AS nom, - u.prenom, u.promo, e.data AS forlife, COUNT(*) AS count - FROM logger.events AS e - INNER JOIN logger.actions AS act ON (e.action = act.id) - INNER JOIN aliases AS a ON (a.alias = e.data) - INNER JOIN auth_user_md5 AS u ON (u.user_id = a.id) - WHERE act.text = 'view_profile' $time - GROUP BY e.data - ORDER BY count DESC - LIMIT 10"); - $page->assign('profiles', $rows); - $page->assign('period', $period); - } } // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: diff --git a/templates/stats/index.tpl b/templates/stats/index.tpl index eee9f04..707c51a 100644 --- a/templates/stats/index.tpl +++ b/templates/stats/index.tpl @@ -33,7 +33,6 @@ Quelques statistiques sur l'utilisation des services de Polytechnique.org ainsi
  • Nombre d'inscrits au cours du temps
  • Nombre d'inscrits dans ta promotion
  • Nombre d'inscrits par promotion
    • -
  • Consultations des fiches de l'annuaire
    • {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} diff --git a/templates/stats/profile.tpl b/templates/stats/profile.tpl deleted file mode 100644 index 339f0e4..0000000 --- a/templates/stats/profile.tpl +++ /dev/null @@ -1,65 +0,0 @@ -{**************************************************************************} -{* *} -{* Copyright (C) 2003-2009 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 *} -{* *} -{**************************************************************************} - - -

    - Fiches les plus consultées -

    - - - - - - - {if hasPerms('admin')}{/if} - - {iterate from=$profiles item=profile} - - - {if hasPerms('admin')}{/if} - - {/iterate} -
    NomConsultations
    {$profile.prenom} {$profile.nom} (X{$profile.promo}){$profile.count}
    - -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}