evenements done

diff --git a/etat_migration b/etat_migration
index b6d11e5..e9ffa01 100644 (file)
--- a/etat_migration
+++ b/etat_migration
@@ -26,7 +26,6 @@ Etat  | Ancien nom                                                              | Nouveau nom
 ;        | step4.php                                                             | 
 ;        | tmpPWD.php                                                            | 
 ------+-[ bordel ]--------------------------------+----------------
-;        | evenements.php                                                        | 
 ;        | fiche_referent.php                                            | 
 ;        | index.coupure.php                                             | 
 ;        | mescontacts_pdf.php                                           | 
@@ -146,6 +145,7 @@ xx    | dons.php                                                              | -
 xx       | emails.php                                                            | -
 xx       | en-cours.php                                                          | docs/en-cours.php
 xx       | ethique.php                                                           | docs/ethique.php
+xx       | evenements.php                                                        | 
 xx       | exit.php                                                              | -
 xx       | faq.php                                                                       | docs/faq.php
 xx       | getphoto.php                                                          | -

diff --git a/htdocs/evenements.php b/htdocs/evenements.php
new file mode 100644 (file)
index 0000000..2285669
--- /dev/null
+++ b/htdocs/evenements.php
@@ -0,0 +1,64 @@
+<?php
+require("auto.prepend.inc.php");
+new_skinned_page('evenements.tpl', AUTH_MDP);
+
+if (isset($_POST['titre'])) {$titre = stripslashes($_POST['titre']);}
+else {$titre = "";}
+
+if (isset($_POST['texte'])) {$texte = stripslashes($_POST['texte']);}
+else {$texte = "";}
+
+if (isset($_POST['promo_min'])) {$promo_min = $_POST['promo_min'];}
+else {$promo_min = 0;}
+
+if (isset($_POST['promo_max'])) {$promo_max = $_POST['promo_max'];}
+else {$promo_max = 0;}
+
+if (isset($_POST['peremption'])) {$peremption = $_POST['peremption'];}
+else {$peremption = 0;}
+
+if (isset($_POST['validation_message'])) {$validation_message = stripslashes($_POST['validation_message']);}
+else {$validation_message = "";}
+
+if (isset($_POST['action'])) { $action = $_POST['action']; } else $action = "" ;
+
+$page->assign('titre', $titre);
+$page->assign('texte', $texte);
+$page->assign('promo_min', $promo_min);
+$page->assign('promo_max', $promo_max);
+$page->assign('peremption', $peremption);
+$page->assign('validation_message', $validation_message);
+$page->assign('action', strtolower($action));
+
+if ($action=="Confirmer") {
+    $sql = "INSERT INTO evenements set user_id = {$_SESSION['uid']}"
+       .", creation_date = NULL"
+       .", titre = '".addslashes($titre)."'"
+       .", texte = '".addslashes($texte)."'"
+       .", peremption = '".$peremption."'"
+       .", promo_min = '$promo_min', promo_max = '$promo_max'"
+       .", validation_message = '".addslashes($validation_message)."'"
+       .", validation_date = 0";
+
+    if ($res = $globals->db->query($sql)) {
+       require("validations.inc.php");
+       $evtreq = new evtreq(mysql_insert_id(),$titre,$texte,$promo_min,
+               $promo_max,$peremption,$validation_message,$_SESSION['uid']);
+       $evtreq->submit();
+       $page->assign('ok', true);
+    }
+}
+
+$select = "";
+for ($i = 1 ; $i < 30 ; $i++) {
+    $p_stamp=date("Ymd",time()+3600*24*$i);
+    $year=substr($p_stamp,0,4);
+    $month=substr($p_stamp,4,2);
+    $day=substr($p_stamp,6,2);
+
+    $select .= "<option value=\"$p_stamp\"" . (($p_stamp == strtr($peremption, array("-" => ""))) ? " selected" : "")."> $day / $month / $year</option>\n";
+}
+$page->assign('select',$select);
+$page->run();
+
+?>

