migrate fiche_referent -> profile/referent/${username}

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

diff --git a/htdocs/fiche_referent.php b/htdocs/fiche_referent.php
deleted file mode 100644 (file)
index bf97dd9..0000000
--- a/htdocs/fiche_referent.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/***************************************************************************
- *  Copyright (C) 2003-2006 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                *
- ***************************************************************************/
-
-
-require_once("xorg.inc.php");
-new_simple_page('fiche_referent.tpl',AUTH_COOKIE);
-require_once('user.func.inc.php');
-
-if (!Env::has('user')) {
-    exit;
-}
-
-$res = $globals->xdb->query(
-        "SELECT  prenom, nom, user_id, promo, cv, a.alias AS bestalias
-          FROM  auth_user_md5 AS u
-    INNER JOIN  aliases       AS a ON (u.user_id=a.id AND FIND_IN_SET('bestalias',a.flags))
-    INNER JOIN  aliases       AS a1 ON (u.user_id=a1.id AND a1.alias = {?} AND a1.type!='homonyme')",
-    Env::get('user'));
-if ($res->numRows() != 1) {
-    exit;
-}
-
-list($prenom, $nom, $user_id, $promo, $cv, $bestalias) = $res->fetchOneRow();
-
-$page->assign('prenom', $prenom);
-$page->assign('nom', $nom);
-$page->assign('promo', $promo);
-$page->assign('cv', $cv);
-$page->assign('bestalias', $bestalias);
-$page->assign('adr_pro', get_user_details_pro($user_id));
-
-/////  recuperations infos referent
-
-//expertise
-$res = $globals->xdb->query("SELECT expertise FROM mentor WHERE uid = {?}", $user_id);
-$page->assign('expertise', $res->fetchOneCell());
-
-//secteurs
-$secteurs = $ss_secteurs = Array();
-$res = $globals->xdb->iterRow(
-        "SELECT  s.label, ss.label
-           FROM  mentor_secteurs AS m
-      LEFT JOIN  emploi_secteur AS s ON(m.secteur = s.id)
-      LEFT JOIN  emploi_ss_secteur AS ss ON(m.secteur = ss.secteur AND m.ss_secteur = ss.id)
-          WHERE  uid = {?}", $user_id);
-while (list($sec, $ssec) = $res->next()) {
-    $secteurs[]    = $sec;
-    $ss_secteurs[] = $ssec;
-}
-$page->assign_by_ref('secteurs', $secteurs);
-$page->assign_by_ref('ss_secteurs', $ss_secteurs);
-
-//pays
-$res = $globals->xdb->query(
-        "SELECT  gp.pays
-           FROM  mentor_pays AS m
-      LEFT JOIN  geoloc_pays AS gp ON(m.pid = gp.a2)
-          WHERE  uid = {?}", $user_id);
-$page->assign('pays', $res->fetchColumn());
-
-$page->addJsLink('javascript/close_on_esc.js');
-$page->run();
-?>

diff --git a/modules/profile.php b/modules/profile.php
index a8dbc1b..2ecfc87 100644 (file)
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -24,15 +24,16 @@ class ProfileModule extends PLModule
     function handlers()
     {
         return array(
     function handlers()
     {
         return array(

-            'photo'          => $this->make_hook('photo',        AUTH_PUBLIC),
-            'photo/change'   => $this->make_hook('photo_change', AUTH_MDP),
+            'photo'        => $this->make_hook('photo',        AUTH_PUBLIC),
+            'photo/change' => $this->make_hook('photo_change', AUTH_MDP),

 
 

-            'profile/orange' => $this->make_hook('p_orange',     AUTH_MDP),
-            'profile/usage'  => $this->make_hook('p_usage',      AUTH_MDP),
+            'profile/orange'   => $this->make_hook('p_orange',   AUTH_MDP),
+            'profile/referent' => $this->make_hook('p_referent', AUTH_MDP),
+            'profile/usage'    => $this->make_hook('p_usage',    AUTH_MDP),

 
 

-            'trombi'         => $this->make_hook('trombi',       AUTH_COOKIE),
+            'trombi'  => $this->make_hook('trombi', AUTH_COOKIE),

 
 

-            'vcard'          => $this->make_hook('vcard',        AUTH_COOKIE),
+            'vcard'   => $this->make_hook('vcard',  AUTH_COOKIE),

         );
     }
 
         );
     }
 


@@ -199,6 +200,73 @@ class ProfileModule extends PLModule
         return PL_OK;
     }
 
         return PL_OK;
     }
 

