Merge commit 'origin/master' into fusionax

diff --cc htdocs/css/default.css
Simple merge

diff --cc htdocs/javascript/profile.js
Simple merge

diff --cc include/user.func.inc.php
index 6074fda,d9232a3..39580d2
--- 1/include/user.func.inc.php
--- 2/include/user.func.inc.php
+++ b/include/user.func.inc.php
@@@ -359,7 -358,8 +359,8 @@@ function get_user_details_adr($uid, $vi
                       gp.pays AS countrytxt,a.region, a.regiontxt,
                       FIND_IN_SET('active', a.statut) AS active, a.adrid,
                       FIND_IN_SET('res-secondaire', a.statut) AS secondaire,
 -                     a.pub, gp.display
+                      FIND_IN_SET('courrier', a.statut) AS courier,
 +                     a.pub, gp.display, a.comment
                 FROM  adresses AS a
            LEFT JOIN  geoloc_pays AS gp ON (gp.a2=a.country)
                WHERE  uid= {?} AND NOT FIND_IN_SET('pro',a.statut)

diff --cc include/userset.inc.php
index f0c1ab0,c05f5ac..ce536a4
--- 1/include/userset.inc.php
--- 2/include/userset.inc.php
+++ b/include/userset.inc.php
@@@ -179,21 -178,13 +178,21 @@@ class MinificheView extends MultipageVi
                  u.perms != 'pending' AS wasinscrit,
                  u.deces != 0 AS dcd, u.deces, u.matricule_ax,
                  FIND_IN_SET('femme', u.flags) AS sexe,
-                 e.entreprise, es.label AS secteur, ef.fonction_fr AS fonction,
+                 e.entreprise, e.web AS job_web, es.label AS secteur, ef.fonction_fr AS fonction,
 -                IF(n.nat='',n.pays,n.nat) AS nat, n.a2 AS iso3166,
 -                ad0.text AS app0text, ad0.url AS app0url, ai0.type AS app0type,
 -                ad1.text AS app1text, ad1.url AS app1url, ai1.type AS app1type,
 +                IF(n1.nat='',n1.pays,n1.nat) AS nat1, n1.a2 AS iso3166_1,
 +                IF(n2.nat='',n2.pays,n2.nat) AS nat2, n2.a2 AS iso3166_2,
 +                IF(n3.nat='',n3.pays,n3.nat) AS nat3, n3.a2 AS iso3166_3,
 +                ede0.name AS eduname0, ede0.url AS eduurl0, edd0.degree AS edudegree0,
 +                edu0.grad_year AS edugrad_year0, f0.field AS edufield0, edu0.program AS eduprogram0,
 +                ede1.name AS eduname1, ede1.url AS eduurl1, edd1.degree AS edudegree1,
 +                edu1.grad_year AS edugrad_year1, f1.field AS edufield1, edu1.program AS eduprogram1,
 +                ede2.name AS eduname2, ede2.url AS eduurl2, edd2.degree AS edudegree2,
 +                edu2.grad_year AS edugrad_year2, f2.field AS edufield2, edu2gram AS eduprogram2,
 +                ede3.name AS eduname3, ede3.url AS eduurl3, edd3.degree AS edudegree3,
 +                edu3.grad_year AS edugrad_year3, f3.field AS edufield3, edu3gram AS eduprogram3,
                  adr.city, gp.a2, gp.pays AS countrytxt, gr.name AS region,
 -                IF(u.nom_usage<>'',u.nom_usage,u.nom) AS sortkey,
 -                (COUNT(em.email) > 0 OR FIND_IN_SET('googleapps', u.mail_storage) > 0) AS actif" .
 +                (COUNT(em.email) > 0 OR FIND_IN_SET('googleapps', u.mail_storage) > 0) AS actif,
 +                nd.display AS name_display, nd.tooltip AS name_tooltip, nd.sort AS name_sort" .
                  (S::logged() ? ", c.contact AS contact" : '');
      }
  

diff --cc modules/profile.php
Simple merge

diff --cc modules/search.php
Simple merge

diff --cc plugins/function.select_nat.php
index 60a9a8e,e17b738..9e7edd5
--- 1/plugins/function.select_nat.php
--- 2/plugins/function.select_nat.php
+++ b/plugins/function.select_nat.php
@@@ -20,8 -20,8 +20,8 @@@
   ***************************************************************************/
  
  
 -function select_nat($valeur,$pad=false) {
 -    $sql = "SELECT a2 AS id,IF(nat='',pays,nat) AS text FROM geoloc_pays WHERE nat IS NOT NULL ORDER BY text";
 +function select_nat($valeur, $pad=false) {
-     $sql = "SELECT a2 AS id,IF(nat='',pays,nat) AS text FROM geoloc_pays ORDER BY text";
++    $sql = "SELECT a2 AS id, IF(nat='', pays, nat) AS text FROM geoloc_pays WHERE nat IS NOT NULL ORDER BY text";
      $res = XDB::iterRow($sql);
      $sel = ' selected="selected"';
  

diff --cc templates/include/minifiche.tpl
Simple merge