backport

Patches applied:

 * opensource@polytechnique.org--2005/platal--release--0.9.6--patch-32
   fix lists perms problem

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-676

diff --git a/htdocs.net/groupe/listes-admin.php b/htdocs.net/groupe/listes-admin.php
index c63934d..86478bd 100644 (file)
--- a/htdocs.net/groupe/listes-admin.php
+++ b/htdocs.net/groupe/listes-admin.php
@@ -25,6 +25,7 @@ $liste  = strtolower(Env::get('liste'));
 $domain = $globals->asso('mail_domain');
 
 new_group_page('listes/admin.tpl');
+$page->assign('force_list_super', may_update());
 
 require_once('lists.inc.php');
 $client =& lists_xmlrpc(Session::getInt('uid'), Session::get('password'), $globals->asso('mail_domain'));

diff --git a/htdocs.net/groupe/listes-archives.php b/htdocs.net/groupe/listes-archives.php
index 2bc1a40..e7fab8f 100644 (file)
--- a/htdocs.net/groupe/listes-archives.php
+++ b/htdocs.net/groupe/listes-archives.php
@@ -25,6 +25,7 @@ $liste  = strtolower(Env::get('liste'));
 $domain = $globals->asso('mail_domain');
 
 new_group_page('listes/archives.tpl');
+$page->assign('force_list_super', may_update());
 
 require_once('lists.inc.php');
 $client =& lists_xmlrpc(Session::getInt('uid'), Session::get('password'), $globals->asso('mail_domain'));

diff --git a/htdocs.net/groupe/listes-check.php b/htdocs.net/groupe/listes-check.php
index 57bb6bc..e44827c 100644 (file)
--- a/htdocs.net/groupe/listes-check.php
+++ b/htdocs.net/groupe/listes-check.php
@@ -23,7 +23,8 @@ require_once 'xnet.inc.php';
 if (!Env::has('liste')) header('Location: index.php');
 $liste = strtolower(Env::get('liste'));
 
-new_admin_page('listes/check.tpl');
+new_groupadmin_page('listes/check.tpl');
+$page->assign('force_list_super', may_update());
 
 require_once('lists.inc.php');
 $client =& lists_xmlrpc(Session::getInt('uid'), Session::get('password'), $globals->asso('mail_domain'));

diff --git a/htdocs.net/groupe/listes-create.php b/htdocs.net/groupe/listes-create.php
index 572f3d7..a49805c 100644 (file)
--- a/htdocs.net/groupe/listes-create.php
+++ b/htdocs.net/groupe/listes-create.php
@@ -2,6 +2,7 @@
 require 'xnet.inc.php';
 
 new_groupadmin_page('xnet/groupe/listes-create.tpl');
+$page->assign('force_list_super', may_update());
 
 if (Post::has('submit')) {
     if (!Post::has('liste')) {

diff --git a/htdocs.net/groupe/listes-delete.php b/htdocs.net/groupe/listes-delete.php
index afbe451..aed95c7 100644 (file)
--- a/htdocs.net/groupe/listes-delete.php
+++ b/htdocs.net/groupe/listes-delete.php
@@ -24,6 +24,7 @@ if (!Env::has('liste')) header('Location: listes.php');
 $liste = strtolower(Env::get('liste'));
 
 new_group_page('listes/delete.tpl');
+$page->assign('force_list_super', may_update());
 
 require_once('lists.inc.php');
 $client =& lists_xmlrpc(Session::getInt('uid'), Session::get('password'), $globals->asso('mail_domain'));

diff --git a/htdocs.net/groupe/listes-members.php b/htdocs.net/groupe/listes-members.php
index d16c508..562ca36 100644 (file)
--- a/htdocs.net/groupe/listes-members.php
+++ b/htdocs.net/groupe/listes-members.php
@@ -24,6 +24,7 @@ if (!Env::has('liste')) header('Location: listes.php');
 $liste = strtolower(Env::get('liste'));
 
 new_group_page('listes/members.tpl');
+$page->assign('force_list_super', may_update());
 
 require_once('lists.inc.php');
 $client =& lists_xmlrpc(Session::getInt('uid'), Session::get('password'), $globals->asso('mail_domain'));

diff --git a/htdocs.net/groupe/listes-moderate.php b/htdocs.net/groupe/listes-moderate.php
index 286aca0..a5b2ff3 100644 (file)
--- a/htdocs.net/groupe/listes-moderate.php
+++ b/htdocs.net/groupe/listes-moderate.php
@@ -29,6 +29,7 @@ if (preg_match("!(?:[a-z0-9]+\\.)?{".$globals->asso('mail_domain')."}_(.*)!", $l
 }
 
 new_group_page('listes/moderate.tpl');
+$page->assign('force_list_super', may_update());
 
 require_once('lists.inc.php');
 $client =& lists_xmlrpc(Session::getInt('uid'), Session::get('password'), $globals->asso('mail_domain'));

diff --git a/htdocs.net/groupe/listes-options.php b/htdocs.net/groupe/listes-options.php
index 3667754..5214f69 100644 (file)
--- a/htdocs.net/groupe/listes-options.php
+++ b/htdocs.net/groupe/listes-options.php
@@ -24,6 +24,7 @@ if (!Env::has('liste')) header('Location: listes.php');
 $liste = strtolower(Env::get('liste'));
 
 new_group_page('listes/options.tpl');
+$page->assign('force_list_super', may_update());
 
 require_once('lists.inc.php');
 $client =& lists_xmlrpc(Session::getInt('uid'), Session::get('password'), $globals->asso('mail_domain'));

diff --git a/htdocs.net/groupe/listes-soptions.php b/htdocs.net/groupe/listes-soptions.php
index cea1523..cb150b9 100644 (file)
--- a/htdocs.net/groupe/listes-soptions.php
+++ b/htdocs.net/groupe/listes-soptions.php
@@ -23,7 +23,8 @@ require_once 'xnet.inc.php';
 if (!Env::has('liste')) header('Location: listes.php');
 $liste = strtolower(Env::get('liste'));
 
-new_admin_page('listes/soptions.tpl');
+new_groupadmin_page('listes/soptions.tpl');
+$page->assign('force_list_super', may_update());
 
 require_once('lists.inc.php');
 $client =& lists_xmlrpc(Session::getInt('uid'), Session::get('password'), $globals->asso('mail_domain'));

diff --git a/templates/listes/header_listes.tpl b/templates/listes/header_listes.tpl
index f0880e5..eff6d9d 100644 (file)
--- a/templates/listes/header_listes.tpl
+++ b/templates/listes/header_listes.tpl
@@ -83,7 +83,7 @@
     </td>
   </tr>
   {/if}
-  {perms level=admin}
+  {if $smarty.session.perms eq admin || $force_list_super}
   <tr>
     <td><strong>Administrer (avancé) :</strong></td>
     <td>
@@ -99,7 +99,7 @@
       {/if}
     </td>
   </tr>
-  {/perms}
+  {/if}
 </table>