'%grp/directory/unact' => $this->make_hook('non_active', AUTH_MDP, 'groupadmin'),
'%grp/trombi' => $this->make_hook('trombi', AUTH_MDP, 'groupannu'),
'%grp/geoloc' => $this->make_hook('geoloc', AUTH_MDP, 'groupannu'),
- '%grp/subscribe' => $this->make_hook('subscribe', AUTH_MDP),
+ '%grp/subscribe' => $this->make_hook('subscribe', AUTH_MDP, 'groups'),
'%grp/subscribe/valid' => $this->make_hook('subscribe_valid', AUTH_MDP, 'groupadmin'),
'%grp/unsubscribe' => $this->make_hook('unsubscribe', AUTH_MDP, 'groupmember'),
- '%grp/change_rights' => $this->make_hook('change_rights', AUTH_MDP),
+ '%grp/change_rights' => $this->make_hook('change_rights', AUTH_MDP, 'groups'),
'%grp/admin/annuaire' => $this->make_hook('admin_annuaire', AUTH_MDP, 'groupadmin'),
'%grp/member' => $this->make_hook('admin_member', AUTH_MDP, 'groupadmin'),
'%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/new/ajax' => $this->make_hook('admin_member_new_ajax', AUTH_MDP, 'groups', 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'),
if (is_null($filename)) {
$filename = $globals->asso('diminutif') . '.csv';
}
- $users = $globals->asso()->getMembersFilter(null, new UFO_Name('directory_name'))->getUsers();
+ $users = $globals->asso()->getMembersFilter(null, new UFO_Name())->getUsers();
pl_cached_content_headers('text/x-csv', 1);
$page->changeTpl('xnetgrp/annuaire-csv.tpl', NO_SKIN);
$page->assign('users', $users);
$append = "\n"
. "-- \n"
. "Ce message a été envoyé suite à la demande d'inscription de\n"
- . S::user()->fullName() . ' (X' . S::v('promo') . ")\n"
+ . S::user()->fullName(true) . "\n"
. "Via le site www.polytechnique.net. Tu peux choisir de valider ou\n"
. "de refuser sa demande d'inscription depuis la page :\n"
. "http://www.polytechnique.net/" . $globals->asso("diminutif") . "/subscribe/" . S::user()->login() . "\n"
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 = new AccountReq($user, $hruid, $email, Platal::globals()->asso('nom'));
$request->submit();
$page->trigSuccessRedirect('Un email va bien être envoyé à ' . $email . ' pour l\'activation de son compte.',
- $group . '/member/' . $hruid);
+ Platal::globals()->asso('diminutif') . '/member/' . $hruid);
} else {
pl_redirect('member/' . $hruid);
}
list($lastname, $firstname) = str_replace(array('-', ' ', "'"), '%', array(Env::t('nom'), Env::t('prenom')));
$cond = new PFC_And(new PFC_Not(new UFC_Registered()));
if (!empty($lastname)) {
- $cond->addChild(new UFC_Name(Profile::LASTNAME, $lastname, UFC_Name::CONTAINS));
+ $cond->addChild(new UFC_NameTokens($lastname, array(), false, false, Profile::LASTNAME));
}
if (!empty($firstname)) {
- $cond->addChild(new UFC_Name(Profile::FIRSTNAME, $firstname, UFC_Name::CONTAINS));
+ $cond->addChild(new UFC_NameTokens($firstname, array(), false, false, Profile::FIRSTNAME));
}
if (Env::t('promo')) {
$cond->addChild(new UFC_Promo('=', UserFilter::DISPLAY, Env::t('promo')));
}
// 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' && !$user->perms)) {
$lastname = Post::s('lastname');
if (Post::s('type') != 'virtual') {
$full_name, $directory_name, Post::t('display_name'), $firstname, $lastname,
(Post::t('sex') == 'male') ? 'male' : 'female', Post::t('email'),
(Post::t('type') == 'xnet') ? 'xnet' : 'virtual', $user->id());
- } else if (!$user->perms) {
+ } else if (!$user->perms && Post::has('email') && require_email_update($user, Post::t('email'))) {
XDB::query('UPDATE accounts
SET email = {?}
WHERE uid = {?}',
Post::t('email'), $user->id());
- }
- if (require_email_update($user, Post::t('email'))) {
$listClient = new MMList(S::user());
$listClient->change_user_email($user->forlifeEmail(), Post::t('email'));
update_alias_user($user->forlifeEmail(), Post::t('email'));
foreach (Env::v('ml1', array()) as $ml => $state) {
$ask = empty($_REQUEST['ml2'][$ml]) ? 0 : 2;
if ($ask == $state) {
- if ($state && $email_changed) {
- $mmlist->replace_email($ml, $from_email, $user->forlifeEmail());
- $page->trigSuccess("L'abonnement de {$user->fullName()} à $ml@ a été mis à jour.");
- }
continue;
}
if ($state == '1') {
$mmlist->mass_subscribe($ml, Array($user->forlifeEmail()));
$page->trigSuccess("{$user->fullName()} a été abonné à $ml@.");
} else {
- if ($email_changed) {
- $mmlist->mass_unsubscribe($ml, Array($from_email));
- } else {
- $mmlist->mass_unsubscribe($ml, Array($user->forlifeEmail()));
- }
+ $mmlist->mass_unsubscribe($ml, Array($user->forlifeEmail()));
$page->trigSuccess("{$user->fullName()} a été désabonné de $ml@.");
}
}
require_once 'emails.inc.php';
$ask = !empty($_REQUEST['ml4'][$ml]);
list($local_part, ) = explode('@', $ml);
- if($state == $ask) {
- if ($state && $email_changed) {
- update_list_alias($user->id(), $from_email, $local_part, $globals->asso('mail_domain'));
- $page->trigSuccess("L'abonnement de {$user->fullName()} à $ml a été mis à jour.");
- }
- } else if($ask) {
+ if ($ask == $state) {
+ continue;
+ }
+ if ($ask) {
add_to_list_alias($user->id(), $local_part, $globals->asso('mail_domain'));
$page->trigSuccess("{$user->fullName()} a été abonné à $ml.");
} else {
}
if ($globals->asso('has_nl')) {
+ $nl = NewsLetter::forGroup($globals->asso('shortname'));
// Updates group's newsletter subscription.
if (Post::i('newsletter') == 1) {
- XDB::execute('INSERT IGNORE INTO newsletter_ins (uid, nlid)
- SELECT {?}, id
- FROM newsletters
- WHERE group_id = {?}',
- $user->id(), $globals->asso('id'));
+ $nl->subscribe($user);
} else {
- XDB::execute('DELETE ni
- FROM newsletter_ins AS ni
- INNER JOIN newsletters AS n ON (n.id = ni.nlid)
- WHERE ni.uid = {?} AND n.group_id = {?}',
- $user->id(), $globals->asso('id'));
+ $nl->unsubscribe(null, $user->id);
}
}
}
$res = XDB::rawFetchAllAssoc('SHOW COLUMNS FROM group_members LIKE \'position\'');
$positions = str_replace(array('enum(', ')', '\''), '', $res[0]['Type']);
- $nl_registered = XDB::fetchOneCell('SELECT COUNT(ni.uid)
- FROM newsletter_ins AS ni
- INNER JOIN newsletters AS n ON (n.id = ni.nlid)
- WHERE ni.uid = {?} AND n.group_id = {?}',
- $user->id(), $globals->asso('id'));
+ if ($globals->asso('has_nl')) {
+ $nl = NewsLetter::forGroup($globals->asso('shortname'));
+ $nl_registered = $nl->subscriptionState($user);
+ } else {
+ $nl_registered = false;
+ }
$page->assign('user', $user);
$page->assign('suggest', $this->suggest($user));
projects / platal.git / blobdiff