Backports

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

diff --git a/configs/mails.conf b/configs/mails.conf
index bb12914..fb63f39 100644 (file)
--- a/configs/mails.conf
+++ b/configs/mails.conf
@@ -19,6 +19,10 @@ to=support@polytechnique.org
 [inscription]
 from=support@polytechnique.org
 
+[emails_broken]
+from="Polytechnique.org" <support@polytechnique.org>
+subject="Une de tes adresse de redirection Polytechnique.org ne marche plus !!"
+
 [newsletter]
 from="Lettre Mensuelle Polytechnique.org" <info_newsletter@polytechnique.org>
 replyto=info+nlp@polytechnique.org

diff --git a/modules/xnetgrp/mail.inc.php b/modules/xnetgrp/mail.inc.php
index 3a51f5e..6c6e866 100644 (file)
--- a/modules/xnetgrp/mail.inc.php
+++ b/modules/xnetgrp/mail.inc.php
@@ -21,7 +21,7 @@
 
 // {{{ get_all_redirects
 
-function get_all_redirects($membres, $exclude, $mls, &$client)
+function get_all_redirects($membres, $mls, &$client)
 {
     global $globals;
     

diff --git a/modules/xnetlists.php b/modules/xnetlists.php
index 7fb3cff..50fb5bb 100644 (file)
--- a/modules/xnetlists.php
+++ b/modules/xnetlists.php
@@ -123,7 +123,6 @@ class XnetListsModule extends ListsModule
         $this->prepare_client($page);
 
         $page->changeTpl('xnetlists/create.tpl');
-        $page->assign('force_list_super', may_update());
 
         if (!Post::has('submit')) {
             return;

diff --git a/templates/lists/header_listes.tpl b/templates/lists/header_listes.tpl
index 07aba7a..708534b 100644 (file)
--- a/templates/lists/header_listes.tpl
+++ b/templates/lists/header_listes.tpl
@@ -46,7 +46,7 @@
       {/if}
     </td>
   </tr>
-  {if $details.own || $smarty.session.perms eq admin || $force_list_super}
+  {if $details.own || $smarty.session.perms eq admin || ($it_is_xnet && $is_admin)}
   <tr>
     <td><strong>Administrer la liste :</strong></td>
     <td>
@@ -73,7 +73,8 @@
     </td>
   </tr>
   {/if}
-  {if $smarty.session.perms eq admin || $force_list_super}
+  {if $smarty.session.perms eq admin || ($it_is_xnet && $is_admin)}
+
   <tr>
     <td><strong>Administrer (avancé) :</strong></td>
     <td>
@@ -90,7 +91,7 @@
     </td>
   </tr>
   {/if}
-  {if $it_is_xnet}
+  {if $it_is_xnet && ($details.own || $is_admin)}
   <tr>
     <td><strong>Synchroniser</strong></td>
     {if $on neq sync}

diff --git a/templates/xnetgrp/announce-edit.tpl b/templates/xnetgrp/announce-edit.tpl
index 1faaf2a..1c66937 100644 (file)
--- a/templates/xnetgrp/announce-edit.tpl
+++ b/templates/xnetgrp/announce-edit.tpl
@@ -36,7 +36,7 @@ function visibilityChange(box)
 
 {if $art.texte}
 <div>
-{include file="xnet/groupe/form.announce.tpl" admin=true}
+{include file="xnetgrp/form.announce.tpl" admin=true}
 <br />
 </div>
 {/if}

diff --git a/templates/xnetgrp/asso.tpl b/templates/xnetgrp/asso.tpl
index ba5b0dd..be5194f 100644 (file)
--- a/templates/xnetgrp/asso.tpl
+++ b/templates/xnetgrp/asso.tpl
@@ -139,7 +139,7 @@
 {if $articles->total()}
 <div>
 {iterate item=art from=$articles}
-{include file="xnet/groupe/form.announce.tpl"}
+{include file="xnetgrp/form.announce.tpl"}
 <br />
 {/iterate}
 </div>