From: x2000habouzit <x2000habouzit>
Date: Mon, 15 Nov 2004 09:22:14 +0000 (+0000)
Subject: backports
X-Git-Tag: xorg/old~936
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=a19b10d2c86332f92a6b4d6ebfda9f2b9ede4127;p=platal.git

backports
---

diff --git a/htdocs/banana/include/format.inc.php b/htdocs/banana/include/format.inc.php
index dcd0059..736a75a 100644
--- a/htdocs/banana/include/format.inc.php
+++ b/htdocs/banana/include/format.inc.php
@@ -130,8 +130,7 @@ function formatDisplayHeader($_header,$_text,$_spool) {
       .'"  alt="x-face" />';
     case "xorgid":
       return "$_text".(preg_match("/[\w]+\.[\w\d]+/",$_text)?
-        " [<a href=\"javascript:x()\"  onclick=\"popWin('"
-        .url("fiche.php")."?user=$_text')\">fiche</a>]":"");
+        " [<a href=\"".url("fiche.php")."?user=$_text\" class='popup2'>fiche</a>]":"");
     default:
       return htmlentities($_text);
   }
diff --git a/htdocs/javascript/xorg.js b/htdocs/javascript/xorg.js
index fbd8c9f..5969a39 100644
--- a/htdocs/javascript/xorg.js
+++ b/htdocs/javascript/xorg.js
@@ -50,7 +50,7 @@ function auto_links() {
     fqdn = fqdn.replace(/^https?:\/\/([^\/]*)\/.*$/,'$1');
     for(var i=0; i<nodes.length; i++) {
 	node = nodes[i];
-	if(!node.href || node.className == 'xdx') continue;
+	if(!node.href || node.className == 'xdx' || node.href.indexOf('mailto:') > -1 ) continue;
 	if(node.href.indexOf(fqdn)<0 || node.className == 'popup') {
 	    node.onclick = function () { window.open(this.href); return false; };
 	}
diff --git a/htdocs/marketing/relance.php b/htdocs/marketing/relance.php
index 478172b..89c14d6 100644
--- a/htdocs/marketing/relance.php
+++ b/htdocs/marketing/relance.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: relance.php,v 1.3 2004-08-31 13:59:42 x2000habouzit Exp $
+        $Id: relance.php,v 1.4 2004-11-15 09:22:15 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -36,8 +36,7 @@ if (isset($_POST["relancer"]) && isset($_POST["relancer"]) != "") {
 
     $res = $globals->db->query("SELECT  e.date,e.promo,e.nom,e.prenom,e.matricule,e.email,e.username
                           FROM  en_cours      AS e
-                     LEFT JOIN  auth_user_md5 AS a ON e.matricule=a.matricule
-                         WHERE  a.nom IS null");
+                    INNER JOIN  auth_user_md5 AS a ON (e.matricule=a.matricule AND a.perms = 'non-inscrit')");
 
     $sent = Array();
 
@@ -76,8 +75,7 @@ if (isset($_POST["relancer"]) && isset($_POST["relancer"]) != "") {
 
 $sql = "SELECT  e.date,e.relance,e.promo,e.nom,e.prenom,e.matricule
           FROM  en_cours      AS e
-     LEFT JOIN  auth_user_md5 AS a ON e.matricule=a.matricule
-         WHERE  a.nom IS null
+    INNER JOIN  auth_user_md5 AS a ON (e.matricule=a.matricule AND a.perms = 'non-inscrit')
       ORDER BY  date DESC";
 
 $page ->mysql_assign($sql, 'relance','nb');