X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetgrp.php;h=b004fde7f367bbe287c0ff8deaeedae493639310;hb=c9910f7559bb0cfd787b4fb73f864000f28e38cc;hp=0516201f2544e160d01f2795cf500f920e66947d;hpb=76362eeb011de4f2cd7825f557643a72494475f9;p=platal.git diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php index 0516201..b004fde 100644 --- a/modules/xnetgrp.php +++ b/modules/xnetgrp.php @@ -47,6 +47,7 @@ class XnetGrpModule extends PLModule '%grp/member/new' => $this->make_hook('admin_member_new', AUTH_MDP, 'groupadmin'), '%grp/member/new/ajax' => $this->make_hook('admin_member_new_ajax', AUTH_MDP, 'user', NO_AUTH), '%grp/member/del' => $this->make_hook('admin_member_del', AUTH_MDP, 'groupadmin'), + '%grp/member/suggest' => $this->make_hook('admin_member_suggest', AUTH_MDP, 'groupadmin'), '%grp/rss' => $this->make_token_hook('rss', AUTH_PUBLIC), '%grp/announce/new' => $this->make_hook('edit_announce', AUTH_MDP, 'groupadmin'), @@ -208,8 +209,13 @@ class XnetGrpModule extends PLModule Post::v('unsub_url'), $flags, Post::t('welcome_msg'), $globals->asso('id')); if (Post::v('mail_domain')) { - XDB::execute('INSERT IGNORE INTO virtual_domains (domain) VALUES({?})', - Post::v('mail_domain')); + XDB::execute('INSERT IGNORE INTO email_virtual_domains (name) + VALUES ({?})', + Post::t('mail_domain')); + XDB::execute('UPDATE email_virtual_domains + SET aliasing = id + WHERE name = {?}', + Post::t('mail_domain')); } } else { XDB::execute( @@ -226,6 +232,16 @@ class XnetGrpModule extends PLModule $globals->asso('id')); } + Phone::deletePhones(0, Phone::LINK_GROUP, $globals->asso('id')); + $phone = new Phone(array('link_type' => 'group', 'link_id' => $globals->asso('id'), 'id' => 0, + 'type' => 'fixed', 'display' => Post::v('phone'), 'pub' => 'public')); + $fax = new Phone(array('link_type' => 'group', 'link_id' => $globals->asso('id'), 'id' => 1, + 'type' => 'fax', 'display' => Post::v('fax'), 'pub' => 'public')); + $phone->save(); + $fax->save(); + Address::deleteAddresses(null, Address::LINK_GROUP, null, $globals->asso('id')); + $address = new Address(array('groupid' => $globals->asso('id'), 'type' => Address::LINK_GROUP, 'text' => Post::v('address'))); + $address->save(); if ($_FILES['logo']['name']) { $upload = PlUpload::get($_FILES['logo'], $globals->asso('id'), 'asso.logo', true); @@ -369,7 +385,7 @@ class XnetGrpModule extends PLModule { global $globals; $vcard = new VCard($photos == 'photos', 'Membre du groupe ' . $globals->asso('nom')); - $vcard->addProfiles($globals->asso()->getMembersFilter()->getProfiles()); + $vcard->addProfiles($globals->asso()->getMembersFilter()->getProfiles(null, Profile::FETCH_ALL)); $vcard->show(); } @@ -641,6 +657,7 @@ class XnetGrpModule extends PLModule } S::assert_xsrf_token(); + $suggest_account_activation = false; // Finds or creates account: first cases are for users with an account. if (!User::isForeignEmailAddress($email)) { @@ -679,7 +696,15 @@ class XnetGrpModule extends PLModule } } } else { - // User is of type xnet. + // User is of type xnet. There are 3 possible cases: + // * the email is not known yet: we create a new account and + // propose to send an email to the user so he can activate + // his account, + // * the email is known but the user was not contacted in order to + // activate yet: we propose to send an email to the user so he + // can activate his account, + // * the email is known and the user was already contacted or has + // an active account: nothing to be done. list($mbox, $domain) = explode('@', strtolower($email)); $hruid = User::makeHrid($mbox, $domain, 'ext'); // User might already have an account (in another group for example). @@ -703,6 +728,8 @@ class XnetGrpModule extends PLModule $hruid, $display_name, $full_name, $directory_name, $email); $user = User::get($hruid); } + + $suggest_account_activation = $this->suggest($user); } if ($user) { @@ -710,8 +737,51 @@ class XnetGrpModule extends PLModule VALUES ({?}, {?})', $user->id(), $globals->asso('id')); $this->removeSubscriptionRequest($user->id()); - pl_redirect('member/' . $user->login()); + if ($suggest_account_activation) { + pl_redirect('member/suggest/' . $user->login() . '/' . $email . '/' . $globals->asso('nom')); + } else { + pl_redirect('member/' . $user->login()); + } + } + } + + // Check if the user has a pending or active account, and thus if we should her account's activation. + private function suggest(PlUser $user) + { + $active = XDB::fetchOneCell('SELECT state = \'active\' + FROM accounts + WHERE uid = {?}', + $user->id()); + $pending = XDB::fetchOneCell('SELECT uid + FROM register_pending_xnet + WHERE uid = {?}', + $user->id()); + $requested = AccountReq::isPending($user->id()); + + if ($active || $pending || $requested) { + return false; + } + return true; + } + + function handler_admin_member_suggest($page, $hruid, $email) + { + $page->changeTpl('xnetgrp/membres-suggest.tpl'); + + if (Post::has('suggest')) { + if (Post::t('suggest') == 'yes') { + $user = S::user(); + $group = Platal::globals()->asso('nom'); + $request = new AccountReq($user, $hruid, $email, $group); + $request->submit(); + $page->trigSuccessRedirect('Un email va bien être envoyé à ' . $email . ' pour l\'activation de son compte.', + $group . '/member/' . $hruid); + } else { + pl_redirect('member/' . $hruid); + } } + $page->assign('email', $email); + $page->assign('hruid', $hruid); } function handler_admin_member_new_ajax($page) @@ -793,11 +863,11 @@ class XnetGrpModule extends PLModule } } - XDB::execute("DELETE FROM virtual_redirect - USING virtual_redirect - INNER JOIN virtual USING(vid) - WHERE redirect={?} AND alias LIKE {?}", - $user->forlifeEmail(), '%@'.$domain); + XDB::execute('DELETE v + FROM email_virtual AS v + INNER JOIN email_virtual_domains AS d ON (v.domain = d.id) + WHERE v.redirect = {?} AND d.name = {?}', + $user->forlifeEmail(), $domain); return !$warning; } @@ -805,12 +875,11 @@ class XnetGrpModule extends PLModule { $page->changeTpl('xnetgrp/membres-del.tpl'); $user = S::user(); - $uid = S::user()->id(); - if (empty($uid)) { + if (empty($user)) { return PL_NOT_FOUND; } $page->assign('self', true); - $page->assign('user', $uid); + $page->assign('user', $user); if (!Post::has('confirm')) { return; @@ -818,10 +887,17 @@ class XnetGrpModule extends PLModule S::assert_xsrf_token(); } + $hasSingleGroup = ($user->groupCount() == 1); + if ($this->unsubscribe($user)) { - $page->trigSuccess('Vous avez été désinscrit du groupe avec succès.'); + $page->trigSuccess('Tu as été désinscrit du groupe avec succès.'); } else { - $page->trigWarning('Vous avez été désinscrit du groupe, mais des erreurs se sont produites lors des désinscriptions des alias et des listes de diffusion.'); + $page->trigWarning('Tu as été désinscrit du groupe, mais des erreurs se sont produites lors des désinscriptions des alias et des listes de diffusion.'); + } + + // If user is of type xnet account and this was her last group, disable the account. + if ($user->type == 'xnet' && $hasSingleGroup) { + $user->clear(true); } $page->assign('is_member', is_member(true)); } @@ -833,6 +909,14 @@ class XnetGrpModule extends PLModule if (empty($user)) { return PL_NOT_FOUND; } + + global $globals; + + if (!$user->inGroup($globals->asso('id'))) { + pl_redirect('annuaire'); + } + + $page->assign('self', false); $page->assign('user', $user); if (!Post::has('confirm')) { @@ -841,14 +925,21 @@ class XnetGrpModule extends PLModule S::assert_xsrf_token(); } + $hasSingleGroup = ($user->groupCount() == 1); + if ($this->unsubscribe($user)) { $page->trigSuccess("{$user->fullName()} a été désinscrit du groupe !"); } else { $page->trigWarning("{$user->fullName()} a été désinscrit du groupe, mais des erreurs subsistent !"); } + + // If user is of type xnet account and this was her last group, disable the account. + if ($user->type == 'xnet' && $hasSingleGroup) { + $user->clear(true); + } } - private function changeLogin(PlPage $page, PlUser $user, MMList $mmlist, $login) + private function changeLogin(PlPage $page, PlUser $user, $login) { // Search the user's uid. $xuser = User::getSilent($login); @@ -878,13 +969,17 @@ class XnetGrpModule extends PLModule { global $globals; - $page->changeTpl('xnetgrp/membres-edit.tpl'); - $user = User::getSilent($user); if (empty($user)) { return PL_NOT_FOUND; } + if (!$user->inGroup($globals->asso('id'))) { + pl_redirect('annuaire'); + } + + $page->changeTpl('xnetgrp/membres-edit.tpl'); + $mmlist = new MMList(S::user(), $globals->asso('mail_domain')); if (Post::has('change')) { @@ -892,7 +987,7 @@ class XnetGrpModule extends PLModule // Convert user status to X if (!Post::blank('login_X')) { - $forlife = $this->changeLogin($page, $user, $mmlist, Post::t('login_X')); + $forlife = $this->changeLogin($page, $user, Post::t('login_X')); if ($forlife) { pl_redirect('member/' . $forlife); } @@ -901,7 +996,7 @@ class XnetGrpModule extends PLModule // Update user info $email_changed = (!$user->profile() && strtolower($user->forlifeEmail()) != strtolower(Post::v('email'))); $from_email = $user->forlifeEmail(); - if ($user->type == 'virtual' || $user->type == 'xnet') { + if ($user->type == 'virtual' || ($user->type == 'xnet' && !$user->perms)) { XDB::query('UPDATE accounts SET full_name = {?}, directory_name = {?}, display_name = {?}, sex = {?}, email = {?}, type = {?} @@ -916,7 +1011,13 @@ class XnetGrpModule extends PLModule Post::t('email'), $user->id()); } if (XDB::affectedRows()) { - $page->trigSuccess('Données de l\'utilisateur mise à jour.'); + $page->trigSuccess('Données de l\'utilisateur mises à jour.'); + } + + if (($user->type == 'xnet' && !$user->perms) && Post::b('suggest')) { + $request = new AccountReq(S::user(), $user->hruid, Post::t('email'), $globals->asso('nom')); + $request->submit(); + $page->trigSuccess('Le compte va bientôt être activé.'); } // Update group params for user @@ -974,26 +1075,18 @@ class XnetGrpModule extends PLModule // Change subscriptioin to aliases foreach (Env::v('ml3', array()) as $ml => $state) { + require_once 'emails.inc.php'; $ask = !empty($_REQUEST['ml4'][$ml]); if($state == $ask) { if ($state && $email_changed) { - XDB::query("UPDATE virtual_redirect AS vr, virtual AS v - SET vr.redirect = {?} - WHERE vr.vid = v.vid AND v.alias = {?} AND vr.redirect = {?}", - $user->forlifeEmail(), $ml, $from_email); + update_list_alias($user, $from_email, $ml, $globals->asso('mail_domain')); $page->trigSuccess("L'abonnement de {$user->fullName()} à $ml a été mis à jour."); } } else if($ask) { - XDB::query("INSERT INTO virtual_redirect (vid,redirect) - SELECT vid,{?} FROM virtual WHERE alias={?}", - $user->forlifeEmail(), $ml); + add_to_list_alias($user, $ml, $globals->asso('mail_domain')); $page->trigSuccess("{$user->fullName()} a été abonné à $ml."); } else { - XDB::query("DELETE FROM virtual_redirect - USING virtual_redirect - INNER JOIN virtual USING(vid) - WHERE redirect={?} AND alias={?}", - $from_email, $ml); + delete_from_list_alias($user, $ml, $globals->asso('mail_domain')); $page->trigSuccess("{$user->fullName()} a été désabonné de $ml."); } } @@ -1003,8 +1096,9 @@ class XnetGrpModule extends PLModule $positions = str_replace(array('enum(', ')', '\''), '', $res[0]['Type']); $page->assign('user', $user); + $page->assign('suggest', $this->suggest($user)); $page->assign('listes', $mmlist->get_lists($user->forlifeEmail())); - $page->assign('alias', $user->emailAliases($globals->asso('mail_domain'), 'user', true)); + $page->assign('alias', $user->emailGroupAliases($globals->asso('mail_domain'))); $page->assign('positions', explode(',', $positions)); }