update wrt new perms + backport

diff --git a/htdocs/marketing/public.php b/htdocs/marketing/public.php
index 781c3a7..42139e4 100644 (file)
--- a/htdocs/marketing/public.php
+++ b/htdocs/marketing/public.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: public.php,v 1.6 2004-10-31 16:39:06 x2000chevalier Exp $
+        $Id: public.php,v 1.7 2004-11-18 14:43:27 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -28,7 +28,7 @@ if (! isset($_REQUEST["num"])) { exit; }
 
 $mat = $_REQUEST["num"];
 
-$res = $globals->db->query("SELECT nom,prenom,promo FROM auth_user_md5 WHERE matricule = '$mat'");
+$res = $globals->db->query("SELECT nom,prenom,promo FROM auth_user_md5 WHERE matricule = '$mat' AND perms='non-inscrit'");
 if (list($nom, $prenom, $promo) = mysql_fetch_row($res)) {
     $page->assign('prenom', $prenom);
     $page->assign('nom', $nom);

diff --git a/htdocs/marketing/utilisateurs_marketing.php b/htdocs/marketing/utilisateurs_marketing.php
index 1827bc4..3df3e2d 100644 (file)
--- a/htdocs/marketing/utilisateurs_marketing.php
+++ b/htdocs/marketing/utilisateurs_marketing.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: utilisateurs_marketing.php,v 1.9 2004-10-31 16:39:06 x2000chevalier Exp $
+        $Id: utilisateurs_marketing.php,v 1.10 2004-11-18 14:43:27 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -28,7 +28,7 @@ require("select_user.inc.php");
 //actions possible une fois un X désigné par son matricule
 switch ($_REQUEST["submit"]) {
     case "Mailer":
-       $result=$globals->db->query("SELECT user_id FROM auth_user_md5 where matricule=".$_REQUEST["xmat"]);
+       $result=$globals->db->query("SELECT user_id FROM auth_user_md5 where matricule={$_REQUEST['xmat']} AND perms!='non-inscrit'");
        if ($myrow = mysql_fetch_assoc($result)) 
             exit_error("Le matricule existe déjà dans la table auth_user_md5.");
   
@@ -49,7 +49,7 @@ switch ($_REQUEST["submit"]) {
 
     case "Envoyer le mail":
         require('xorg.misc.inc.php');
-       $result=$globals->db->query("SELECT user_id FROM auth_user_md5 where matricule=".$_REQUEST["xmat"]);
+       $result=$globals->db->query("SELECT user_id FROM auth_user_md5 where matricule={$_REQUEST['xmat']} AND perms!='non-inscrit'");
        if ($myrow = mysql_fetch_assoc($result))
             exit_error("Le matricule existe déjà dans la table auth_user_md5.");