From: x2000habouzit <x2000habouzit>
Date: Wed, 17 Nov 2004 11:20:13 +0000 (+0000)
Subject: use bestalias instead of forlife
X-Git-Tag: xorg/old~917
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=29d0bd64bc7a09fa3f45fe65820e5b4a2812fd9b;p=platal.git

use bestalias instead of forlife
---

diff --git a/include/notifs.inc.php b/include/notifs.inc.php
index 8db049a..700e9cc 100644
--- a/include/notifs.inc.php
+++ b/include/notifs.inc.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: notifs.inc.php,v 1.18 2004-11-14 17:39:12 x2000habouzit Exp $
+        $Id: notifs.inc.php,v 1.19 2004-11-17 11:20:13 x2000habouzit Exp $
  ***************************************************************************/
 
 define("WATCH_FICHE", 1);
@@ -56,17 +56,17 @@ function getNbNotifs() {
 
     $res = $globals->db->query("
     (
-	    SELECT  u.promo, u.prenom, IF(u.epouse='',u.nom,u.epouse) AS nom, a.alias AS forlife,
+	    SELECT  u.promo, u.prenom, IF(u.epouse='',u.nom,u.epouse) AS nom, a.alias AS bestalias,
 		    wo.*, 1 AS contact, (u.perms='admin' OR u.perms='user') AS inscrit
 	      FROM  auth_user_quick AS q
 	INNER JOIN  contacts        AS c  ON(q.user_id = c.uid)
 	INNER JOIN  watch_ops       AS wo ON(wo.uid=c.contact)
 	INNER JOIN  watch_sub       AS ws ON(wo.cid=ws.cid AND ws.uid=c.uid)
 	INNER JOIN  auth_user_md5   AS u  ON(u.user_id = wo.uid)
-	 LEFT JOIN  aliases         AS a  ON(u.user_id = a.id AND a.type='a_vie')
+	 LEFT JOIN  aliases         AS a  ON(u.user_id = a.id AND FIND_IN_SET('bestalias',a.flags))
 	     WHERE  q.user_id = '$uid' AND FIND_IN_SET('contacts',q.watch_flags) AND wo.known > $watchlast
     ) UNION DISTINCT (
-	    SELECT  u.promo, u.prenom, IF(u.epouse='',u.nom,u.epouse) AS nom, a.alias AS forlife,
+	    SELECT  u.promo, u.prenom, IF(u.epouse='',u.nom,u.epouse) AS nom, a.alias AS bestalias,
 		    wo.*, NOT (c.contact IS NULL) AS contact, (u.perms='admin' OR u.perms='user') AS inscrit
 	      FROM  watch_promo     AS w
 	INNER JOIN  auth_user_md5   AS u  USING(promo)
@@ -75,10 +75,10 @@ function getNbNotifs() {
 	INNER JOIN  watch_ops       AS wo ON(wo.uid=u.user_id)
 	INNER JOIN  watch_sub       AS ws ON(wo.cid=ws.cid AND ws.uid=w.uid)
 	INNER JOIN  watch_cat       AS wc ON(wc.id=wo.cid AND wc.frequent=0)
-	 LEFT JOIN  aliases         AS a  ON(u.user_id = a.id AND a.type='a_vie')
+	 LEFT JOIN  aliases         AS a  ON(u.user_id = a.id AND FIND_IN_SET('bestalias',a.flags))
 	     WHERE  w.uid = '$uid' AND wo.known > $watchlast
     ) UNION DISTINCT (
-	    SELECT  u.promo, u.prenom, IF(u.epouse='',u.nom,u.epouse) AS nom, a.alias AS forlife,
+	    SELECT  u.promo, u.prenom, IF(u.epouse='',u.nom,u.epouse) AS nom, a.alias AS bestalias,
 		    wo.*, 0 AS contact, (u.perms='admin' OR u.perms='user') AS inscrit
 	      FROM  watch_nonins    AS w
 	INNER JOIN  auth_user_quick AS q  ON(q.user_id = w.uid)
@@ -86,7 +86,7 @@ function getNbNotifs() {
 	INNER JOIN  watch_ops       AS wo ON(wo.uid=u.user_id)
 	INNER JOIN  watch_sub       AS ws ON(wo.cid=ws.cid AND ws.uid=w.uid)
 	INNER JOIN  watch_cat       AS wc ON(wc.id=wo.cid)
-	 LEFT JOIN  aliases         AS a  ON(u.user_id = a.id AND a.type='a_vie')
+	 LEFT JOIN  aliases         AS a  ON(u.user_id = a.id AND FIND_IN_SET('bestalias',a.flags))
 	     WHERE  w.uid = '$uid' AND wo.known > $watchlast
     )");
     $n = mysql_num_rows($res);
@@ -115,48 +115,48 @@ class AllNotifs {
 	$res = $globals->db->query("
 	(
 		SELECT  q.user_id AS aid, v.prenom AS aprenom, IF(v.epouse='',v.nom,v.prenom) AS anom,
-			b.alias AS aforlife, (v.flags='femme') AS sexe,
-			u.promo, u.prenom, IF(u.epouse='',u.nom,u.epouse) AS nom, a.alias AS forlife,
+			b.alias AS abestalias, (v.flags='femme') AS sexe,
+			u.promo, u.prenom, IF(u.epouse='',u.nom,u.epouse) AS nom, a.alias AS bestalias,
 			wo.*, 1 AS contact, (u.perms='admin' OR u.perms='user') AS inscrit
 	          FROM  auth_user_quick AS q
 	    INNER JOIN  auth_user_md5   AS v  USING(user_id)
-	    INNER JOIN  aliases         AS b  ON(q.user_id = b.id AND b.type='a_vie')
+	    INNER JOIN  aliases         AS b  ON(q.user_id = b.id AND FIND_IN_SET('bestalias',b.flags))
 	    INNER JOIN  contacts        AS c  ON(q.user_id = c.uid)
 	    INNER JOIN  watch_ops       AS wo ON(wo.uid=c.contact AND wo.known > q.watch_last)
 	    INNER JOIN  watch_sub       AS ws ON(ws.uid=q.user_id AND wo.cid=ws.cid)
 	    INNER JOIN  auth_user_md5   AS u  ON(u.user_id = wo.uid)
-	     LEFT JOIN  aliases         AS a  ON(u.user_id = a.id AND a.type='a_vie')
+	     LEFT JOIN  aliases         AS a  ON(u.user_id = a.id AND FIND_IN_SET('bestalias',a.flags))
 	         WHERE  q.watch_flags=3
 	) UNION DISTINCT (
 		SELECT  q.user_id AS aid, v.prenom AS aprenom, IF(v.epouse='',v.nom,v.prenom) AS anom,
-			b.alias AS aforlife, (v.flags='femme') AS sexe,
-			u.promo, u.prenom, IF(u.epouse='',u.nom,u.epouse) AS nom, a.alias AS forlife,
+			b.alias AS abestalias, (v.flags='femme') AS sexe,
+			u.promo, u.prenom, IF(u.epouse='',u.nom,u.epouse) AS nom, a.alias AS bestalias,
 			wo.*, NOT (c.contact IS NULL) AS contact, (u.perms='admin' OR u.perms='user') AS inscrit
 	          FROM  auth_user_quick AS q
 	    INNER JOIN  auth_user_md5   AS v  USING(user_id)
-	    INNER JOIN  aliases         AS b  ON(q.user_id = b.id AND b.type='a_vie')
+	    INNER JOIN  aliases         AS b  ON(q.user_id = b.id AND FIND_IN_SET('bestalias',b.flags))
 	    INNER JOIN  watch_promo     AS w  ON(w.uid=q.user_id)
 	    INNER JOIN  auth_user_md5   AS u  USING(promo)
 	     LEFT JOIN  contacts        AS c  ON(w.uid = c.uid AND c.contact=u.user_id)
 	    INNER JOIN  watch_sub       AS ws ON(ws.uid=w.uid)
 	    INNER JOIN  watch_cat       AS wc ON(wc.id=wo.cid AND wc.frequent=0)
             INNER JOIN  watch_ops       AS wo ON(wo.cid=ws.cid AND wo.uid=u.user_id AND wo.known > q.watch_last)
-	     LEFT JOIN  aliases         AS a  ON(u.user_id = a.id AND a.type='a_vie')
+	     LEFT JOIN  aliases         AS a  ON(u.user_id = a.id AND FIND_IN_SET('bestalias',a.flags))
 		 WHERE  q.watch_flags=3 OR q.watch_flags=1
 	) UNION DISTINCT (
 		SELECT  q.user_id AS aid, v.prenom AS aprenom, IF(v.epouse='',v.nom,v.prenom) AS anom,
-			b.alias AS aforlife, (v.flags='femme') AS sexe,
-			u.promo, u.prenom, IF(u.epouse='',u.nom,u.epouse) AS nom, a.alias AS forlife,
+			b.alias AS abestalias, (v.flags='femme') AS sexe,
+			u.promo, u.prenom, IF(u.epouse='',u.nom,u.epouse) AS nom, a.alias AS bestalias,
 			wo.*, 0 AS contact, (u.perms='admin' OR u.perms='user') AS inscrit
 	          FROM  auth_user_quick AS q
 	    INNER JOIN  auth_user_md5   AS v  USING(user_id)
-	    INNER JOIN  aliases         AS b  ON(q.user_id = b.id AND b.type='a_vie')
+	    INNER JOIN  aliases         AS b  ON(q.user_id = b.id AND FIND_IN_SET('bestalias',b.flags))
 	    INNER JOIN  watch_nonins    AS w  ON(w.uid=q.user_id)
 	    INNER JOIN  auth_user_md5   AS u  ON(w.ni_id=u.user_id)
 	    INNER JOIN  watch_sub       AS ws ON(ws.uid=w.uid)
 	    INNER JOIN  watch_cat       AS wc ON(wc.id=wo.cid)
 	    INNER JOIN  watch_ops       AS wo ON(wo.cid=ws.cid AND wo.uid=u.user_id AND wo.known > q.watch_last)
-	     LEFT JOIN  aliases         AS a  ON(u.user_id = a.id AND a.type='a_vie')
+	     LEFT JOIN  aliases         AS a  ON(u.user_id = a.id AND FIND_IN_SET('bestalias',a.flags))
 		 WHERE  q.watch_flags=3 OR q.watch_flags=1
 	)
 	ORDER BY  cid,promo,nom");
@@ -164,8 +164,8 @@ class AllNotifs {
 	while($tmp = mysql_fetch_assoc($res)) {
 	    $aid = $tmp['aid'];
 	    $this->_data[$aid] = Array("prenom" => $tmp['aprenom'], 'nom' => $tmp['anom'],
-				       'forlife'=>$tmp['aforlife'], 'sexe' => $tmp['sexe']);
-	    unset($tmp['aprenom'],$tmp['anom'],$tmp['aforlife'],$tmp['aid'],$tmp['sexe']);
+				       'bestalias'=>$tmp['abestalias'], 'sexe' => $tmp['sexe']);
+	    unset($tmp['aprenom'],$tmp['anom'],$tmp['abestalias'],$tmp['aid'],$tmp['sexe']);
 	    $this->_data[$aid]['data'][$tmp['cid']][] = $tmp;
 	}
     }
@@ -188,17 +188,17 @@ class Notifs {
 
 	$res = $globals->db->query("
 	(
-		SELECT  u.promo, u.prenom, IF(u.epouse='',u.nom,u.epouse) AS nom, a.alias AS forlife,
+		SELECT  u.promo, u.prenom, IF(u.epouse='',u.nom,u.epouse) AS nom, a.alias AS bestalias,
 			wo.*, 1 AS contact, (u.perms='admin' OR u.perms='user') AS inscrit
 		  FROM  auth_user_quick AS q
 	    INNER JOIN  contacts        AS c  ON(q.user_id = c.uid)
 	    INNER JOIN  watch_ops       AS wo ON(wo.uid=c.contact)
 	    INNER JOIN  watch_sub       AS ws ON(wo.cid=ws.cid AND ws.uid=q.user_id)
 	    INNER JOIN  auth_user_md5   AS u  ON(u.user_id = wo.uid)
-	     LEFT JOIN  aliases         AS a  ON(u.user_id = a.id AND a.type='a_vie')
+	     LEFT JOIN  aliases         AS a  ON(u.user_id = a.id AND FIND_IN_SET('bestalias',a.flags))
 		 WHERE  q.user_id = '$uid' AND FIND_IN_SET('contacts',q.watch_flags) AND wo.known > $lastweek
 	) UNION DISTINCT (
-		SELECT  u.promo, u.prenom, IF(u.epouse='',u.nom,u.epouse) AS nom, a.alias AS forlife,
+		SELECT  u.promo, u.prenom, IF(u.epouse='',u.nom,u.epouse) AS nom, a.alias AS bestalias,
 			wo.*, NOT (c.contact IS NULL) AS contact, (u.perms='admin' OR u.perms='user') AS inscrit
 		  FROM  watch_promo     AS w
 	    INNER JOIN  auth_user_md5   AS u  USING(promo)
@@ -206,17 +206,17 @@ class Notifs {
 	    INNER JOIN  watch_ops       AS wo ON(wo.uid=u.user_id)
 	    INNER JOIN  watch_sub       AS ws ON(wo.cid=ws.cid AND ws.uid=w.uid)
 	    INNER JOIN  watch_cat       AS wc ON(wc.id=wo.cid AND wc.frequent=0)
-	     LEFT JOIN  aliases         AS a  ON(u.user_id = a.id AND a.type='a_vie')
+	     LEFT JOIN  aliases         AS a  ON(u.user_id = a.id AND FIND_IN_SET('bestalias',a.flags))
 		 WHERE  w.uid = '$uid' AND wo.known > $lastweek
 	) UNION DISTINCT (
-		SELECT  u.promo, u.prenom, IF(u.epouse='',u.nom,u.epouse) AS nom, a.alias AS forlife,
+		SELECT  u.promo, u.prenom, IF(u.epouse='',u.nom,u.epouse) AS nom, a.alias AS bestalias,
 			wo.*, 0 AS contact, (u.perms='admin' OR u.perms='user') AS inscrit
 		  FROM  watch_nonins    AS w
 	    INNER JOIN  auth_user_md5   AS u  ON(w.ni_id=u.user_id)
 	    INNER JOIN  watch_ops       AS wo ON(wo.uid=u.user_id)
 	    INNER JOIN  watch_sub       AS ws ON(wo.cid=ws.cid AND ws.uid=w.uid)
 	    INNER JOIN  watch_cat       AS wc ON(wc.id=wo.cid)
-	     LEFT JOIN  aliases         AS a  ON(u.user_id = a.id AND a.type='a_vie')
+	     LEFT JOIN  aliases         AS a  ON(u.user_id = a.id AND FIND_IN_SET('bestalias',a.flags))
 		 WHERE  w.uid = '$uid' AND wo.known > $lastweek
 	)
 	ORDER BY  cid,promo,nom");
diff --git a/scripts/cron/send_nl.php b/scripts/cron/send_nl.php
index 51a1e34..d364afe 100755
--- a/scripts/cron/send_nl.php
+++ b/scripts/cron/send_nl.php
@@ -19,7 +19,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: send_nl.php,v 1.7 2004-11-02 16:37:19 x2000habouzit Exp $
+        $Id: send_nl.php,v 1.8 2004-11-17 11:20:14 x2000habouzit Exp $
  ***************************************************************************/
 
 require('./connect.db.inc.php');
@@ -47,21 +47,18 @@ $nl = new NewsLetter($id);
 $nl->setSent();
 
 while(true) {
-    $sql = mysql_query("SELECT  ni.user_id,ni.pref, IF(e.alias IS NULL,a.alias,e.alias),
+    $sql = mysql_query("SELECT  ni.user_id,ni.pref, a.alias,
 				u.prenom, IF(u.epouse='', u.nom, u.epouse)
 			  FROM  newsletter_ins AS ni
 		    INNER JOIN  auth_user_md5  AS u  USING(user_id)
-		     LEFT JOIN  aliases        AS e  ON(u.user_id=e.id AND e.type='epouse')
-		    INNER JOIN  aliases        AS a  ON(u.user_id=a.id AND a.type!='homonyme')
-		    LEFT  JOIN  aliases        AS b  ON(u.user_id=b.id AND a.type!='homonyme'
-							AND LENGTH(a.alias)>LENGTH(b.alias))
-		         WHERE  b.alias IS NULL AND ni.last<$id 
+		    INNER JOIN  aliases        AS a  ON(u.user_id=a.id AND FIND_IN_SET('bestalias',a.flags)
+		         WHERE  ni.last<$id 
 			 LIMIT  60");
     if(!mysql_num_rows($sql)) exit(0);
     $sent = Array();
-    while(list($uid,$fmt,$forlife,$prenom,$nom,$sexe) = mysql_fetch_row($sql)) {
+    while(list($uid,$fmt,$bestalias,$prenom,$nom,$sexe) = mysql_fetch_row($sql)) {
 	$sent[] = "user_id='$uid'";
-	$nl->sendTo($prenom,$nom,$forlife,$sexe,$html=='html');
+	$nl->sendTo($prenom,$nom,$bestalias,$sexe,$html=='html');
     }
     mysql_free_result($sql);
     mysql_query("UPDATE newsletter_ins SET last=$id WHERE ".implode(' OR ',$sent));
diff --git a/scripts/cron/send_notifs.php b/scripts/cron/send_notifs.php
index fbd085d..a6e1019 100755
--- a/scripts/cron/send_notifs.php
+++ b/scripts/cron/send_notifs.php
@@ -19,7 +19,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: send_notifs.php,v 1.3 2004-11-16 21:02:47 x2000habouzit Exp $
+        $Id: send_notifs.php,v 1.4 2004-11-17 11:20:14 x2000habouzit Exp $
  ***************************************************************************/
 
 require('./connect.db.inc.php');
@@ -54,7 +54,7 @@ foreach($all->_data as $u) {
     
     $mailer = new HermesMailer();
     $mailer->setFrom("Carnet Polytechnicien <support_carnet@polytechnique.org>");
-    $mailer->addTo("\"{$u['prenom']} {$u['nom']}\" <{$u['forlife']}@polytechnique.org>");
+    $mailer->addTo("\"{$u['prenom']} {$u['nom']}\" <{$u['bestalias']}@polytechnique.org>");
     $mailer->setSubject("Notifications de la semaine ".date("W - Y"));
     $mailer->setTxtBody($text);
     $mailer->send();
diff --git a/templates/carnet/panel.tpl b/templates/carnet/panel.tpl
index ed7bf65..e14db7a 100644
--- a/templates/carnet/panel.tpl
+++ b/templates/carnet/panel.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: panel.tpl,v 1.5 2004-11-13 15:56:36 x2000habouzit Exp $
+        $Id: panel.tpl,v 1.6 2004-11-17 11:20:14 x2000habouzit Exp $
  ***************************************************************************}
 
 <h1>Bilan des Notifications</h1>
@@ -51,11 +51,11 @@ Il faut pour cel
     <td class='titre' style="width:15%">{if $smarty.section.row.first}{$p}{/if}</td>
     <td>
       {if $promo[row].inscrit}
-      <a href="{"fiche.php"|url}?user={$promo[row].forlife}" class="popup2">
+      <a href="{"fiche.php"|url}?user={$promo[row].bestalias}" class="popup2">
         {$promo[row].prenom} {$promo[row].nom}
       </a>
       {if !$promo[row].contact}
-      <a href="{"carnet/mescontacts.php"|url}?action=ajouter&amp;user={$promo[row].forlife}">{*
+      <a href="{"carnet/mescontacts.php"|url}?action=ajouter&amp;user={$promo[row].bestalias}">{*
         *}<img src="{"images/ajouter.gif"|url}" alt="ajouter à mes contacts" />{*
       *}</a>
       {/if}