diff --git a/include/valid_evts.inc.php b/include/valid_evts.inc.php
index 2cadbee..2296448 100644 (file)
--- a/include/valid_evts.inc.php
+++ b/include/valid_evts.inc.php
@@ -63,10 +63,11 @@ class EvtReq extends Validate {
             if($_REQUEST['action']=="Supprimer") {
                 $globals->db->query("DELETE from evenements WHERE id='{$this->evtid}' LIMIT 1");
             }
-            if ($_POST['action']!="Supprimer")
+            if ($_POST['action'] != "Supprimer")
                 $mymail->send();
             $this->clean();
         }
+       return "";
     }
 
     function commit() {

diff --git a/templates/admin/evenements.tpl b/templates/admin/evenements.tpl
index cc734b4..edb7a66 100644 (file)
--- a/templates/admin/evenements.tpl
+++ b/templates/admin/evenements.tpl
@@ -1,4 +1,4 @@
-{* $Id: evenements.tpl,v 1.2 2004-07-19 12:09:32 x2000habouzit Exp $ *}
+{* $Id: evenements.tpl,v 1.3 2004-07-19 13:35:35 x2000habouzit Exp $ *}
 
 {dynamic}
 
@@ -17,77 +17,7 @@
 
 {if $mode}
 
-<form action="{$smarty.server.PHP_SELF}" method="post" name="evenement_nouveau">
-  <input type="hidden" name="evt_id" value="{$smarty.post.evt_id}" />
-  <table class="bicol">
-    <tr>
-      <th colspan="2">Contenu du message</th>
-    </tr>
-    <tr>
-      <td><strong>Titre</strong></td>
-      <td>
-        <input type="text" name="titre" size="50" maxlength="200" value="{$titre}" />
-      </td>
-    </tr>
-    <tr>
-      <td><strong>Texte</strong></td>
-      <td><textarea name="texte" rows="10" cols="60">{$texte}</textarea></td>
-    </tr>
-  </table>
-
-  <br />
-
-  <table class="bicol">
-    <tr>
-      <th colspan="2">Informations complémentaires</th>
-    </tr>
-    <tr>
-      <td>
-        <strong>Promo min *</strong> (incluse)
-      </td>
-      <td>
-        <input type="text" name="promo_min" size="4" maxlength="4" value="{$promo_min}" />
-        &nbsp;<em>0 signifie pas de minimum</em>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <strong>Promo max *</strong> (incluse)
-      </td>
-      <td>
-        <input type="text" name="promo_max" size="4" maxlength="4" value="{$promo_max}" />
-        &nbsp;<em>0 signifie pas de maximum</em>
-      </td>
-    </tr>
-    <tr>
-      <td colspan="2">
-        * sert à limiter l'affichage de l'annonce aux camarades appartenant à certaines promos seulement.
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <strong>Dernier jour d'affichage</strong>
-      </td>
-      <td>
-        <select name="peremption">
-          {$select}
-        </select>
-      </td>
-    </tr>
-    <tr>
-      <td><strong>Message pour le validateur</strong></td>
-      <td><textarea name="validation_message" cols="50" rows="7">{$validation_message}</textarea></td>
-    </tr>
-  </table>
-
-  <br />
-
-  <div class="center">
-    <input type="submit" name="action" value="Proposer" />
-  </div>
-
-</form>
-
+{include file="include/form.evenement.tpl"}
 
 {else}
 
@@ -122,10 +52,10 @@
         {else}
         <input type="submit" name="action" value="Editer" />
         {if $ev.fvalide}
-        <input type="submit" name="action" value="Valider" />
-        {else}
         <input type="submit" name="action" value="Invalider" />
         <input type="submit" name="action" value="Archiver" />
+        {else}
+        <input type="submit" name="action" value="Valider" />
         {/if}
         <input type="submit" name="action" value="Supprimer" />
         {/if}

diff --git a/templates/evenements.tpl b/templates/evenements.tpl
new file mode 100644 (file)
index 0000000..3a8a567
--- /dev/null
+++ b/templates/evenements.tpl
@@ -0,0 +1,78 @@
+{* $Id: evenements.tpl,v 1.1 2004-07-19 13:35:35 x2000habouzit Exp $ *}
+
+<div class="rubrique">
+  Proposition d'information événementielle
+</div>
+
+{dynamic}
+
+{if $action eq "proposer"}
+
+<p class="normal">
+Voici ton annonce :
+</p>
+
+<table class="bicol" width="98%">
+  <tr>
+    <th>{$titre|nl2br}</th>
+  </tr>
+  <tr>
+    <td>{$texte|nl2br}</td>
+  </tr>
+</table>
+
+<p class="normal">
+Ce message est à destination
+{if $promo_min || $promo_max}
+des promotions {if $promo_min}X{$promo_min}{/if} {if $promo_max}jusqu'à X{$promo_max}{else}et plus{/if}
+{else}
+de toutes les promotions
+{/if}
+et sera affiché sur la page d'accueil jusqu'au {$peremption|date_format:"%e %b %Y"}
+</p>
+
+{if $validation_message}
+<p class="normal">
+Tu as ajouté le message suivant à l'intention du validateur : {$validation_message|nl2br}
+</p>
+{/if}
+
+<form action="{$smarty.request.PHP_SELF}" method="post" name="evenement_nouveau">
+  <input type="hidden" name="titre" value="{$titre|escape}" />
+  <input type="hidden" name="texte" value="{$texte|escape}" />
+  <input type="hidden" name="promo_min" value="{$promo_min}" />
+  <input type="hidden" name="promo_max" value="{$promo_max}" />
+  <input type="hidden" name="peremption" value="{$peremption}" />
+  <input type="hidden" name="validation_message" value="{$validation_message|escape}" />
+  <input type="submit" name="action" value="Confirmer" />
+  <input type="submit" name="action" value="Modifier" />
+</form>
+
+
+{elseif $action eq "confirmer"}
+
+{if $ok}
+<p class="normal">
+Ta proposition a bien été enregistrée, un administrateur va se charger de la valider aussi rapidement que possible.
+</p>
+<p class="normal">
+Merci pour ta contribution à la vie du site!
+</p>
+<p class="normal">
+<a href="login.php">Retour à la page d'accueil</a>
+</p>
+{else}
+<p class="erreur">
+Une erreur s'est produite pendant l'enregistrement de ta proposition.  Merci de nous <a href="contacts.php">contacter</a>!
+</p>
+{/if}
+
+{else}
+
+{include file="include/form.evenement.tpl"}
+
+{/if}
+
+{/dynamic}
+
+{* vim:set et sw=2 sts=2 sws=2: *}

diff --git a/templates/include/form.evenement.tpl b/templates/include/form.evenement.tpl
new file mode 100644 (file)
index 0000000..265ee85
--- /dev/null
+++ b/templates/include/form.evenement.tpl
@@ -0,0 +1,74 @@
+{* $Id: form.evenement.tpl,v 1.1 2004-07-19 13:35:36 x2000habouzit Exp $ *}
+
+<form action="{$smarty.server.PHP_SELF}" method="post" name="evenement_nouveau">
+  <input type="hidden" name="evt_id" value="{$smarty.post.evt_id}" />
+  <table class="bicol">
+    <tr>
+      <th colspan="2">Contenu du message</th>
+    </tr>
+    <tr>
+      <td><strong>Titre</strong></td>
+      <td>
+        <input type="text" name="titre" size="50" maxlength="200" value="{$titre}" />
+      </td>
+    </tr>
+    <tr>
+      <td><strong>Texte</strong></td>
+      <td><textarea name="texte" rows="10" cols="60">{$texte}</textarea></td>
+    </tr>
+  </table>
+
+  <br />
+
+  <table class="bicol">
+    <tr>
+      <th colspan="2">Informations complémentaires</th>
+    </tr>
+    <tr>
+      <td>
+        <strong>Promo min *</strong> (incluse)
+      </td>
+      <td>
+        <input type="text" name="promo_min" size="4" maxlength="4" value="{$promo_min}" />
+        &nbsp;<em>0 signifie pas de minimum</em>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <strong>Promo max *</strong> (incluse)
+      </td>
+      <td>
+        <input type="text" name="promo_max" size="4" maxlength="4" value="{$promo_max}" />
+        &nbsp;<em>0 signifie pas de maximum</em>
+      </td>
+    </tr>
+    <tr>
+      <td colspan="2">
+        * sert à limiter l'affichage de l'annonce aux camarades appartenant à certaines promos seulement.
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <strong>Dernier jour d'affichage</strong>
+      </td>
+      <td>
+        <select name="peremption">
+          {$select}
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td><strong>Message pour le validateur</strong></td>
+      <td><textarea name="validation_message" cols="50" rows="7">{$validation_message}</textarea></td>
+    </tr>
+  </table>
+
+  <br />
+
+  <div class="center">
+    <input type="submit" name="action" value="Proposer" />
+  </div>
+
+</form>
+
+{* vim:set et sw=2 sts=2 sws=2: *}

diff --git a/templates/include/form.valid.evts.tpl b/templates/include/form.valid.evts.tpl
index 6311756..0344fdd 100644 (file)
--- a/templates/include/form.valid.evts.tpl
+++ b/templates/include/form.valid.evts.tpl
@@ -1,52 +1,48 @@
-{* $Id: form.valid.evts.tpl,v 1.2 2004-02-09 17:47:07 x2000habouzit Exp $ *}
+{* $Id: form.valid.evts.tpl,v 1.3 2004-07-19 13:35:36 x2000habouzit Exp $ *}
 
-<form action="{$smarty.server.PHP_SELF}" method="POST" name="modif">
+<form action="{$smarty.server.PHP_SELF}" method="post" name="modif">
   <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">
-    <thead>
-      <tr>
-        <th colspan="2">Événement</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td>
-          Posté par <a href="javascript:x()"  onclick="popWin('{"x.php?x=$valid->username"|url}">
-            {$valid->prenom} {$valid->nom} (X{$valid->promo})
-          </a>
-          [<a href="mailto:{$valid->username}@polytechnique.org">lui écrire</a>]"
-        </td>
-      </tr>
-      <tr>
-        <th>Titre</th>
-        <td>{$valid->titre}</td>
-      </tr>
-      <tr>
-        <th>Texte</th>
-        <td>{$valid->texte}</td>
-      </tr>
-      <tr>
-        <th>Péremption</th>
-        <td>{$valid->peremption}</td>
-      </tr>
-      <tr>
-        <th>Promos</th>
-        <td>{$valid->pmin} - {$valid->pmax}</td>
-      </tr>
-      <tr>
-        <th>Commentaire</th>
-        <td>{$valid->comment}</td>
-      </tr>
-      <tr>
-        <td class="center" colspan="2">
-          <input type="submit" name="action" value="Valider" />
-          <input type="submit" name="action" value="Invalider" />
-          <input type="submit" name="action" value="Supprimer" />
-        </td>
-      </tr>
-    </tbody>
+    <tr>
+      <th class="titre" colspan="2">Événement</th>
+    </tr>
+    <tr>
+      <td>
+        Posté par <a href="javascript:x()"  onclick="popWin('{"x.php?x=$valid->username"|url}">
+          {$valid->prenom} {$valid->nom} (X{$valid->promo})
+        </a>
+        [<a href="mailto:{$valid->username}@polytechnique.org">lui écrire</a>]
+      </td>
+    </tr>
+    <tr>
+      <td class="titre">Titre</td>
+      <td>{$valid->titre}</td>
+    </tr>
+    <tr>
+      <td class="titre">Texte</td>
+      <td>{$valid->texte}</td>
+    </tr>
+    <tr>
+      <td class="titre">Péremption</td>
+      <td>{$valid->peremption}</td>
+    </tr>
+    <tr>
+      <td class="titre">Promos</td>
+      <td>{$valid->pmin} - {$valid->pmax}</td>
+    </tr>
+    <tr>
+      <td class="titre">Commentaire</td>
+      <td>{$valid->comment}</td>
+    </tr>
+    <tr>
+      <td class="center" colspan="2">
+        <input type="submit" name="action" value="Valider" />
+        <input type="submit" name="action" value="Invalider" />
+        <input type="submit" name="action" value="Supprimer" />
+      </td>
+    </tr>
   </table>
 </form>