X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Flists.php;h=b84da88245ef0523e2d3d810dd80419ea7e3dfe6;hb=9da274faea12bbc19a291abbc07d4d767057b741;hp=cc6a7470b302ee1b8067d2b59ae2a8b747672425;hpb=7c5842f36aef50ec20bb16cc383027192652626d;p=platal.git

diff --git a/modules/lists.php b/modules/lists.php
index cc6a747..b84da88 100644
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -86,7 +86,7 @@ class ListsModule extends PLModule
 
         $this->prepare_client($page);
 
-        $page->changeTpl('listes/index.tpl');
+        $page->changeTpl('lists/index.tpl');
         $page->addJsLink('ajax.js');
         $page->assign('xorg_title','Polytechnique.org - Listes de diffusion');
 
@@ -127,7 +127,7 @@ class ListsModule extends PLModule
     {
         header('Content-Type: text/html; charset="iso-8859-15"');
         $domain = $this->prepare_client($page);
-        $page->changeTpl('listes/liste.inc.tpl', NO_SKIN);
+        $page->changeTpl('lists/liste.inc.tpl', NO_SKIN);
         if (Get::has('unsubscribe')) {
             $this->client->unsubscribe($list);
         }
@@ -153,7 +153,7 @@ class ListsModule extends PLModule
 
     function handler_create(&$page)
     {
-        $page->changeTpl('listes/create.tpl');
+        $page->changeTpl('lists/create.tpl');
 
         $owners  = preg_split("/[\s]+/", Post::v('owners'), -1, PREG_SPLIT_NO_EMPTY);
         $members = preg_split("/[\s]+/", Post::v('members'), -1, PREG_SPLIT_NO_EMPTY);
@@ -243,7 +243,7 @@ class ListsModule extends PLModule
 
         $this->prepare_client($page);
 
-        $page->changeTpl('listes/members.tpl');
+        $page->changeTpl('lists/members.tpl');
 
         if (Get::has('del')) {
             $this->client->unsubscribe($liste);
@@ -302,7 +302,7 @@ class ListsModule extends PLModule
 
         $this->prepare_client($page);
 
-        $page->changeTpl('listes/trombi.tpl');
+        $page->changeTpl('lists/trombi.tpl');
 
         if (Get::has('del')) {
             $this->client->unsubscribe($liste);
@@ -338,7 +338,7 @@ class ListsModule extends PLModule
 
         $domain = $this->prepare_client($page);
 
-        $page->changeTpl('listes/archives.tpl');
+        $page->changeTpl('lists/archives.tpl');
 
         $page->addCssLink('lists.archives.css');
         if (list($det) = $this->client->get_members($liste)) {
@@ -404,8 +404,7 @@ class ListsModule extends PLModule
                         ."    Sujet : « {$mail['subj']} »\n"
                         ."    Date  : ".strftime("le %d %b %Y à %H:%M:%S", (int)$mail['stamp'])."\n\n"
                         .$append;
-            require_once 'diogenes/diogenes.hermes.inc.php';
-            $mailer = new HermesMailer();
+            $mailer = new PlMailer();
             $mailer->addTo("$liste-owner@{$domain}");
             $mailer->setFrom("$liste-bounces@{$domain}");
             $mailer->addHeader('Reply-To', "$liste-owner@{$domain}");
@@ -426,7 +425,7 @@ class ListsModule extends PLModule
 
         $domain = $this->prepare_client($page);
 
-        $page->changeTpl('listes/moderate.tpl');
+        $page->changeTpl('lists/moderate.tpl');
 
         $page->register_modifier('qpd', 'quoted_printable_decode');
         $page->register_modifier('hdc', 'list_header_decode');
@@ -455,9 +454,10 @@ class ListsModule extends PLModule
                 $msg = str_replace("%(reason)s",    "<< TON EXPLICATION >>",  $msg);
                 $msg = str_replace("%(listname)s",  $liste, $msg);
 
+                $mail['stamp'] = strftime("%Y%m%d%H%M%S", $mail['stamp']);
                 $page->assign('msg', $msg);
             
-                $page->changeTpl('listes/moderate_mail.tpl');
+                $page->changeTpl('lists/moderate_mail.tpl');
                 $page->assign_by_ref('mail', $mail);
                 return;
             }   
@@ -465,7 +465,7 @@ class ListsModule extends PLModule
             if (list($subs,$mails) = $this->client->get_pending_ops($liste)) {
                 foreach($subs as $user) {
                     if ($user['id'] == Env::v('sid')) {
-                        $page->changeTpl('listes/moderate_sub.tpl');
+                        $page->changeTpl('lists/moderate_sub.tpl');
                         $page->assign('del_user', $user);
                         return;
                     }
@@ -475,6 +475,9 @@ class ListsModule extends PLModule
         }
 
         if (list($subs,$mails) = $this->client->get_pending_ops($liste)) {
+            foreach ($mails as $key=>$mail) {
+                $mails[$key]['stamp'] = strftime("%Y%m%d%H%M%S", $mail['stamp']);
+            }
             $page->assign_by_ref('subs', $subs);
             $page->assign_by_ref('mails', $mails);
         } else {
@@ -492,7 +495,7 @@ class ListsModule extends PLModule
 
         $this->prepare_client($page);
 
-        $page->changeTpl('listes/admin.tpl');
+        $page->changeTpl('lists/admin.tpl');
 
         if (Env::has('add_member')) {
             require_once('user.func.inc.php');
@@ -546,7 +549,9 @@ class ListsModule extends PLModule
             $page->assign('np_m', count($mem));
 
         } else {
-            $page->kill("La liste n'existe pas ou tu n'as pas le droit de l'administrer");
+            $page->kill("La liste n'existe pas ou tu n'as pas le droit de l'administrer.<br />"
+                       ." Si tu penses qu'il s'agit d'une erreur, "
+                       ."<a href='mailto:support@polytechnique.org'>contact le support</a>");
         }
     }
 
@@ -558,7 +563,7 @@ class ListsModule extends PLModule
 
         $this->prepare_client($page);
 
-        $page->changeTpl('listes/options.tpl');
+        $page->changeTpl('lists/options.tpl');
 
         if (Post::has('submit')) {
             $values = $_POST;
@@ -619,7 +624,7 @@ class ListsModule extends PLModule
             $type   = 'list';
         }
 
-        $page->changeTpl('listes/delete.tpl');
+        $page->changeTpl('lists/delete.tpl');
         if (Post::v('valid') == 'OUI') {
             if ($this->client->delete_list($liste, Post::b('del_archive'))) {
                 foreach (array('', '-owner', '-admin', '-bounces') as $app) {
@@ -650,7 +655,7 @@ class ListsModule extends PLModule
 
         $this->prepare_client($page);
 
-        $page->changeTpl('listes/soptions.tpl');
+        $page->changeTpl('lists/soptions.tpl');
 
         if (Post::has('submit')) {
             $values = $_POST;
@@ -676,7 +681,7 @@ class ListsModule extends PLModule
 
         $this->prepare_client($page);
 
-        $page->changeTpl('listes/check.tpl');
+        $page->changeTpl('lists/check.tpl');
 
         if (Post::has('correct')) {
             $this->client->check_options($liste, true);
@@ -691,7 +696,7 @@ class ListsModule extends PLModule
     }
 
     function handler_admin_all(&$page) {
-        $page->changeTpl('listes/admin_all.tpl');
+        $page->changeTpl('lists/admin_all.tpl');
         $page->assign('xorg_title','Polytechnique.org - Administration - Mailing lists');
 
         $client = new MMList(S::v('uid'), S::v('password'));