backport + some templates

Patches applied:

 * opensource@polytechnique.org--2005/platal--release--0.9.5--patch-8
   omg,,,,, DAMN TYPO

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

diff --git a/hooks/lists.inc.php b/hooks/lists.inc.php
index 2dccd6c..57fae45 100644 (file)
--- a/hooks/lists.inc.php
+++ b/hooks/lists.inc.php
@@ -56,7 +56,7 @@ function lists_menu()
 function lists_subscribe($forlife, $uid, $promo, $password)
 {
     require_once('lists.inc.php');
-    $client =& lists_xmlrpc($uid, $pass);
+    $client =& lists_xmlrpc($uid, $password);
     $client->subscribe("promo$promo");
 }
 

diff --git a/templates/xnet/include/membre_ext.tpl b/templates/xnet/include/membre_ext.tpl
new file mode 100644 (file)
index 0000000..5463db8
--- /dev/null
+++ b/templates/xnet/include/membre_ext.tpl
@@ -0,0 +1,45 @@
+{***************************************************************************
+ *  Copyright (C) 2003-2004 Polytechnique.org                              *
+ *  http://opensource.polytechnique.org/                                   *
+ *                                                                         *
+ *  This program is free software; you can redistribute it and/or modify   *
+ *  it under the terms of the GNU General Public License as published by   *
+ *  the Free Software Foundation; either version 2 of the License, or      *
+ *  (at your option) any later version.                                    *
+ *                                                                         *
+ *  This program is distributed in the hope that it will be useful,        *
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
+ *  GNU General Public License for more details.                           *
+ *                                                                         *
+ *  You should have received a copy of the GNU General Public License      *
+ *  along with this program; if not, write to the Free Software            *
+ *  Foundation, Inc.,                                                      *
+ *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
+ ***************************************************************************}
+
+<h1> Ajout d'un membre ext&eacute;rieur</h1>
+<form method="post" action="{$smarty.server.PHP_SELF}">
+  <table>
+    <tr>
+      <td>Nom :</td>
+      <td><input type="text" name="nom" value="{$smarty.request.nom}" size="40" maxlength="255" /></td>
+    </tr>
+    <tr>
+      <td>Pr&eacute;nom :</td>
+      <td><input type="text" name="prenom" value="{$smarty.request.prenom}" size="40" maxlength="40" /></td>
+    </tr>
+    <tr>
+      <td>Email :</td>
+      <td><input type="text" name="email" value="{$smarty.request.email}" size="40" maxlength="60" /></td>
+    </tr>
+    <tr>
+      <td colspan="2" align="center">
+        <input type="submit" name="addext" value="Ajouter" />
+        <input type="hidden" name="id" value="{$smarty.request.id}" />
+      </td>
+    </tr>
+  </table>
+</form>
+
+{* vim:set et sw=2 sts=2 sws=2: *}

diff --git a/templates/xnet/include/membre_x.tpl b/templates/xnet/include/membre_x.tpl
new file mode 100644 (file)
index 0000000..766dd46
--- /dev/null
+++ b/templates/xnet/include/membre_x.tpl
@@ -0,0 +1,39 @@
+{***************************************************************************
+ *  Copyright (C) 2003-2004 Polytechnique.org                              *
+ *  http://opensource.polytechnique.org/                                   *
+ *                                                                         *
+ *  This program is free software; you can redistribute it and/or modify   *
+ *  it under the terms of the GNU General Public License as published by   *
+ *  the Free Software Foundation; either version 2 of the License, or      *
+ *  (at your option) any later version.                                    *
+ *                                                                         *
+ *  This program is distributed in the hope that it will be useful,        *
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
+ *  GNU General Public License for more details.                           *
+ *                                                                         *
+ *  You should have received a copy of the GNU General Public License      *
+ *  along with this program; if not, write to the Free Software            *
+ *  Foundation, Inc.,                                                      *
+ *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
+ ***************************************************************************}
+
+<h1> Ajout d'un membre polytechnicien</h1>
+<form method="post" action="{$smarty.server.PHP_SELF}">
+  <p class="descr">
+  Identifiant X.org <small>(prenom.nom)</small> :
+  <input type="text" name="username" value="{$smarty.request.username}" size="40" maxlength="100" />
+  </p>
+  <p class="descr">
+  Permissions sur ce groupe :
+  </p>
+  <select name="is_admin">
+    <option value="0">Membre</option>
+    <option value="1">Administrateur</option>
+  </select>
+  <div class="center">
+    <input type="submit" name="addx" value="Ajouter" />
+  </div>
+</form>
+
+{* vim:set et sw=2 sts=2 sws=2: *}