summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
a1cec86)
Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>
-Subproject commit f8b161ad3b2bd9aa5f176328fe9f2ee1b6ca9ee9
+Subproject commit 40d6b19a2d6233fb1549cfb11693eaba33dd05aa
-// {{{ function get_users_forlife_list()
-
-function get_users_forlife_list($members, $strict = false, $callback = '_default_user_callback')
-{
- return get_users_login_list($members, $strict, true, $callback);
-}
-
-// }}}
// {{{ function get_user_hruid()
function get_user_hruid($data, $callback = '_default_user_callback')
// {{{ function get_user_hruid()
function get_user_hruid($data, $callback = '_default_user_callback')
{
$where = $this->getUids($users);
if ($where) {
{
$where = $this->getUids($users);
if ($where) {
- $where = "a.alias IN ($where)";
+ $where = "u.hruid IN ($where)";
} else {
$where = " 0 ";
}
} else {
$where = " 0 ";
}
private function getUids(array $users)
{
private function getUids(array $users)
{
- $users = get_users_forlife_list($users, true, '_silent_user_callback');
+ $users = User::getBulkHruid($users, '_silent_user_callback');
if (is_null($users)) {
return '';
}
if (is_null($users)) {
return '';
}
// click on validate button 'add_owner_sub' or type <enter>
if (Post::has('add_owner_sub') && Post::has('add_owner')) {
// click on validate button 'add_owner_sub' or type <enter>
if (Post::has('add_owner_sub') && Post::has('add_owner')) {
- require_once('user.func.inc.php');
// if we want to add an owner and then type <enter>, then both
// add_owner_sub and add_owner are filled.
// if we want to add an owner and then type <enter>, then both
// add_owner_sub and add_owner are filled.
- $oforlifes = get_users_forlife_list(Post::v('add_owner'), true);
- $mforlifes = get_users_forlife_list(Post::v('add_member'), true);
+ $oforlifes = User::getBulkForlifeEmails(Post::v('add_owner'), true);
+ $mforlifes = User::getBulkForlifeEmails(Post::v('add_member'), true);
if (!is_null($oforlifes)) {
$owners = array_merge($owners, $oforlifes);
}
if (!is_null($oforlifes)) {
$owners = array_merge($owners, $oforlifes);
}
}
// click on validate button 'add_member_sub'
}
// click on validate button 'add_member_sub'
- require_once('user.func.inc.php');
if (Post::has('add_member_sub') && Post::has('add_member')) {
if (Post::has('add_member_sub') && Post::has('add_member')) {
- $forlifes = get_users_forlife_list(Post::v('add_member'), true);
+ $forlifes = User::getBulkForlifeEmails(Post::v('add_member'), true);
if (!is_null($forlifes)) {
$members = array_merge($members, $forlifes);
}
if (!is_null($forlifes)) {
$members = array_merge($members, $forlifes);
}
if (!$upload) {
$page->trigError('Une erreur s\'est produite lors du téléchargement du fichier');
} else {
if (!$upload) {
$page->trigError('Une erreur s\'est produite lors du téléchargement du fichier');
} else {
- $forlifes = get_users_forlife_list($upload->getContents(), true);
+ $forlifes = User::getBulkForlifeEmails($upload->getContents(), true);
if (!is_null($forlifes)) {
$members = array_merge($members, $forlifes);
}
if (!is_null($forlifes)) {
$members = array_merge($members, $forlifes);
}
if (Env::has('add_member')) {
S::assert_xsrf_token();
if (Env::has('add_member')) {
S::assert_xsrf_token();
- require_once('user.func.inc.php');
- $members = get_users_forlife_list(Env::v('add_member'),
- false,
- array('ListsModule', 'no_login_callback'));
+ $members = User::getBulkForlifeEmails(Env::v('add_member'),
+ false,
+ array('ListsModule', 'no_login_callback'));
$arr = $this->client->mass_subscribe($liste, $members);
if (is_array($arr)) {
foreach($arr as $addr) {
$arr = $this->client->mass_subscribe($liste, $members);
if (is_array($arr)) {
foreach($arr as $addr) {
if (!$upload) {
$page->trigError('Une erreur s\'est produite lors du téléchargement du fichier');
} else {
if (!$upload) {
$page->trigError('Une erreur s\'est produite lors du téléchargement du fichier');
} else {
- $members = get_users_forlife_list($upload->getContents(),
- false,
- array('ListsModule', 'no_login_callback'));
+ $members = User::getBulkForlifeEmails($upload->getContents(),
+ false,
+ array('ListsModule', 'no_login_callback'));
$arr = $this->client->mass_subscribe($liste, $members);
if (is_array($arr)) {
foreach($arr as $addr) {
$arr = $this->client->mass_subscribe($liste, $members);
if (is_array($arr)) {
foreach($arr as $addr) {
if (Env::has('add_owner')) {
S::assert_xsrf_token();
if (Env::has('add_owner')) {
S::assert_xsrf_token();
- require_once('user.func.inc.php');
- $owners = get_users_forlife_list(Env::v('add_owner'), false, array('ListsModule', 'no_login_callback'));
+ $owners = User::getBulkForlifeEmails(Env::v('add_owner'), false, array('ListsModule', 'no_login_callback'));
if ($owners) {
foreach ($owners as $login) {
if ($this->client->add_owner($liste, $login)) {
if ($owners) {
foreach ($owners as $login) {
if ($this->client->add_owner($liste, $login)) {
- $page->trigSuccess($alias." ajouté aux modérateurs.");
+ $page->trigSuccess($login ." ajouté aux modérateurs.");