various path fixes.

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

diff --git a/modules/marketing.php b/modules/marketing.php
index b26040e..3684e33 100644 (file)
--- a/modules/marketing.php
+++ b/modules/marketing.php
@@ -79,7 +79,8 @@ class MarketingModule extends PLModule
         return PL_OK;
     }
 
-    function handler_private(&$page, $uid = null)
+    function handler_private(&$page, $uid = null,
+                             $action = null, $value = null)
     {
         global $globals;
 
@@ -89,6 +90,8 @@ class MarketingModule extends PLModule
             return PL_NOT_FOUND;
         }
 
+        $page->assign('path', 'marketing/private/'.$uid);
+
         $res = $globals->xdb->query("SELECT nom, prenom, promo, matricule
                                        FROM auth_user_md5
                                       WHERE user_id={?} AND perms='pending'", $uid);
@@ -105,44 +108,45 @@ class MarketingModule extends PLModule
             $page->kill('uid invalide');
         }
 
-        if (Env::has('del')) {
+        if ($action == 'del') {
             $globals->xdb->execute('DELETE FROM register_marketing WHERE uid={?} AND email={?}',
-                                   $uid, Env::get('del'));
+                                   $uid, $value);
         }
 
-        if (Env::has('rel') && !Env::has('valider')) {
+        if ($action == 'rel') {
             require_once('marketing.inc.php');
-            list($to, $title, $text) = mark_text_mail($uid, Env::get('rel'));
-            $from = mark_from_mail($uid, Env::get('rel'));
+            list($to, $title, $text) = mark_text_mail($uid, $value);
+            $from = mark_from_mail($uid, $value);
             $page->assign('rel_from_user', $from);
             $page->assign('rel_from_staff',
                           "\"Equipe Polytechnique.org\" <register@polytechnique.org>");
             $page->assign('rel_to', $to);
             $page->assign('rel_title', $title);
             $page->assign('rel_text', $text);
+            $page->assign('rel_email', $value);
         }
 
-        if (Env::get('valider') == 'Envoyer') {
+        if ($action == 'relforce') {
             require_once('marketing.inc.php');
-            mark_send_mail($uid, Env::get('rel'), Env::get('from'),
+            mark_send_mail($uid, $value, Env::get('from'),
                            Env::get('to'), Env::get('title'),
                            Env::get('message'));
             $page->trig("Mail envoyé");
         }
 
-        if (Env::has('relance')) {
+        if ($action == 'insrel') {
             require_once('marketing.inc.php');
             if (relance($uid)) {
                 $page->trig('relance faite');
             }
         }
 
-        if (Env::get('action') == 'ajouter') {
+        if ($action == 'add' && Post::has('email') && Post::has('type')) {
             $globals->xdb->execute(
                 "INSERT INTO register_marketing
                          SET uid = {?}, sender = {?}, email = {?},
                              date = NOW(), type = {?}",
-                $uid, Session::get('uid'), Env::get('email'), Env::get('type')); 
+                $uid, Session::get('uid'), Post::get('email'), Post::get('type')); 
         }
 
         $res = $globals->xdb->iterator(

diff --git a/templates/marketing/private.tpl b/templates/marketing/private.tpl
index 11fa083..b0aa4b1 100644 (file)
--- a/templates/marketing/private.tpl
+++ b/templates/marketing/private.tpl
@@ -45,58 +45,58 @@ sa derni
 {/if}
 </p>
 
-<p>[<a href='{rel}/{$smarty.request.p}?relance=1'>le relancer</a>]</p>
+<p>[<a href='{rel}/{$path}/insrel'>le relancer</a>]</p>
 
 {/if}
 
 <h2>Adresses connues</h2>
 
-<form action="{rel}/{$smarty.request.uid}" method="post">
-<table class="bicol" cellpadding="0" cellspacing="0">
-  <tr>
-    <th>Adresse</th>
-    <th>Marketeur</th>
-    <th>Date</th>
-    <th>Envois</th>
-    <th>Nb.</th>
-    <th>&nbsp;</th>
-  </tr>
-  {iterate from=$addr item=a}
-  <tr class="{cycle values='impair,pair'}">
-    <td>{$a.email}</td>
-    <td><a href="{rel}/fiche.php?user={$a.alias}" class="popup2">{$a.alias}</a> {if $a.type eq user}(*){/if}</td>
-    <td>{$a.date|date_format|default:'-'}</td>
-    <td>{$a.last|date_format|default:'-'}</td>
-    <td class='center'>{$a.nb|default:"-"}</td>
-    <td class='action'>
-      <a href='{rel}/{$smarty.request.p}?del={$a.email}'>del</a><br />
-      <a href='{rel}/{$smarty.request.p}?rel={$a.email}'>relance</a>
-    </td>
-  </tr>
-  {/iterate}
-  <tr>
-    <td></td>
-    <td colspan='5' class='smaller'>(*): mail perso</td>
-  </tr>
-  <tr>
-    <td>
-      <input type='text' name='email' />
-    </td>
-    <td colspan="4">
-      <select name="type">
-        <option value="staff">staff</option>
-        <option value="user">user</option>
-      </select>
-    </td>
-    <td class='action'>
-      <input type='submit' name='action' value='ajouter' />
-    </td>
-  </tr>
-</table>
+<form action="{rel}/{$path}/add" method="post">
+  <table class="bicol" cellpadding="0" cellspacing="0">
+    <tr>
+      <th>Adresse</th>
+      <th>Marketeur</th>
+      <th>Date</th>
+      <th>Envois</th>
+      <th>Nb.</th>
+      <th>&nbsp;</th>
+    </tr>
+    {iterate from=$addr item=a}
+    <tr class="{cycle values='impair,pair'}">
+      <td>{$a.email}</td>
+      <td><a href="{rel}/fiche.php?user={$a.alias}" class="popup2">{$a.alias}</a> {if $a.type eq user}(*){/if}</td>
+      <td>{$a.date|date_format|default:'-'}</td>
+      <td>{$a.last|date_format|default:'-'}</td>
+      <td class='center'>{$a.nb|default:"-"}</td>
+      <td class='action'>
+        <a href='{rel}/{$path}/del/{$a.email}'>del</a><br />
+        <a href='{rel}/{$path}/rel/{$a.email}'>relance</a>
+      </td>
+    </tr>
+    {/iterate}
+    <tr>
+      <td></td>
+      <td colspan='5' class='smaller'>(*): mail perso</td>
+    </tr>
+    <tr>
+      <td>
+        <input type='text' name='email' />
+      </td>
+      <td colspan="4">
+        <select name="type">
+          <option value="staff">staff</option>
+          <option value="user">user</option>
+        </select>
+      </td>
+      <td class='action'>
+        <input type='submit' value='ajouter' />
+      </td>
+    </tr>
+  </table>
 </form>
 
 {if $rel_to}
-<form action="{rel}/{$smarty.request.p}" method="post">
+<form action="{rel}/{$path}/relforce/{$email}" method="post">
   <table class="bicol">
     <tr class="pair">
       <th colspan="2">Edition du mail de relance</th>
@@ -127,7 +127,6 @@ sa derni
     </tr>
   </table>
   <div class="center">
-    <input type="hidden" name="email" value="{$smarty.request.rel}" />
     <input type="reset" value="Recommencer" />
     <input type="submit" name="valider" value="Envoyer" />
   </div>