Merge branch 'fusionax' of /home/git/platal into fusionax

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

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

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

diff --cc modules/email.php
Simple merge

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

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

diff --cc templates/include/minifiche.tpl
index 0b60e96,41801aa..ac57278
--- 1/templates/include/minifiche.tpl
--- 2/templates/include/minifiche.tpl
+++ b/templates/include/minifiche.tpl
@@@ -38,12 -38,23 +38,18 @@@
      </div>
  
      <div class="appli">
-       {if $c.iso3166}
-       <img src='images/flags/{$c.iso3166}.gif' alt='{$c.nat}' height='11' title='{$c.nat}' />&nbsp;
+       {if $c.iso3166_1}
+       <img src='images/flags/{$c.iso3166_1}.gif' alt='{$c.nat1}' height='11' title='{$c.nat1}' />&nbsp;
+       {/if}
+       {if $c.iso3166_2}
+       <img src='images/flags/{$c.iso3166_2}.gif' alt='{$c.nat2}' height='11' title='{$c.nat2}' />&nbsp;
+       {/if}
+       {if $c.iso3166_3}
+       <img src='images/flags/{$c.iso3166_3}.gif' alt='{$c.nat3}' height='11' title='{$c.nat3}' />&nbsp;
        {/if}
 -      (X {$c.promo}{if $c.app0text}, {applis_fmt type=$c.app0type text=$c.app0text url=$c.app0url}{*
 -      *}{/if}{if $c.app1text}, {applis_fmt type=$c.app1type text=$c.app1text url=$c.app1url}{/if})
 -      {if $c.dcd}décédé{if $c.sexe}e{/if} le {$c.deces|date_format}{/if}
 -      {if $smarty.session.auth ge AUTH_COOKIE}
 -      {if !$c.dcd && !$c.wasinscrit}
 -      <a href="marketing/public/{$c.user_id}" class='popup'>clique ici si tu connais son adresse email !</a>
 -      {/if}
 -      {/if}
 +      X {$c.promo}{if $c.app0text}, {applis_fmt type=$c.app0type text=$c.app0text url=$c.app0url}{*
 +      *}{/if}{if $c.app1text}, {applis_fmt type=$c.app1type text=$c.app1text url=$c.app1url}{/if}{*
 +      *}{if $c.dcd}, décédé{if $c.sexe}e{/if} le {$c.deces|date_format}{/if}
      </div>
    </div>
  

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