From c03abc01758b832896459ea03cb2333de6288c76 Mon Sep 17 00:00:00 2001
From: x2000habouzit <x2000habouzit>
Date: Thu, 5 Feb 2004 13:03:09 +0000
Subject: [PATCH] =?utf8?q?qqs=20css,=20et=20correction=20de=20bugs=20patte?=
 =?utf8?q?cass=E9e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 configs/menu.conf.php         |  2 +-
 etat_migration                |  2 +-
 htdocs/pattecassee.php        | 13 +++++++------
 include/valid_aliases.inc.php |  1 -
 plugins/insert.mkStats.php    |  2 +-
 templates/pattecassee.tpl     |  8 ++++----
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/configs/menu.conf.php b/configs/menu.conf.php
index 53a777f..0bfa957 100644
--- a/configs/menu.conf.php
+++ b/configs/menu.conf.php
@@ -15,7 +15,7 @@ if(logged()) {
             'Forums & PA' => '###url###' ,
             'Listes de diffusion' => '###url###' ,
             'Micropaiements' => '###url###' ,
-            'Patte cassée' => '###url###' ,
+            'Patte cassée' => 'pattecassee.php' ,
             'Sondages' => '###url###'
         ),
         'Communauté X' => Array (
diff --git a/etat_migration b/etat_migration
index e964ea8..3a95b50 100644
--- a/etat_migration
+++ b/etat_migration
@@ -144,7 +144,6 @@ x	  | domaineperso.php						  | -
 x	  | epouse.php								  | -
 x	  | groupex.php								  | groupex/index.php 
 x	  | parselog.php							  | stats/...
-x	  | pattecassee.php							  | - -> encore buggué
 x	  | sendmail.php							  | -
 x	  | trackers/index.php						  | -
 x	  | trackers/tracker_admin.php				  | -
@@ -192,6 +191,7 @@ xx	  | index.php								  | -
 xx	  | login.php								  | -
 xx	  | motdepassemd5.php						  | -
 xx	  | nbpromo2.php							  | stats/nb_by_promo.php
+xx	  | pattecassee.php							  | -
 xx	  | preferences.php							  | -
 xx	  | rss.php									  | -
 xx	  | secu.php								  | docs/secu.php
diff --git a/htdocs/pattecassee.php b/htdocs/pattecassee.php
index f1281ca..3e9b799 100644
--- a/htdocs/pattecassee.php
+++ b/htdocs/pattecassee.php
@@ -45,6 +45,7 @@ consulter la page <https://www.polytechnique.org/pattecassee.php>.
 A bientôt sur Polytechnique.org !
 L'équipe d'administration <support@polytechnique.org>";
 
+    require_once("diogenes.mailer.inc.php");
 	$mail = new DiogenesMailer('Polytechnique.org <support@polytechnique.org>', $dest, "Une de tes adresse de redirection Polytechnique.org ne marche plus !!", false);
 	$mail->setBody($message);
 	$mail->send();
@@ -53,12 +54,12 @@ L'
 } elseif (array_key_exists('email', $_POST)) {
     $email = valide_email($_POST['email']);
     $page->assign('email',$email);
-    $sel = mysql_query("SELECT e1.uid, e1.panne != 0 AS panne, count(e2.uid) AS nb_mails, u.nom, u.prenom, u.promo"
-        ." FROM emails as e1"
-        ." LEFT JOIN emails as e2 ON(e1.uid = e2.uid AND FIND_IN_SET('active', e2.flags) AND e1.num != e2.num)"
-        ." INNER JOIN auth_user_md5 as u ON(e1.uid = u.user_id)"
-        ." WHERE e1.email ='$email'"
-        ." GROUP BY e1.uid");
+    $sel = mysql_query("SELECT e1.uid, e1.panne != 0 AS panne, count(e2.uid) AS nb_mails, u.nom, u.prenom, u.promo
+                        FROM emails as e1
+                        LEFT JOIN emails as e2 ON(e1.uid = e2.uid AND FIND_IN_SET('active', e2.flags) AND e1.num != e2.num)
+                        INNER JOIN auth_user_md5 as u ON(e1.uid = u.user_id)
+                        WHERE e1.email ='$email'
+                        GROUP BY e1.uid");
     if ($x = mysql_fetch_assoc($sel)) {
         // on écrit dans la base que l'adresse est cassée
         if (!$x['panne'])
diff --git a/include/valid_aliases.inc.php b/include/valid_aliases.inc.php
index 25286e6..be61ed9 100644
--- a/include/valid_aliases.inc.php
+++ b/include/valid_aliases.inc.php
@@ -76,7 +76,6 @@ ________EOF;
             return false;
 
         require_once("diogenes.mailer.inc.php");
-
         $mymail = new DiogenesMailer(
                 from_mail_valid_alias(),
                 to_mail_valid_alias( $this->username ),
diff --git a/plugins/insert.mkStats.php b/plugins/insert.mkStats.php
index 2e5f7f8..87a6d72 100644
--- a/plugins/insert.mkStats.php
+++ b/plugins/insert.mkStats.php
@@ -37,7 +37,7 @@ function smarty_insert_mkStats($params, &$smarty)
     $rel = url();
     return <<<EOF
         <table class="bicol"
-          style="font-weight:normal;text-align:center; border-left:0px; border-right:0px; margin-top:0.5em; width:100%; margin-left: 0;">
+          style="font-weight:normal;text-align:center; border-left:0px; border-right:0px; margin-top:0.5em; width:100%; margin-left: 0; font-size: smaller;">
         <tr>
           <th width="33%">Valid</th>
           <th width="33%">Bugs</th>
diff --git a/templates/pattecassee.tpl b/templates/pattecassee.tpl
index e903e76..2058104 100644
--- a/templates/pattecassee.tpl
+++ b/templates/pattecassee.tpl
@@ -1,4 +1,4 @@
-{* $Id: pattecassee.tpl,v 1.2 2004-02-04 23:22:05 x2000habouzit Exp $ *}
+{* $Id: pattecassee.tpl,v 1.3 2004-02-05 13:03:11 x2000habouzit Exp $ *}
 
 {dynamic on="0$erreur"}
 <p class="erreur">{$erreur}</p>
@@ -9,9 +9,9 @@
 </div>
 
 {dynamic}
-{if $x && $x.nb_emails}
+{if $x && $x.nb_mails}
   <p class="erreur">
-    Ton correspondant a à l'heure actuelle {$x.nb_emails} adresse(s) email(s) de redirection active(s)
+    Ton correspondant a à l'heure actuelle {$x.nb_mails} adresse(s) email(s) de redirection active(s)
     en dehors de celle que tu nous as communiquée. Cela ne veut pas forcément dire qu'il les avait
     déjà activées lorsque tu as envoyé ton email, mais c'est fort probable.
   </p>
@@ -59,7 +59,7 @@
 <br />
 <div class="center">
   <form action="{$smarty.server.PHP_SELF}" method="post">
-  <table class="bicol" cellpadding="3" summary="Saisie email en panne">
+  <table class="tinybicol" cellpadding="3" summary="Saisie email en panne">
     <tr>
       <th colspan="2">Adresse email défectueuse</th>
     </tr>
-- 
2.1.4