projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'xorg/maint' into xorg/master
[platal.git]
/
modules
/
email.php
diff --git
a/modules/email.php
b/modules/email.php
index
6c5d96f
..
331eacf
100644
(file)
--- a/
modules/email.php
+++ b/
modules/email.php
@@
-152,7
+152,7
@@
class EmailModule extends PLModule
INNER JOIN email_virtual_domains AS d ON (s.domain = d.id)
WHERE s.uid = {?} AND s.type = \'alias_aux\'',
$user->id());
INNER JOIN email_virtual_domains AS d ON (s.domain = d.id)
WHERE s.uid = {?} AND s.type = \'alias_aux\'',
$user->id());
- $visibility = $user->hasProfile() &&
($user->profile(true)->alias_pub == 'public'
);
+ $visibility = $user->hasProfile() &&
$user->profile()->isVisible($user->profile()->alias_pub
);
$page->assign('current', $alias);
$page->assign('user', $user);
$page->assign('mail_public', $visibility);
$page->assign('current', $alias);
$page->assign('user', $user);
$page->assign('mail_public', $visibility);
@@
-163,20
+163,21
@@
class EmailModule extends PLModule
// Retrieves user request.
$new_alias = Env::v('alias');
$reason = Env::v('reason');
// Retrieves user request.
$new_alias = Env::v('alias');
$reason = Env::v('reason');
- $public = (Env::v('public', 'off') == 'on') ? 'p
ublic' : 'private
';
+ $public = (Env::v('public', 'off') == 'on') ? 'p
rivate' : 'hidden
';
$page->assign('r_alias', $new_alias);
$page->assign('r_reason', $reason);
$page->assign('r_alias', $new_alias);
$page->assign('r_reason', $reason);
- if ($public == 'p
ublic
') {
+ if ($public == 'p
rivate
') {
$page->assign('r_public', true);
}
// Checks special charaters in alias.
$page->assign('r_public', true);
}
// Checks special charaters in alias.
- if (!preg_match("/^[a-zA-Z0-9\-.]{
3,20}
$/", $new_alias)) {
+ if (!preg_match("/^[a-zA-Z0-9\-.]{
2,19}[a-zA-Z0-9\-]
$/", $new_alias)) {
$page->trigError("L'adresse demandée n'est pas valide."
. " Vérifie qu'elle comporte entre 3 et 20 caractères"
. " et qu'elle ne contient que des lettres non accentuées,"
$page->trigError("L'adresse demandée n'est pas valide."
. " Vérifie qu'elle comporte entre 3 et 20 caractères"
. " et qu'elle ne contient que des lettres non accentuées,"
- . " des chiffres ou les caractères - et .");
+ . " des chiffres ou les caractères '-' et '.'. De plus, elle ne"
+ . " peut pas se terminer par un point.");
return;
} else {
// Checks if the alias has already been given.
return;
} else {
// Checks if the alias has already been given.