Merge commit 'origin/master' into fusionax

diff --cc ChangeLog
Simple merge

diff --cc configs/platal.cron.in
Simple merge

diff --cc configs/platal.ini
Simple merge

diff --cc include/notifs.inc.php
Simple merge

diff --cc include/profil.func.inc.php
Simple merge

diff --cc include/user.func.inc.php
index 3eb76f5,1a07456..2e30213
--- 1/include/user.func.inc.php
--- 2/include/user.func.inc.php
+++ b/include/user.func.inc.php
@@@ -632,8 -572,11 +632,8 @@@ function set_user_details_pro($uid, $pr
  // {{{ function set_user_details()
  function set_user_details($uid, $details) {
      if (isset($details['nom_usage'])) {
-         XDB::execute("UPDATE auth_user_md5 SET nom_usage = {?} WHERE user_id = {?}", strtoupper($details['nom_usage']), $uid);
+         XDB::execute("UPDATE auth_user_md5 SET nom_usage = {?} WHERE user_id = {?}", mb_strtoupper($details['nom_usage']), $uid);
      }
 -    if (isset($details['mobile'])) {
 -        XDB::execute("UPDATE auth_user_quick SET profile_mobile = {?} WHERE user_id = {?}", $details['mobile'], $uid);
 -    }
      if (isset($details['nationalite'])) {
          XDB::execute(
              "UPDATE auth_user_md5 AS u

diff --cc include/validations.inc.php
Simple merge

diff --cc modules/admin.php
Simple merge

diff --cc modules/email.php
Simple merge

diff --cc modules/newsletter.php
index ee6447e,75ab2e9..f7afc21
--- 1/modules/newsletter.php
--- 2/modules/newsletter.php
+++ b/modules/newsletter.php
@@@ -149,9 -149,9 +149,9 @@@ class NewsletterModule extends PLModul
              pl_redirect("admin/newsletter/edit/$nid");
          }
  
-         if($action == 'edit' && $aid != 'update') {
+         if ($action == 'edit' && $aid != 'update') {
              $eaid = $aid;
 -            if(Post::has('title')) {
 +            if (Post::has('title')) {
                  $art  = new NLArticle(Post::v('title'), Post::v('body'), Post::v('append'),
                                        $eaid, Post::v('cid'), Post::v('pos'));
              } else {

diff --cc modules/profile.php
index 298d49c,58a485f..f64d8c7
--- 1/modules/profile.php
--- 2/modules/profile.php
+++ b/modules/profile.php
@@@ -24,54 -24,45 +24,55 @@@ class ProfileModule extends PLModul
      function handlers()
      {
          return array(
 -            'photo'                => $this->make_hook('photo',             AUTH_PUBLIC),
 -            'photo/change'         => $this->make_hook('photo_change',      AUTH_MDP),
 -
 -            'fiche.php'            => $this->make_hook('fiche',             AUTH_PUBLIC),
 -            'profile'              => $this->make_hook('profile',           AUTH_PUBLIC),
 -            'profile/private'      => $this->make_hook('profile',           AUTH_COOKIE),
 -            'profile/ax'           => $this->make_hook('ax',                AUTH_COOKIE, 'admin'),
 -            'profile/edit'         => $this->make_hook('p_edit',            AUTH_MDP),
 -            'profile/ajax/address' => $this->make_hook('ajax_address',      AUTH_COOKIE, 'user', NO_AUTH),
 -            'profile/ajax/tel'     => $this->make_hook('ajax_tel',          AUTH_COOKIE, 'user', NO_AUTH),
 -            'profile/ajax/medal'   => $this->make_hook('ajax_medal',        AUTH_COOKIE, 'user', NO_AUTH),
 -            'profile/ajax/job'     => $this->make_hook('ajax_job',          AUTH_COOKIE, 'user', NO_AUTH),
 -            'profile/ajax/secteur' => $this->make_hook('ajax_secteur',      AUTH_COOKIE, 'user', NO_AUTH),
 -            'profile/ajax/skill'   => $this->make_hook('ajax_skill',        AUTH_COOKIE, 'user', NO_AUTH),
 -            'javascript/applis.js' => $this->make_hook('applis_js',         AUTH_COOKIE),
 -            'javascript/grades.js' => $this->make_hook('grades_js',         AUTH_COOKIE),
 -            'profile/medal'        => $this->make_hook('medal',             AUTH_PUBLIC),
 -            'profile/orange'       => $this->make_hook('p_orange',          AUTH_MDP),
 -            'profile/usage'        => $this->make_hook('p_usage',           AUTH_MDP),
 -
 -            'referent'             => $this->make_hook('referent',          AUTH_COOKIE),
 -            'emploi'               => $this->make_hook('ref_search',        AUTH_COOKIE),
 -            'referent/search'      => $this->make_hook('ref_search',        AUTH_COOKIE),
 -            'referent/ssect'       => $this->make_hook('ref_sect',          AUTH_COOKIE, 'user', NO_AUTH),
 -            'referent/country'     => $this->make_hook('ref_country',       AUTH_COOKIE, 'user', NO_AUTH),
 -
 -            'groupes-x'            => $this->make_hook('xnet',              AUTH_COOKIE),
 -            'groupes-x/logo'       => $this->make_hook('xnetlogo',          AUTH_PUBLIC),
 -
 -            'vcard'                => $this->make_hook('vcard',             AUTH_COOKIE),
 -            'admin/binets'         => $this->make_hook('admin_binets',      AUTH_MDP,    'admin'),
 -            'admin/medals'         => $this->make_hook('admin_medals',      AUTH_MDP,    'admin'),
 -            'admin/formations'     => $this->make_hook('admin_formations',  AUTH_MDP,    'admin'),
 -            'admin/sections'       => $this->make_hook('admin_sections',    AUTH_MDP,    'admin'),
 -            'admin/secteurs'       => $this->make_hook('admin_secteurs',    AUTH_MDP,    'admin'),
 -            'admin/trombino'       => $this->make_hook('admin_trombino',    AUTH_MDP,    'admin'),
 -            'admin/ss_secteurs'    => $this->make_hook('admin_ss_secteurs', AUTH_MDP,    'admin'),
 -            'admin/fonctions'      => $this->make_hook('admin_fonctions',   AUTH_MDP,    'admin'),
 -
 +            'photo'                      => $this->make_hook('photo',                      AUTH_PUBLIC),
 +            'photo/change'               => $this->make_hook('photo_change',               AUTH_MDP),
 +
 +            'fiche.php'                  => $this->make_hook('fiche',                      AUTH_PUBLIC),
 +            'profile'                    => $this->make_hook('profile',                    AUTH_PUBLIC),
 +            'profile/private'            => $this->make_hook('profile',                    AUTH_COOKIE),
 +            'profile/ax'                 => $this->make_hook('ax',                         AUTH_COOKIE, 'admin'),
 +            'profile/edit'               => $this->make_hook('p_edit',                     AUTH_MDP),
 +            'profile/ajax/address'       => $this->make_hook('ajax_address',               AUTH_COOKIE, 'user', NO_AUTH),
 +            'profile/ajax/tel'           => $this->make_hook('ajax_tel',                   AUTH_COOKIE, 'user', NO_AUTH),
 +            'profile/ajax/edu'           => $this->make_hook('ajax_edu',                   AUTH_COOKIE, 'user', NO_AUTH),
 +            'profile/ajax/medal'         => $this->make_hook('ajax_medal',                 AUTH_COOKIE, 'user', NO_AUTH),
 +            'profile/networking'         => $this->make_hook('networking',                 AUTH_PUBLIC),
 +            'profile/ajax/job'           => $this->make_hook('ajax_job',                   AUTH_COOKIE, 'user', NO_AUTH),
 +            'profile/ajax/sector'        => $this->make_hook('ajax_sector',                AUTH_COOKIE, 'user', NO_AUTH),
 +            'profile/ajax/sub_sector'    => $this->make_hook('ajax_sub_sector',            AUTH_COOKIE, 'user', NO_AUTH),
 +            'profile/ajax/alternates'    => $this->make_hook('ajax_alternates',            AUTH_COOKIE, 'user', NO_AUTH),
 +            'profile/ajax/skill'         => $this->make_hook('ajax_skill',                 AUTH_COOKIE, 'user', NO_AUTH),
 +            'profile/ajax/searchname'    => $this->make_hook('ajax_searchname',            AUTH_COOKIE, 'user', NO_AUTH),
 +            'profile/ajax/buildnames'    => $this->make_hook('ajax_buildnames',            AUTH_COOKIE, 'user', NO_AUTH),
 +            'javascript/education.js'    => $this->make_hook('education_js',               AUTH_COOKIE),
 +            'javascript/grades.js'       => $this->make_hook('grades_js',                  AUTH_COOKIE),
 +            'profile/medal'              => $this->make_hook('medal',                      AUTH_PUBLIC),
 +            'profile/name_info'          => $this->make_hook('name_info',                  AUTH_PUBLIC),
 +            'profile/orange'             => $this->make_hook('p_orange',                   AUTH_MDP),
 +
 +            'referent'                   => $this->make_hook('referent',                   AUTH_COOKIE),
 +            'emploi'                     => $this->make_hook('ref_search',                 AUTH_COOKIE),
 +            'referent/search'            => $this->make_hook('ref_search',                 AUTH_COOKIE),
 +            'referent/ssect'             => $this->make_hook('ref_sect',                   AUTH_COOKIE, 'user', NO_AUTH),
 +            'referent/country'           => $this->make_hook('ref_country',                AUTH_COOKIE, 'user', NO_AUTH),
 +
 +            'groupes-x'                  => $this->make_hook('xnet',                       AUTH_COOKIE),
++            'groupes-x/logo'             => $this->make_hook('xnetlogo',                   AUTH_PUBLIC),
 +
 +            'vcard'                      => $this->make_hook('vcard',                      AUTH_COOKIE, 'user', NO_HTTPS),
 +            'admin/binets'               => $this->make_hook('admin_binets',               AUTH_MDP, 'admin'),
 +            'admin/medals'               => $this->make_hook('admin_medals',               AUTH_MDP, 'admin'),
 +            'admin/education'            => $this->make_hook('admin_education',            AUTH_MDP, 'admin'),
 +            'admin/education_field'      => $this->make_hook('admin_education_field',      AUTH_MDP, 'admin'),
 +            'admin/education_degree'     => $this->make_hook('admin_education_degree',     AUTH_MDP, 'admin'),
 +            'admin/education_degree_set' => $this->make_hook('admin_education_degree_set', AUTH_MDP, 'admin'),
 +            'admin/sections'             => $this->make_hook('admin_sections',             AUTH_MDP, 'admin'),
 +            'admin/networking'           => $this->make_hook('admin_networking',           AUTH_MDP, 'admin'),
 +            'admin/trombino'             => $this->make_hook('admin_trombino',             AUTH_MDP, 'admin'),
 +            'admin/sectors'              => $this->make_hook('admin_sectors',              AUTH_MDP, 'admin'),
 +            'admin/corps_enum'           => $this->make_hook('admin_corps_enum',           AUTH_MDP, 'admin'),
 +            'admin/corps_rank'           => $this->make_hook('admin_corps_rank',           AUTH_MDP, 'admin'),
 +            'admin/names'                => $this->make_hook('admin_names',                AUTH_MDP, 'admin'),
          );
      }
  

diff --cc modules/profile/general.inc.php
Simple merge

diff --cc modules/register.php
Simple merge

diff --cc modules/search/classes.inc.php
Simple merge

diff --cc templates/admin/index.tpl
Simple merge

diff --cc templates/axletter/edit.tpl
Simple merge

diff --cc templates/emails/redirect.tpl
Simple merge

diff --cc templates/events/index.tpl
index a24a212,904d698..23004ce
--- 1/templates/events/index.tpl
--- 2/templates/events/index.tpl
+++ b/templates/events/index.tpl
@@@ -27,8 -27,8 +27,8 @@@
  {else}
  
  <h1 id='pagetop'>
 -Bienvenue {$smarty.session.prenom}{if $birthday}
 +Bienvenue {$smarty.session.yourself_name}{if $birthday}
-   &nbsp;et joyeux anniversaire de la part de toute l'équipe !
+   &nbsp;et joyeux anniversaire de la part de toute l'équipe&nbsp;!
  {else},
  {/if}
  </h1>

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

diff --cc templates/newsletter/edit.tpl
Simple merge

diff --cc templates/platal/motdepasse.success.tpl
index 0ff8196,e4fe950..cf9f2b5
--- 1/templates/platal/motdepasse.success.tpl
--- 2/templates/platal/motdepasse.success.tpl
+++ b/templates/platal/motdepasse.success.tpl
@@@ -29,10 -29,10 +29,10 @@@
  <strong>Mot de passe enregistré le {$smarty.now|date_format}</strong>
  </p>
  <p>
 -  <strong>Attention!</strong> Il est crypté irréversiblement,
 +  <strong>Attention&nbsp;!</strong> Il est crypté irréversiblement,
    donc <strong>non récupérable</strong>. Pour retrouver un accès au site
    consécutivement à une perte de mot de passe, la procédure
-   est longue et laborieuse...
+   est longue et laborieuse&hellip;
  </p>
  
  

diff --cc templates/profile/groupesx.tpl
Simple merge

diff --cc templates/profile/mentor.tpl
index 36a6e87,7e3f372..14a0a83
--- 1/templates/profile/mentor.tpl
--- 2/templates/profile/mentor.tpl
+++ b/templates/profile/mentor.tpl
@@@ -22,9 -22,9 +22,9 @@@
  
  <p>{icon name=information title="Afficher ma fiche référent"}Tu peux consulter ta <a class="popup2" href="referent/{$smarty.session.hruid}">fiche référent</a> qui n'est accessible que par les X.
  </p>
 -{if (!$expertise)||(!($secteurs|@count))}
 +{if (!$expertise)||(!($sectors|@count))}
    <p>
-     <strong>Attention : pour figurer dans la base de données des mentors, il faut remplir la
+     <strong>Attention&nbsp;: pour figurer dans la base de données des mentors, il faut remplir la
      dernière case en bas de cette page et avoir au moins un secteur d'activité de prédilection.</strong><br />
    </p>
  {/if}

diff --cc templates/profile/orange.tpl
index 628ad9a,08a62db..df9aea4
--- 1/templates/profile/orange.tpl
--- 2/templates/profile/orange.tpl
+++ b/templates/profile/orange.tpl
@@@ -32,10 -32,10 +32,10 @@@
  {else}
  
  <p>
 -  Afin de pouvoir être considéré(e) à la fois dans ta promotion d'origine et ta
 +  Afin de pouvoir être considéré{if $sexe}e{/if} à la fois dans ta promotion d'origine et ta
-   ou tes promotions d'adoption tu peux entrer ici ton année de sortie de l'école.
+   ou tes promotions d'adoption tu peux entrer ici ton année de sortie de l'Ã\89cole.
    Plus précisément, il s'agit de l'année d'entrée en quatrième année ou année d'application.
 -  Pour tes cocons d'origine (X{$promo}) il s'agit de l'année {math equation="a + b" a=$promo b=3}.
 +  Pour tes cocons d'origine ({$promo}) il s'agit de l'année {math equation="a + b" a=$promo b=3}.
  </p>
  
  <br />

diff --cc templates/profile/profile.tpl
Simple merge

diff --cc templates/profile/referent.tpl
index 5e02b2c,90f5afb..01e3d30
--- 1/templates/profile/referent.tpl
--- 2/templates/profile/referent.tpl
+++ b/templates/profile/referent.tpl
@@@ -69,11 -69,11 +69,11 @@@ function setSubSectors(
    <table cellpadding="0" cellspacing="0" summary="Formulaire de recherche de referents" class="bicol">
      <tr class="impair">
        <td class="titre">
-         Secteur de compétence <br /> du référent
+         Secteur de compétence<br />du référent
        </td>
        <td>
 -        <select name="secteur" id="sect_field" onchange="setSecteur(this.value)">
 -          {html_options options=$secteurs selected=$secteur_sel}
 +        <select name="sector" id="sect_field" onchange="setSector(this.value)">
 +          {html_options options=$sectors selected=$sectorSelection}
          </select>
        </td>
      </tr>

diff --cc templates/search/adv.form.tpl
Simple merge

diff --cc templates/skin/common.menu.tpl
Simple merge

diff --cc templates/xnetgrp/annuaire.tpl
Simple merge