+    function handler_p_referent(&$page, $x = null)
+    {
+        global $globals;
+
+        require_once 'user.func.inc.php';
+
+        if (is_null($x)) {
+            return PL_NOT_FOUND;
+        }
+
+        $page->changeTpl('fiche_referent.tpl');
+        $page->assign('simple', true);
+
+        $res = $globals->xdb->query(
+                "SELECT  prenom, nom, user_id, promo, cv, a.alias AS bestalias
+                  FROM  auth_user_md5 AS u
+            INNER JOIN  aliases       AS a ON (u.user_id=a.id AND FIND_IN_SET('bestalias',a.flags))
+            INNER JOIN  aliases       AS a1 ON (u.user_id=a1.id
+                                                AND a1.alias = {?}
+                                                AND a1.type!='homonyme')", $x);
+
+        if ($res->numRows() != 1) {
+            return PL_NOT_FOUND;
+        }
+
+        list($prenom, $nom, $user_id, $promo, $cv, $bestalias) = $res->fetchOneRow();
+
+        $page->assign('prenom', $prenom);
+        $page->assign('nom',    $nom);
+        $page->assign('promo',  $promo);
+        $page->assign('cv',     $cv);
+        $page->assign('bestalias', $bestalias);
+        $page->assign('adr_pro', get_user_details_pro($user_id));
+
+        /////  recuperations infos referent
+
+        //expertise
+        $res = $globals->xdb->query("SELECT expertise FROM mentor WHERE uid = {?}", $user_id);
+        $page->assign('expertise', $res->fetchOneCell());
+
+        //secteurs
+        $secteurs = $ss_secteurs = Array();
+        $res = $globals->xdb->iterRow(
+                "SELECT  s.label, ss.label
+                   FROM  mentor_secteurs AS m
+              LEFT JOIN  emploi_secteur AS s ON(m.secteur = s.id)
+              LEFT JOIN  emploi_ss_secteur AS ss ON(m.secteur = ss.secteur AND m.ss_secteur = ss.id)
+                  WHERE  uid = {?}", $user_id);
+        while (list($sec, $ssec) = $res->next()) {
+            $secteurs[]    = $sec;
+            $ss_secteurs[] = $ssec;
+        }
+        $page->assign_by_ref('secteurs', $secteurs);
+        $page->assign_by_ref('ss_secteurs', $ss_secteurs);
+
+        //pays
+        $res = $globals->xdb->query(
+                "SELECT  gp.pays
+                   FROM  mentor_pays AS m
+              LEFT JOIN  geoloc_pays AS gp ON(m.pid = gp.a2)
+                  WHERE  uid = {?}", $user_id);
+        $page->assign('pays', $res->fetchColumn());
+
+        $page->addJsLink('javascript/close_on_esc.js');
+        return PL_OK;
+    }
+

     function handler_p_usage(&$page)
     {
         global $globals;
     function handler_p_usage(&$page)
     {
         global $globals;

diff --git a/templates/fiche.tpl b/templates/fiche.tpl
index 72377ef..132ad0e 100644 (file)
--- a/templates/fiche.tpl
+++ b/templates/fiche.tpl
@@ -107,7 +107,7 @@ function chgMainWinLoc( strPage ) {
         {/if}
         {if $logged}
         {if $x.is_referent}
         {/if}
         {if $logged}
         {if $x.is_referent}

-        [<a href="fiche_referent.php?user={$x.forlife}" class='popup2'>Ma fiche référent</a>]
+        [<a href="{rel}/profile/referent/{$x.forlife}" class='popup2'>Ma fiche référent</a>]

         {/if}
         {/if}
       </div>
         {/if}
         {/if}
       </div>

diff --git a/templates/referent.tpl b/templates/referent.tpl
index 650d317..a2ae163 100644 (file)
--- a/templates/referent.tpl
+++ b/templates/referent.tpl
@@ -63,7 +63,7 @@ d'
         <span class='smaller'>
         <a href="{"fiche.php"|url}?user={$personnes[resultat].bestalias}" class="popup2">
           <img src="images/loupe.gif" alt="voir sa fiche" title="Voir sa fiche" /></a> - 
         <span class='smaller'>
         <a href="{"fiche.php"|url}?user={$personnes[resultat].bestalias}" class="popup2">
           <img src="images/loupe.gif" alt="voir sa fiche" title="Voir sa fiche" /></a> - 

-          <a href="{"fiche_referent.php"|url}?user={$personnes[resultat].bestalias}" class="popup2">Voir sa fiche référent</a>
+          <a href="{rel}/profile/referent/{$personnes[resultat].bestalias}" class="popup2">Voir sa fiche référent</a>

         </span>
       </div>
       <div class="long">
         </span>
       </div>
       <div class="long">