Same as [1286]

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

diff --git a/modules/lists.php b/modules/lists.php
index 8266f50..b84da88 100644 (file)
--- 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)) {
@@ -425,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');
@@ -457,7 +457,7 @@ class ListsModule extends PLModule
                 $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;
                     }
@@ -495,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');
@@ -563,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;
@@ -624,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) {
@@ -655,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;
@@ -681,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);
@@ -696,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'));

diff --git a/modules/xnetlists.php b/modules/xnetlists.php
index 299d4cd..ff51041 100644 (file)
--- a/modules/xnetlists.php
+++ b/modules/xnetlists.php
@@ -245,7 +245,7 @@ class XnetListsModule extends ListsModule
             return PL_NOT_FOUND;
         }
 
-        new_groupadmin_page('xnet/groupe/alias-admin.tpl');
+        new_groupadmin_page('xnetlists/alias-admin.tpl');
 
         if (Env::has('add_member')) {
             $add = Env::v('add_member');
@@ -320,7 +320,7 @@ class XnetListsModule extends ListsModule
         if (!$globals->asso('mail_domain')) {
             return PL_NOT_FOUND;
         }
-        new_groupadmin_page('xnet/groupe/alias-create.tpl');
+        new_groupadmin_page('xnetlists/alias-create.tpl');
 
         if (!Post::has('submit')) {
             return;

diff --git a/templates/listes/admin.tpl b/templates/lists/admin.tpl
similarity index 100%
rename from templates/listes/admin.tpl
rename to templates/lists/admin.tpl

diff --git a/templates/listes/admin_all.tpl b/templates/lists/admin_all.tpl
similarity index 100%
rename from templates/listes/admin_all.tpl
rename to templates/lists/admin_all.tpl

diff --git a/templates/listes/archives.tpl b/templates/lists/archives.tpl
similarity index 100%
rename from templates/listes/archives.tpl
rename to templates/lists/archives.tpl

diff --git a/templates/listes/check.tpl b/templates/lists/check.tpl
similarity index 100%
rename from templates/listes/check.tpl
rename to templates/lists/check.tpl

diff --git a/templates/listes/create.tpl b/templates/lists/create.tpl
similarity index 100%
rename from templates/listes/create.tpl
rename to templates/lists/create.tpl

diff --git a/templates/listes/delete.tpl b/templates/lists/delete.tpl
similarity index 100%
rename from templates/listes/delete.tpl
rename to templates/lists/delete.tpl

diff --git a/templates/listes/header_listes.tpl b/templates/lists/header_listes.tpl
similarity index 100%
rename from templates/listes/header_listes.tpl
rename to templates/lists/header_listes.tpl

diff --git a/templates/listes/index.tpl b/templates/lists/index.tpl
similarity index 100%
rename from templates/listes/index.tpl
rename to templates/lists/index.tpl

diff --git a/templates/listes/liste.inc.tpl b/templates/lists/liste.inc.tpl
similarity index 100%
rename from templates/listes/liste.inc.tpl
rename to templates/lists/liste.inc.tpl

diff --git a/templates/listes/listes.inc.tpl b/templates/lists/listes.inc.tpl
similarity index 100%
rename from templates/listes/listes.inc.tpl
rename to templates/lists/listes.inc.tpl

diff --git a/templates/listes/members.tpl b/templates/lists/members.tpl
similarity index 100%
rename from templates/listes/members.tpl
rename to templates/lists/members.tpl

diff --git a/templates/listes/moderate.tpl b/templates/lists/moderate.tpl
similarity index 100%
rename from templates/listes/moderate.tpl
rename to templates/lists/moderate.tpl

diff --git a/templates/listes/moderate_mail.tpl b/templates/lists/moderate_mail.tpl
similarity index 100%
rename from templates/listes/moderate_mail.tpl
rename to templates/lists/moderate_mail.tpl

diff --git a/templates/listes/moderate_sub.tpl b/templates/lists/moderate_sub.tpl
similarity index 100%
rename from templates/listes/moderate_sub.tpl
rename to templates/lists/moderate_sub.tpl

diff --git a/templates/listes/options.tpl b/templates/lists/options.tpl
similarity index 100%
rename from templates/listes/options.tpl
rename to templates/lists/options.tpl

diff --git a/templates/listes/soptions.tpl b/templates/lists/soptions.tpl
similarity index 100%
rename from templates/listes/soptions.tpl
rename to templates/lists/soptions.tpl

diff --git a/templates/listes/trombi.tpl b/templates/lists/trombi.tpl
similarity index 100%
rename from templates/listes/trombi.tpl
rename to templates/lists/trombi.tpl

diff --git a/templates/xnetgrp/alias-admin.tpl b/templates/xnetlists/alias-admin.tpl
similarity index 100%
rename from templates/xnetgrp/alias-admin.tpl
rename to templates/xnetlists/alias-admin.tpl

diff --git a/templates/xnetgrp/alias-create.tpl b/templates/xnetlists/alias-create.tpl
similarity index 100%
rename from templates/xnetgrp/alias-create.tpl
rename to templates/xnetlists/alias-create.tpl