projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some fixes in user management functions (Closes #849)
[platal.git]
/
include
/
user.func.inc.php
diff --git
a/include/user.func.inc.php
b/include/user.func.inc.php
index
a363394
..
ac934f7
100644
(file)
--- a/
include/user.func.inc.php
+++ b/
include/user.func.inc.php
@@
-209,8
+209,16
@@
function get_users_forlife_list($members, $strict = false, $callback = '_default
}
if (($login = get_user_forlife($alias, $callback)) !== false) {
$list[$i] = $login;
}
if (($login = get_user_forlife($alias, $callback)) !== false) {
$list[$i] = $login;
- } else if(!$strict) {
+ } else if
(!$strict) {
$list[$i] = $alias;
$list[$i] = $alias;
+ } else {
+ global $globals;
+ if (strpos($alias, '@') !== false) {
+ list($user, $dom) = explode('@', $alias);
+ if ($dom != $globals->mail->domain && $dom != $globals->mail->domain2) {
+ $list[$i] = $alias;
+ }
+ }
}
}
return $list;
}
}
return $list;
@@
-251,7
+259,7
@@
function get_not_registered_user($login, $iterator = false)
}
$sql = "SELECT user_id, nom, prenom, promo
FROM auth_user_md5
}
$sql = "SELECT user_id, nom, prenom, promo
FROM auth_user_md5
- WHERE $where
+ WHERE $where
AND perms = 'pending'
ORDER BY promo, nom, prenom";
if ($iterator) {
return XDB::iterator($sql, $nom, $prenom, $promo);
ORDER BY promo, nom, prenom";
if ($iterator) {
return XDB::iterator($sql, $nom, $prenom, $promo);