projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo in cron for profile modifications
[platal.git]
/
modules
/
lists
/
lists.inc.php
diff --git
a/modules/lists/lists.inc.php
b/modules/lists/lists.inc.php
index
38757c3
..
0a8e0d2
100644
(file)
--- a/
modules/lists/lists.inc.php
+++ b/
modules/lists/lists.inc.php
@@
-30,20
+30,19
@@
function list_sort_owners(&$members, $tri_promo = true)
foreach($members as $mem) {
$user = User::getSilent($mem);
if (!$user) {
foreach($members as $mem) {
$user = User::getSilent($mem);
if (!$user) {
- $membres[0][] = array('l' => $mem, 'p' => (!$tri_promo ? 'inconnu
e' : null)
);
+ $membres[0][] = array('l' => $mem, 'p' => (!$tri_promo ? 'inconnu
s' : null), 'n' => null, 'x' => null, 'b' => null
);
} else {
$uid = $user->id();
} else {
$uid = $user->id();
- $nom = $user->
fullName(); # XXX: Get a notion of 'last name' here, I want to sort user by lastnames
- $promo = $user->
promo
();
+ $nom = $user->
directoryName();
+ $promo = $user->
category
();
if (!$promo) {
if (!$promo) {
- $promo = '
non-X
';
+ $promo = '
extérieurs
';
}
}
- $broken = false; # XXX: fill it with the good value if the user has no valid email
- $key = $tri_promo ? ($promo != 'non-X' ? $promo : 0) : strtoupper(@$nom{0});
+ $key = $tri_promo ? ($promo != 'extérieurs' ? $promo : 0) : strtoupper(@$nom{0});
if ($tri_promo) {
$promo = null;
}
if ($tri_promo) {
$promo = null;
}
- $membres[$key][$nom.$m
] = Array('n' => $nom, 'l' => $m, 'p' => $promo, 'x' => $uid, 'b' => $broken
);
+ $membres[$key][$nom.$m
em] = array('n' => $nom, 'l' => $mem, 'p' => $promo, 'x' => $uid, 'b' => $user->lost
);
}
}
}
}
@@
-75,16
+74,17
@@
function list_sort_members($members, $tri_promo = true)
}
// }}}
}
// }}}
+// {{{ function list_fetch_basic_info
-function list_fetch_
names
($members)
+function list_fetch_
basic_info
($members)
{
$res = array();
foreach ($members as $member) {
$user = User::getSilent($member);
if (!$user) {
{
$res = array();
foreach ($members as $member) {
$user = User::getSilent($member);
if (!$user) {
- $res[] = $member;
+ $res[] = $member
. ',,'
;
} else {
} else {
- $res[] = $user->f
ullName
();
+ $res[] = $user->f
orlifeEmail() . ',' . $user->directoryName() . ',' . $user->promo
();
}
}
return $res;
}
}
return $res;