From 00112b2e8cd1e6e37d06135e6279380f7e2aaa73 Mon Sep 17 00:00:00 2001 From: Vincent Zanotti Date: Mon, 9 Nov 2009 02:51:08 +0100 Subject: [PATCH] Adds support for database tablename prefixs. Signed-off-by: Vincent Zanotti --- bin/cron/checkdb.php | 8 +- bin/cron/compliance.php | 22 ++--- bin/cron/cron_validations.php | 4 +- classes/platalglobals.php.in | 5 +- classes/platallogger.php | 8 +- classes/xnetpage.php | 4 +- classes/xnetsession.php | 4 +- classes/xorgsession.php | 4 +- core | 2 +- htdocs/listes_redirect.php | 2 +- include/banana/forum.inc.php | 4 +- include/banana/hooks.inc.php | 4 +- include/reminder/promotion_ml.inc.php | 8 +- include/user.func.inc.php | 8 +- include/userset.inc.php | 2 +- include/validations/listes.inc.php | 10 +-- include/validations/paiements.inc.php | 14 ++-- modules/admin.php | 56 ++++++------- modules/auth/auth.inc.php | 4 +- modules/forums.php | 2 +- modules/lists.php | 6 +- modules/lists/lists.inc.php | 6 +- modules/payment.php | 36 ++++---- modules/payment/money.inc.php | 6 +- modules/profile.php | 8 +- modules/profile/groups.inc.php | 8 +- modules/register.php | 8 +- modules/search.php | 14 ++-- modules/search/classes.inc.php | 2 +- modules/search/search.inc.php | 2 +- modules/xnet.php | 45 +++++----- modules/xnetevents.php | 90 ++++++++++---------- modules/xnetevents/xnetevents.inc.php | 62 +++++++------- modules/xnetgrp.php | 154 +++++++++++++++++----------------- modules/xnetgrp/feed.inc.php | 12 +-- modules/xnetgrp/mail.inc.php | 8 +- modules/xnetlists.php | 56 ++++++------- templates/payment/index.tpl | 4 +- 38 files changed, 353 insertions(+), 349 deletions(-) diff --git a/bin/cron/checkdb.php b/bin/cron/checkdb.php index 60970dc..6988415 100755 --- a/bin/cron/checkdb.php +++ b/bin/cron/checkdb.php @@ -111,10 +111,10 @@ check("select c.* from contacts as c left join auth_user_md5 as u on u.user_id=c check("select e.* from emails as e left join auth_user_md5 as u on u.user_id=e.uid where e.uid and u.prenom is null"); /* validite de forums */ -check("select f.* from forums.abos as f left join auth_user_md5 as u on u.user_id=f.uid where u.prenom is null"); -check("select f.* from forums.abos as f left join forums.list as fd on fd.fid=f.fid where fd.nom is null"); -check("select f.* from forums.respofaqs as f left join forums.list as fd on fd.fid=f.fid where fd.nom is null"); -check("select f.* from forums.respofaqs as f left join auth_user_md5 as u on u.user_id=f.uid where u.prenom is null"); +check("select f.* from #forums#.abos as f left join #x4dat#.auth_user_md5 as u on u.user_id=f.uid where u.prenom is null"); +check("select f.* from #forums#.abos as f left join #forums#.list as fd on fd.fid=f.fid where fd.nom is null"); +check("select f.* from #forums#.respofaqs as f left join #forums#.list as fd on fd.fid=f.fid where fd.nom is null"); +check("select f.* from #forums#.respofaqs as f left join #x4dat#.auth_user_md5 as u on u.user_id=f.uid where u.prenom is null"); /* validite de groupesx_ins */ check("select g.* from groupesx_ins as g left join auth_user_md5 as u on u.user_id=g.guid where u.prenom is null"); diff --git a/bin/cron/compliance.php b/bin/cron/compliance.php index 0a07a15..4879770 100755 --- a/bin/cron/compliance.php +++ b/bin/cron/compliance.php @@ -32,15 +32,15 @@ require('./connect.db.inc.php'); */ function discardExpiredSessions($userPerms, $retentionPeriod, $minimalBacklog) { XDB::execute( - "DELETE logger.s - FROM logger.sessions AS s + "DELETE #logger#.s + FROM #logger#.sessions AS s JOIN (SELECT u.user_id, (SELECT us.start - FROM logger.sessions AS us + FROM #logger#.sessions AS us WHERE us.uid = u.user_id ORDER BY us.start DESC LIMIT {?}, 1) AS no_discard_limit - FROM x4dat.auth_user_md5 AS u + FROM #x4dat#.auth_user_md5 AS u WHERE u.perms = {?} ORDER BY u.user_id ASC) AS ut ON (ut.user_id = s.uid) WHERE s.start < DATE_SUB(NOW(), INTERVAL {?} MONTH) @@ -57,8 +57,8 @@ function discardExpiredSessions($userPerms, $retentionPeriod, $minimalBacklog) { function checkOrphanedSessions() { $res = XDB::query( "SELECT COUNT(*) - FROM logger.sessions AS s - LEFT JOIN x4dat.auth_user_md5 AS u ON (u.user_id = s.uid) + FROM #logger#.sessions AS s + LEFT JOIN #x4dat#.auth_user_md5 AS u ON (u.user_id = s.uid) WHERE u.user_id IS NULL"); if (($count = $res->fetchOneCell())) { echo "Orphaned sessions: found $count orphaned sessions. Please fix that.\n"; @@ -70,9 +70,9 @@ function checkOrphanedSessions() { */ function purgeOrphanedEvents() { XDB::execute( - "DELETE logger.e - FROM logger.events AS e - LEFT JOIN logger.sessions AS s ON (s.id = e.session) + "DELETE #logger#.e + FROM #logger#.events AS e + LEFT JOIN #logger#.sessions AS s ON (s.id = e.session) WHERE s.id IS NULL"); $affectedRows = XDB::affectedRows(); echo "Orphaned events: removed $affectedRows events.\n"; @@ -93,8 +93,8 @@ checkOrphanedSessions(); purgeOrphanedEvents(); // Many rows have been removed from the two logger tables. Let's optimize them. -XDB::execute("OPTIMIZE TABLE logger.events"); -XDB::execute("OPTIMIZE TABLE logger.sessions"); +XDB::execute("OPTIMIZE TABLE #logger#.events"); +XDB::execute("OPTIMIZE TABLE #logger#.sessions"); // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?> diff --git a/bin/cron/cron_validations.php b/bin/cron/cron_validations.php index bdf7330..3948493 100755 --- a/bin/cron/cron_validations.php +++ b/bin/cron/cron_validations.php @@ -31,7 +31,7 @@ require('plmailer.php'); $res = XDB::query("SELECT count(r.stamp), UNIX_TIMESTAMP(MIN(r.stamp)), sum(r.stamp < NOW() - $M_PERIOD), sum(r.stamp < NOW() - $R_PERIOD) - FROM x4dat.requests AS r"); + FROM requests AS r"); list($nb, $age, $nbold, $nbveryold) = $res->fetchOneRow(); $age = (time() - intval($age)) / 86400; @@ -70,7 +70,7 @@ $message = ."https://www.polytechnique.org/admin/validate\n\n" ."Par catégorie :\n"; $res = XDB::iterRow("SELECT type, count(*) - FROM x4dat.requests + FROM requests GROUP BY type ORDER BY type"); while (list($type, $nb) = $res->next()) { diff --git a/classes/platalglobals.php.in b/classes/platalglobals.php.in index a35c3c1..0fb6e6f 100644 --- a/classes/platalglobals.php.in +++ b/classes/platalglobals.php.in @@ -26,6 +26,7 @@ class PlatalGlobals extends PlGlobals /** db params */ public $dbdb = 'x4dat'; + public $dbprefix = ''; public $dbhost = 'localhost'; public $dbuser = 'x4dat'; public $dbpwd = 'x4dat'; @@ -63,8 +64,8 @@ class PlatalGlobals extends PlGlobals $res = XDB::query("SELECT a.*, d.nom AS domnom, FIND_IN_SET('notif_unsub', a.flags) AS notif_unsub, FIND_IN_SET('has_ml', a.flags) AS has_ml - FROM groupex.asso AS a - LEFT JOIN groupex.dom AS d ON d.id = a.dom + FROM #groupex#.asso AS a + LEFT JOIN #groupex#.dom AS d ON d.id = a.dom WHERE diminutif = {?}", $gp); if (!($aid = $res->fetchOneAssoc())) { diff --git a/classes/platallogger.php b/classes/platallogger.php index 7ebdab0..9e9e535 100644 --- a/classes/platallogger.php +++ b/classes/platallogger.php @@ -45,7 +45,7 @@ class PlatalLogger extends PlLogger $this->session = $this->writeSession($uid, $suid); // retrieve available actions - $res = XDB::iterRow("SELECT id, text FROM logger.actions"); + $res = XDB::iterRow("SELECT id, text FROM #logger#.actions"); while (list($action_id, $action_text) = $res->next()) { $this->actions[$action_text] = $action_id; @@ -74,7 +74,7 @@ class PlatalLogger extends PlLogger $proxy = 'proxy'; } - XDB::execute("INSERT INTO logger.sessions + XDB::execute("INSERT INTO #logger#.sessions SET uid={?}, host={?}, ip={?}, forward_ip={?}, forward_host={?}, browser={?}, suid={?}, flags={?}", $uid, $host, ip_to_uint($ip), ip_to_uint($forward_ip), $forward_host, $browser, $suid, $proxy); if ($forward_ip) { @@ -91,7 +91,7 @@ class PlatalLogger extends PlLogger } public function saveLastSession() { - XDB::execute('REPLACE INTO logger.last_sessions (uid, id) + XDB::execute('REPLACE INTO #logger#.last_sessions (uid, id) VALUES ({?}, {?})', $this->uid, $this->session); } @@ -109,7 +109,7 @@ class PlatalLogger extends PlLogger public function log($action, $data = null) { if (isset($this->actions[$action])) { - XDB::execute("INSERT INTO logger.events + XDB::execute("INSERT INTO #logger#.events SET session={?}, action={?}, data={?}", $this->session, $this->actions[$action], $data); } else { diff --git a/classes/xnetpage.php b/classes/xnetpage.php index 9839749..29e8ea3 100644 --- a/classes/xnetpage.php +++ b/classes/xnetpage.php @@ -144,8 +144,8 @@ function list_all_my_groups($params) } $res = XDB::iterRow( "SELECT a.nom, a.diminutif - FROM groupex.asso AS a - INNER JOIN groupex.membres AS m ON m.asso_id = a.id + FROM #groupex#.asso AS a + INNER JOIN #groupex#.membres AS m ON m.asso_id = a.id WHERE m.uid={?}", S::v('uid')); $links = 'déconnexion'; $html = '
Mes groupes (' . $links . ') :
'; diff --git a/classes/xnetsession.php b/classes/xnetsession.php index e69e6eb..1fffc9b 100644 --- a/classes/xnetsession.php +++ b/classes/xnetsession.php @@ -166,7 +166,7 @@ function may_update($force = false, $lose = false) $may_update[$asso_id] = true; } elseif (!isset($may_update[$asso_id]) || $force) { $res = XDB::query("SELECT perms - FROM groupex.membres + FROM #groupex#.membres WHERE uid={?} AND asso_id={?}", S::v('uid'), $asso_id); $may_update[$asso_id] = ($res->fetchOneCell() == 'admin'); @@ -198,7 +198,7 @@ function is_member($force = false, $lose = false) $is_member[$asso_id] = true; } elseif (!isset($is_member[$asso_id]) || $force) { $res = XDB::query("SELECT COUNT(*) - FROM groupex.membres + FROM #groupex#.membres WHERE uid={?} AND asso_id={?}", S::v('uid'), $asso_id); $is_member[$asso_id] = ($res->fetchOneCell() == 1); diff --git a/classes/xorgsession.php b/classes/xorgsession.php index 0e55c97..e46be2c 100644 --- a/classes/xorgsession.php +++ b/classes/xorgsession.php @@ -214,8 +214,8 @@ class XorgSession extends PlSession FROM auth_user_md5 AS u INNER JOIN auth_user_quick AS q USING(user_id) LEFT JOIN gapps_accounts AS g ON (u.user_id = g.l_userid AND g.g_status = 'active') - LEFT JOIN logger.last_sessions AS ls ON (ls.uid = u.user_id) - LEFT JOIN logger.sessions AS s ON(s.id = ls.id) + LEFT JOIN #logger#.last_sessions AS ls ON (ls.uid = u.user_id) + LEFT JOIN #logger#.sessions AS s ON(s.id = ls.id) WHERE u.user_id = {?} AND u.perms IN('admin', 'user')", $uid); if ($res->numRows() != 1) { return false; diff --git a/core b/core index bf9d90c..4d6eeac 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit bf9d90c0821df2c226822c4691ef5e8ec633490d +Subproject commit 4d6eeacc55d925a4efc6bbcfaff82a21da13e8f0 diff --git a/htdocs/listes_redirect.php b/htdocs/listes_redirect.php index 29ad13f..42a7dd9 100644 --- a/htdocs/listes_redirect.php +++ b/htdocs/listes_redirect.php @@ -35,7 +35,7 @@ if ($matches) { http_redirect("https://www.polytechnique.org/lists/$action/$mbox$sup"); } - $res = XDB::query("select diminutif from groupex.asso where mail_domain = {?}", $fqdn); + $res = XDB::query("SELECT diminutif FROM #groupex#.asso WHERE mail_domain = {?}", $fqdn); if ($gpx = $res->fetchOneCell()) { http_redirect("http://www.polytechnique.net/$gpx/lists/$action/$mbox$sup"); } diff --git a/include/banana/forum.inc.php b/include/banana/forum.inc.php index 7ccabd7..e3998c2 100644 --- a/include/banana/forum.inc.php +++ b/include/banana/forum.inc.php @@ -203,7 +203,7 @@ class ForumsBanana extends Banana $read = Post::s('read'); if (!in_array($unread, $colors) || !in_array($read, $colors)) { $page->trigError('Le choix de type pour l\'arborescence est invalide'); - } elseif (XDB::execute("REPLACE INTO forums.profils (uid, sig, mail, nom, flags, tree_unread, tree_read) + } elseif (XDB::execute("REPLACE INTO #forums#.profils (uid, sig, mail, nom, flags, tree_unread, tree_read) VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?})", S::v('uid'), Post::v('bananasig'), Post::v('bananamail'), Post::v('banananame'), @@ -221,7 +221,7 @@ class ForumsBanana extends Banana FIND_IN_SET('xface', flags), tree_unread, tree_read - FROM forums.profils + FROM #forums#.profils WHERE uid = {?}", S::v('uid')); if (!(list($nom, $mail, $sig, $disp, $maj, $xface, $unread, $read) = $req->fetchOneRow())) { $nom = S::v('prenom').' '.S::v('nom'); diff --git a/include/banana/hooks.inc.php b/include/banana/hooks.inc.php index ebd913c..703df77 100644 --- a/include/banana/hooks.inc.php +++ b/include/banana/hooks.inc.php @@ -186,8 +186,8 @@ function hook_getXFace($headers) } if (isset($headers['x-face'])) { $res = XDB::query("SELECT p.uid - FROM forums.profils AS p - INNER JOIN aliases AS a ON (p.uid = a.id) + FROM #forums#.profils AS p + INNER JOIN #x4dat#.aliases AS a ON (p.uid = a.id) WHERE FIND_IN_SET('xface', p.flags) AND a.alias = {?}", $login); if ($res->numRows()) { diff --git a/include/reminder/promotion_ml.inc.php b/include/reminder/promotion_ml.inc.php index b67b59b..ec1b0c5 100644 --- a/include/reminder/promotion_ml.inc.php +++ b/include/reminder/promotion_ml.inc.php @@ -26,11 +26,11 @@ class ReminderPromotionMl extends Reminder switch ($action) { case 'yes': $res = XDB::query('SELECT id - FROM groupex.asso + FROM #groupex#.asso WHERE diminutif = {?}', S::v('promo')); $asso_id = $res->fetchOneCell(); - XDB::execute('REPLACE INTO groupex.membres (uid, asso_id) + XDB::execute('REPLACE INTO #groupex#.membres (uid, asso_id) VALUES ({?}, {?})', S::v('uid'), $asso_id); $mmlist = new MMList(S::v('uid'), S::v('password')); @@ -67,9 +67,9 @@ class ReminderPromotionMl extends Reminder // We only test if the user is in her promotion group for it is too // expensive to check if she is in the corresponding ML as well. $res = XDB::query('SELECT COUNT(*) - FROM groupex.membres + FROM #groupex#.membres WHERE uid = {?} AND asso_id = (SELECT id - FROM groupex.asso + FROM #groupex#.asso WHERE diminutif = {?})', $user->id(), S::v('promo')); diff --git a/include/user.func.inc.php b/include/user.func.inc.php index 1a07456..c419197 100644 --- a/include/user.func.inc.php +++ b/include/user.func.inc.php @@ -41,8 +41,8 @@ function user_clear_all_subs($user_id, $really_del=true) 'user_id' => array('requests', 'user_changes')); if ($really_del) { - array_push($tables_to_clear['uid'], 'emails', 'groupex.membres', 'contacts', 'adresses', 'tels', - 'photo', 'perte_pass', 'langues_ins', 'forums.abos', 'forums.profils'); + array_push($tables_to_clear['uid'], 'emails', '#groupex#.membres', 'contacts', 'adresses', 'tels', + 'photo', 'perte_pass', 'langues_ins', '#forums#.abos', '#forums#.profils'); array_push($tables_to_clear['user_id'], 'newsletter_ins', 'auth_user_quick', 'binets_ins'); $tables_to_clear['id'] = array('aliases'); $tables_to_clear['contact'] = array('contacts'); @@ -327,8 +327,8 @@ function &get_user_details($login, $from_uid = '', $view = 'private') $user['binets_join'] = join(', ', $user['binets']); $res = XDB::iterRow("SELECT a.diminutif, a.nom, a.site - FROM groupex.asso AS a - LEFT JOIN groupex.membres AS m ON (m.asso_id = a.id) + FROM #groupex#.asso AS a + LEFT JOIN #groupex#.membres AS m ON (m.asso_id = a.id) WHERE m.uid = {?} AND (a.cat = 'GroupesX' OR a.cat = 'Institutions') AND pub = 'public'", $uid); $user['gpxs'] = Array(); diff --git a/include/userset.inc.php b/include/userset.inc.php index 100be7d..f97dbad 100644 --- a/include/userset.inc.php +++ b/include/userset.inc.php @@ -44,7 +44,7 @@ class UserSet extends PlSet global $globals; parent::__construct('auth_user_md5 AS u', (!empty($GLOBALS['IS_XNET_SITE']) ? - 'INNER JOIN groupex.membres AS gxm ON (u.user_id = gxm.uid + 'INNER JOIN #groupex#.membres AS gxm ON (u.user_id = gxm.uid AND gxm.asso_id = ' . $globals->asso('id') . ') ' : '') . 'LEFT JOIN auth_user_quick AS q USING (user_id)' . $joins, $where, diff --git a/include/validations/listes.inc.php b/include/validations/listes.inc.php index 9dd97c0..07003d8 100644 --- a/include/validations/listes.inc.php +++ b/include/validations/listes.inc.php @@ -125,14 +125,14 @@ class ListeReq extends Validate if ($this->asso == "alias") { $new = $this->liste . '@' . $this->domain; - XDB::query('INSERT INTO x4dat.virtual (alias, type) VALUES({?}, "user")', $new); + XDB::query('INSERT INTO virtual (alias, type) VALUES({?}, "user")', $new); foreach ($this->members as $member) { $user = User::get($member); if ($user != null) { XDB::query( - "INSERT INTO x4dat.virtual_redirect (vid, redirect) + "INSERT INTO virtual_redirect (vid, redirect) SELECT vid, {?} - FROM x4dat.virtual + FROM virtual WHERE alias = {?}", $user->forlifeEmail(), $new); } } @@ -155,9 +155,9 @@ class ListeReq extends Validate $app = '-' . $app; } $red = $this->domain . '_' . $liste; - XDB::execute('INSERT INTO x4dat.virtual (alias, type) + XDB::execute('INSERT INTO virtual (alias, type) VALUES({?}, {?})', $liste . $app . '@' . $this->domain, 'list'); - XDB::execute('INSERT INTO x4dat.virtual_redirect (vid, redirect) + XDB::execute('INSERT INTO virtual_redirect (vid, redirect) VALUES ({?}, {?})', XDB::insertId(), $red . $mdir . '@listes.polytechnique.org'); $list->mass_subscribe($liste, join(' ', $this->members)); diff --git a/include/validations/paiements.inc.php b/include/validations/paiements.inc.php index 01d3f25..0942529 100644 --- a/include/validations/paiements.inc.php +++ b/include/validations/paiements.inc.php @@ -60,11 +60,11 @@ Si le télépaiement n'est pas lié à un groupe ou supérieur à 51 euros, lais $this->montant_max = $_montantmax; if ($_asso_id) { - $res = XDB::query("SELECT nom FROM groupex.asso WHERE id = {?}", $_asso_id); + $res = XDB::query("SELECT nom FROM #groupex#.asso WHERE id = {?}", $_asso_id); $this->asso = $res->fetchOneCell(); } if ($_asso_id && $_evt) { - $res = XDB::query("SELECT intitule FROM groupex.evenements WHERE asso_id = {?} AND eid = {?}", $_asso_id, $_evt); + $res = XDB::query("SELECT intitule FROM #groupex#.evenements WHERE asso_id = {?} AND eid = {?}", $_asso_id, $_evt); $this->evt_intitule = $res->fetchOneCell(); } } @@ -165,9 +165,9 @@ Si le télépaiement n'est pas lié à un groupe ou supérieur à 51 euros, lais public function commit() { - $res = XDB::query("SELECT MAX(id) FROM paiement.paiements"); + $res = XDB::query("SELECT MAX(id) FROM #paiement#.paiements"); $id = $res->fetchOneCell()+1; - $ret = XDB::execute("INSERT INTO paiement.paiements VALUES + $ret = XDB::execute("INSERT INTO #paiement#.paiements VALUES ( {?}, {?}, {?}, '', {?}, {?}, {?}, {?}, {?}, {?} ) @@ -176,13 +176,13 @@ Si le télépaiement n'est pas lié à un groupe ou supérieur à 51 euros, lais $this->montant, $this->montant_min, $this->montant_max, $this->user->bestEmail(), $this->msg_reponse, $this->asso_id); if ($this->asso_id && $this->evt) { - XDB::execute("UPDATE groupex.evenements + XDB::execute("UPDATE #groupex#.evenements SET paiement_id = {?} WHERE asso_id = {?} AND eid = {?}", $id, $this->asso_id, $this->evt); $res = XDB::query("SELECT a.nom, a.diminutif, e.intitule - FROM groupex.asso AS a - INNER JOIN groupex.evenements AS e ON (a.id = e.asso_id) + FROM #groupex#.asso AS a + INNER JOIN #groupex#.evenements AS e ON (a.id = e.asso_id) WHERE e.eid = {?}", $this->evt); list($nom, $diminutif, $evt) = $res->fetchOneRow(); diff --git a/modules/admin.php b/modules/admin.php index cb96fed..77427d9 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -129,7 +129,7 @@ class AdminModule extends PLModule MONTH(MAX(start)), MONTH(MIN(start)), DAYOFMONTH(MAX(start)), DAYOFMONTH(MIN(start)) - FROM logger.sessions"); + FROM #logger#.sessions"); list($ymax, $ymin, $mmax, $mmin, $dmax, $dmin) = $res->fetchOneRow(); if (($year < $ymin) || ($year == $ymin && $month < $mmin)) { @@ -167,7 +167,7 @@ class AdminModule extends PLModule if ($year) { $res = XDB::query("SELECT YEAR (MAX(start)), YEAR (MIN(start)), MONTH(MAX(start)), MONTH(MIN(start)) - FROM logger.sessions"); + FROM #logger#.sessions"); list($ymax, $ymin, $mmax, $mmin) = $res->fetchOneRow(); if (($year < $ymin) || ($year > $ymax)) { @@ -197,7 +197,7 @@ class AdminModule extends PLModule $years[0] = "----"; // retrieve available years - $res = XDB::query("select YEAR(MAX(start)), YEAR(MIN(start)) FROM logger.sessions"); + $res = XDB::query("select YEAR(MAX(start)), YEAR(MIN(start)) FROM #logger#.sessions"); list($max, $min) = $res->fetchOneRow(); for($i = intval($min); $i<=$max; $i++) { @@ -257,16 +257,16 @@ class AdminModule extends PLModule // we are viewing a session $res = XDB::query("SELECT ls.*, a.alias AS username, sa.alias AS suer - FROM logger.sessions AS ls - LEFT JOIN aliases AS a ON (a.id = ls.uid AND a.type='a_vie') - LEFT JOIN aliases AS sa ON (sa.id = ls.suid AND sa.type='a_vie') + FROM #logger#.sessions AS ls + LEFT JOIN #x4dat#.aliases AS a ON (a.id = ls.uid AND a.type='a_vie') + LEFT JOIN #x4dat#.aliases AS sa ON (sa.id = ls.suid AND sa.type='a_vie') WHERE ls.id = {?}", $arg); $page->assign('session', $a = $res->fetchOneAssoc()); $res = XDB::iterator('SELECT a.text, e.data, e.stamp - FROM logger.events AS e - LEFT JOIN logger.actions AS a ON e.action=a.id + FROM #logger#.events AS e + LEFT JOIN #logger#.actions AS a ON e.action=a.id WHERE e.session={?}', $arg); while ($myarr = $res->next()) { $page->append('events', $myarr); @@ -316,8 +316,8 @@ class AdminModule extends PLModule $where = $this->_makeWhere($year, $month, $day, $loguid); $select = "SELECT s.id, s.start, s.uid, a.alias as username - FROM logger.sessions AS s - LEFT JOIN aliases AS a ON (a.id = s.uid AND a.type='a_vie') + FROM #logger#.sessions AS s + LEFT JOIN #x4dat#.aliases AS a ON (a.id = s.uid AND a.type='a_vie') $where ORDER BY start DESC"; $res = XDB::iterator($select); @@ -331,9 +331,9 @@ class AdminModule extends PLModule // attach events $sql = "SELECT s.id, a.text - FROM logger.sessions AS s - LEFT JOIN logger.events AS e ON(e.session=s.id) - INNER JOIN logger.actions AS a ON(a.id=e.action) + FROM #logger#.sessions AS s + LEFT JOIN #logger#.events AS e ON(e.session=s.id) + INNER JOIN #logger#.actions AS a ON(a.id=e.action) $where"; $res = XDB::iterator($sql); @@ -640,9 +640,9 @@ class AdminModule extends PLModule // Forum ban update. case "b_edit": - XDB::execute("DELETE FROM forums.innd WHERE uid = {?}", $user->id()); + XDB::execute("DELETE FROM #forums#.innd WHERE uid = {?}", $user->id()); if (Env::v('write_perm') != "" || Env::v('read_perm') != "" || Env::v('commentaire') != "" ) { - XDB::execute("INSERT INTO forums.innd + XDB::execute("INSERT INTO #forums#.innd SET ipmin = '0', ipmax = '4294967295', write_perm = {?}, read_perm = {?}, comment = {?}, priority = '200', uid = {?}", @@ -654,7 +654,7 @@ class AdminModule extends PLModule // Displays last login and last host information. $res = XDB::query("SELECT start, host - FROM logger.sessions + FROM #logger#.sessions WHERE uid = {?} AND suid = 0 ORDER BY start DESC LIMIT 1", $user->id()); @@ -689,7 +689,7 @@ class AdminModule extends PLModule // Displays forum bans. $res = XDB::query("SELECT write_perm, read_perm, comment - FROM forums.innd + FROM #forums#.innd WHERE uid = {?}", $user->id()); $bans = $res->fetchOneAssoc(); $page->assign('bans', $bans); @@ -894,8 +894,8 @@ class AdminModule extends PLModule $res = XDB::iterator( "SELECT u.promo, u.nom, u.prenom, u.deces, u.hruid, DATE(MAX(s.start)) AS last - FROM auth_user_md5 AS u - LEFT JOIN logger.sessions AS s ON (s.uid = u.user_id AND suid = 0) + FROM #x4dat#.auth_user_md5 AS u + LEFT JOIN #logger#.sessions AS s ON (s.uid = u.user_id AND suid = 0) WHERE perms IN ('admin', 'user') AND deces <> 0 GROUP BY u.user_id ORDER BY u.promo, u.nom"); @@ -1042,7 +1042,7 @@ class AdminModule extends PLModule function handler_logger_actions(&$page, $action = 'list', $id = null) { $page->setTitle('Administration - Actions'); $page->assign('title', 'Gestion des actions de logger'); - $table_editor = new PLTableEditor('admin/logger/actions','logger.actions','id'); + $table_editor = new PLTableEditor('admin/logger/actions','#logger#.actions','id'); $table_editor->describe('text','intitulé',true); $table_editor->describe('description','description',true); $table_editor->apply($page, $action, $id); @@ -1172,10 +1172,10 @@ class AdminModule extends PLModule IF(w.ip = s2.ip, s2.host, s2.forward_host), IF(w.ip = s.ip, s.host, s.forward_host)), w.mask, w.detection, w.state, u.hruid - FROM ip_watch AS w - LEFT JOIN logger.sessions AS s ON (s.ip = w.ip) - LEFT JOIN logger.sessions AS s2 ON (s2.forward_ip = w.ip) - LEFT JOIN auth_user_md5 AS u ON (u.user_id = s.uid) + FROM #x4dat#.ip_watch AS w + LEFT JOIN #logger#.sessions AS s ON (s.ip = w.ip) + LEFT JOIN #logger#.sessions AS s2 ON (s2.forward_ip = w.ip) + LEFT JOIN #x4dat#.auth_user_md5 AS u ON (u.user_id = s.uid) GROUP BY w.ip, u.hruid ORDER BY w.state, w.ip, u.hruid"; $it = Xdb::iterRow($sql); @@ -1206,10 +1206,10 @@ class AdminModule extends PLModule } elseif ($action == 'edit') { $sql = "SELECT w.detection, w.state, w.last, w.description, w.mask, u1.hruid AS edit, u2.hruid AS hruid, s.host - FROM ip_watch AS w - LEFT JOIN auth_user_md5 AS u1 ON (u1.user_id = w.uid) - LEFT JOIN logger.sessions AS s ON (w.ip = s.ip) - LEFT JOIN auth_user_md5 AS u2 ON (u2.user_id = s.uid) + FROM #x4dat#.ip_watch AS w + LEFT JOIN #x4dat#.auth_user_md5 AS u1 ON (u1.user_id = w.uid) + LEFT JOIN #logger#.sessions AS s ON (w.ip = s.ip) + LEFT JOIN #x4dat#.auth_user_md5 AS u2 ON (u2.user_id = s.uid) WHERE w.ip = {?} GROUP BY u2.hruid ORDER BY u2.hruid"; diff --git a/modules/auth/auth.inc.php b/modules/auth/auth.inc.php index c2b5737..ac5e41a 100644 --- a/modules/auth/auth.inc.php +++ b/modules/auth/auth.inc.php @@ -59,8 +59,8 @@ function gpex_make($chlg, $privkey, $datafields, $charset) } else if ($val == 'grpauth') { if (isset($_GET['group'])) { $res = XDB::query("SELECT perms - FROM groupex.membres - INNER JOIN groupex.asso ON(id = asso_id) + FROM #groupex#.membres + INNER JOIN #groupex#.asso ON(id = asso_id) WHERE uid = {?} AND diminutif = {?}", S::v('uid'), $_GET['group']); $perms = $res->fetchOneCell(); diff --git a/modules/forums.php b/modules/forums.php index a3ebc22..3890004 100644 --- a/modules/forums.php +++ b/modules/forums.php @@ -73,7 +73,7 @@ class ForumsModule extends PLModule { $page->setTitle('Administration - Bannissements des forums'); $page->assign('title', 'Gestion des mises au ban'); - $table_editor = new PLTableEditor('admin/forums','forums.innd','id_innd'); + $table_editor = new PLTableEditor('admin/forums','#forums#.innd','id_innd'); $table_editor->add_sort_field('priority', true, true); $table_editor->describe('read_perm','lecture',true); $table_editor->describe('write_perm','écriture',true); diff --git a/modules/lists.php b/modules/lists.php index f0d6f8f..02e119e 100644 --- a/modules/lists.php +++ b/modules/lists.php @@ -249,13 +249,13 @@ class ListsModule extends PLModule } $new = $liste . '@' . $domain; - $res = XDB::query('SELECT COUNT(*) FROM x4dat.virtual WHERE alias={?}', $new); + $res = XDB::query('SELECT COUNT(*) FROM virtual WHERE alias={?}', $new); } else { if ($asso == "groupex") { $groupex_name = Post::v('groupex_name'); - $res_groupe = XDB::query('SELECT mail_domain FROM groupex.asso WHERE nom={?}', $groupex_name); + $res_groupe = XDB::query('SELECT mail_domain FROM #groupex#.asso WHERE nom={?}', $groupex_name); $domain = $res_groupe->fetchOneCell(); if (!$domain) { @@ -263,7 +263,7 @@ class ListsModule extends PLModule } $new = $liste . '@' . $domain; - $res = XDB::query('SELECT COUNT(*) FROM x4dat.virtual WHERE alias={?}', $new); + $res = XDB::query('SELECT COUNT(*) FROM virtual WHERE alias={?}', $new); } else { $res = XDB::query("SELECT COUNT(*) FROM aliases WHERE alias={?}", $liste); $domain = $globals->mail->domain; diff --git a/modules/lists/lists.inc.php b/modules/lists/lists.inc.php index 8c9e81c..a6dc53a 100644 --- a/modules/lists/lists.inc.php +++ b/modules/lists/lists.inc.php @@ -94,9 +94,9 @@ function list_fetch_name($member) IF(m2.origine="X", u.nom, m1.nom) AS nom, IF(m2.origine="X", u.promo, "non-X") AS promo, 0 AS lost - FROM groupex.membres AS m1 - LEFT JOIN groupex.membres AS m2 ON(m1.email=m2.email AND m2.asso_id={?}) - LEFT JOIN auth_user_md5 AS u ON(m2.origine = "X" AND m2.uid = u.user_id) + FROM #groupex#.membres AS m1 + LEFT JOIN #groupex#.membres AS m2 ON(m1.email=m2.email AND m2.asso_id={?}) + LEFT JOIN #x4dat#.auth_user_md5 AS u ON(m2.origine = "X" AND m2.uid = u.user_id) WHERE m1.email={?}', $globals->asso('id'), $member); } if ($res->numRows() == 0) { diff --git a/modules/payment.php b/modules/payment.php index 415b607..84a285e 100644 --- a/modules/payment.php +++ b/modules/payment.php @@ -112,7 +112,7 @@ class PaymentModule extends PLModule return PL_NOT_FOUND; } $res = XDB::query("SELECT asso_id - FROM paiement.paiements + FROM #paiement#.paiements WHERE asso_id = {?} AND id = {?}", $globals->asso('id'), $ref); if (!$res->numRows()) { @@ -142,7 +142,7 @@ class PaymentModule extends PLModule $pay->prepareform($pay); } else { $res = XDB::iterator("SELECT timestamp, montant - FROM paiement.transactions + FROM #paiement#.transactions WHERE uid = {?} AND ref = {?} ORDER BY timestamp DESC", S::v('uid', -1), $ref); @@ -197,7 +197,7 @@ class PaymentModule extends PLModule echo ($ref = $matches[1]); $res = XDB::query("SELECT mail,text,confirmation - FROM paiement.paiements + FROM #paiement#.paiements WHERE id={?}", $ref); if (!list($conf_mail,$conf_title,$conf_text) = $res->fetchOneRow()) { cb_erreur("référence de commande inconnue"); @@ -206,8 +206,8 @@ class PaymentModule extends PLModule /* on extrait le code de retour */ if ($champ906 != "0000") { $res = XDB::query("SELECT rcb.text,c.id,c.text - FROM paiement.codeRCB AS rcb - LEFT JOIN paiement.codeC AS c ON rcb.codeC=c.id + FROM #paiement#.codeRCB AS rcb + LEFT JOIN #paiement#.codeC AS c ON rcb.codeC=c.id WHERE rcb.id={?}", $champ906); if (list($rcb_text, $c_id, $c_text) = $res->fetchOneRow()) { cb_erreur("erreur lors du paiement : $c_text ($c_id)"); @@ -217,13 +217,13 @@ class PaymentModule extends PLModule } /* on fait l'insertion en base de donnees */ - XDB::execute("INSERT INTO paiement.transactions (id,uid,ref,fullref,montant,cle,comment) + XDB::execute("INSERT INTO #paiement#.transactions (id,uid,ref,fullref,montant,cle,comment) VALUES ({?},{?},{?},{?},{?},{?},{?})", $champ901, $uid, $ref, $champ200, $montant, $champ905,Env::v('comment')); // We check if it is an Xnet payment and then update the related ML. $res = XDB::query('SELECT eid - FROM groupex.evenements + FROM #groupex#.evenements WHERE paiement_id = {?}', $ref); if ($eid = $res->fetchOneCell()) { $this->load('xnetevents.inc.php'); @@ -311,20 +311,20 @@ class PaymentModule extends PLModule $ref = $matches[1]; $res = XDB::query("SELECT mail,text,confirmation - FROM paiement.paiements + FROM #paiement#.paiements WHERE id={?}", $ref); if (!list($conf_mail,$conf_title,$conf_text) = $res->fetchOneRow()) { paypal_erreur("référence de commande inconnue"); } /* on fait l'insertion en base de donnees */ - XDB::execute("INSERT INTO paiement.transactions (id,uid,ref,fullref,montant,cle,comment) + XDB::execute("INSERT INTO #paiement#.transactions (id,uid,ref,fullref,montant,cle,comment) VALUES ({?},{?},{?},{?},{?},{?},{?})", $no_transaction, $uid, $ref, $fullref, $montant, $clef, Env::v('comment')); // We check if it is an Xnet payment and then update the related ML. $res = XDB::query('SELECT eid - FROM groupex.evenements + FROM #groupex#.evenements WHERE paiement_id = {?}', $ref); if ($eid = $res->fetchOneCell()) { $this->load('xnetevents.inc.php'); @@ -378,8 +378,8 @@ class PaymentModule extends PLModule return PL_FORBIDDEN; } $res = XDB::query("SELECT 1 - FROM groupex.evenements AS e - INNER JOIN groupex.evenements_participants AS ep ON (ep.eid = e.eid AND uid = {?}) + FROM #groupex#.evenements AS e + INNER JOIN #groupex#.evenements_participants AS ep ON (ep.eid = e.eid AND uid = {?}) WHERE e.paiement_id = {?} AND e.asso_id = {?}", S::i('uid'), $pid, $globals->asso('id')); if ($res->numRows() == 0) { @@ -454,9 +454,9 @@ class PaymentModule extends PLModule 'montant' => strtr($sum, '.', ',').' €'); } $res = XDB::iterRow("SELECT e.eid, e.short_name, e.intitule, ep.nb, ei.montant, ep.paid - FROM groupex.evenements AS e - LEFT JOIN groupex.evenements_participants AS ep ON (ep.eid = e.eid AND uid = {?}) - INNER JOIN groupex.evenements_items AS ei ON (ep.eid = ei.eid AND ep.item_id = ei.item_id) + FROM #groupex#.evenements AS e + LEFT JOIN #groupex#.evenements_participants AS ep ON (ep.eid = e.eid AND uid = {?}) + INNER JOIN #groupex#.evenements_items AS ei ON (ep.eid = ei.eid AND ep.item_id = ei.item_id) WHERE e.paiement_id = {?}", S::v('uid'), $pid); $event[$pid] = array(); @@ -490,11 +490,11 @@ class PaymentModule extends PLModule function handler_admin(&$page, $action = 'list', $id = null) { $page->setTitle('Administration - Paiements'); $page->assign('title', 'Gestion des télépaiements'); - $table_editor = new PLTableEditor('admin/payments','paiement.paiements','id'); - $table_editor->add_join_table('paiement.transactions','ref',true); + $table_editor = new PLTableEditor('admin/payments','#paiement#.paiements','id'); + $table_editor->add_join_table('#paiement#.transactions','ref',true); $table_editor->add_sort_field('flags'); $table_editor->add_sort_field('id', true, true); - $table_editor->on_delete("UPDATE paiement.paiements SET flags = 'old' WHERE id = {?}", "Le paiement a été archivé"); + $table_editor->on_delete("UPDATE #paiement#.paiements SET flags = 'old' WHERE id = {?}", "Le paiement a été archivé"); $table_editor->describe('text','intitulé',true); $table_editor->describe('url','site web',false); $table_editor->describe('montant_def','montant par défaut',false); diff --git a/modules/payment/money.inc.php b/modules/payment/money.inc.php index a5aae56..bb0f8f1 100644 --- a/modules/payment/money.inc.php +++ b/modules/payment/money.inc.php @@ -88,9 +88,9 @@ class Payment { if ($this->asso_id) { $res = XDB::query("SELECT e.eid, a.diminutif - FROM groupex.evenements AS e - INNER JOIN groupex.asso AS a ON (e.asso_id = a.id) - LEFT JOIN groupex.evenements_participants AS p ON (p.eid = e.eid AND p.uid = {?}) + FROM #groupex#.evenements AS e + INNER JOIN #groupex#.asso AS a ON (e.asso_id = a.id) + LEFT JOIN #groupex#.evenements_participants AS p ON (p.eid = e.eid AND p.uid = {?}) WHERE e.paiement_id = {?} AND p.uid IS NULL", S::i('uid'), $this->id); if ($res->numRows()) { return $res->fetchOneAssoc(); diff --git a/modules/profile.php b/modules/profile.php index 5c985cc..016fd32 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -698,9 +698,9 @@ class ProfileModule extends PLModule $req = XDB::query(' SELECT m.asso_id, a.nom, diminutif, a.logo IS NOT NULL AS has_logo, COUNT(e.eid) AS events, mail_domain AS lists - FROM groupex.membres AS m - INNER JOIN groupex.asso AS a ON(m.asso_id = a.id) - LEFT JOIN groupex.evenements AS e ON(e.asso_id = m.asso_id AND e.archive = 0) + FROM #groupex#.membres AS m + INNER JOIN #groupex#.asso AS a ON(m.asso_id = a.id) + LEFT JOIN #groupex#.evenements AS e ON(e.asso_id = m.asso_id AND e.archive = 0) WHERE uid = {?} GROUP BY m.asso_id ORDER BY a.nom', S::i('uid')); $page->assign('assos', $req->fetchAllAssoc()); } @@ -712,7 +712,7 @@ class ProfileModule extends PLModule } $res = XDB::query('SELECT logo, logo_mime - FROM groupex.asso + FROM #groupex#.asso WHERE id = {?}', $id); list($logo, $logo_mime) = $res->fetchOneRow(); diff --git a/modules/profile/groups.inc.php b/modules/profile/groups.inc.php index 5fb7b45..1b11e8d 100644 --- a/modules/profile/groups.inc.php +++ b/modules/profile/groups.inc.php @@ -109,14 +109,14 @@ class ProfileGroups extends ProfilePage public function _prepare(PlPage &$page, $id) { $page->assign('mygroups', XDB::iterator("SELECT a.nom, a.site, a.diminutif, a.unsub_url, a.pub, m.perms - FROM groupex.asso AS a - INNER JOIN groupex.membres AS m ON (m.asso_id = a.id) + FROM #groupex#.asso AS a + INNER JOIN #groupex#.membres AS m ON (m.asso_id = a.id) WHERE m.uid = {?} AND (a.cat = 'GroupesX' OR a.cat = 'Institutions')", S::i('uid'))); $page->assign('listgroups', XDB::iterator("SELECT a.nom, a.diminutif, a.sub_url, IF (a.cat = 'Institutions', a.cat, d.nom) AS dom - FROM groupex.asso AS a - LEFT JOIN groupex.dom AS d ON (d.id = a.dom) + FROM #groupex#.asso AS a + LEFT JOIN #groupex#.dom AS d ON (d.id = a.dom) WHERE a.inscriptible != 0 AND (a.cat = 'GroupesX' OR a.cat = 'Institutions') ORDER BY a.cat, a.dom, a.nom")); diff --git a/modules/register.php b/modules/register.php index 4b90734..9ac8d6b 100644 --- a/modules/register.php +++ b/modules/register.php @@ -348,10 +348,10 @@ class RegisterModule extends PLModule $storage->activate(); break; case 'ml_promo': - $r = XDB::query('SELECT id FROM groupex.asso WHERE diminutif = {?}', S::user()->promo()); + $r = XDB::query('SELECT id FROM #groupex#.asso WHERE diminutif = {?}', S::user()->promo()); if ($r->numRows()) { $asso_id = $r->fetchOneCell(); - XDB::execute('REPLACE INTO groupex.membres (uid, asso_id) + XDB::execute('REPLACE INTO #groupex#.membres (uid, asso_id) VALUES ({?}, {?})', S::user()->id(), $asso_id); $mmlist = new MMList(S::user()->id(), S::v('password')); @@ -390,9 +390,9 @@ class RegisterModule extends PLModule $promo_forum = 'xorg.promo.x' . $promo; $registered_forums = array('xorg.general', 'xorg.pa.divers', 'xorg.pa.logements', $promo_forum); foreach ($registered_forums as $forum) { - XDB::execute("INSERT INTO forums.abos (fid,uid) + XDB::execute("INSERT INTO #forums#.abos (fid,uid) SELECT fid, {?} - FROM forums.list + FROM #forums#.list WHERE nom = {?}", $uid, $val); diff --git a/modules/search.php b/modules/search.php index 5520042..986d832 100644 --- a/modules/search.php +++ b/modules/search.php @@ -70,9 +70,9 @@ class SearchModule extends PLModule { global $globals; - $res = XDB::query("SELECT MIN(`diminutif`), MAX(`diminutif`) - FROM `groupex`.`asso` - WHERE `cat` = 'Promotions'"); + $res = XDB::query("SELECT MIN(diminutif), MAX(diminutif) + FROM #groupex#.asso + WHERE cat = 'Promotions'"); list($min, $max) = $res->fetchOneRow(); $page->assign('promo_min', $min); $page->assign('promo_max', $max); @@ -166,7 +166,7 @@ class SearchModule extends PLModule 'secteur' => array('field' => 'id', 'table' => 'emploi_secteur', 'text' => 'label', 'exact' => false), 'nationalite' => array('field' => 'a2', 'table' => 'geoloc_pays', 'text' => 'nat', 'exact' => 'false'), 'binet' => array('field' => 'id', 'table' => 'binets_def', 'text' => 'text', 'exact' => false), - 'groupex' => array('field' => 'id', 'table' => 'groupex.asso', + 'groupex' => array('field' => 'id', 'table' => '#groupex#.asso', 'text' => "(cat = 'GroupesX' OR cat = 'Institutions') AND pub = 'public' AND nom", 'exact' => false), 'section' => array('field' => 'id', 'table' => 'sections', 'text' => 'text', 'exact' => false), @@ -288,8 +288,8 @@ class SearchModule extends PLModule $beginwith = false; break; case 'groupexTxt': - $db = "groupex.asso AS a INNER JOIN - groupex.membres AS m ON(a.id = m.asso_id + $db = "#groupex#.asso AS a INNER JOIN + #groupex#.membres AS m ON(a.id = m.asso_id AND (a.cat = 'GroupesX' OR a.cat = 'Institutions') AND a.pub = 'public')"; $field='a.nom'; @@ -424,7 +424,7 @@ class SearchModule extends PLModule $page->changeTpl('search/adv.grade.form.tpl', NO_SKIN); return; case 'groupex': - $db = 'groupex.asso'; + $db = '#groupex#.asso'; $where = " WHERE (cat = 'GroupesX' OR cat = 'Institutions') AND pub = 'public'"; $field = 'nom'; break; diff --git a/modules/search/classes.inc.php b/modules/search/classes.inc.php index 9def2db..4f7b4a3 100644 --- a/modules/search/classes.inc.php +++ b/modules/search/classes.inc.php @@ -340,7 +340,7 @@ class QuickSearch extends SField $join .= "LEFT JOIN emails AS ems ON (ems.uid = u.user_id)"; } if (!empty($this->ip)) { - $join .= "INNER JOIN logger.sessions AS ls ON (ls.uid = u.user_id)\n"; + $join .= "INNER JOIN #logger#.sessions AS ls ON (ls.uid = u.user_id)\n"; } return $join; } diff --git a/modules/search/search.inc.php b/modules/search/search.inc.php index 042398e..06d3686 100644 --- a/modules/search/search.inc.php +++ b/modules/search/search.inc.php @@ -64,7 +64,7 @@ function advancedSearchFromInput() $natField = new RefSField('nationalite',array('u.nationalite'),'','',''); $binetField = new RefSField('binet',array('b.binet_id'),'binets_ins','b','u.user_id=b.user_id'); - $groupexField = new RefSField('groupex',array('g.id'),array('groupex.asso', 'groupex.membres'),array('g', 'gm'), + $groupexField = new RefSField('groupex',array('g.id'),array('#groupex#.asso', '#groupex#.membres'),array('g', 'gm'), array("(g.cat = 'GroupesX' OR g.cat = 'Institutions') AND g.pub = 'public'", 'gm.asso_id = g.id AND u.user_id=gm.uid')); $sectionField = new RefSField('section',array('u.section'),'','',''); diff --git a/modules/xnet.php b/modules/xnet.php index 0152bdb..ea1d55c 100644 --- a/modules/xnet.php +++ b/modules/xnet.php @@ -76,14 +76,14 @@ class XnetModule extends PLModule if (Get::has('del')) { $res = XDB::query('SELECT id, nom, mail_domain - FROM groupex.asso WHERE diminutif={?}', + FROM #groupex#.asso WHERE diminutif={?}', Get::v('del')); list($id, $nom, $domain) = $res->fetchOneRow(); $page->assign('nom', $nom); if ($id && Post::has('del')) { S::assert_xsrf_token(); - XDB::query('DELETE FROM groupex.membres WHERE asso_id={?}', $id); + XDB::query('DELETE FROM #groupex#.membres WHERE asso_id={?}', $id); $page->trigSuccess('membres supprimés'); if ($domain) { @@ -102,7 +102,7 @@ class XnetModule extends PLModule } } - XDB::query('DELETE FROM groupex.asso WHERE id={?}', $id); + XDB::query('DELETE FROM #groupex#.asso WHERE id={?}', $id); $page->trigSuccess("Groupe $nom supprimé"); Get::kill('del'); } @@ -115,12 +115,12 @@ class XnetModule extends PLModule S::assert_xsrf_token(); $res = XDB::query('SELECT COUNT(*) - FROM groupex.asso + FROM #groupex#.asso WHERE diminutif = {?}', Post::v('diminutif')); if ($res->fetchOneCell() == 0) { - XDB::execute('INSERT INTO groupex.asso (id, diminutif) + XDB::execute('INSERT INTO #groupex#.asso (id, diminutif) VALUES (NULL, {?})', Post::v('diminutif')); pl_redirect('../' . Post::v('diminutif') . '/edit'); @@ -130,7 +130,7 @@ class XnetModule extends PLModule } $res = XDB::query('SELECT nom, diminutif - FROM groupex.asso + FROM #groupex#.asso ORDER BY nom'); $page->assign('assos', $res->fetchAllAssoc()); } @@ -143,8 +143,8 @@ class XnetModule extends PLModule $res = XDB::iterator( 'SELECT dom.id, dom.nom as domnom, asso.diminutif, asso.nom - FROM groupex.dom - INNER JOIN groupex.asso ON dom.id = asso.dom + FROM #groupex#.dom + INNER JOIN #groupex#.asso ON dom.id = asso.dom WHERE FIND_IN_SET("GroupesX", dom.cat) AND FIND_IN_SET("GroupesX", asso.cat) ORDER BY dom.nom, asso.nom'); $groupesx = array(); @@ -153,8 +153,8 @@ class XnetModule extends PLModule $res = XDB::iterator( 'SELECT dom.id, dom.nom as domnom, asso.diminutif, asso.nom - FROM groupex.dom - INNER JOIN groupex.asso ON dom.id = asso.dom + FROM #groupex#.dom + INNER JOIN #groupex#.asso ON dom.id = asso.dom WHERE FIND_IN_SET("Binets", dom.cat) AND FIND_IN_SET("Binets", asso.cat) ORDER BY dom.nom, asso.nom'); $binets = array(); @@ -163,14 +163,14 @@ class XnetModule extends PLModule $res = XDB::iterator( 'SELECT asso.diminutif, asso.nom - FROM groupex.asso + FROM #groupex#.asso WHERE cat LIKE "%Promotions%" ORDER BY diminutif'); $page->assign('promos', $res); $res = XDB::iterator( 'SELECT asso.diminutif, asso.nom - FROM groupex.asso + FROM #groupex#.asso WHERE FIND_IN_SET("Institutions", cat) ORDER BY diminutif'); $page->assign('inst', $res); @@ -193,21 +193,24 @@ class XnetModule extends PLModule $page->assign('cat', $cat); $page->assign('dom', $dom); - $res = XDB::query("SELECT id,nom FROM groupex.dom - WHERE FIND_IN_SET({?}, cat) - ORDER BY nom", $cat); + $res = XDB::query("SELECT id,nom + FROM #groupex#.dom + WHERE FIND_IN_SET({?}, cat) + ORDER BY nom", $cat); $doms = $res->fetchAllAssoc(); $page->assign('doms', $doms); if (empty($doms)) { - $res = XDB::query("SELECT diminutif, nom, site FROM groupex.asso - WHERE FIND_IN_SET({?}, cat) - ORDER BY nom", $cat); + $res = XDB::query("SELECT diminutif, nom, site + FROM #groupex#.asso + WHERE FIND_IN_SET({?}, cat) + ORDER BY nom", $cat); $page->assign('gps', $res->fetchAllAssoc()); } elseif (!is_null($dom)) { - $res = XDB::query("SELECT diminutif, nom, site FROM groupex.asso - WHERE FIND_IN_SET({?}, cat) AND dom={?} - ORDER BY nom", $cat, $dom); + $res = XDB::query("SELECT diminutif, nom, site + FROM #groupex#.asso + WHERE FIND_IN_SET({?}, cat) AND dom={?} + ORDER BY nom", $cat, $dom); $page->assign('gps', $res->fetchAllAssoc()); } diff --git a/modules/xnetevents.php b/modules/xnetevents.php index 3d21fe4..fb9406e 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -60,7 +60,7 @@ class XnetEventsModule extends PLModule } S::assert_xsrf_token(); - $res = XDB::query("SELECT asso_id, short_name FROM groupex.evenements + $res = XDB::query("SELECT asso_id, short_name FROM #groupex#.evenements WHERE eid = {?} AND asso_id = {?}", $eid, $globals->asso('id')); @@ -81,15 +81,15 @@ class XnetEventsModule extends PLModule } // deletes the event items - XDB::execute('DELETE FROM groupex.evenements_items + XDB::execute('DELETE FROM #groupex#.evenements_items WHERE eid = {?}', $eid); // deletes the event participants - XDB::execute('DELETE FROM groupex.evenements_participants + XDB::execute('DELETE FROM #groupex#.evenements_participants WHERE eid = {?}', $eid); // deletes the event - XDB::execute('DELETE FROM groupex.evenements + XDB::execute('DELETE FROM #groupex#.evenements WHERE eid = {?} AND asso_id = {?}', $eid, $globals->asso('id')); @@ -102,14 +102,14 @@ class XnetEventsModule extends PLModule } if ($action == 'archive') { - XDB::execute("UPDATE groupex.evenements + XDB::execute("UPDATE #groupex#.evenements SET archive = 1 WHERE eid = {?} AND asso_id = {?}", $eid, $globals->asso('id')); } if ($action == 'unarchive') { - XDB::execute("UPDATE groupex.evenements + XDB::execute("UPDATE #groupex#.evenements SET archive = 0 WHERE eid = {?} AND asso_id = {?}", $eid, $globals->asso('id')); @@ -122,10 +122,10 @@ class XnetEventsModule extends PLModule 1) AS inscr_open, e.deadline_inscription, u.nom, u.prenom, u.promo, a.alias, MAX(ep.nb) IS NOT NULL AS inscrit, MAX(ep.paid) AS paid - FROM groupex.evenements AS e - INNER JOIN x4dat.auth_user_md5 AS u ON u.user_id = e.organisateur_uid - INNER JOIN x4dat.aliases AS a ON (a.type = 'a_vie' AND a.id = u.user_id) - LEFT JOIN groupex.evenements_participants AS ep ON (ep.eid = e.eid AND ep.uid = {?}) + FROM #groupex#.evenements AS e + INNER JOIN #x4dat#.auth_user_md5 AS u ON u.user_id = e.organisateur_uid + INNER JOIN #x4dat#.aliases AS a ON (a.type = 'a_vie' AND a.id = u.user_id) + LEFT JOIN #groupex#.evenements_participants AS ep ON (ep.eid = e.eid AND ep.uid = {?}) WHERE asso_id = {?} AND archive = " . ($archive ? "1 " : "0 ") . "GROUP BY e.eid @@ -144,8 +144,8 @@ class XnetEventsModule extends PLModule $e['show_participants'] = ($e['show_participants'] && (is_member() || may_update())); $res = XDB::query( "SELECT titre, details, montant, ei.item_id, nb, ep.paid - FROM groupex.evenements_items AS ei - LEFT JOIN groupex.evenements_participants AS ep + FROM #groupex#.evenements_items AS ei + LEFT JOIN #groupex#.evenements_participants AS ep ON (ep.eid = ei.eid AND ep.item_id = ei.item_id AND uid = {?}) WHERE ei.eid = {?}", S::v('uid'), $e['eid']); @@ -256,14 +256,14 @@ class XnetEventsModule extends PLModule foreach ($subs as $j => $nb) { if ($nb >= 0) { XDB::execute( - "REPLACE INTO groupex.evenements_participants + "REPLACE INTO #groupex#.evenements_participants VALUES ({?}, {?}, {?}, {?}, {?}, {?})", $eid, S::v('uid'), $j, $nb, Env::has('notify_payment') ? 'notify_payment' : '', $j == 1 ? $paid - $telepaid : 0); $updated = $eid; } else { XDB::execute( - "DELETE FROM groupex.evenements_participants + "DELETE FROM #groupex#.evenements_participants WHERE eid = {?} AND uid = {?} AND item_id = {?}", $eid, S::v("uid"), $j); $updated = $eid; @@ -346,7 +346,7 @@ class XnetEventsModule extends PLModule // get eid if the the given one is a short name if (!is_null($eid) && !is_numeric($eid)) { $res = XDB::query("SELECT eid - FROM groupex.evenements + FROM #groupex#.evenements WHERE asso_id = {?} AND short_name = {?}", $globals->asso('id'), $eid); if ($res->numRows()) { @@ -357,7 +357,7 @@ class XnetEventsModule extends PLModule // check the event is in our group if (!is_null($eid)) { $res = XDB::query("SELECT short_name - FROM groupex.evenements + FROM #groupex#.evenements WHERE eid = {?} AND asso_id = {?}", $eid, $globals->asso('id')); if ($res->numRows()) { @@ -414,7 +414,7 @@ class XnetEventsModule extends PLModule } // Store the modifications in the database - XDB::execute('REPLACE INTO groupex.evenements + XDB::execute('REPLACE INTO #groupex#.evenements SET eid={?}, asso_id={?}, organisateur_uid={?}, intitule={?}, paiement_id = {?}, descriptif = {?}, debut = {?}, fin = {?}, show_participants = {?}, short_name = {?}, @@ -441,12 +441,12 @@ class XnetEventsModule extends PLModule $montant = strtr(Post::v('montant'.$i), ',', '.'); $money_defaut += (float)$montant; XDB::execute(" - REPLACE INTO groupex.evenements_items + REPLACE INTO #groupex#.evenements_items VALUES ({?}, {?}, {?}, {?}, {?})", $eid, $i, Post::v('titre'.$i), Post::v('details'.$i), $montant); } else { - XDB::execute("DELETE FROM groupex.evenements_items + XDB::execute("DELETE FROM #groupex#.evenements_items WHERE eid = {?} AND item_id = {?}", $eid, $i); } } @@ -469,7 +469,7 @@ class XnetEventsModule extends PLModule // events with no sub-event: add a sub-event with no name if ($nb_moments == 0) { - XDB::execute("INSERT INTO groupex.evenements_items + XDB::execute("INSERT INTO #groupex#.evenements_items VALUES ({?}, {?}, '', '', 0)", $eid, 1); } @@ -490,10 +490,10 @@ class XnetEventsModule extends PLModule // when modifying an old event retreive the old datas if ($eid) { $res = XDB::query( - "SELECT eid, intitule, descriptif, debut, fin, organisateur_uid, - show_participants, paiement_id, short_name, - deadline_inscription, noinvite, accept_nonmembre - FROM groupex.evenements + "SELECT eid, intitule, descriptif, debut, fin, organisateur_uid, + show_participants, paiement_id, short_name, + deadline_inscription, noinvite, accept_nonmembre + FROM #groupex#.evenements WHERE eid = {?}", $eid); $evt = $res->fetchOneAssoc(); // find out if there is already a request for a payment for this event @@ -509,10 +509,10 @@ class XnetEventsModule extends PLModule $page->assign('evt', $evt); // get all the different moments infos $res = XDB::iterator( - "SELECT item_id, titre, details, montant - FROM groupex.evenements_items AS ei - INNER JOIN groupex.evenements AS e ON(e.eid = ei.eid) - WHERE e.eid = {?} + "SELECT item_id, titre, details, montant + FROM #groupex#.evenements_items AS ei + INNER JOIN #groupex#.evenements AS e ON(e.eid = ei.eid) + WHERE e.eid = {?} ORDER BY item_id", $eid); $items = array(); while ($item = $res->next()) { @@ -549,7 +549,7 @@ class XnetEventsModule extends PLModule // change the price paid by a participant if (Env::v('adm') == 'prix' && $member) { - XDB::execute("UPDATE groupex.evenements_participants + XDB::execute("UPDATE #groupex#.evenements_participants SET paid = paid + {?} WHERE uid = {?} AND eid = {?} AND item_id = 1", strtr(Env::v('montant'), ',', '.'), @@ -559,7 +559,7 @@ class XnetEventsModule extends PLModule // change the number of personns coming with a participant if (Env::v('adm') == 'nbs' && $member) { $res = XDB::query("SELECT paid - FROM groupex.evenements_participants + FROM #groupex#.evenements_participants WHERE uid = {?} AND eid = {?}", $member['uid'], $evt['eid']); @@ -568,13 +568,13 @@ class XnetEventsModule extends PLModule foreach ($nbs as $id => $nb) { $nb = max(intval($nb), 0); - XDB::execute("REPLACE INTO groupex.evenements_participants + XDB::execute("REPLACE INTO #groupex#.evenements_participants VALUES ({?}, {?}, {?}, {?}, {?}, {?})", $evt['eid'], $member['uid'], $id, $nb, '', $id == 1 ? $paid : 0); } $res = XDB::query("SELECT COUNT(uid) AS cnt, SUM(nb) AS nb - FROM groupex.evenements_participants + FROM #groupex#.evenements_participants WHERE uid = {?} AND eid = {?} GROUP BY uid", $member['uid'], $evt['eid']); @@ -599,10 +599,10 @@ class XnetEventsModule extends PLModule 'SELECT UPPER(SUBSTRING(IF(u.nom IS NULL, m.nom, IF(u.nom_usage<>"", u.nom_usage, u.nom)), 1, 1)), COUNT(DISTINCT ep.uid) - FROM groupex.evenements_participants AS ep - INNER JOIN groupex.evenements AS e ON (ep.eid = e.eid) - LEFT JOIN groupex.membres AS m ON ( ep.uid = m.uid AND e.asso_id = m.asso_id) - LEFT JOIN auth_user_md5 AS u ON ( u.user_id = ep.uid ) + FROM #groupex#.evenements_participants AS ep + INNER JOIN #groupex#.evenements AS e ON (ep.eid = e.eid) + LEFT JOIN #groupex#.membres AS m ON ( ep.uid = m.uid AND e.asso_id = m.asso_id) + LEFT JOIN #x4dat#.auth_user_md5 AS u ON ( u.user_id = ep.uid ) WHERE ep.eid = {?} '.$whereitemid . ' GROUP BY UPPER(SUBSTRING(IF(u.nom IS NULL,m.nom,u.nom), 1, 1))', $evt['eid']); @@ -623,9 +623,9 @@ class XnetEventsModule extends PLModule "SELECT IF(u.nom_usage<>'', u.nom_usage, u.nom) AS nom, u.prenom, u.promo, a.alias AS email, t.montant FROM {$globals->money->mpay_tprefix}transactions AS t - INNER JOIN auth_user_md5 AS u ON(t.uid = u.user_id) - INNER JOIN aliases AS a ON (a.id = t.uid AND a.type='a_vie' ) - LEFT JOIN groupex.evenements_participants AS ep ON(ep.uid = t.uid AND ep.eid = {?}) + INNER JOIN #x4dat#.auth_user_md5 AS u ON(t.uid = u.user_id) + INNER JOIN #x4dat#.aliases AS a ON (a.id = t.uid AND a.type='a_vie' ) + LEFT JOIN #groupex#.evenements_participants AS ep ON(ep.uid = t.uid AND ep.eid = {?}) WHERE t.ref = {?} AND ep.uid IS NULL", $evt['eid'], $evt['paiement_id']); $page->assign('oublis', $res->total()); @@ -638,12 +638,12 @@ class XnetEventsModule extends PLModule IF(m.origine = 'X', u.promo, m.origine) AS promo, IF(m.origine = 'X', FIND_IN_SET('femme', u.flags), m.sexe) AS sexe, IF(m.origine = 'X', a.alias, m.email) AS email - FROM groupex.evenements_participants AS p - INNER JOIN groupex.membres AS m USING(uid) - LEFT JOIN groupex.evenements_participants AS p2 ON (p2.uid = m.uid AND p2.eid = p.eid - AND p2.nb != 0) - LEFT JOIN auth_user_md5 AS u ON (u.user_id = m.uid) - LEFT JOIN aliases AS a ON (a.id = u.user_id AND a.type = 'a_vie') + FROM #groupex#.evenements_participants AS p + INNER JOIN #groupex#.membres AS m USING(uid) + LEFT JOIN #groupex#.evenements_participants AS p2 ON (p2.uid = m.uid AND p2.eid = p.eid + AND p2.nb != 0) + LEFT JOIN #x4dat#.auth_user_md5 AS u ON (u.user_id = m.uid) + LEFT JOIN #x4dat#.aliases AS a ON (a.id = u.user_id AND a.type = 'a_vie') WHERE p.eid = {?} AND p2.eid IS NULL " . (Env::v('initiale') ? " AND IF(u.nom IS NULL, m.nom, IF(u.nom_usage<>'', u.nom_usage, u.nom)) LIKE '" . Env::v('initiale') . "%'" diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php index ef8cc0c..d2725d4 100644 --- a/modules/xnetevents/xnetevents.inc.php +++ b/modules/xnetevents/xnetevents.inc.php @@ -35,15 +35,15 @@ function get_event_detail($eid, $item_id = false, $asso_id = null) al.vid AS absent_list, pl.vid AS participant_list, bl.vid AS payed_list, ul.vid AS booked_unpayed_list, a.nom, a.prenom, a.promo, aa.alias - FROM groupex.evenements AS e - INNER JOIN x4dat.auth_user_md5 AS a ON a.user_id = e.organisateur_uid - INNER JOIN x4dat.aliases AS aa ON (aa.type = 'a_vie' AND aa.id = a.user_id) - INNER JOIN groupex.evenements_items AS ei ON (e.eid = ei.eid) - LEFT JOIN groupex.evenements_participants AS ep ON (e.eid = ep.eid AND ei.item_id = ep.item_id) - LEFT JOIN virtual AS al ON (al.type = 'evt' AND al.alias = CONCAT(short_name, {?})) - LEFT JOIN virtual AS pl ON (pl.type = 'evt' AND pl.alias = CONCAT(short_name, {?})) - LEFT JOIN virtual AS bl ON (bl.type = 'evt' AND bl.alias = CONCAT(short_name, {?})) - LEFT JOIN virtual AS ul ON (ul.type = 'evt' AND ul.alias = CONCAT(short_name, {?})) + FROM #groupex#.evenements AS e + INNER JOIN #x4dat#.auth_user_md5 AS a ON a.user_id = e.organisateur_uid + INNER JOIN #x4dat#.aliases AS aa ON (aa.type = 'a_vie' AND aa.id = a.user_id) + INNER JOIN #groupex#.evenements_items AS ei ON (e.eid = ei.eid) + LEFT JOIN #groupex#.evenements_participants AS ep ON (e.eid = ep.eid AND ei.item_id = ep.item_id) + LEFT JOIN #x4dat#.virtual AS al ON (al.type = 'evt' AND al.alias = CONCAT(short_name, {?})) + LEFT JOIN #x4dat#.virtual AS pl ON (pl.type = 'evt' AND pl.alias = CONCAT(short_name, {?})) + LEFT JOIN #x4dat#.virtual AS bl ON (bl.type = 'evt' AND bl.alias = CONCAT(short_name, {?})) + LEFT JOIN #x4dat#.virtual AS ul ON (ul.type = 'evt' AND ul.alias = CONCAT(short_name, {?})) WHERE (e.eid = {?} OR e.short_name = {?}) AND ei.item_id = {?} AND e.asso_id = {?} GROUP BY ei.item_id", '-absents@' . $globals->xnet->evts_domain, @@ -65,9 +65,9 @@ function get_event_detail($eid, $item_id = false, $asso_id = null) if (!$item_id) { $res = XDB::query( "SELECT MAX(nb) - FROM groupex.evenements AS e - INNER JOIN groupex.evenements_items AS ei ON (e.eid = ei.eid) - LEFT JOIN groupex.evenements_participants AS ep + FROM #groupex#.evenements AS e + INNER JOIN #groupex#.evenements_items AS ei ON (e.eid = ei.eid) + LEFT JOIN #groupex#.evenements_participants AS ep ON (e.eid = ep.eid AND ei.item_id = ep.item_id) WHERE e.eid = {?} GROUP BY ep.uid", $evt['eid']); @@ -78,8 +78,8 @@ function get_event_detail($eid, $item_id = false, $asso_id = null) $res = XDB::query( "SELECT titre, details, montant, ei.item_id, nb, ep.paid, FIND_IN_SET('notify_payment', ep.flags) AS notify_payment - FROM groupex.evenements_items AS ei - LEFT JOIN groupex.evenements_participants AS ep + FROM #groupex#.evenements_items AS ei + LEFT JOIN #groupex#.evenements_participants AS ep ON (ep.eid = ei.eid AND ep.item_id = ei.item_id AND uid = {?}) WHERE ei.eid = {?}", S::v('uid'), $evt['eid']); @@ -143,11 +143,11 @@ function get_event_participants(&$evt, $item_id, $tri, $limit = '') { (m.origine = 'X' OR m.origine IS NULL) AS x, ep.uid, SUM(ep.paid) AS paid, SUM(ep.nb) AS nb, FIND_IN_SET('notify_payment', ep.flags) AS notify_payment - FROM groupex.evenements_participants AS ep - INNER JOIN groupex.evenements AS e ON (ep.eid = e.eid) - LEFT JOIN groupex.membres AS m ON ( ep.uid = m.uid AND e.asso_id = m.asso_id) - LEFT JOIN auth_user_md5 AS u ON ( u.user_id = ep.uid ) - LEFT JOIN aliases AS a ON ( a.id = ep.uid AND a.type='a_vie' ) + FROM #groupex#.evenements_participants AS ep + INNER JOIN #groupex#.evenements AS e ON (ep.eid = e.eid) + LEFT JOIN #groupex#.membres AS m ON ( ep.uid = m.uid AND e.asso_id = m.asso_id) + LEFT JOIN #x4dat#.auth_user_md5 AS u ON ( u.user_id = ep.uid ) + LEFT JOIN #x4dat#.aliases AS a ON ( a.id = ep.uid AND a.type='a_vie' ) WHERE ep.eid = {?} ".(($item_id)?" AND item_id = $item_id":"")." $where @@ -188,8 +188,8 @@ function get_event_participants(&$evt, $item_id, $tri, $limit = '') { $u['telepayment'] = $u['paid'] - $u['adminpaid']; $res_ = XDB::iterator( "SELECT ep.nb, ep.item_id, ei.montant - FROM groupex.evenements_participants AS ep - INNER JOIN groupex.evenements_items AS ei ON (ei.eid = ep.eid AND ei.item_id = ep.item_id) + FROM #groupex#.evenements_participants AS ep + INNER JOIN #groupex#.evenements_items AS ei ON (ei.eid = ep.eid AND ei.item_id = ep.item_id) WHERE ep.eid = {?} AND ep.uid = {?}", $eid, $u['uid']); while ($i = $res_->next()) { @@ -222,7 +222,7 @@ function subscribe_lists_event($participate, $uid, $evt, $paid, $payment = null) $email = $user->forlifeEmail(); } else { $res = XDB::query("SELECT email - FROM groupex.membres + FROM #groupex#.membres WHERE uid = {?} AND asso_id = {?}", $uid, $globals->asso('id')); $email = $res->fetchOneCell(); @@ -293,7 +293,7 @@ function event_change_shortname(&$page, $eid, $old, $new) //vérifier que l'alias n'est pas déja pris if ($new && $old != $new) { $res = XDB::query('SELECT COUNT(*) - FROM groupex.evenements + FROM #groupex#.evenements WHERE short_name = {?}', $new); if ($res->fetchOneCell() > 0) { @@ -338,20 +338,20 @@ function event_change_shortname(&$page, $eid, $old, $new) foreach (array('-participants@', '-paye@', '-participants-non-paye@') as $v) { XDB::execute("INSERT IGNORE INTO virtual_redirect ( SELECT {?} AS vid, IF(a.alias IS NULL, m.email, CONCAT(a.alias, {?})) AS redirect - FROM groupex.evenements_participants AS ep - LEFT JOIN groupex.membres AS m ON (ep.uid = m.uid) - LEFT JOIN auth_user_md5 AS u ON (u.user_id = ep.uid) - LEFT JOIN aliases AS a ON (a.id = ep.uid AND a.type = 'a_vie') + FROM #groupex#.evenements_participants AS ep + LEFT JOIN #groupex#.membres AS m ON (ep.uid = m.uid) + LEFT JOIN #x4dat#.auth_user_md5 AS u ON (u.user_id = ep.uid) + LEFT JOIN #x4dat#.aliases AS a ON (a.id = ep.uid AND a.type = 'a_vie') WHERE ep.eid = {?} AND " . $where[$v] . " GROUP BY ep.uid)", $lastid[$v], '@' . $globals->mail->domain, $eid); } XDB::execute("INSERT IGNORE INTO virtual_redirect ( SELECT {?} AS vid, IF(a.alias IS NULL, m.email, CONCAT(a.alias, {?})) AS redirect - FROM groupex.membres AS m - LEFT JOIN groupex.evenements_participants AS ep ON (ep.uid = m.uid AND ep.eid = {?}) - LEFT JOIN auth_user_md5 AS u ON (u.user_id = m.uid) - LEFT JOIN aliases AS a ON (a.id = m.uid AND a.type = 'a_vie') + FROM #groupex#.membres AS m + LEFT JOIN #groupex#.evenements_participants AS ep ON (ep.uid = m.uid AND ep.eid = {?}) + LEFT JOIN #x4dat#.auth_user_md5 AS u ON (u.user_id = m.uid) + LEFT JOIN #x4dat#.aliases AS a ON (a.id = m.uid AND a.type = 'a_vie') WHERE m.asso_id = {?} AND ep.uid IS NULL GROUP BY m.uid)", $lastid['-absents@'], '@' . $globals->mail->domain, $eid, $globals->asso('id')); diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php index 187151d..6c71978 100644 --- a/modules/xnetgrp.php +++ b/modules/xnetgrp.php @@ -35,7 +35,7 @@ function get_infos($email) $res = XDB::query( "SELECT uid, nom, prenom, email, email AS email2, perms='admin', origine, comm, sexe - FROM groupex.membres + FROM #groupex#.membres WHERE $field = {?} AND asso_id = {?}", $email, $globals->asso('id')); if ($res->numRows()) { @@ -56,10 +56,10 @@ function get_infos($email) CONCAT(b.alias, '@polytechnique.org') AS email2, m.perms = 'admin' AS perms, m.origine, m.comm, FIND_IN_SET('femme', u.flags) AS sexe - FROM auth_user_md5 AS u - INNER JOIN aliases AS a ON ( u.user_id = a.id AND a.type != 'homonyme' ) - INNER JOIN aliases AS b ON ( u.user_id = b.id AND b.type = 'a_vie' ) - LEFT JOIN groupex.membres AS m ON ( m.uid = u.user_id AND asso_id={?}) + FROM #x4dat#.auth_user_md5 AS u + INNER JOIN #x4dat#.aliases AS a ON ( u.user_id = a.id AND a.type != 'homonyme' ) + INNER JOIN #x4dat#.aliases AS b ON ( u.user_id = b.id AND b.type = 'a_vie' ) + LEFT JOIN #groupex#.membres AS m ON ( m.uid = u.user_id AND asso_id={?}) WHERE a.alias = {?} AND u.user_id < 50000", $globals->asso('id'), $mbox); return $res->fetchOneAssoc(); } @@ -115,26 +115,26 @@ class XnetGrpModule extends PLModule if (S::logged()) { if (Env::has('read')) { - XDB::query('DELETE groupex.r.* - FROM groupex.announces_read AS r - INNER JOIN groupex.announces AS a ON a.id = r.announce_id + XDB::query('DELETE #groupex#.r.* + FROM #groupex#.announces_read AS r + INNER JOIN #groupex#.announces AS a ON a.id = r.announce_id WHERE peremption < CURRENT_DATE()'); - XDB::query('INSERT INTO groupex.announces_read + XDB::query('INSERT INTO #groupex#.announces_read VALUES ({?}, {?})', Env::i('read'), S::i('uid')); pl_redirect(""); } if (Env::has('unread')) { - XDB::query('DELETE FROM groupex.announces_read + XDB::query('DELETE FROM #groupex#.announces_read WHERE announce_id={?} AND user_id={?}', Env::i('unread'), S::i('uid')); pl_redirect("#art" . Env::i('unread')); } $arts = XDB::iterator("SELECT a.*, u.nom, u.prenom, u.promo, u.hruid, FIND_IN_SET('photo', a.flags) AS photo - FROM groupex.announces AS a - INNER JOIN auth_user_md5 AS u USING(user_id) - LEFT JOIN groupex.announces_read AS r ON (r.user_id = {?} AND r.announce_id = a.id) + FROM #groupex#.announces AS a + INNER JOIN #x4dat#.auth_user_md5 AS u USING(user_id) + LEFT JOIN #groupex#.announces_read AS r ON (r.user_id = {?} AND r.announce_id = a.id) WHERE asso_id = {?} AND peremption >= CURRENT_DATE() AND (promo_min = 0 OR promo_min <= {?}) AND (promo_max = 0 OR promo_max >= {?}) @@ -142,8 +142,8 @@ class XnetGrpModule extends PLModule ORDER BY a.peremption", S::i('uid'), $globals->asso('id'), S::i('promo'), S::i('promo')); $index = XDB::iterator("SELECT a.id, a.titre, r.user_id IS NULL AS nonlu - FROM groupex.announces AS a - LEFT JOIN groupex.announces_read AS r ON (a.id = r.announce_id AND r.user_id = {?}) + FROM #groupex#.announces AS a + LEFT JOIN #groupex#.announces_read AS r ON (a.id = r.announce_id AND r.user_id = {?}) WHERE asso_id = {?} AND peremption >= CURRENT_DATE() AND (promo_min = 0 OR promo_min <= {?}) AND (promo_max = 0 OR promo_max >= {?}) @@ -152,15 +152,15 @@ class XnetGrpModule extends PLModule $page->assign('article_index', $index); } else { $arts = XDB::iterator("SELECT a.*, u.nom, u.prenom, u.promo, FIND_IN_SET('photo', a.flags) AS photo - FROM groupex.announces AS a - INNER JOIN auth_user_md5 AS u USING(user_id) + FROM #groupex#.announces AS a + INNER JOIN #x4dat#.auth_user_md5 AS u USING(user_id) WHERE asso_id = {?} AND peremption >= CURRENT_DATE() AND FIND_IN_SET('public', u.flags)", $globals->asso('id')); } if (may_update()) { $subs_valid = XDB::query("SELECT uid - FROM groupex.membres_sub_requests + FROM #groupex#.membres_sub_requests WHERE asso_id = {?}", $globals->asso('id')); $page->assign('requests', $subs_valid->numRows()); @@ -182,7 +182,7 @@ class XnetGrpModule extends PLModule global $globals; $res = XDB::query("SELECT logo, logo_mime - FROM groupex.asso WHERE id = {?}", + FROM #groupex#.asso WHERE id = {?}", $globals->asso('id')); list($logo, $logo_mime) = $res->fetchOneRow(); @@ -234,7 +234,7 @@ class XnetGrpModule extends PLModule return; } XDB::execute( - "UPDATE groupex.asso + "UPDATE #groupex#.asso SET nom={?}, diminutif={?}, cat={?}, dom={?}, descr={?}, site={?}, mail={?}, resp={?}, forum={?}, mail_domain={?}, ax={?}, pub={?}, @@ -255,7 +255,7 @@ class XnetGrpModule extends PLModule } } else { XDB::execute( - "UPDATE groupex.asso + "UPDATE #groupex#.asso SET descr={?}, site={?}, mail={?}, resp={?}, forum={?}, pub= {?}, sub_url={?}, unsub_url={?},flags={?} @@ -270,7 +270,7 @@ class XnetGrpModule extends PLModule if ($_FILES['logo']['name']) { $logo = file_get_contents($_FILES['logo']['tmp_name']); $mime = $_FILES['logo']['type']; - XDB::execute('UPDATE groupex.asso + XDB::execute('UPDATE #groupex#.asso SET logo={?}, logo_mime={?} WHERE id={?}', $logo, $mime, $globals->asso('id')); @@ -280,7 +280,7 @@ class XnetGrpModule extends PLModule } if (S::admin()) { - $dom = XDB::iterator('SELECT * FROM groupex.dom ORDER BY nom'); + $dom = XDB::iterator('SELECT * FROM #groupex#.dom ORDER BY nom'); $page->assign('dom', $dom); $page->assign('super', true); } @@ -370,8 +370,8 @@ class XnetGrpModule extends PLModule 'SELECT UPPER(SUBSTRING( IF(m.origine="X", IF(u.nom_usage<>"", u.nom_usage, u.nom),m.nom), 1, 1)) as letter, COUNT(*) - FROM groupex.membres AS m - LEFT JOIN auth_user_md5 AS u ON ( u.user_id = m.uid) + FROM #groupex#.membres AS m + LEFT JOIN #x4dat#.auth_user_md5 AS u ON ( u.user_id = m.uid) WHERE asso_id = {?} and (u.perms != \'pending\' OR m.email IS NOT NULL) GROUP BY letter ORDER BY letter', $globals->asso('id')); @@ -380,8 +380,8 @@ class XnetGrpModule extends PLModule 'SELECT IF(m.origine="X",u.promo, IF(m.origine="ext", "extérieur", "personne morale")) AS promo, COUNT(*), IF(m.origine="X",u.promo,"") AS promo_o - FROM groupex.membres AS m - LEFT JOIN auth_user_md5 AS u ON ( u.user_id = m.uid ) + FROM #groupex#.membres AS m + LEFT JOIN #x4dat#.auth_user_md5 AS u ON ( u.user_id = m.uid ) WHERE asso_id = {?} GROUP BY promo ORDER BY promo_o DESC', $globals->asso('id')); @@ -442,10 +442,10 @@ class XnetGrpModule extends PLModule u.perms!='pending' AS inscrit, m.comm as comm, m.uid, IF(e.email IS NULL AND FIND_IN_SET('googleapps', u.mail_storage) = 0, NULL, 1) AS actif - FROM groupex.membres AS m - LEFT JOIN auth_user_md5 AS u ON ( u.user_id = m.uid ) - LEFT JOIN aliases AS a ON ( a.id = m.uid AND a.type='a_vie' ) - LEFT JOIN emails AS e ON ( e.flags = 'active' AND e.uid = m.uid) + FROM #groupex#.membres AS m + LEFT JOIN #x4dat#.auth_user_md5 AS u ON ( u.user_id = m.uid ) + LEFT JOIN #x4dat#.aliases AS a ON ( a.id = m.uid AND a.type='a_vie' ) + LEFT JOIN #x4dat#.emails AS e ON ( e.flags = 'active' AND e.uid = m.uid) WHERE m.asso_id = {?} $ini AND (m.origine != 'X' OR u.perms != 'pending' OR m.email IS NOT NULL) GROUP BY m.uid @@ -469,7 +469,7 @@ class XnetGrpModule extends PLModule { global $globals; $res = XDB::query('SELECT uid - FROM groupex.membres + FROM #groupex#.membres WHERE asso_id = {?}', $globals->asso('id')); $vcard = new VCard($photos == 'photos', 'Membre du groupe ' . $globals->asso('nom')); $vcard->addUsers($res->fetchColumn()); @@ -489,9 +489,9 @@ class XnetGrpModule extends PLModule IF(m.origine='X' AND u.perms != 'pending',CONCAT(a.alias, '@', {?}), m.email) AS email, IF(m.origine='X',FIND_IN_SET('femme', u.flags), m.sexe) AS femme, m.comm as comm - FROM groupex.membres AS m - LEFT JOIN auth_user_md5 AS u ON ( u.user_id = m.uid ) - LEFT JOIN aliases AS a ON ( a.id = m.uid AND a.type = 'a_vie' ) + FROM #groupex#.membres AS m + LEFT JOIN #x4dat#.auth_user_md5 AS u ON ( u.user_id = m.uid ) + LEFT JOIN #x4dat#.aliases AS a ON ( a.id = m.uid AND a.type = 'a_vie' ) WHERE m.asso_id = {?} AND (m.origine != 'X' OR u.perms != 'pending' OR m.email IS NOT NULL) GROUP BY m.uid @@ -505,7 +505,7 @@ class XnetGrpModule extends PLModule private function removeSubscriptionRequest($uid) { global $globals; - XDB::execute("DELETE FROM groupex.membres_sub_requests + XDB::execute("DELETE FROM #groupex#.membres_sub_requests WHERE asso_id = {?} AND uid = {?}", $globals->asso('id'), $uid); } @@ -514,7 +514,7 @@ class XnetGrpModule extends PLModule { global $globals; $this->removeSubscriptionRequest($user->id()); - XDB::execute("INSERT IGNORE INTO groupex.membres (asso_id, uid) + XDB::execute("INSERT IGNORE INTO #groupex#.membres (asso_id, uid) VALUES ({?}, {?})", $globals->asso('id'), $user->id()); if (XDB::affectedRows() == 1) { @@ -555,13 +555,13 @@ class XnetGrpModule extends PLModule // Retrieves the subscription status, and the reason. $res = XDB::query("SELECT reason - FROM groupex.membres_sub_requests + FROM #groupex#.membres_sub_requests WHERE asso_id = {?} AND uid = {?}", $globals->asso('id'), $user->id()); $reason = ($res->numRows() ? $res->fetchOneCell() : null); $res = XDB::query("SELECT COUNT(*) - FROM groupex.membres + FROM #groupex#.membres WHERE asso_id = {?} AND uid = {?}", $globals->asso('id'), $user->id()); $already_member = ($res->fetchOneCell() > 0); @@ -599,7 +599,7 @@ class XnetGrpModule extends PLModule } $res = XDB::query("SELECT uid - FROM groupex.membres_sub_requests + FROM #groupex#.membres_sub_requests WHERE uid = {?} AND asso_id = {?}", S::i('uid'), $globals->asso('id')); if ($res->numRows() != 0) { @@ -610,14 +610,14 @@ class XnetGrpModule extends PLModule if (Post::has('inscrire')) { S::assert_xsrf_token(); - XDB::execute("INSERT INTO groupex.membres_sub_requests (asso_id, uid, ts, reason) + XDB::execute("INSERT INTO #groupex#.membres_sub_requests (asso_id, uid, ts, reason) VALUES ({?}, {?}, NOW(), {?})", $globals->asso('id'), S::i('uid'), Post::v('message')); $res = XDB::query('SELECT IF(m.email IS NULL, CONCAT(al.alias,"@polytechnique.org"), m.email) - FROM groupex.membres AS m - INNER JOIN aliases AS al ON (al.type = "a_vie" + FROM #groupex#.membres AS m + INNER JOIN #x4dat#.aliases AS al ON (al.type = "a_vie" AND al.id = m.uid) WHERE perms="admin" AND m.asso_id = {?}', $globals->asso('id')); @@ -675,8 +675,8 @@ class XnetGrpModule extends PLModule $it = XDB::iterator("SELECT IF(u.nom_usage != '', u.nom_usage, u.nom) AS nom, u.prenom, u.promo, u.hruid, s.ts AS date - FROM groupex.membres_sub_requests AS s - INNER JOIN auth_user_md5 AS u ON (s.uid = u.user_id) + FROM #groupex#.membres_sub_requests AS s + INNER JOIN #x4dat#.auth_user_md5 AS u ON (s.uid = u.user_id) WHERE asso_id = {?} ORDER BY nom, prenom", $globals->asso('id')); @@ -739,9 +739,9 @@ class XnetGrpModule extends PLModule foreach ($subscribers as $mail) { $res = XDB::query( 'SELECT COUNT(*) - FROM groupex.membres AS m - LEFT JOIN auth_user_md5 AS u ON (m.uid=u.user_id AND m.uid<50000) - LEFT JOIN aliases AS a ON (a.id=u.user_id and a.type="a_vie") + FROM #groupex#.membres AS m + LEFT JOIN #x4dat#.auth_user_md5 AS u ON (m.uid = u.user_id AND m.uid < 50000) + LEFT JOIN #x4dat#.aliases AS a ON (a.id = u.user_id and a.type = "a_vie") WHERE asso_id = {?} AND (m.email = {?} OR CONCAT(a.alias, "@polytechnique.org") = {?})', $globals->asso('id'), $mail, $mail); @@ -775,7 +775,7 @@ class XnetGrpModule extends PLModule if (!User::isForeignEmailAddress($email)) { $user = User::get($email); if ($user) { - XDB::execute("REPLACE INTO groupex.membres (uid, asso_id, origine) + XDB::execute("REPLACE INTO #groupex#.membres (uid, asso_id, origine) VALUES ({?}, {?}, 'X')", $user->id(), $globals->asso('id')); pl_redirect("member/" . $user->login()); @@ -796,7 +796,7 @@ class XnetGrpModule extends PLModule $market->add(); } } - XDB::execute('REPLACE INTO groupex.membres (uid, asso_id, origine, email) + XDB::execute('REPLACE INTO #groupex#.membres (uid, asso_id, origine, email) VALUES ({?}, {?}, "X", {?})', $uid, $globals->asso('id'), $email); $this->removeSubscriptionRequest($uid); @@ -804,9 +804,9 @@ class XnetGrpModule extends PLModule } $page->trigError("Utilisateur invalide"); } else { - $res = XDB::query('SELECT MAX(uid)+1 FROM groupex.membres'); + $res = XDB::query('SELECT MAX(uid) + 1 FROM #groupex#.membres'); $uid = max(intval($res->fetchOneCell()), 50001); - XDB::execute('REPLACE INTO groupex.membres (uid, asso_id, origine, email) + XDB::execute('REPLACE INTO #groupex#.membres (uid, asso_id, origine, email) VALUES ({?}, {?}, "ext", {?})', $uid, $globals->asso('id'), $email); pl_redirect("member/$email"); @@ -855,15 +855,15 @@ class XnetGrpModule extends PLModule { global $globals; XDB::execute( - "DELETE FROM groupex.membres WHERE uid={?} AND asso_id={?}", + "DELETE FROM #groupex#.membres WHERE uid={?} AND asso_id={?}", $user['uid'], $globals->asso('id')); if ($globals->asso('notif_unsub')) { $mailer = new PlMailer('xnetgrp/unsubscription-notif.mail.tpl'); $res = XDB::iterRow("SELECT a.alias, u.prenom, IF(u.nom_usage != '', u.nom_usage, u.nom) AS nom - FROM groupex.membres AS m - INNER JOIN aliases AS a ON (m.uid = a.id AND FIND_IN_SET('bestalias', a.flags)) - INNER JOIn auth_user_md5 AS u ON (u.user_id = a.id) + FROM #groupex#.membres AS m + INNER JOIN #x4dat#.aliases AS a ON (m.uid = a.id AND FIND_IN_SET('bestalias', a.flags)) + INNER JOIn #x4dat#.auth_user_md5 AS u ON (u.user_id = a.id) WHERE m.asso_id = {?} AND m.perms = 'admin'", $globals->asso('id')); while (list($alias, $prenom, $nom) = $res->next()) { @@ -986,17 +986,17 @@ class XnetGrpModule extends PLModule // Check if the user is already in the group global $globals; $res = XDB::query("SELECT uid, email - FROM groupex.membres + FROM #groupex#.membres WHERE uid = {?} AND asso_id = {?}", $uid, $globals->asso('id')); if ($res->numRows()) { list($uid, $email) = $res->fetchOneRow(); - XDB::execute("DELETE FROM groupex.membres + XDB::execute("DELETE FROM #groupex#.membres WHERE uid = {?}", $user['uid']); } else { $email = $user['email']; - XDB::execute("UPDATE groupex.membres + XDB::execute("UPDATE #groupex#.membres SET uid = {?}, origine = 'X' WHERE uid = {?} AND asso_id = {?}", $uid, $user['uid'], $globals->asso('id')); @@ -1060,9 +1060,9 @@ class XnetGrpModule extends PLModule $user['prenom'] = (Post::v('origine') == 'ext') ? Post::v('prenom') : ''; $user['sexe'] = (Post::v('origine') == 'ext') ? Post::v('sexe') : 0; $user['origine'] = Post::v('origine'); - XDB::query('UPDATE groupex.membres - SET prenom={?}, nom={?}, email={?}, sexe={?}, origine={?} - WHERE uid={?} AND asso_id={?}', + XDB::query('UPDATE #groupex#.membres + SET prenom = {?}, nom = {?}, email = {?}, sexe = {?}, origine = {?} + WHERE uid = {?} AND asso_id = {?}', $user['prenom'], $user['nom'], Post::v('email'), $user['sexe'], $user['origine'], $user['uid'], $globals->asso('id')); @@ -1074,9 +1074,9 @@ class XnetGrpModule extends PLModule $perms = Post::i('is_admin'); $comm = trim(Post::s('comm')); if ($user['perms'] != $perms || $user['comm'] != $comm) { - XDB::query('UPDATE groupex.membres - SET perms={?}, comm={?} - WHERE uid={?} AND asso_id={?}', + XDB::query('UPDATE #groupex#.membres + SET perms = {?}, comm = {?} + WHERE uid = {?} AND asso_id = {?}', $perms ? 'admin' : 'membre', $comm, $user['uid'], $globals->asso('id')); if ($perms != $user['perms']) { @@ -1180,7 +1180,7 @@ class XnetGrpModule extends PLModule function handler_photo_announce(&$page, $eid = null) { if ($eid) { - $res = XDB::query("SELECT * FROM groupex.announces_photo WHERE eid = {?}", $eid); + $res = XDB::query("SELECT * FROM #groupex#.announces_photo WHERE eid = {?}", $eid); if ($res->numRows()) { $photo = $res->fetchOneAssoc(); pl_cached_dynamic_content_headers("image/" . $photo['attachmime']); @@ -1257,7 +1257,7 @@ class XnetGrpModule extends PLModule } $art['photo'] = $upload->exists() || Post::i('photo'); if (Post::v('valid') == 'Pas d\'image' && !is_null($aid)) { - XDB::query("DELETE FROM groupex.announces_photo WHERE eid = {?}", $aid); + XDB::query("DELETE FROM #groupex#.announces_photo WHERE eid = {?}", $aid); $upload->rm(); Post::kill('valid'); $art['photo'] = false; @@ -1286,7 +1286,7 @@ class XnetGrpModule extends PLModule $post = $banana->post($globals->asso('forum'), null, $art['titre'], MiniWiki::wikiToText($fulltext, false, 0, 80)); }*/ - XDB::query("INSERT INTO groupex.announces + XDB::query("INSERT INTO #groupex#.announces (user_id, asso_id, create_date, titre, texte, contacts, peremption, promo_min, promo_max, flags, post_id) VALUES ({?}, {?}, NOW(), {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})", @@ -1295,7 +1295,7 @@ class XnetGrpModule extends PLModule $aid = XDB::insertId(); if ($art['photo']) { list($imgx, $imgy, $imgtype) = $upload->imageInfo(); - XDB::execute("INSERT INTO groupex.announces_photo + XDB::execute("INSERT INTO #groupex#.announces_photo SET eid = {?}, attachmime = {?}, x = {?}, y = {?}, attach = {?}", $aid, $imgtype, $imgx, $imgy, $upload->getContents()); } @@ -1317,7 +1317,7 @@ class XnetGrpModule extends PLModule $page->trigWarning("La parution dans la Lettre Mensuelle est en attente de validation."); } } else { - XDB::query("UPDATE groupex.announces + XDB::query("UPDATE #groupex#.announces SET titre={?}, texte={?}, contacts={?}, peremption={?}, promo_min={?}, promo_max={?}, flags={?} WHERE id={?} AND asso_id={?}", @@ -1326,8 +1326,8 @@ class XnetGrpModule extends PLModule $art['id'], $globals->asso('id')); if ($art['photo'] && $upload->exists()) { list($imgx, $imgy, $imgtype) = $upload->imageInfo(); - XDB::execute("REPLACE INTO groupex.announces_photo - SET eid = {?}, attachmime = {?}, x = {?}, y = {?}, attach = {?}", + XDB::execute("REPLACE INTO #groupex#.announces_photo + SET eid = {?}, attachmime = {?}, x = {?}, y = {?}, attach = {?}", $aid, $imgtype, $imgx, $imgy, $upload->getContents()); $upload->rm(); } @@ -1341,8 +1341,8 @@ class XnetGrpModule extends PLModule $res = XDB::query("SELECT a.*, u.nom, u.prenom, u.promo, u.hruid, FIND_IN_SET('public', a.flags) AS public, FIND_IN_SET('photo', a.flags) AS photo - FROM groupex.announces AS a - INNER JOIN auth_user_md5 AS u USING(user_id) + FROM #groupex#.announces AS a + INNER JOIN #x4dat#.auth_user_md5 AS u USING(user_id) WHERE asso_id = {?} AND a.id = {?}", $globals->asso('id'), $aid); if ($res->numRows()) { @@ -1355,7 +1355,7 @@ class XnetGrpModule extends PLModule if (is_null($aid)) { $events = XDB::iterator("SELECT * - FROM groupex.evenements + FROM #groupex#.evenements WHERE asso_id = {?} AND archive = 0", $globals->asso('id')); if ($events->total()) { @@ -1375,12 +1375,12 @@ class XnetGrpModule extends PLModule if (Env::has('del')) { S::assert_xsrf_token(); - XDB::execute("DELETE FROM groupex.announces + XDB::execute("DELETE FROM #groupex#.announces WHERE id = {?} AND asso_id = {?}", Env::i('del'), $globals->asso('id')); } $res = XDB::iterator("SELECT a.id, a.titre, a.peremption, a.peremption < CURRENT_DATE() AS perime - FROM groupex.announces AS a + FROM #groupex#.announces AS a WHERE a.asso_id = {?} ORDER BY a.peremption DESC", $globals->asso('id')); diff --git a/modules/xnetgrp/feed.inc.php b/modules/xnetgrp/feed.inc.php index c367967..88ba32a 100644 --- a/modules/xnetgrp/feed.inc.php +++ b/modules/xnetgrp/feed.inc.php @@ -42,10 +42,10 @@ class XnetGrpEventFeed extends PlFeed CONCAT(u2.prenom, ' ', IF(u2.nom_usage != '', u2.nom_usage, u2.nom), ' (X', u2.promo, ')') AS author, FIND_IN_SET('photo', a.flags) AS photo, CONCAT({?}, '/#art', a.id) AS link - FROM auth_user_md5 AS u - INNER JOIN groupex.announces AS a ON ( (a.promo_min = 0 OR a.promo_min <= u.promo) - AND (a.promo_max = 0 OR a.promo_max <= u.promo)) - INNER JOIN auth_user_md5 AS u2 ON (u2.user_id = a.user_id) + FROM #x4dat#.auth_user_md5 AS u + INNER JOIN #groupex#.announces AS a ON ((a.promo_min = 0 OR a.promo_min <= u.promo) + AND (a.promo_max = 0 OR a.promo_max <= u.promo)) + INNER JOIN #x4dat#.auth_user_md5 AS u2 ON (u2.user_id = a.user_id) WHERE u.user_id = {?} AND peremption >= NOW() AND a.asso_id = {?}", $this->link, $user->id(), $globals->asso('id')); } else { @@ -53,8 +53,8 @@ class XnetGrpEventFeed extends PlFeed CONCAT(u.prenom, ' ', IF(u.nom_usage != '', u.nom_usage, u.nom), ' (X', u.promo, ')') AS author, CONCAT({?}, '/#art', a.id) AS link, NULL AS photo, NULL AS contacts - FROM groupex.announces AS a - INNER JOIN auth_user_md5 AS u USING(user_id) + FROM #groupex#.announces AS a + INNER JOIN #x4dat#.auth_user_md5 AS u USING(user_id) WHERE FIND_IN_SET('public', a.flags) AND peremption >= NOW() AND a.asso_id = {?}", $this->link, $globals->asso('id')); } diff --git a/modules/xnetgrp/mail.inc.php b/modules/xnetgrp/mail.inc.php index 5751457..654add1 100644 --- a/modules/xnetgrp/mail.inc.php +++ b/modules/xnetgrp/mail.inc.php @@ -35,9 +35,9 @@ function get_all_redirects($membres, $mls, &$client) IF(u.prenom <> "", u.prenom, m.prenom) AS prenom, IF(m.email <> "", m.email, CONCAT(a.alias, "@polytechnique.org")) as email, IF(m.sexe IS NULL, FIND_IN_SET("femme", u.flags), m.sexe) AS sexe - FROM groupex.membres AS m - LEFT JOIN auth_user_md5 AS u ON (m.uid=u.user_id AND m.uid<50000) - LEFT JOIN aliases AS a ON (a.id=u.user_id and a.type="a_vie") + FROM #groupex#.membres AS m + LEFT JOIN #x4dat#.auth_user_md5 AS u ON (m.uid=u.user_id AND m.uid<50000) + LEFT JOIN #x4dat#.aliases AS a ON (a.id=u.user_id and a.type="a_vie") WHERE asso_id = {?} AND m.origine IN (' . $membres . ') AND (m.email <> "" OR u.perms <> "pending")', $globals->asso('id')); @@ -58,7 +58,7 @@ function get_all_redirects($membres, $mls, &$client) $tos[] = $person; } } else { - $res = XDB::query('SELECT prenom, nom, sexe FROM groupex.membres WHERE email={?}', $mem[1]); + $res = XDB::query('SELECT prenom, nom, sexe FROM #groupex#.membres WHERE email={?}', $mem[1]); if ($person = $res->fetchOneAssoc()) { $person['email'] = $mem[1]; $tos[] = $person; diff --git a/modules/xnetlists.php b/modules/xnetlists.php index 95c71bd..7176f09 100644 --- a/modules/xnetlists.php +++ b/modules/xnetlists.php @@ -97,8 +97,8 @@ class XnetListsModule extends ListsModule $alias = substr($alias, 0, strpos($alias, '@')).'@'.$globals->asso('mail_domain'); XDB::query( 'DELETE FROM r, v - USING x4dat.virtual AS v - LEFT JOIN x4dat.virtual_redirect AS r USING(vid) + USING virtual AS v + LEFT JOIN virtual_redirect AS r USING(vid) WHERE v.alias={?}', $alias); $page->trigSuccess(Post::v('del_alias')." supprimé !"); } @@ -108,7 +108,7 @@ class XnetListsModule extends ListsModule $alias = XDB::iterator( 'SELECT alias,type - FROM x4dat.virtual + FROM virtual WHERE alias LIKE {?} AND type="user" ORDER BY alias', '%@'.$globals->asso('mail_domain')); @@ -117,7 +117,7 @@ class XnetListsModule extends ListsModule $page->assign('may_update', may_update()); if (count($listes) > 0 && !$globals->asso('has_ml')) { - XDB::execute("UPDATE groupex.asso + XDB::execute("UPDATE #groupex#.asso SET flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'has_ml') WHERE id = {?}", $globals->asso('id')); @@ -153,7 +153,7 @@ class XnetListsModule extends ListsModule } $new = $liste.'@'.$globals->asso('mail_domain'); - $res = XDB::query('SELECT alias FROM x4dat.virtual WHERE alias={?}', $new); + $res = XDB::query('SELECT alias FROM virtual WHERE alias={?}', $new); if ($res->numRows()) { $page->trigError('cet alias est déjà pris'); @@ -182,14 +182,14 @@ class XnetListsModule extends ListsModule if (!empty($app)) { $app = '-' . $app; } - XDB::execute('INSERT INTO x4dat.virtual (alias,type) + XDB::execute('INSERT INTO virtual (alias,type) VALUES({?},{?})', $liste. $app . '@'.$dom, 'list'); - XDB::execute('INSERT INTO x4dat.virtual_redirect (vid,redirect) + XDB::execute('INSERT INTO virtual_redirect (vid,redirect) VALUES ({?}, {?})', XDB::insertId(), $red . $mdir . '@listes.polytechnique.org'); } - XDB::execute("UPDATE groupex.asso + XDB::execute("UPDATE #groupex#.asso SET flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'has_ml') WHERE id = {?}", $globals->asso('id')); @@ -227,9 +227,9 @@ class XnetListsModule extends ListsModule if (m.origine='X',FIND_IN_SET('femme', u.flags),0) AS femme, m.perms='admin' AS admin, m.origine='X' AS x - FROM groupex.membres AS m - LEFT JOIN auth_user_md5 AS u ON ( u.user_id = m.uid ) - LEFT JOIN aliases AS a ON ( a.id = m.uid AND a.type='a_vie' ) + FROM #groupex#.membres AS m + LEFT JOIN #x4dat#.auth_user_md5 AS u ON ( u.user_id = m.uid ) + LEFT JOIN #x4dat#.aliases AS a ON ( a.id = m.uid AND a.type='a_vie' ) WHERE m.asso_id = {?} ORDER BY promo, nom, prenom", $globals->asso('id')); @@ -266,15 +266,15 @@ class XnetListsModule extends ListsModule if ($dom == 'polytechnique.org' || $dom == 'm4x.org') { $res = XDB::query( "SELECT a.alias, b.alias - FROM x4dat.aliases AS a - LEFT JOIN x4dat.aliases AS b ON (a.id=b.id AND b.type = 'a_vie') + FROM aliases AS a + LEFT JOIN aliases AS b ON (a.id=b.id AND b.type = 'a_vie') WHERE a.alias={?} AND a.type!='homonyme'", $mbox); if (list($alias, $blias) = $res->fetchOneRow()) { $alias = empty($blias) ? $alias : $blias; XDB::query( - "INSERT IGNORE INTO x4dat.virtual_redirect (vid,redirect) + "INSERT IGNORE INTO virtual_redirect (vid,redirect) SELECT vid, {?} - FROM x4dat.virtual + FROM virtual WHERE alias={?}", "$alias@m4x.org", $lfull); $page->trigSuccess("$alias@m4x.org ajouté"); } else { @@ -282,9 +282,9 @@ class XnetListsModule extends ListsModule } } else { XDB::query( - "INSERT IGNORE INTO x4dat.virtual_redirect (vid,redirect) + "INSERT IGNORE INTO virtual_redirect (vid,redirect) SELECT vid,{?} - FROM x4dat.virtual + FROM virtual WHERE alias={?}", "$mbox@$dom", $lfull); $page->trigSuccess("$mbox@$dom ajouté"); } @@ -293,9 +293,9 @@ class XnetListsModule extends ListsModule if (Env::has('del_member')) { S::assert_xsrf_token(); XDB::query( - "DELETE FROM x4dat.virtual_redirect - USING x4dat.virtual_redirect - INNER JOIN x4dat.virtual USING(vid) + "DELETE FROM virtual_redirect + USING virtual_redirect + INNER JOIN virtual USING(vid) WHERE redirect={?} AND alias={?}", Env::v('del_member'), $lfull); pl_redirect('alias/admin/'.$lfull); } @@ -308,13 +308,13 @@ class XnetListsModule extends ListsModule FROM (SELECT redirect AS redirect, IF(SUBSTRING_INDEX(redirect, '@', -1) IN ({?}, {?}), SUBSTRING_INDEX(redirect, '@', 1), NULL) AS login - FROM x4dat.virtual_redirect AS vr - INNER JOIN x4dat.virtual AS v USING(vid) + FROM #x4dat#.virtual_redirect AS vr + INNER JOIN #x4dat#.virtual AS v USING(vid) WHERE v.alias = {?} - ORDER BY redirect) AS r - LEFT JOIN aliases AS a ON (r.login IS NOT NULL AND r.login = a.alias) - LEFT JOIN auth_user_md5 AS u ON (u.user_id = a.id) - LEFT JOIN groupex.membres AS m ON (m.asso_id = {?} AND IF(r.login IS NULL, m.email = r.redirect, m.uid = u.user_id))", + ORDER BY redirect) AS r + LEFT JOIN #x4dat#.aliases AS a ON (r.login IS NOT NULL AND r.login = a.alias) + LEFT JOIN #x4dat#.auth_user_md5 AS u ON (u.user_id = a.id) + LEFT JOIN #groupex#.membres AS m ON (m.asso_id = {?} AND IF(r.login IS NULL, m.email = r.redirect, m.uid = u.user_id))", $globals->mail->domain, $globals->mail->domain2, $lfull, $globals->asso('id')); $page->assign('mem', $res); @@ -347,14 +347,14 @@ class XnetListsModule extends ListsModule } $new = $liste.'@'.$globals->asso('mail_domain'); - $res = XDB::query('SELECT COUNT(*) FROM x4dat.virtual WHERE alias={?}', $new); + $res = XDB::query('SELECT COUNT(*) FROM virtual WHERE alias = {?}', $new); $n = $res->fetchOneCell(); if ($n) { $page->trigError('cet alias est déjà pris'); return; } - XDB::query('INSERT INTO x4dat.virtual (alias,type) VALUES({?}, "user")', $new); + XDB::query('INSERT INTO virtual (alias,type) VALUES({?}, "user")', $new); pl_redirect("alias/admin/$new"); } diff --git a/templates/payment/index.tpl b/templates/payment/index.tpl index e5ce00c..a8c3a8d 100644 --- a/templates/payment/index.tpl +++ b/templates/payment/index.tpl @@ -116,7 +116,7 @@ function payment_submit(form) {/if} {if $pay->url} @@ -129,7 +129,7 @@ function payment_submit(form) Méthode -- 2.1.4