From 731f326d18bb0292aa5ef9c7594eef71ae840c10 Mon Sep 17 00:00:00 2001
From: x2000habouzit <x2000habouzit>
Date: Thu, 26 Aug 2004 09:34:02 +0000
Subject: [PATCH] debug + xhtml

---
 htdocs/trombipromo.php    | 14 ++++----------
 templates/trombipromo.tpl |  4 ++--
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/htdocs/trombipromo.php b/htdocs/trombipromo.php
index 1fbdb4e..763d6e3 100644
--- a/htdocs/trombipromo.php
+++ b/htdocs/trombipromo.php
@@ -8,21 +8,15 @@ $page->assign('limit', $limit);
 
 if(!isset($_REQUEST['xpromo'])) $page->run();
 
-if (ereg("[0-9]{2}",$_REQUEST['xpromo'])) {
-    if ($_REQUEST['xpromo'] > 20) {
-        $_REQUEST['xpromo'] += 1900;
-    } else {
-        $_REQUEST['xpromo'] += 2000;
-    }
-}
+$xpromo = intval($_REQUEST['xpromo']);
 
-if (!ereg("(19|20)[0-9]{2}",$_REQUEST['xpromo']) && ($_REQUEST['xpromo']!="all" || $_SESSION['perms']!="admin")) {
-    $page->assign('erreur', "La promotion doit être saisie au format YYYY. Recommence.");
+if ( $xpromo<1900 || $xpromo>date('Y') || ($xpormo = -1 && $_SESSION['perms']!="admin") ) {
+    $page->assign('erreur', "Promotion incorrecte (saisir au format YYYY). Recommence.");
 }
 
 $offset = (empty($_REQUEST['offset']) ? 0 : $_REQUEST['offset']);
 
-$where = ( $_REQUEST['xpromo']!="all" ? "WHERE promo='{$_REQUEST['xpromo']}'" : "" );
+$where = ( $xpromo>0 ? "WHERE promo='$xpromo'" : "" );
 
 $res = $globals->db->query("SELECT  COUNT(*)
                               FROM  auth_user_md5 AS u
diff --git a/templates/trombipromo.tpl b/templates/trombipromo.tpl
index 7c794e1..29915be 100644
--- a/templates/trombipromo.tpl
+++ b/templates/trombipromo.tpl
@@ -1,4 +1,4 @@
-{* $Id: trombipromo.tpl,v 1.1 2004-07-24 16:06:57 x2000habouzit Exp $ *}
+{* $Id: trombipromo.tpl,v 1.2 2004-08-26 09:34:02 x2000habouzit Exp $ *}
 
 {dynamic}
 
@@ -74,7 +74,7 @@ chaque page affiche au plus {$limit} photos.
   {/foreach}
   {if $loop eq "1"}
   <td></td><td></td></tr>
-  {else if $loop eq "2"}
+  {elseif $loop eq "2"}
   <td></td></tr>
   {/if}
 </table>
-- 
2.1.4