From 45dcd6dd4d35789f657ffb1e983de67897499b64 Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Thu, 15 Jan 2009 00:24:41 +0100 Subject: [PATCH] Start porting xnetgrp. Signed-off-by: Florent Bruneau --- classes/user.php | 14 ++- modules/xnetgrp.php | 119 +++++++----------------- plugins/function.profile.php | 22 +++-- templates/xnetgrp/unsubscription-notif.mail.tpl | 6 +- 4 files changed, 60 insertions(+), 101 deletions(-) diff --git a/classes/user.php b/classes/user.php index 54a3737..5562e47 100644 --- a/classes/user.php +++ b/classes/user.php @@ -137,9 +137,10 @@ class User extends PlUser protected static function loadMainFieldsFromUIDs(array $uids, $sorted = null) { - $uids = array_map(array('XDB', 'escape'), $uids); + global $globals; $joins = ''; $orderby = ''; + $fields = array(); if (!is_null($sorted)) { $order = array(); $with_ap = false; @@ -181,7 +182,14 @@ class User extends PlUser $orderby = 'ORDER BY ' . implode(', ', $order); } } - global $globals; + if ($globals->asso('id')) { + $joins .= XDB::format("LEFT JOIN groupex.membres AS gpm ON (gpm.uid = a.uid AND gpm.asso_id = {?})\n", $globals->asso('id')); + $fields[] = 'gpm.perms AS group_perms'; + } + if (count($fields) > 0) { + $fields = ', ' . implode(', ', $fields); + } + $uids = array_map(array('XDB', 'escape'), $uids); return XDB::iterator('SELECT a.uid, a.hruid, a.registration_date, CONCAT(af.alias, \'@' . $globals->mail->domain . '\') AS forlife, CONCAT(ab.alias, \'@' . $globals->mail->domain . '\') AS bestalias, @@ -190,7 +198,7 @@ class User extends PlUser a.email_format, a.is_admin, a.state, a.type, a.skin, FIND_IN_SET(\'watch\', a.flags) AS watch, a.comment, a.weak_password IS NOT NULL AS weak_access, - a.token IS NOT NULL AS token_access + a.token IS NOT NULL AS token_access ' . $fields . ' FROM accounts AS a INNER JOIN account_types AS at ON (at.type = a.type) LEFT JOIN aliases AS af ON (af.id = a.uid AND af.type = \'a_vie\') diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php index 3523f86..f8ad347 100644 --- a/modules/xnetgrp.php +++ b/modules/xnetgrp.php @@ -19,54 +19,6 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ -function get_infos($email) -{ - global $globals; - // look for uid instead of email if numeric - $field = is_numeric($email) ? 'uid' : 'email'; - - if ($field == 'email') { - $email = strtolower($email); - if (strpos($email, '@') === false) { - $email .= '@m4x.org'; - } - list($mbox,$dom) = explode('@', $email); - } - - $res = XDB::query( - "SELECT uid, nom, prenom, email, email AS email2, perms='admin', origine, comm, sexe - FROM groupex.membres - WHERE $field = {?} AND asso_id = {?}", $email, $globals->asso('id')); - - if ($res->numRows()) { - $user = $res->fetchOneAssoc(); - if ($user['origine'] == 'X') { - $res = XDB::query("SELECT nom, prenom, promo, FIND_IN_SET('femme', flags) AS sexe - FROM auth_user_md5 - WHERE user_id = {?}", $user['uid']); - $user = array_merge($user, $res->fetchOneAssoc()); - } - return $user; - } elseif ($dom == 'polytechnique.org' || $dom == 'm4x.org') { - $res = XDB::query( - "SELECT user_id AS uid, u.promo, - IF(u.nom_usage<>'', u.nom_usage, u.nom) AS nom, - u.prenom, b.alias, - CONCAT(b.alias, '@m4x.org') AS 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={?}) - WHERE a.alias = {?} AND u.user_id < 50000", $globals->asso('id'), $mbox); - return $res->fetchOneAssoc(); - } - - return null; -} - class XnetGrpModule extends PLModule { @@ -867,71 +819,66 @@ class XnetGrpModule extends PLModule } } - function unsubscribe(&$user) + function unsubscribe(PlUser &$user) { global $globals; - XDB::execute( - "DELETE FROM groupex.membres WHERE uid={?} AND asso_id={?}", - $user['uid'], $globals->asso('id')); + XDB::execute("DELETE FROM groupex.membres + WHERE uid = {?} AND asso_id = {?}", + $user->id(), $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) - WHERE m.asso_id = {?} AND m.perms = 'admin'", - $globals->asso('id')); - while (list($alias, $prenom, $nom) = $res->next()) { - $mailer->addTo("\"$prenom $nom\" <$alias@{$globals->mail->domain}>"); + $uids = XDB::fetchColumn('SELECT uid + FROM groupex.membres + WHERE perms = \'admin\' AND asso_id = {?}', + $globals->asso('id')); + $users = User::getBuildUsersWithUIDs($uids); + foreach ($users as $user) { + $mailer->addTo($user); } $mailer->assign('group', $globals->asso('nom')); - $mailer->assign('prenom', $user['prenom']); - $mailer->assign('nom', $user['nom']); - $mailer->assign('mail', $user['email2']); - $mailer->assign('selfdone', $user['uid'] == S::i('uid')); + $mailer->assign('user', $user); + $mailer->assign('selfdone', $user->id() == S::i('uid')); $mailer->send(); } - $user_same_email = get_infos($user['email']); $domain = $globals->asso('mail_domain'); - - if (!$domain || (!empty($user_same_email) && $user_same_email['uid'] != $user['uid'])) { + if (!$domain) { return true; } - $mmlist = new MMList(S::v('uid'), S::v('password'), $domain); - $listes = $mmlist->get_lists($user['email2']); + $mmlist = new MMList($user, $domain); + $listes = $mmlist->get_lists($user->forlifeEmail()); $may_update = may_update(); $warning = false; foreach ($listes as $liste) { if ($liste['sub'] == 2) { if ($may_update) { - $mmlist->mass_unsubscribe($liste['list'], Array($user['email2'])); + $mmlist->mass_unsubscribe($liste['list'], Array($user->forlifeEmail())); } else { $mmlist->unsubscribe($liste['list']); } } elseif ($liste['sub']) { - Platal::page()->trigWarning("{$user['prenom']} {$user['nom']} a une" + Platal::page()->trigWarning($user->fullName() . " a une" ." demande d'inscription en cours sur la" ." liste {$liste['list']}@ !"); $warning = true; } } - XDB::execute( - "DELETE FROM virtual_redirect - USING virtual_redirect - INNER JOIN virtual USING(vid) - WHERE redirect={?} AND alias LIKE {?}", $user['email'], '%@'.$domain); + XDB::execute("DELETE FROM virtual_redirect + USING virtual_redirect + INNER JOIN virtual USING(vid) + WHERE redirect={?} AND alias LIKE {?}", + $user->forlifeEmail(), '%@'.$domain); return !$warning; } function handler_unsubscribe(&$page) { $page->changeTpl('xnetgrp/membres-del.tpl'); - $user = get_infos(S::user()->id()); + $user = S::user()->id(); if (empty($user)) { return PL_NOT_FOUND; } @@ -955,7 +902,7 @@ class XnetGrpModule extends PLModule function handler_admin_member_del(&$page, $user = null) { $page->changeTpl('xnetgrp/membres-del.tpl'); - $user = get_infos($user); + $user = User::getSilent($user); if (empty($user)) { return PL_NOT_FOUND; } @@ -968,13 +915,13 @@ class XnetGrpModule extends PLModule } if ($this->unsubscribe($user)) { - $page->trigSuccess("{$user['prenom']} {$user['nom']} a été désabonné du groupe !"); + $page->trigSuccess("{$user->fullName()} a été désinscrit du groupe !"); } else { - $page->trigWarning("{$user['prenom']} {$user['nom']} a été désabonné du groupe, mais des erreurs subsistent !"); + $page->trigWarning("{$user->fullName()} a été désinscrit du groupe, mais des erreurs subsistent !"); } } - private function changeLogin(PlPage &$page, array &$user, MMList &$mmlist, $login) + private function changeLogin(PlPage &$page, PlUser &$user, MMList &$mmlist, $login) { require_once 'user.func.inc.php'; // Search the uid of the user... @@ -1049,20 +996,20 @@ class XnetGrpModule extends PLModule $page->changeTpl('xnetgrp/membres-edit.tpl'); - $user = get_infos($user); + $user = User::getSilent($user); if (empty($user)) { return PL_NOT_FOUND; } - $mmlist = new MMList(S::v('uid'), S::v('password'), - $globals->asso('mail_domain')); + $mmlist = new MMList($user, $globals->asso('mail_domain')); if (Post::has('change')) { S::assert_xsrf_token(); // Convert user status to X - if ($user['origine'] == 'ext' && trim(Post::v('login_X'))) { - $forlife = $this->changeLogin($page, $user, $mmlist, trim(Post::v('login_X'))); + if (Post::blank('login_X'))) { + // TODO: Rewrite changeLogin!!! + $forlife = $this->changeLogin($page, $user, $mmlist, Post::t('login_X')); if ($forlife) { pl_redirect('member/' . $forlife); } diff --git a/plugins/function.profile.php b/plugins/function.profile.php index 8d34076..d686b1c 100644 --- a/plugins/function.profile.php +++ b/plugins/function.profile.php @@ -24,23 +24,27 @@ function smarty_function_profile($params, &$smarty) $with_promo = isset($params['with_promo']) ? $params['with_promo'] : false; $with_sex = isset($params['with_sex']) ? $params['with_sex'] : true; $with_link = isset($params['with_link']) ? $params['with_link'] : true; + $with_groupperms = isset($params['with_groupperms']) ? $params['with_groupperms'] : true; $user = $params['user']; $name = pl_entities($user->fullName()); if ($with_sex && $user->isFemale()) { - $name = '•' . $name; + $name = '•' . $name; } if ($with_promo) { - $promo = $user->promo(); - if ($promo) { - $name .= ' (' . pl_entities($promo) . ')'; - } + $promo = $user->promo(); + if ($promo) { + $name .= ' (' . pl_entities($promo) . ')'; + } } if ($with_link) { - $profile = ($user instanceof Profile) ? $user : $user->profile(); - if ($profile) { - $name = '' . $name . ''; - } + $profile = ($user instanceof Profile) ? $user : $user->profile(); + if ($profile) { + $name = '' . $name . ''; + } + } + if ($with_groupperms && $user instanceof User && $user->group_perms == 'admin') { + $name = '' . $name . ''; } return $name; } diff --git a/templates/xnetgrp/unsubscription-notif.mail.tpl b/templates/xnetgrp/unsubscription-notif.mail.tpl index 8636f73..3bc6b91 100644 --- a/templates/xnetgrp/unsubscription-notif.mail.tpl +++ b/templates/xnetgrp/unsubscription-notif.mail.tpl @@ -23,14 +23,14 @@ {config_load file="mails.conf" section="xnet_unsubscription"} {if $mail_part eq 'head'} {from full=#from#} -{subject text="[`$group`] Désinscription de `$prenom` `$nom`"} +{subject text="[`$group`] Désinscription de `$prenom->fullName()`"} {elseif $mail_part eq 'wiki'} Chers animateurs du groupe {$group}, {if $selfdone} -{$prenom} {$nom} ({$mail}) vient de se désinscrire du groupe. +{$user->fullName()} ({$user->forlifeEmail()}) vient de se désinscrire du groupe. {else} -{$prenom} {$nom} ({$mail}) vient d'être désinscrit du groupe par {$smarty.session.prenom} {$smarty.session.nom}. +{$user->fullName()} ({$user->forlifeEmail()}) vient d'être désinscrit du groupe par {$smarty.session.user->fullName()}. {/if} Cordialement,\\ -- 2.1.4