fix #346

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

diff --git a/ChangeLog b/ChangeLog
index b273db2..a5f7b63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,7 @@ Bug/Wish :
         - #330,333: Interface improvements.                                 -Car
         - #332: User can precise why he asks for a usage name.              -Car
         - #335: Already assigned promotion don't generate a request.        -CAT
+        - #346: Professional profile code desynch. fixed.                   -MC
 
     * Xnet :
         - #334: Interface improvements.                                     -Car

diff --git a/htdocs/fiche_referent.php b/htdocs/fiche_referent.php
index 2eec23d..2884cb2 100644 (file)
--- a/htdocs/fiche_referent.php
+++ b/htdocs/fiche_referent.php
@@ -22,6 +22,7 @@
 
 require_once("xorg.inc.php");
 new_simple_page('fiche_referent.tpl',AUTH_COOKIE);
+require_once('user.func.inc.php');
 
 if (!Env::has('user')) {
     exit;
@@ -44,22 +45,7 @@ $page->assign('nom', $nom);
 $page->assign('promo', $promo);
 $page->assign('cv', $cv);
 $page->assign('bestalias', $bestalias);
-
-
-//recuperation des infos professionnelles
-$res = $globals->xdb->query(
-        "SELECT  e.entreprise, s.label as secteur , ss.label as ss_secteur , f.fonction_fr as fonction,
-                 e.poste, e.adr1, e.adr2, e.adr3, e.postcode, e.city,
-                 gp.pays, gr.name, e.tel, e.fax, e.mobile
-           FROM  entreprises AS e
-      LEFT JOIN  emploi_secteur AS s ON(e.secteur = s.id)
-      LEFT JOIN  emploi_ss_secteur AS ss ON(e.ss_secteur = ss.id AND e.secteur = ss.secteur)
-      LEFT JOIN  fonctions_def AS f ON(e.fonction = f.id)
-      LEFT JOIN  geoloc_pays AS gp ON (gp.a2 = e.country)
-      LEFT JOIN  geoloc_region AS gr ON (gr.a2 = e.country and gr.region = e.region)
-          WHERE  e.uid = {?}
-       ORDER BY  e.entrid", $user_id);
-$page->assign('adr_pro', $res->fetchAllAssoc());
+$page->assign('adr_pro', get_user_details_pro($user_id));
 
 /////  recuperations infos referent
 

diff --git a/include/user.func.inc.php b/include/user.func.inc.php
index 9d02f5d..7f440e0 100644 (file)
--- a/include/user.func.inc.php
+++ b/include/user.func.inc.php
@@ -150,6 +150,28 @@ function get_user_forlife($data) {
 }
 
 // }}}
+// {{{ function get_user_details_pro()
+
+function get_user_details_pro($uid)
+{
+    global $globals;
+    $sql  = "SELECT  e.entreprise, s.label as secteur , ss.label as sous_secteur , f.fonction_fr as fonction,
+                     e.poste, e.adr1, e.adr2, e.adr3, e.postcode, e.city,
+                     gp.pays AS countrytxt, gr.name AS region, e.tel, e.fax, e.mobile, e.entrid,
+                     e.pub, e.adr_pub, e.tel_pub, e.email, e.email_pub, e.web
+               FROM  entreprises AS e
+          LEFT JOIN  emploi_secteur AS s ON(e.secteur = s.id)
+          LEFT JOIN  emploi_ss_secteur AS ss ON(e.ss_secteur = ss.id AND e.secteur = ss.secteur)
+          LEFT JOIN  fonctions_def AS f ON(e.fonction = f.id)
+          LEFT JOIN  geoloc_pays AS gp ON (gp.a2 = e.country)
+          LEFT JOIN  geoloc_region AS gr ON (gr.a2 = e.country and gr.region = e.region)
+              WHERE  e.uid = {?}
+           ORDER BY  e.entrid";
+    $res  = $globals->xdb->query($sql, $uid);
+    return $res->fetchAllAssoc();
+}
+
+// }}}
 // {{{ function get_user_details()
 
 function &get_user_details($login, $from_uid = '')
@@ -180,20 +202,7 @@ function &get_user_details($login, $from_uid = '')
     $user = $res->fetchOneAssoc();
     $uid  = $user['user_id'];
 
-    $sql  = "SELECT  e.entreprise, s.label as secteur , ss.label as sous_secteur , f.fonction_fr as fonction,
-                     e.poste, e.adr1, e.adr2, e.adr3, e.postcode, e.city,
-                     gp.pays AS countrytxt, gr.name AS region, e.tel, e.fax, e.mobile, e.entrid,
-                     e.pub, e.adr_pub, e.tel_pub, e.email, e.email_pub, e.web
-               FROM  entreprises AS e
-          LEFT JOIN  emploi_secteur AS s ON(e.secteur = s.id)
-          LEFT JOIN  emploi_ss_secteur AS ss ON(e.ss_secteur = ss.id AND e.secteur = ss.secteur)
-          LEFT JOIN  fonctions_def AS f ON(e.fonction = f.id)
-          LEFT JOIN  geoloc_pays AS gp ON (gp.a2 = e.country)
-          LEFT JOIN  geoloc_region AS gr ON (gr.a2 = e.country and gr.region = e.region)
-              WHERE  e.uid = {?}
-           ORDER BY  e.entrid";
-    $res  = $globals->xdb->query($sql, $uid);
-    $user['adr_pro'] = $res->fetchAllAssoc();
+    $user['adr_pro'] = get_user_details_pro($uid);
 
     $sql  = "SELECT  a.adr1,a.adr2,a.adr3,a.postcode,a.city,
                      gp.pays AS countrytxt,gr.name AS region,a.tel,a.fax,