marketing : litte bugfix, and bestalias rather than forlife

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-107

diff --git a/include/select_user.inc.php b/include/select_user.inc.php
index 0bcc6bb..6ce6e3c 100644 (file)
--- a/include/select_user.inc.php
+++ b/include/select_user.inc.php
@@ -36,14 +36,14 @@ if (!Env::has("xmat") || !Env::has("submit")) {
        $chaine2 = strtok(" -'");
         $chaine  = ( strlen($chaine2) > strlen($chaine1) ) ? $chaine2 : $chaine1;
 
-        $rq = strlen(Env::get("promoR")==4 ? "AND promo=".Env::getInt("promoR") : "";
+        $rq = strlen(Env::get("promoR")==4 ? "AND promo=".Env::getInt("promoR") : "");
 
        $where = "prenom LIKE '%$prenom%' AND nom LIKE '%$chaine%' $rq ORDER BY promo,nom";
     }
 
     $sql = "SELECT  matricule,matricule_ax,promo,nom,prenom,comment,appli,flags,last_known_email,deces,user_id
               FROM  auth_user_md5
-             WHERE  perms IN ('admin','user') AND deces=0 AND $where";
+             WHERE  perms NOT IN ('admin','user') AND deces=0 AND $where";
 
     new_admin_page('marketing/utilisateurs_select.tpl');
     $page->mysql_assign($sql, 'nonins');

diff --git a/templates/marketing/utilisateurs_form.tpl b/templates/marketing/utilisateurs_form.tpl
index 6bf9eb4..abe9a6d 100644 (file)
--- a/templates/marketing/utilisateurs_form.tpl
+++ b/templates/marketing/utilisateurs_form.tpl
@@ -67,7 +67,7 @@ calculé à partir de ces donn
       </td>
       <td>
         <input type="text" size="40" maxlength="60" name="from"
-        value="{$smarty.request.from|default:"`$smarty.session.forlife`@polytechnique.org"}" />
+        value="{$smarty.request.from|default:"`$smarty.session.bestalias`@polytechnique.org"}" />
       </td>
     </tr>
     <tr>