+++ /dev/null
-<?php
-require 'xnet.inc.php';
-
-new_groupadmin_page('xnet/groupe/alias-admin.tpl');
-
-if (!Get::has('liste')) {
- redirect("listes.php");
-}
-
-$lfull = strtolower(Get::get('liste'));
-
-if (Env::has('add_member')) {
- $add = Env::get('add_member');
- if(strstr($add, '@')) {
- list($mbox,$dom) = explode('@', strtolower($add));
- } else {
- $mbox = $add;
- $dom = 'm4x.org';
- }
- if($dom == 'polytechnique.org' || $dom == 'm4x.org') {
- $res = $globals->xdb->query(
- "SELECT a.alias, b.alias
- FROM x4dat.aliases AS a
- LEFT JOIN x4dat.aliases AS b ON (a.id=b.id AND b.type = 'a_vie')
- WHERE a.alias={?} AND a.type!='homonyme'", $mbox);
- if (list($alias, $blias) = $res->fetchOneRow()) {
- $alias = empty($blias) ? $alias : $blias;
- $globals->xdb->query(
- "INSERT INTO x4dat.virtual_redirect (vid,redirect)
- SELECT vid, {?}
- FROM x4dat.virtual
- WHERE alias={?}", "$alias@m4x.org", $lfull);
- $page->trig("$alias@m4x.org ajouté");
- } else {
- $page->trig("$mbox@polytechnique.org n'existe pas.");
- }
- } else {
- $globals->xdb->query(
- "INSERT INTO x4dat.virtual_redirect (vid,redirect)
- SELECT vid,{?}
- FROM x4dat.virtual
- WHERE alias={?}", "$mbox@$dom", $lfull);
- $page->trig("$mbox@$dom ajouté");
- }
-}
-
-if (Env::has('del_member')) {
- $globals->xdb->query(
- "DELETE FROM x4dat.virtual_redirect
- USING x4dat.virtual_redirect
- INNER JOIN x4dat.virtual USING(vid)
- WHERE redirect={?} AND alias={?}", Env::get('del_member'), $lfull);
- redirect("?liste=$lfull");
-}
-
-$res = $globals->xdb->iterator(
- "SELECT redirect
- FROM x4dat.virtual_redirect AS vr
- INNER JOIN x4dat.virtual AS v USING(vid)
- WHERE v.alias={?}
- ORDER BY redirect", $lfull);
-$page->assign('mem', $res);
-
-$page->run();
-?>
+++ /dev/null
-<?php
-require 'xnet.inc.php';
-
-new_groupadmin_page('xnet/groupe/alias-create.tpl');
-
-if(Post::has('submit')) {
- if (!Post::has('liste')) {
- $page->trig_run('champs «addresse souhaitée» vide');
- }
- $liste = Post::get('liste');
- if (!preg_match("/^[a-zA-Z0-9\-\.]*$/", $liste)) {
- $page->trig_run('le nom de l\'alias ne doit contenir que des lettres, chiffres, tirets et points');
- }
-
- $new = $liste.'@'.$globals->asso('mail_domain');
- $res = $globals->xdb->query('SELECT COUNT(*) FROM x4dat.virtual WHERE alias={?}', $new);
- $n = $res->fetchOneCell();
- if($n) {
- $page->trig_run('cet alias est déjà pris');
- }
-
- $globals->xdb->query('INSERT INTO x4dat.virtual (alias,type) VALUES({?}, "user")', $new);
- redirect("alias-admin.php?liste=$new");
-}
-
-$page->run();
-
-?>
if ($globals->asso('mail_domain')) {
$sub['envoyer un mail'] = "$dim/mail";
$sub['créer une liste'] = "$dim/lists/create";
- $sub['créer un alias'] = "$dim/alias-create.php";
+ $sub['créer un alias'] = "$dim/alias/create";
}
$menu['Administrer Groupe'] = $sub;
}
'grp/lists/check' => $this->make_hook('check', AUTH_MDP),
'grp/lists/sync' => $this->make_hook('sync', AUTH_MDP),
+ 'grp/alias/admin' => $this->make_hook('aadmin', AUTH_MDP),
+ 'grp/alias/create' => $this->make_hook('acreate', AUTH_MDP),
+
/* hack: lists uses that */
'profile' => $this->make_hook('profile', AUTH_PUBLIC),
);
$page->assign('not_in_list', $not_in_list);
}
+ function handler_aadmin(&$page, $lfull = null)
+ {
+ global $globals;
+
+ if (is_null($lfull)) {
+ return PL_NOT_FOUND;
+ }
+
+ new_groupadmin_page('xnet/groupe/alias-admin.tpl');
+
+ if (Env::has('add_member')) {
+ $add = Env::get('add_member');
+ if (strstr($add, '@')) {
+ list($mbox,$dom) = explode('@', strtolower($add));
+ } else {
+ $mbox = $add;
+ $dom = 'm4x.org';
+ }
+ if($dom == 'polytechnique.org' || $dom == 'm4x.org') {
+ $res = $globals->xdb->query(
+ "SELECT a.alias, b.alias
+ FROM x4dat.aliases AS a
+ LEFT JOIN x4dat.aliases AS b ON (a.id=b.id AND b.type = 'a_vie')
+ WHERE a.alias={?} AND a.type!='homonyme'", $mbox);
+ if (list($alias, $blias) = $res->fetchOneRow()) {
+ $alias = empty($blias) ? $alias : $blias;
+ $globals->xdb->query(
+ "INSERT INTO x4dat.virtual_redirect (vid,redirect)
+ SELECT vid, {?}
+ FROM x4dat.virtual
+ WHERE alias={?}", "$alias@m4x.org", $lfull);
+ $page->trig("$alias@m4x.org ajouté");
+ } else {
+ $page->trig("$mbox@polytechnique.org n'existe pas.");
+ }
+ } else {
+ $globals->xdb->query(
+ "INSERT INTO x4dat.virtual_redirect (vid,redirect)
+ SELECT vid,{?}
+ FROM x4dat.virtual
+ WHERE alias={?}", "$mbox@$dom", $lfull);
+ $page->trig("$mbox@$dom ajouté");
+ }
+ }
+
+ if (Env::has('del_member')) {
+ $globals->xdb->query(
+ "DELETE FROM x4dat.virtual_redirect
+ USING x4dat.virtual_redirect
+ INNER JOIN x4dat.virtual USING(vid)
+ WHERE redirect={?} AND alias={?}", Env::get('del_member'), $lfull);
+ redirect("?liste=$lfull");
+ }
+
+ $res = $globals->xdb->iterator(
+ "SELECT redirect
+ FROM x4dat.virtual_redirect AS vr
+ INNER JOIN x4dat.virtual AS v USING(vid)
+ WHERE v.alias={?}
+ ORDER BY redirect", $lfull);
+ $page->assign('mem', $res);
+ }
+
+ function handler_acreate(&$page)
+ {
+ global $globals;
+
+ new_groupadmin_page('xnet/groupe/alias-create.tpl');
+
+ if (!Post::has('submit')) {
+ return;
+ }
+
+ if (!Post::has('liste')) {
+ $page->trig('champs «addresse souhaitée» vide');
+ return;
+ }
+ $liste = Post::get('liste');
+ if (!preg_match("/^[a-zA-Z0-9\-\.]*$/", $liste)) {
+ $page->trig('le nom de l\'alias ne doit contenir que des lettres,'
+ .' chiffres, tirets et points');
+ return;
+ }
+
+ $new = $liste.'@'.$globals->asso('mail_domain');
+ $res = $globals->xdb->query('SELECT COUNT(*) FROM x4dat.virtual WHERE alias={?}', $new);
+ $n = $res->fetchOneCell();
+ if($n) {
+ $page->trig('cet alias est déjà pris');
+ return;
+ }
+
+ $globals->xdb->query('INSERT INTO x4dat.virtual (alias,type) VALUES({?}, "user")', $new);
+
+ global $platal;
+ redirect(smarty_function_rel()."/{$platal->ns}alias/admin/$new");
+ }
+
function handler_profile(&$page, $user = null)
{
redirect('https://www.polytechnique.org/profile/'.$user);
{* *}
{**************************************************************************}
-<p>[<a href='listes.php'>retour à la page des listes</a>]</p>
+<p>[<a href='{rel}/{$platal->ns}lists'>retour à la page des listes</a>]</p>
-<h1>Membres de {$smarty.request.liste}</h1>
+<h1>Membres de {$platal->argv[1]}</h1>
<table class='tiny'>
<tr>
{if $mem->total()}
{iterate from=$mem item=m}
{$m.redirect}
- <a href='?liste={$smarty.request.liste|urlencode}&del_member={$m.redirect|urlencode}'>
+ <a href='{rel}/{$platal->ns}alias/admin/{$platal->argv[1]}?del_member={$m.redirect|urlencode}'>
<img src='{rel}/images/del.png' alt='retirer membre' title='retirer membre' />
</a>
<br />
<tr>
<td><strong>Ajouter</strong></td>
<td>
- <form method="post" action="{$smarty.server.REQUEST_URI}">
+ <form method="post" action="{rel}/{$platal->ns}alias/admin/{$platal->argv[1]}">
<div>
<input type='text' name='add_member' />
<p class='descr'>
Pour les autres besoins de communications (notament pour un grand nombre de personnes, et pour bénéficier des outils
-de modération), il est recommandé de créer <a href="listes-create.php">une liste de diffusion</a>.
+de modération), il est recommandé de créer <a href="{rel}/{$platal->ns}lists/create">une liste de diffusion</a>.
</p>
-<form action='{$smarty.server.PHP_SELF}' method='post'>
+<form action='{rel}/{$platal->ns}alias/create' method='post'>
<table class='large'>
<tr>
<th colspan='2'>Caractéristiques de l'alias</th>
<tr>
<td>{$l.list}</td>
<td>{$l.desc}</td>
- <td><a href="listes-sync.php?liste={$l.list}">synchro</a></td>
+ <td><a href="{rel}/{$platal->ns}lists/sync/{$l.list}">synchro</a></td>
</tr>
{/foreach}
</table>
<strong>Note :</strong> Les listes de diffusion sont un outil particulièrement adapté pour des
échanges entre 6 personnes, ou plus (newsletter, débat interne au groupe ...). En revanche, elles
s'avèrent peu praticables pour des discussions plus restreintes. Il est alors préférable
-d'utiliser <a href="alias-create.php">un alias</a>, à la gestion beaucoup plus souple.
+d'utiliser <a href="{rel}/{$platal->ns}alias/create">un alias</a>, à la gestion beaucoup plus souple.
</p>
<p class="descr">
D'autre part, il est impossible d'inscrire une liste de diffusion à une autre liste de diffusion.
Si tu as besoin de cette fonctionnalité, il faut alors <strong>impérativement</strong> utiliser
-<a href="alias-create.php">un alias</a> qui, lui, est capable de regrouper plusieurs listes.
+<a href="{rel}/{$platal->ns}alias/create">un alias</a> qui, lui, est capable de regrouper plusieurs listes.
</p>
<form action='{rel}/{$platal->ns}lists/create' method='post'>
<table class="large">
<tr>
{if $may_update}
<td class="center"><a href='mailto:{$a.alias}'><img src='{rel}/images/mail.png' alt='[mail]' /></a></td>
- <td><a href="alias-admin.php?liste={$a.alias}">{$a.alias}</a></td>
+ <td><a href="{rel}/{$platal->ns}alias/admin/{$a.alias}">{$a.alias}</a></td>
<td class="center"><a href="{rel}/{$platal->ns}lists?del_alias={$a.alias}"><img src='{rel}/images/del.png' alt='[supprimer]' /></a></td>
{else}
<td><a href='mailto:{$a.alias}'><img src='{rel}/images/mail.png' alt='[mail]' /> {$a.alias}</a></td>
<input type='checkbox' name='ml4[{$a.alias}]' {if $a.sub}checked="checked"{/if} />
</td>
<td>
- <a href='alias-admin.php?liste={$a.alias}'>{$a.alias}</a>
+ <a href='{rel}/{$platal->ns}alias/admin/{$a.alias}'>{$a.alias}</a>
</td>
</tr>
{foreachelse}