drop unsupported things

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@52 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/htdocs.net/groupe/mail.php b/htdocs.net/groupe/mail.php
index f81937a..71ac706 100644 (file)
--- a/htdocs.net/groupe/mail.php
+++ b/htdocs.net/groupe/mail.php
@@ -6,19 +6,15 @@
     $client =& lists_xmlrpc(Session::getInt('uid'), Session::get('password'), $globals->asso('mail_domain'));
     $page->assign('listes', $client->get_lists());
 
-    $alias = $globals->xdb->query("SELECT alias FROM virtual WHERE alias LIKE {?} AND type='user' ORDER BY alias", '%@'.$globals->asso("mail_domain"));
-    $page->assign('alias', $alias->fetchColumn());
-
     if (Post::has('send')) {
         $from  = Post::get('from');
         $sujet = Post::get('sujet');
         $body  = Post::get('body');
 
         $mls = array_keys(Env::getMixed('ml', array()));
-        $als = array_keys(Env::getMixed('al', array()));
 
         require_once 'xnet/mail.inc.php';
-        $tos = get_all_redirects(Post::has('membres'), $mls, $als, $client);
+        $tos = get_all_redirects(Post::has('membres'), $mls, $client);
         send_xnet_mails($from, $sujet, $body, $tos);
         $page->kill("Mail envoyé !");
         $page->assign('sent', true);

diff --git a/include/xnet/mail.inc.php b/include/xnet/mail.inc.php
index ad5f4d2..9380a79 100644 (file)
--- a/include/xnet/mail.inc.php
+++ b/include/xnet/mail.inc.php
@@ -23,7 +23,7 @@ require_once 'diogenes/diogenes.hermes.inc.php';
 
 // {{{ get_all_redirects
 
-function get_all_redirects($membres, $mls, $alias, &$client)
+function get_all_redirects($membres, $mls, &$client)
 {
     global $globals;
     

diff --git a/templates/xnet/groupe/mail.tpl b/templates/xnet/groupe/mail.tpl
index fcc6a4b..f6ae741 100644 (file)
--- a/templates/xnet/groupe/mail.tpl
+++ b/templates/xnet/groupe/mail.tpl
@@ -68,21 +68,6 @@ masculin ou f
     </tr>
     {/foreach}
 
-    {* NOT SUPPORTED ATM
-    {foreach from=$alias item=a}
-    {assign var=b value=$a|regex_replace:"!@.*!":""}
-    <tr>
-      <td style='padding-left: 1em' class='titre'>
-        *&nbsp;{$b}
-      </td>
-      <td>
-        <input type="checkbox" name="al[{$b}]" value="1" {if $smarty.request.al[$b]}checked="checked"{/if} />
-        {$a} <a href="alias-admin.php?liste={$b}" class='popup'>(voir composition)</a>
-      </td>
-    </tr>
-    {/foreach}
-    *}
-
     <tr>
       <th colspan="2">Contenu du mail</th>
     </tr>