Backport

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

diff --git a/classes/platal.php b/classes/platal.php
index e72fc0b..ce21fbc 100644 (file)
--- a/classes/platal.php
+++ b/classes/platal.php
@@ -259,7 +259,7 @@ class Platal
         $page->run();
     }
 
-    private function on_subscribe($forlife, $uid, $promo, $pass)
+    public function on_subscribe($forlife, $uid, $promo, $pass)
     {
         $args = func_get_args();
         foreach ($this->__mods as $mod) {

diff --git a/modules/register/register.inc.php b/modules/register/register.inc.php
index e81f32e..e0458fe 100644 (file)
--- a/modules/register/register.inc.php
+++ b/modules/register/register.inc.php
@@ -62,7 +62,7 @@ function check_mat($promo, $mat, $nom, $prenom, &$ourmat, &$ourid, &$watch, &$na
     }
 
     $res = XDB::query(
-            'SELECT  user_id, promo, perms IN ("admin","user"), nom, prenom, FIND_IN_SET(\'watch\', u.flags), naissance_ini
+            'SELECT  user_id, promo, perms IN ("admin","user"), nom, prenom, FIND_IN_SET(\'watch\', flags), naissance_ini
               FROM  auth_user_md5
              WHERE  matricule={?} and deces = 0', $ourmat);
     list ($uid, $_promo, $_already, $_nom, $_prenom, $watch, $naiss) = $res->fetchOneRow();

diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl
index 9a95c13..4236250 100644 (file)
--- a/templates/include/minifiche.tpl
+++ b/templates/include/minifiche.tpl
@@ -40,7 +40,7 @@
     {if $c.dcd}décédé{if $c.sexe}e{/if} le {$c.deces|date_format}{/if}
     {if $smarty.session.auth ge AUTH_COOKIE}
     {if !$c.dcd && !$c.wasinscrit}
-    <a href="marketing/public/{$c.forlife}" class='popup'>clique ici si tu connais son adresse email !</a>
+    <a href="marketing/public/{$c.user_id}" class='popup'>clique ici si tu connais son adresse email !</a>
     {/if}
     {/if}
   </div>
@@ -127,7 +127,7 @@
       <tr>
         <td class="smaller" colspan="2">
           Ce camarade n'a plus d'adresse redirection valide.
-          <a href="marketing/broken/{$c.user_id}">
+          <a href="marketing/broken/{$c.forlife}">
             Si tu en connais une, <strong>n'hésite pas à nous la transmettre</strong>
           </a>
         </td>

diff --git a/templates/profile/profile.tpl b/templates/profile/profile.tpl
index f5a507d..09dd97d 100644 (file)
--- a/templates/profile/profile.tpl
+++ b/templates/profile/profile.tpl
@@ -79,7 +79,7 @@ function chgMainWinLoc(strPage)
           <a href="marketing/broken/{$x.forlife}" class="popup">clique ici si tu connais son adresse email !</a>
           {elseif !$x.inscrit}
           Cette personne n'est pas inscrite à Polytechnique.org,<br />
-          <a href="marketing/public/{$x.forlife}" class="popup">clique ici si tu connais son adresse email !</a>
+          <a href="marketing/public/{$x.user_id}" class="popup">clique ici si tu connais son adresse email !</a>
           {else}
           {if $virtualalias}
           <a href="mailto:{$virtualalias}">{$virtualalias}</a><br />

diff --git a/templates/search/adv.form.tpl b/templates/search/adv.form.tpl
index 77aac66..3668108 100644 (file)
--- a/templates/search/adv.form.tpl
+++ b/templates/search/adv.form.tpl
@@ -366,7 +366,7 @@ checked="checked"{/if}/>chercher uniquement les adresses où les camarades sont
     <tr>
       <td colspan="2" style="padding-top: 1.5em">
         <div style="float: right">
-          <input type="button" value="Chercher" />
+          <input type="submit" value="Chercher" />
         </div>
         {if $smarty.session.auth ge AUTH_COOKIE}
           <input type='checkbox' name='order' value='date_mod' {if $smarty.request.order eq "date_mod"}checked='checked'{/if} id="order"/>