passage des validations d'alias avec formulaire en templates.

à compter de ce commit, les autres validations sont momentanément cassées

diff --git a/include/valid_aliases.inc.php b/include/valid_aliases.inc.php
index d4c1bd1..e6296a6 100644 (file)
--- a/include/valid_aliases.inc.php
+++ b/include/valid_aliases.inc.php
@@ -1,5 +1,6 @@
 <?php
 class AliasReq extends Validate {
+    var $tpl_form='include/form.valid.aliases.tpl';
     var $alias;
     var $raison;
 
@@ -24,49 +25,6 @@ class AliasReq extends Validate {
         return parent::get_unique_request($uid,'alias');
     }
 
-    function formu() {
-        $old = $this->old ? "({$this->old})" : "";
-        $raison = nl2br(stripslashes(htmlentities($this->raison)));
-        $newAlias = $this->alias.'@melix.net';
-        return <<<________EOF
-        <form action="{$_SERVER['PHP_SELF']}" method="POST">
-        <input type="hidden" name="uid" value="{$this->uid}" />
-        <input type="hidden" name="type" value="{$this->type}" />
-        <input type="hidden" name="stamp" value="{$this->stamp}" />
-        <table class="bicol" cellpadding="4" summary="Demande d'alias">
-        <tr>
-            <td>Demandeur&nbsp;:
-            </td>
-            <td><a href="javascript:x()" onclick="popWin('/x.php?x={$this->username}">
-                {$this->prenom} {$this->nom}</a> $old
-            </td>
-        </tr>
-        <tr>
-            <td>Nouvel&nbsp;alias&nbsp;:</td>
-            <td>{$newAlias}</td>
-        </tr>
-        <tr>
-            <td>Motif :</td>
-            <td style="border: 1px dotted inherit">
-                $raison
-            </td>
-        </tr>
-        <tr>
-            <td style="vertical-align: middle;">
-                <input type="submit" name="submit" value="Accepter" />
-                <br /><br />
-                <input type="submit" name="submit" value="Refuser" />
-            </td>
-            <td>
-                <p>Raison du refus:</p>
-                <textarea rows="5" cols="74" name=motif></textarea>
-            </td>
-        </tr>
-        </table>
-        </form>
-________EOF;
-    }
-
     function handle_formu () {
         global $no_update_bd;
         if($no_update_bd) return false;

diff --git a/include/validations.inc.php b/include/validations.inc.php
index 71e8e59..075a000 100644 (file)
--- a/include/validations.inc.php
+++ b/include/validations.inc.php
@@ -1,6 +1,6 @@
 <?php
 /* vim: set expandtab shiftwidth=4 tabstop=4 softtabstop=4 textwidth=100:
- * $Id: validations.inc.php,v 1.4 2004-02-03 17:42:45 x2000gommard Exp $
+ * $Id: validations.inc.php,v 1.5 2004-02-07 16:57:58 x2000habouzit Exp $
  *
  */
 
@@ -36,6 +36,8 @@ class ValidateIterator {
  * Par contre, à la sortie de toute fonction il faut que le stamp soit valide !!! XXX
  */
 class Validate {
+    /** nom du template qui contient le formulaire */
+    var $tpl_form = null;
     /** l'uid de la personne faisant la requête */
     var $uid;
     /** le time stamp de la requête */
@@ -139,11 +141,6 @@ class Validate {
                 .($this->unique ? "" : " AND stamp='".$this->stamp."'"));
     }
     
-    /** doit retourner le fomulaire de validation de la donnée
-     * XXX la fonction est "virtuelle" XXX
-     * XXX doit définir les variables $uid et $stamp en hidden XXX
-     */
-    function formu() { }
     /** fonction à réaliser en cas de valistion du formulaire
      * XXX la fonction est "virtuelle" XXX
      */

diff --git a/templates/admin/valider.tpl b/templates/admin/valider.tpl
index 3fdff44..0eb9511 100644 (file)
--- a/templates/admin/valider.tpl
+++ b/templates/admin/valider.tpl
@@ -1,10 +1,10 @@
-{* $Id: valider.tpl,v 1.1 2004-01-27 09:08:57 x2000habouzit Exp $ *}
+{* $Id: valider.tpl,v 1.2 2004-02-07 16:57:58 x2000habouzit Exp $ *}
 
 {dynamic}
 {$mail}
 {foreach item=valid from=$valids}
 <br />
-{$valid->formu()}
+{include file=$valid->tpl_form valid=$valid}
 {/foreach}
 {/dynamic}
 

diff --git a/templates/include/form.valid.aliases.tpl b/templates/include/form.valid.aliases.tpl
new file mode 100644 (file)
index 0000000..3e7e429
--- /dev/null
+++ b/templates/include/form.valid.aliases.tpl
@@ -0,0 +1,40 @@
+{* $Id: form.valid.aliases.tpl,v 1.1 2004-02-07 16:57:59 x2000habouzit Exp $ *}
+{assign var="newAlias" value=""}
+<form action="{$smarty.server.PHP_SELF}" method="POST">
+<input type="hidden" name="uid" value="{$valid->uid}" />
+<input type="hidden" name="type" value="{$valid->type}" />
+<input type="hidden" name="stamp" value="{$valid->stamp}" />
+<table class="bicol" cellpadding="4" summary="Demande d'alias">
+<tr>
+  <td>Demandeur&nbsp;:
+  </td>
+  <td>
+    <a href="javascript:x()" onclick="popWin('{"x.php?x=$valid->username"|url}')">
+    {$valid->prenom} {$valid->nom}</a> {$valid->old}
+  </td>
+</tr>
+<tr>
+  <td>Nouvel&nbsp;alias&nbsp;:</td>
+  <td>{$valid->alias}@melix.net</td>
+</tr>
+<tr>
+  <td>Motif :</td>
+  <td style="border: 1px dotted inherit">
+    {$this->raison|escape:"html"|nl2br}
+  </td>
+</tr>
+<tr>
+  <td style="vertical-align: middle;">
+    <input type="submit" name="submit" value="Accepter" />
+    <br /><br />
+    <input type="submit" name="submit" value="Refuser" />
+  </td>
+  <td>
+    <p>Raison du refus:</p>
+    <textarea rows="5" cols="74" name="motif"></textarea>
+  </td>
+</tr>
+</table>
+</form>
+
+{* vim:set et sw=2 sts=2 sws=2: *}