X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetgrp.php;h=4fccb1b6345af16593083a274ee66f5604611de0;hb=247ca43bd087a71c05bb700085dd3ac483349192;hp=2c6479ba51dc6136496056cc1649a59cff76bd74;hpb=025433d6446c3cb26b7ef924c3a87dec537d1451;p=platal.git diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php index 2c6479b..4fccb1b 100644 --- a/modules/xnetgrp.php +++ b/modules/xnetgrp.php @@ -51,6 +51,7 @@ class XnetGrpModule extends PLModule '%grp/member/new/ajax' => $this->make_hook('admin_member_new_ajax', AUTH_PASSWD, 'groups', NO_AUTH), '%grp/member/del' => $this->make_hook('admin_member_del', AUTH_PASSWD, 'groupadmin'), '%grp/member/suggest' => $this->make_hook('admin_member_suggest', AUTH_PASSWD, 'groupadmin'), + '%grp/member/reg' => $this->make_hook('admin_member_reg', AUTH_PASSWD, 'groupadmin'), '%grp/rss' => $this->make_token_hook('rss', AUTH_PUBLIC), '%grp/announce/new' => $this->make_hook('edit_announce', AUTH_PASSWD, 'groupadmin'), @@ -514,20 +515,22 @@ class XnetGrpModule extends PLModule continue; } + require_once 'name.func.inc.php'; $parts = explode('.', $local_part); if (count($parts) == 1) { - $lastname = $display_name = $full_name = $directory_name = ucfirst($local_part); + $lastname = $display_name = capitalize_name($mbox); $firstname = ''; } else { - $firstname = ucfirst($parts[0]); - $lastname = ucwords(implode(' ', array_slice($parts, 1))); - $display_name = $firstname; - $full_name = $firstname . ' ' . $lastname; - $directory_name = strtoupper($lastname) . ' ' . $firstname; + $display_name = $firstname = capitalize_name($parts[0]); + $lastname = capitalize_name(implode(' ', array_slice($parts, 1))); } - XDB::execute('INSERT INTO accounts (hruid, display_name, full_name, directory_name, firstname, lastname, email, type, state) - VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, \'xnet\', \'disabled\')', - $hruid, $display_name, $full_name, $directory_name, $firstname, $lastname, $email); + $full_name = build_full_name($firstname, $lastname); + $directory_name = build_directory_name($firstname, $lastname); + $sort_name = build_sort_name($firstname, $lastname); + XDB::execute('INSERT INTO accounts (hruid, display_name, full_name, directory_name, sort_name, + firstname, lastname, email, type, state) + VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, \'xnet\', \'disabled\')', + $hruid, $display_name, $full_name, $directory_name, $sort_name, $firstname, $lastname, $email); $uid = XDB::insertId(); XDB::execute('INSERT INTO group_members (asso_id, uid) VALUES ({?}, {?})', @@ -613,8 +616,7 @@ class XnetGrpModule extends PLModule $uids_to_enable = array_intersect(array_keys(Post::v('enable_accounts')), $uids); $user = S::user(); - $group = Platal::globals()->asso('nom'); - $request = new BulkAccountsReq($user, $uids_to_enable, $group); + $request = new BulkAccountsReq($user, $uids_to_enable, $globals->asso('nom'), $globals->asso('diminutif')); $request->submit(); $page->trigSuccess('Un email va bientôt être envoyé aux personnes sélectionnées pour l\'activation de leur compte.'); @@ -880,6 +882,7 @@ class XnetGrpModule extends PLModule global $globals; $page->changeTpl('xnetgrp/membres-add.tpl'); + $page->addJsLink('xnet_members.js'); if (is_null($email)) { return; @@ -908,16 +911,20 @@ class XnetGrpModule extends PLModule XDB::query('UPDATE accounts SET email = {?} WHERE uid = {?} AND email IS NULL', - Post::t('email'), $user->id()); + $email, $user->id()); // Add email for marketing if required. - if (Env::v('market')) { + if (Env::v('marketing')) { $market = Marketing::get($user->uid, $email); if (!$market) { $market = new Marketing($user->uid, $email, 'group', $globals->asso('nom'), - Env::v('market_from'), S::v('uid')); + Env::v('marketing_from'), S::v('uid')); $market->add(); } } + } elseif (Env::v('broken')) { + // Add email for broken if required. + $valid = new BrokenReq(S::user(), $user, $email, 'Groupe : ' . $globals->asso('nom')); + $valid->submit(); } } else { $user = User::getSilent($email); @@ -946,20 +953,22 @@ class XnetGrpModule extends PLModule // If the user has no account yet, creates new account: build names from email address. if (empty($user)) { + require_once 'name.func.inc.php'; $parts = explode('.', $mbox); if (count($parts) == 1) { - $lastname = $display_name = $full_name = $directory_name = ucfirst($mbox); + $lastname = $display_name = capitalize_name($mbox); $firstname = ''; } else { - $firstname = ucfirst($parts[0]); - $lastname = ucwords(implode(' ', array_slice($parts, 1))); - $display_name = $firstname; - $full_name = "$firstname $lastname"; - $directory_name = strtoupper($lastname) . " " . $firstname; + $display_name = $firstname = capitalize_name($parts[0]); + $lastname = capitalize_name(implode(' ', array_slice($parts, 1))); } - XDB::execute('INSERT INTO accounts (hruid, display_name, full_name, directory_name, firstname, lastname, email, type, state) - VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, \'xnet\', \'disabled\')', - $hruid, $display_name, $full_name, $directory_name, $firstname, $lastname, $email); + $full_name = build_full_name($firstname, $lastname); + $directory_name = build_directory_name($firstname, $lastname); + $sort_name = build_sort_name($firstname, $lastname); + XDB::execute('INSERT INTO accounts (hruid, display_name, full_name, directory_name, sort_name, + firstname, lastname, email, type, state) + VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, \'xnet\', \'disabled\')', + $hruid, $display_name, $full_name, $directory_name, $sort_name, $firstname, $lastname, $email); $user = User::getSilent($hruid); } @@ -1024,11 +1033,13 @@ class XnetGrpModule extends PLModule if (Post::has('suggest')) { if (Post::t('suggest') == 'yes') { + global $globals; + $user = S::user(); - $request = new AccountReq($user, $hruid, $email, Platal::globals()->asso('nom')); + $request = new AccountReq($user, $hruid, $email, $globals->asso('nom'), $globals->asso('diminutif')); $request->submit(); $page->trigSuccessRedirect('Un email va bien être envoyé à ' . $email . ' pour l\'activation de son compte.', - Platal::globals()->asso('diminutif') . '/member/' . $hruid); + $globals->asso('diminutif') . '/member/' . $hruid); } else { pl_redirect('member/' . $hruid); } @@ -1037,20 +1048,34 @@ class XnetGrpModule extends PLModule $page->assign('hruid', $hruid); } + function handler_admin_member_reg($page, $uid) + { + pl_content_headers('text/plain'); + + $user = User::getSilentWithUID($uid); + if ($user && $user->state != 'pending' && $user->hasProfile()) { + echo true; + } + echo false; + exit(); + } + function handler_admin_member_new_ajax($page) { pl_content_headers("text/html"); $page->changeTpl('xnetgrp/membres-new-search.tpl', NO_SKIN); $users = array(); + $same_email = false; if (Env::has('login')) { $user = User::getSilent(Env::t('login')); if ($user && $user->state != 'pending') { - $users = array($user); + $users = array($user->id() => $user); + $same_email = true; } } if (empty($users)) { list($lastname, $firstname) = str_replace(array('-', ' ', "'"), '%', array(Env::t('nom'), Env::t('prenom'))); - $cond = new PFC_And(new PFC_Not(new UFC_Registered())); + $cond = new PFC_And(); if (!empty($lastname)) { $cond->addChild(new UFC_NameTokens($lastname, array(), false, false, Profile::LASTNAME)); } @@ -1067,7 +1092,9 @@ class XnetGrpModule extends PLModule $users = array(); } } + $page->assign('users', $users); + $page->assign('same_email', $same_email); } function unsubscribe(PlUser $user, $remember = false) @@ -1190,7 +1217,7 @@ class XnetGrpModule extends PLModule } } - private function changeLogin(PlPage $page, PlUser $user, $login) + private function changeLogin(PlPage $page, PlUser $user, $login, $req_broken = false, $req_marketing = false, $marketing_from = 'user') { // Search the user's uid. $xuser = User::getSilent($login); @@ -1210,6 +1237,19 @@ class XnetGrpModule extends PLModule return false; } + // Market or suggest new redirection if required. + $email = $user->bestEmail(); + if ($req_broken) { + $valid = new BrokenReq(S::user(), $xuser, $email, 'Groupe : ' . Platal::globals()->asso('nom')); + $valid->submit(); + } elseif ($req_marketing) { + $market = Marketing::get($xuser->uid, $email); + if (!$market) { + $market = new Marketing($xuser->uid, $email, 'group', Platal::globals()->asso('nom'), $marketing_from, S::i('uid')); + $market->add(); + } + } + if ($user->mergeIn($xuser)) { return $xuser->login(); } @@ -1230,16 +1270,18 @@ class XnetGrpModule extends PLModule } $page->changeTpl('xnetgrp/membres-edit.tpl'); + $page->addJsLink('xnet_members.js'); $mmlist = new MMList(S::user(), $globals->asso('mail_domain')); if (Post::has('change')) { - require_once 'emails.inc.php'; S::assert_xsrf_token(); + require_once 'emails.inc.php'; + require_once 'name.func.inc.php'; // Convert user status to X - if (!Post::blank('login_X')) { - $forlife = $this->changeLogin($page, $user, Post::t('login_X')); + if (!Post::blank('x')) { + $forlife = $this->changeLogin($page, $user, Post::i('userid'), Post::b('broken'), Post::b('marketing'), Post::v('marketing_from')); if ($forlife) { pl_redirect('member/' . $forlife); } @@ -1247,21 +1289,20 @@ class XnetGrpModule extends PLModule // Update user info if ($user->type == 'virtual' || ($user->type == 'xnet' && !$user->perms)) { - $lastname = Post::s('lastname'); + $lastname = capitalize_name(Post::t('lastname')); if (Post::s('type') != 'virtual') { - $firstname = Post::s('firstname'); - $full_name = $firstname . ' ' . $lastname; - $directory_name = mb_strtoupper($lastname) . ' ' . $firstname; + $firstname = capitalize_name(Post::t('firstname')); } else { $firstname = ''; - $full_name = $lastname; - $directory_name = mb_strtoupper($lastname); } + $full_name = build_full_name($firstname, $lastname); + $directory_name = build_directory_name($firstname, $lastname); + $sort_name = build_sort_name($firstname, $lastname); XDB::query('UPDATE accounts - SET full_name = {?}, directory_name = {?}, display_name = {?}, + SET full_name = {?}, directory_name = {?}, sort_name = {?}, display_name = {?}, firstname = {?}, lastname = {?}, sex = {?}, type = {?} WHERE uid = {?}', - $full_name, $directory_name, Post::t('display_name'), $firstname, $lastname, + $full_name, $directory_name, $sort_name, Post::t('display_name'), $firstname, $lastname, (Post::t('sex') == 'male') ? 'male' : 'female', (Post::t('type') == 'xnet') ? 'xnet' : 'virtual', $user->id()); } @@ -1287,7 +1328,7 @@ class XnetGrpModule extends PLModule if (($user->type == 'xnet' && !$user->perms)) { if (Post::b('suggest')) { - $request = new AccountReq(S::user(), $user->hruid, Post::t('email'), $globals->asso('nom')); + $request = new AccountReq(S::user(), $user->hruid, Post::t('email'), $globals->asso('nom'), $globals->asso('diminutif')); $request->submit(); $page->trigSuccess('Le compte va bientôt être activé.'); }