From d99c76ebc76580a8c7147f6212d10b9c5ff9616e Mon Sep 17 00:00:00 2001 From: x2000habouzit Date: Thu, 18 Nov 2004 14:24:02 +0000 Subject: [PATCH] update wrt new perms --- include/identification.inc.php | 6 +++--- include/notifs.inc.php | 20 ++++++++++---------- include/select_user.inc.php | 4 ++-- include/user.func.inc.php | 4 ++-- include/xorg.globals.inc.php | 30 +++++++++++++++--------------- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/include/identification.inc.php b/include/identification.inc.php index ab59e2e..e6f346b 100644 --- a/include/identification.inc.php +++ b/include/identification.inc.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: identification.inc.php,v 1.17 2004-11-16 21:02:46 x2000habouzit Exp $ + $Id: identification.inc.php,v 1.18 2004-11-18 14:24:02 x2000habouzit Exp $ ***************************************************************************/ require_once('xorg.misc.inc.php'); @@ -87,7 +87,7 @@ if ($promo > 1995) { // sinon le même X pourrait s'inscrire deux fois avec le même matricule // exemple yann.buril et yann.buril-dupont seraient acceptés ! alors que // le matricule est unique - $result=$globals->db->query("SELECT user_id FROM auth_user_md5 WHERE matricule=$matricule AND perms != 'non-inscrit'"); + $result=$globals->db->query("SELECT user_id FROM auth_user_md5 WHERE matricule=$matricule AND perms IN('admin','user')"); if (mysql_num_rows($result)) { $str="Matricule déjà existant. Causes possibles\n" ."- tu t'es trompé de matricule\n" @@ -156,7 +156,7 @@ if ($promo > 1995) { // exemple yann.buril et yan.buril seraient acceptés ! alors que le matricule // est unique if (! empty($matricule)) { - $result=$globals->db->query("SELECT * FROM auth_user_md5 WHERE matricule='".$matricule."' AND perms != 'non-inscrit'"); + $result=$globals->db->query("SELECT * FROM auth_user_md5 WHERE matricule='".$matricule."' AND perms IN ('admin','user')"); if ($myrow = mysql_fetch_array($result)) { $str="Tu t'es déjà inscrit une fois.\n" ."Ecris à support@polytechnique.org pour tout problème."; diff --git a/include/notifs.inc.php b/include/notifs.inc.php index 700e9cc..3452fec 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.19 2004-11-17 11:20:13 x2000habouzit Exp $ + $Id: notifs.inc.php,v 1.20 2004-11-18 14:24:02 x2000habouzit Exp $ ***************************************************************************/ define("WATCH_FICHE", 1); @@ -57,7 +57,7 @@ function getNbNotifs() { $res = $globals->db->query(" ( 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 + wo.*, 1 AS contact, (u.perms IN ('admin','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) @@ -67,7 +67,7 @@ function getNbNotifs() { 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 bestalias, - wo.*, NOT (c.contact IS NULL) AS contact, (u.perms='admin' OR u.perms='user') AS inscrit + wo.*, NOT (c.contact IS NULL) AS contact, (u.perms IN ('admin','user')) AS inscrit FROM watch_promo AS w INNER JOIN auth_user_md5 AS u USING(promo) INNER JOIN auth_user_quick AS q ON(q.user_id = w.uid) @@ -79,7 +79,7 @@ function getNbNotifs() { 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 bestalias, - wo.*, 0 AS contact, (u.perms='admin' OR u.perms='user') AS inscrit + wo.*, 0 AS contact, (u.perms IN ('admin','user')) AS inscrit FROM watch_nonins AS w INNER JOIN auth_user_quick AS q ON(q.user_id = w.uid) INNER JOIN auth_user_md5 AS u ON(w.ni_id=u.user_id) @@ -117,7 +117,7 @@ class AllNotifs { SELECT q.user_id AS aid, v.prenom AS aprenom, IF(v.epouse='',v.nom,v.prenom) AS anom, 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 + wo.*, 1 AS contact, (u.perms IN ('admin','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 FIND_IN_SET('bestalias',b.flags)) @@ -131,7 +131,7 @@ class AllNotifs { SELECT q.user_id AS aid, v.prenom AS aprenom, IF(v.epouse='',v.nom,v.prenom) AS anom, 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 + wo.*, NOT (c.contact IS NULL) AS contact, (u.perms IN ('admin','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 FIND_IN_SET('bestalias',b.flags)) @@ -147,7 +147,7 @@ class AllNotifs { SELECT q.user_id AS aid, v.prenom AS aprenom, IF(v.epouse='',v.nom,v.prenom) AS anom, 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 + wo.*, 0 AS contact, (u.perms IN ('admin','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 FIND_IN_SET('bestalias',b.flags)) @@ -189,7 +189,7 @@ class Notifs { $res = $globals->db->query(" ( 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 + wo.*, 1 AS contact, (u.perms IN ('admin','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) @@ -199,7 +199,7 @@ class Notifs { 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 bestalias, - wo.*, NOT (c.contact IS NULL) AS contact, (u.perms='admin' OR u.perms='user') AS inscrit + wo.*, NOT (c.contact IS NULL) AS contact, (u.perms IN ('admin','user')) AS inscrit FROM watch_promo AS w 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) @@ -210,7 +210,7 @@ class Notifs { 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 bestalias, - wo.*, 0 AS contact, (u.perms='admin' OR u.perms='user') AS inscrit + wo.*, 0 AS contact, (u.perms IN ('admin','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) diff --git a/include/select_user.inc.php b/include/select_user.inc.php index 338f57b..bf1ca02 100644 --- a/include/select_user.inc.php +++ b/include/select_user.inc.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: select_user.inc.php,v 1.4 2004-10-31 16:12:12 x2000chevalier Exp $ + $Id: select_user.inc.php,v 1.5 2004-11-18 14:24:02 x2000habouzit Exp $ ***************************************************************************/ if(empty($_REQUEST["xmat"]) || empty($_REQUEST["submit"])) { @@ -62,7 +62,7 @@ if(empty($_REQUEST["xmat"]) || empty($_REQUEST["submit"])) { $sql = "SELECT matricule,matricule_ax,promo,nom,prenom,comment,appli,flags,last_known_email,deces,user_id FROM auth_user_md5 - WHERE perms = 'non-inscrit' AND deces=0 AND $where"; + WHERE perms IN ('admin','user') AND deces=0 AND $where"; new_admin_page('marketing/utilisateurs_select.tpl'); $page->mysql_assign($sql, 'nonins'); diff --git a/include/user.func.inc.php b/include/user.func.inc.php index 0991290..fb87b81 100644 --- a/include/user.func.inc.php +++ b/include/user.func.inc.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: user.func.inc.php,v 1.1 2004-11-18 13:45:48 x2000habouzit Exp $ + $Id: user.func.inc.php,v 1.2 2004-11-18 14:24:02 x2000habouzit Exp $ ***************************************************************************/ @@ -72,7 +72,7 @@ function inscription_forum_promo($uid,$promo) { // récupération de l'id du forum promo $result=$globals->db->query("SELECT fid FROM forums.list WHERE nom='xorg.promo.x$promo'"); if (!list($fid)=mysql_fetch_row($result)) { // pas de forum promo, il faut le créer - $req_au=$globals->db->query("SELECT count(*) FROM auth_user_md5 WHERE promo='$promo' AND perms!='non-inscrit'"); + $req_au=$globals->db->query("SELECT count(*) FROM auth_user_md5 WHERE promo='$promo' AND perms IN ('admin','user')"); list($effau) = mysql_fetch_row($req_au); $req_id=$globals->db->query("SELECT count(*) FROM auth_user_md5 WHERE promo='$promo'"); list($effid) = mysql_fetch_row($req_id); diff --git a/include/xorg.globals.inc.php b/include/xorg.globals.inc.php index 84fd47d..3d969fe 100644 --- a/include/xorg.globals.inc.php +++ b/include/xorg.globals.inc.php @@ -18,27 +18,27 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: xorg.globals.inc.php,v 1.5 2004-11-02 07:16:30 x2000habouzit Exp $ + $Id: xorg.globals.inc.php,v 1.6 2004-11-18 14:24:02 x2000habouzit Exp $ ***************************************************************************/ require("diogenes.core.globals.inc.php"); class XorgGlobals extends DiogenesCoreGlobals { - var $page = 'XorgPage'; - var $session = 'XorgSession'; + var $page = 'XorgPage'; + var $session = 'XorgSession'; - var $dbdb = 'x4dat'; - var $table_auth = 'auth_user_md5'; - var $table_log_actions = 'logger.actions'; - var $table_log_sessions = 'logger.sessions'; - var $table_log_events = 'logger.events'; + var $dbdb = 'x4dat'; + var $table_auth = 'auth_user_md5'; + var $table_log_actions = 'logger.actions'; + var $table_log_sessions = 'logger.sessions'; + var $table_log_events = 'logger.events'; - /** logger */ - var $tauth = array('native'=>"auth_user_md5"); - var $tlabel = array('native'=>"X.Org"); - - /** recherche */ - var $public_max_search_results = 25; - var $search_results_per_page = 20; + /** logger */ + var $tauth = array('native'=>"auth_user_md5"); + var $tlabel = array('native'=>"X.Org"); + + /** recherche */ + var $public_max_search_results = 25; + var $search_results_per_page = 20; } ?> -- 2.1.4