backport

Patches applied:

 * opensource@polytechnique.org--2005/platal--release--0.9.3--patch-25
   bugfix (couldn't delete owner or member of a ML)

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

diff --git a/htdocs/banana/include/error.inc.php b/htdocs/banana/include/error.inc.php
deleted file mode 100644 (file)
index b42781a..0000000
--- a/htdocs/banana/include/error.inc.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-function error($_type) {
-  global $locale,$css,$group;
-  switch ($_type) {
-    case "nntpsock":
-      echo "<p class=\"error\">\n\t".$locale['error']['connect']."\n</p>";
-      break;  
-    case "nntpauth":
-      echo "<p class=\"error\">\n\t".$locale['error']['credentials']
-        ."\n</p>";
-      break;
-    case "nntpgroups":
-      echo "<p class=\"{$css['normal']}\">";
-      echo "\n".$locale['error']['nogroup']."\n";
-      echo "</p>\n";
-      break;
-    case "nntpspool":
-      echo "<div class=\"{$css['bananashortcuts']}\">\n";
-      echo "[<a href=\"index.php\">Liste des forums</a>]\n";
-      echo "</div>\n";
-      echo "<p class=\"error\">\n\t".$locale['error']['group']."\n</p>";
-      break;
-    case "nntpart":
-      echo "<div class=\"{$css['bananashortcuts']}\">\n";
-      echo "[<a href=\"index.php\">Liste des forums</a>] \n";
-      echo "[<a href=\"thread.php?group=$group\">$group</a>] \n";
-      echo "</div>\n";
-      echo "<p class=\"error\">\n\t".$locale['error']['post']."\n</p>";
-      break;
-  }
-}
-
-?>

diff --git a/templates/listes/admin.tpl b/templates/listes/admin.tpl
index b167577..b62f9dc 100644 (file)
--- a/templates/listes/admin.tpl
+++ b/templates/listes/admin.tpl
@@ -50,7 +50,7 @@ qui y 
         {else}
         {$x.l}
         {/if}
-        <a href='?liste={$smarty.get.liste}&amp;del_owner={$x.a}'><img src='{"images/retirer.gif"|url}' alt='retirer modérateur' title='retirer modérateur' /></a>
+        <a href='?liste={$smarty.get.liste}&amp;del_owner={$x.l}'><img src='{"images/retirer.gif"|url}' alt='retirer modérateur' title='retirer modérateur' /></a>
         <br />
         {/foreach}
       </td>
@@ -84,7 +84,7 @@ qui y 
         {else}
         {$x.l}
         {/if}
-        <a href='?liste={$smarty.get.liste}&amp;del_member={$x.a}'><img src='{"images/retirer.gif"|url}' alt='retirer membre' title='retirer membre' /></a>
+        <a href='?liste={$smarty.get.liste}&amp;del_member={$x.l}'><img src='{"images/retirer.gif"|url}' alt='retirer membre' title='retirer membre' /></a>
         <br />
         {/foreach}
       </td>