projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes accessing to groups having shortnames that look like ids. Closes #1084
[platal.git]
/
modules
/
email.php
diff --git
a/modules/email.php
b/modules/email.php
index
9a77979
..
cca8797
100644
(file)
--- a/
modules/email.php
+++ b/
modules/email.php
@@
-131,6
+131,9
@@
class EmailModule extends PLModule
// Fetch existing @alias_dom aliases.
$alias = $user->emailAlias();
$visibility = $user->hasProfile() && $user->profile()->alias_pub;
// Fetch existing @alias_dom aliases.
$alias = $user->emailAlias();
$visibility = $user->hasProfile() && $user->profile()->alias_pub;
+ $page->assign('actuel', $alias);
+ $page->assign('user', $user);
+ $page->assign('mail_public', $visibility);
if ($action == 'ask' && Env::has('alias') && Env::has('raison')) {
S::assert_xsrf_token();
if ($action == 'ask' && Env::has('alias') && Env::has('raison')) {
S::assert_xsrf_token();
@@
-393,10
+396,11
@@
class EmailModule extends PLModule
if (!is_array($aliases)) {
return null;
}
if (!is_array($aliases)) {
return null;
}
- $rel = Env::v('contacts');
+ $uf = new UserFilter(new UFC_Hrpid($aliases));
+ $users = $uf->iterUsers();
$ret = array();
$ret = array();
-
foreach ($aliases as $alias
) {
- $ret[
$alias] = $rel[$alias]
;
+
while ($user = $users->next()
) {
+ $ret[
] = $user->forlife
;
}
return join(', ', $ret);
}
}
return join(', ', $ret);
}
@@
-480,7
+484,10
@@
class EmailModule extends PLModule
}
}
}
}
- $contacts = S::user()->getContacts();
+ $uf = new UserFilter(new PFC_And(new UFC_Contact(S::user()),
+ new UFC_Registered()),
+ UserFilter::sortByName());
+ $contacts = $uf->getProfiles();
$page->assign('contacts', $contacts);
$page->assign('maxsize', ini_get('upload_max_filesize') . 'o');
$page->assign('user', S::user());
$page->assign('contacts', $contacts);
$page->assign('maxsize', ini_get('upload_max_filesize') . 'o');
$page->assign('user', S::user());
@@
-592,7
+599,10
@@
class EmailModule extends PLModule
if (!empty($hash) || !empty($login)) {
$user = User::getSilent($login);
if ($user) {
if (!empty($hash) || !empty($login)) {
$user = User::getSilent($login);
if ($user) {
- $req = XDB::query("SELECT 1 FROM newsletter_ins WHERE user_id = {?} AND hash = {?}", $user->id(), $hash);
+ $req = XDB::query('SELECT 1
+ FROM newsletter_ins
+ WHERE uid = {?} AND hash = {?}',
+ $user->id(), $hash);
if ($req->numRows() == 0) {
$user = null;
}
if ($req->numRows() == 0) {
$user = null;
}
@@
-922,7
+932,7
@@
class EmailModule extends PLModule
if ($x = $sel->fetchOneAssoc()) {
if ($x['nb_mails'] == 0) {
if ($x = $sel->fetchOneAssoc()) {
if ($x['nb_mails'] == 0) {
- register_profile_update($x['u
ser_
id'], 'broken');
+ register_profile_update($x['uid'], 'broken');
}
fputcsv($csv, array($x['fullname'], $x['promo'], $alias,
join(',', $mails), $x['nb_mails'],
}
fputcsv($csv, array($x['fullname'], $x['promo'], $alias,
join(',', $mails), $x['nb_mails'],