From: x2000habouzit <x2000habouzit>
Date: Thu, 21 Oct 2004 12:24:20 +0000 (+0000)
Subject: backport
X-Git-Tag: xorg/old~1215
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=6d5bc0a16774c9a7ed8392593c9b27f79d7eaa6f;p=platal.git

backport
---

diff --git a/htdocs/mescontacts.php b/htdocs/mescontacts.php
index 93d5364..b12a410 100644
--- a/htdocs/mescontacts.php
+++ b/htdocs/mescontacts.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: mescontacts.php,v 1.14 2004-10-16 15:13:12 x2000habouzit Exp $
+        $Id: mescontacts.php,v 1.15 2004-10-21 12:24:20 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -60,7 +60,7 @@ if (isset($_REQUEST['action'])) {
 $sql = "SELECT contact AS id,
                a.*, l.alias AS forlife,
                i.deces != 0 AS dcd, i.matricule_ax,
-               e.entreprise, es.label AS secteur, ef.label AS fonction,
+               e.entreprise, es.label AS secteur, ef.fonction_fr AS fonction,
                n.text AS nat,
                ad0.text AS app0text, ad0.url AS app0url, ai0.type AS app0type,
                ad1.text AS app1text, ad1.url AS app1url, ai1.type AS app1type,
@@ -72,7 +72,7 @@ $sql = "SELECT contact AS id,
 	INNER JOIN aliases        AS l   ON (a.user_id = l.id AND l.type='a_vie')
         LEFT  JOIN entreprises    AS e   ON (e.entrid = 0 AND e.uid = a.user_id)
         LEFT  JOIN emploi_secteur AS es  ON (e.secteur = es.id)
-        LEFT  JOIN emploi_naf     AS ef  ON (e.fonction = ef.id)
+        LEFT  JOIN fonctions_def  AS ef  ON (e.fonction = ef.id)
         LEFT  JOIN nationalites   AS n   ON (a.nationalite = n.id)
         LEFT  JOIN applis_ins     AS ai0 ON (a.user_id = ai0.uid AND ai0.ordre = 0)
         LEFT  JOIN applis_def     AS ad0 ON (ad0.id = ai0.aid)
diff --git a/htdocs/mescontacts_ldif.php b/htdocs/mescontacts_ldif.php
index 2b9e5df..860edc0 100644
--- a/htdocs/mescontacts_ldif.php
+++ b/htdocs/mescontacts_ldif.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: mescontacts_ldif.php,v 1.10 2004-09-05 12:54:18 x2000habouzit Exp $
+        $Id: mescontacts_ldif.php,v 1.11 2004-10-21 12:26:12 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -49,12 +49,12 @@ $page->register_modifier('utf8', 'utf8_encode');
 $contacts = Array();
 $req = $globals->db->query("SELECT contact AS id, date, prenom, nom, epouse, l.alias AS forlife, mobile, web, libre, promo,
                            entreprise, adr1, adr2, adr3, cp, ville, gp.pays, gr.name, tel, fax,
-                           poste, f.label AS fonction
+                           poste, f.fonction_fr AS fonction
                     FROM      contacts      AS c 
                     LEFT JOIN auth_user_md5 AS a  ON(a.user_id = c.contact)
                    INNER JOIN aliases       AS l  ON(a.user_id = l.id AND type='a_vie')
                     LEFT JOIN entreprises   AS e  ON(a.user_id = e.uid)
-                    LEFT JOIN emploi_naf    AS f  ON(e.fonction = f.id)
+                    LEFT JOIN fonctions_def AS f  ON(e.fonction = f.id)
                     LEFT JOIN geoloc_pays   AS gp ON(e.pays = gp.a2)
                     LEFT JOIN geoloc_region AS gr ON(e.pays = gr.a2 AND e.region = gr.region)
                     WHERE c.uid ='{$_SESSION['uid']}'
diff --git a/htdocs/vcard.php b/htdocs/vcard.php
index 4296bd6..0f4e940 100644
--- a/htdocs/vcard.php
+++ b/htdocs/vcard.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: vcard.php,v 1.12 2004-10-08 19:58:06 x2000habouzit Exp $
+        $Id: vcard.php,v 1.13 2004-10-21 12:26:12 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -118,9 +118,9 @@ $page->assign_by_ref('home', $home);
 
 
 $adr = $globals->db->query(
-        "SELECT adr1,adr2,adr3,cp,ville,gp.pays,gr.name,tel,fax,poste,entreprise,f.label as fonction
+        "SELECT adr1,adr2,adr3,cp,ville,gp.pays,gr.name,tel,fax,poste,entreprise,f.fonction_fr as fonction
         FROM entreprises as e
-        LEFT JOIN emploi_naf AS f ON(e.fonction = f.id)
+        LEFT JOIN fonctions_def AS f ON(e.fonction = f.id)
         LEFT JOIN geoloc_pays AS gp ON(e.pays = gp.a2)
         LEFT JOIN geoloc_region AS gr
         ON(e.pays = gr.a2 AND e.region = gr.region)
diff --git a/include/search.classes.inc.php b/include/search.classes.inc.php
index 15b58c9..09c853d 100644
--- a/include/search.classes.inc.php
+++ b/include/search.classes.inc.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: search.classes.inc.php,v 1.21 2004-10-19 18:06:45 x2000bedo Exp $
+        $Id: search.classes.inc.php,v 1.22 2004-10-21 12:24:20 x2000habouzit Exp $
  ***************************************************************************/
 
 require_once("xorg.misc.inc.php");
@@ -30,7 +30,7 @@ $globals->search_result_fields = '
                 u.epouse,u.date,u.web,
                 ad0.text AS app0text, ad0.url AS app0url, ai0.type AS app0type,
                 ad1.text AS app1text, ad1.url AS app1url, ai1.type AS app1type,
-                e.entreprise, es.label AS secteur, ef.label AS fonction,
+                e.entreprise, es.label AS secteur, ef.fonction_fr AS fonction,
                 n.text AS nat,
                 adr.ville, gp.pays, gr.name AS region,';
 $globals->search_result_where_statement = '
@@ -40,7 +40,7 @@ $globals->search_result_where_statement = '
                 LEFT JOIN  applis_def     AS ad1 ON (ad1.id = ai1.aid)
                 LEFT JOIN  entreprises    AS e   ON (e.entrid = 0 AND e.uid = u.user_id)
                 LEFT JOIN  emploi_secteur AS es  ON (e.secteur = es.id)
-                LEFT JOIN  emploi_naf     AS ef  ON (e.fonction = ef.id)
+                LEFT JOIN  fonctions_def  AS ef  ON (e.fonction = ef.id)
                 LEFT JOIN  nationalites   AS n   ON (u.nationalite = n.id)
                 LEFT JOIN  adresses       AS adr ON (u.user_id = adr.uid AND FIND_IN_SET(\'active\',adr.statut))
                 LEFT JOIN  geoloc_pays    AS gp  ON (adr.pays = gp.a2)
diff --git a/templates/include/x_inscrit.tpl b/templates/include/x_inscrit.tpl
index 15137bf..5cdb83c 100644
--- a/templates/include/x_inscrit.tpl
+++ b/templates/include/x_inscrit.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: x_inscrit.tpl,v 1.14 2004-10-16 14:54:50 x2000habouzit Exp $
+        $Id: x_inscrit.tpl,v 1.15 2004-10-21 12:24:21 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -83,7 +83,7 @@
         <td class="rt">
           {$c.entreprise}
           {if $c.secteur}( {$c.secteur} ){/if}
-          {if $c.fonction}<br />{$c.fonction} ){/if}
+          {if $c.fonction}<br />( {$c.fonction} ){/if}
         </td>
       </tr>
       {/if}
diff --git a/templates/search.result.private.tpl b/templates/search.result.private.tpl
index 1d72c65..832a7db 100644
--- a/templates/search.result.private.tpl
+++ b/templates/search.result.private.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: search.result.private.tpl,v 1.17 2004-10-20 14:09:15 x2000habouzit Exp $
+        $Id: search.result.private.tpl,v 1.18 2004-10-21 12:24:21 x2000habouzit Exp $
  ***************************************************************************}
 
 <div class="bits">
@@ -80,7 +80,7 @@
       <td class="rt">
         {$result.entreprise}
         {if $result.secteur}( {$result.secteur} ){/if}
-        {if $result.fonction}<br />{$result.fonction} ){/if}
+        {if $result.fonction}<br />( {$result.fonction} ){/if}
       </td>
     </tr>
     {/if}