projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/xorg/maint' into xorg/master
[platal.git]
/
include
/
validations
/
listes.inc.php
diff --git
a/include/validations/listes.inc.php
b/include/validations/listes.inc.php
index
e7b2b4d
..
806ceae
100644
(file)
--- a/
include/validations/listes.inc.php
+++ b/
include/validations/listes.inc.php
@@
-42,7
+42,7
@@
class ListeReq extends Validate
// }}}
// {{{ constructor
// }}}
// {{{ constructor
- public function __construct(User
&
$_user, $_asso, $_liste, $_domain, $_desc, $_advertise,
+ public function __construct(User $_user, $_asso, $_liste, $_domain, $_desc, $_advertise,
$_modlevel, $_inslevel, $_owners, $_members, $_stamp=0)
{
parent::__construct($_user, false, 'liste', $_stamp);
$_modlevel, $_inslevel, $_owners, $_members, $_stamp=0)
{
parent::__construct($_user, false, 'liste', $_stamp);
@@
-82,17
+82,23
@@
class ListeReq extends Validate
global $globals;
if (Env::has('listname')) {
global $globals;
if (Env::has('listname')) {
- $this->liste =
trim(Env::v('listname')
);
+ $this->liste =
Post::t('listname'
);
}
if (Env::has('domainname')) {
}
if (Env::has('domainname')) {
- $this->domain =
trim(Env::v('domainname')
);
+ $this->domain =
Post::t('domainname'
);
}
if (Env::has('assotype')) {
}
if (Env::has('assotype')) {
- $this->asso =
trim(Env::v('assotype')
);
+ $this->asso =
Post::t('assotype'
);
}
if (!$this->asso) {
$this->domain = $globals->mail->domain;
}
}
if (!$this->asso) {
$this->domain = $globals->mail->domain;
}
+ foreach ($this->owners as $key => &$email) {
+ $email = Post::t('owners_' . $key);
+ }
+ foreach ($this->members as $key => &$email) {
+ $email = Post::t('members_' . $key);
+ }
return true;
}
return true;
}
@@
-160,7
+166,6
@@
class ListeReq extends Validate
XDB::execute('INSERT INTO virtual_redirect (vid, redirect)
VALUES ({?}, {?})', XDB::insertId(),
$red . $mdir . '@listes.polytechnique.org');
XDB::execute('INSERT INTO virtual_redirect (vid, redirect)
VALUES ({?}, {?})', XDB::insertId(),
$red . $mdir . '@listes.polytechnique.org');
- $list->mass_subscribe($liste, join(' ', $this->members));
}
}
return $ret;
}
}
return $ret;