From: Stéphane Jacob Date: Mon, 21 Jul 2008 00:06:41 +0000 (+0200) Subject: Displays the possible multiple nationalities. X-Git-Tag: xorg/1.0.0~332^2~550^2~4 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=eeb2ec0f85030e4890868d034ef6ff60ed94ea7d;p=platal.git Displays the possible multiple nationalities. --- diff --git a/include/notifs.inc.php b/include/notifs.inc.php index 9466aa7..b4592fa 100644 --- a/include/notifs.inc.php +++ b/include/notifs.inc.php @@ -143,6 +143,8 @@ $prf_desc = array('nom' => 'Son patronyme', 'freetext' => 'Le texte libre', 'mobile' => 'Son numéro de téléphone portable', 'nationalite' => 'Sa nationalité', + 'nationalite2' => 'Sa seconde nationalité', + 'nationalite3' => 'Sa troisième nationalité', 'nick' => 'Son surnom', 'networking' => 'La liste de ses adresses de networking', 'appli1' => 'Son école d\'application', diff --git a/include/user.func.inc.php b/include/user.func.inc.php index bdf4602..f5e492a 100644 --- a/include/user.func.inc.php +++ b/include/user.func.inc.php @@ -48,7 +48,8 @@ function user_clear_all_subs($user_id, $really_del=true) $tables_to_clear['contact'] = array('contacts'); XDB::execute("UPDATE auth_user_md5 SET date_ins = 0, promo_sortie = 0, nom_usage = '', password = '', perms = 'pending', - nationalite = '', cv = '', section = 0, date = 0, smtppass = '', mail_storage = '' + nationalite = '', nationalite2 = '', nationalite3 = '', cv = '', section = 0, + date = 0, smtppass = '', mail_storage = '' WHERE user_id = {?}", $uid); XDB::execute("DELETE virtual.* FROM virtual INNER JOIN virtual_redirect AS r USING(vid) WHERE redirect = {?}", $alias.'@'.$globals->mail->domain); @@ -392,7 +393,9 @@ function &get_user_details($login, $from_uid = '', $view = 'private') q.profile_nick AS nickname, q.profile_from_ax, q.profile_freetext AS freetext, q.profile_freetext_pub AS freetext_pub, q.profile_medals_pub AS medals_pub, - IF(gp.nat='',gp.pays,gp.nat) AS nationalite, gp.a2 AS iso3166, + IF(gp1.nat='',gp1.pays,gp1.nat) AS nationalite, gp1.a2 AS iso3166_1, + IF(gp2.nat='',gp2.pays,gp2.nat) AS nationalite2, gp2.a2 AS iso3166_2, + IF(gp3.nat='',gp3.pays,gp3.nat) AS nationalite3, gp3.a2 AS iso3166_3, a.alias AS forlife, a2.alias AS bestalias, c.uid IS NOT NULL AS is_contact, s.text AS section, p.x, p.y, p.pub AS photo_pub, @@ -401,15 +404,17 @@ function &get_user_details($login, $from_uid = '', $view = 'private') (COUNT(e.email) > 0 OR FIND_IN_SET('googleapps', u.mail_storage) > 0) AS actif, nd.display AS name_display, nd.tooltip AS name_tooltip FROM auth_user_md5 AS u - INNER JOIN auth_user_quick AS q USING(user_id) - INNER JOIN aliases AS a ON (u.user_id=a.id AND a.type='a_vie') - INNER JOIN aliases AS a2 ON (u.user_id=a2.id AND FIND_IN_SET('bestalias',a2.flags)) - LEFT JOIN contacts AS c ON (c.uid = {?} and c.contact = u.user_id) - LEFT JOIN geoloc_pays AS gp ON (gp.a2 = u.nationalite) - INNER JOIN sections AS s ON (s.id = u.section) - LEFT JOIN photo AS p ON (p.uid = u.user_id) - LEFT JOIN mentor AS m ON (m.uid = u.user_id) - LEFT JOIN emails AS e ON (e.uid = u.user_id AND e.flags='active') + INNER JOIN auth_user_quick AS q USING(user_id) + INNER JOIN aliases AS a ON (u.user_id=a.id AND a.type='a_vie') + INNER JOIN aliases AS a2 ON (u.user_id=a2.id AND FIND_IN_SET('bestalias',a2.flags)) + LEFT JOIN contacts AS c ON (c.uid = {?} and c.contact = u.user_id) + LEFT JOIN geoloc_pays AS gp1 ON (gp1.a2 = u.nationalite) + LEFT JOIN geoloc_pays AS gp2 ON (gp2.a2 = u.nationalite2) + LEFT JOIN geoloc_pays AS gp3 ON (gp3.a2 = u.nationalite3) + INNER JOIN sections AS s ON (s.id = u.section) + LEFT JOIN photo AS p ON (p.uid = u.user_id) + LEFT JOIN mentor AS m ON (m.uid = u.user_id) + LEFT JOIN emails AS e ON (e.uid = u.user_id AND e.flags='active') INNER JOIN profile_names_display AS nd ON (nd.user_id = u.user_id) WHERE a.alias = {?} GROUP BY u.user_id"; diff --git a/include/userset.inc.php b/include/userset.inc.php index ab8cb89..cab99f5 100644 --- a/include/userset.inc.php +++ b/include/userset.inc.php @@ -32,7 +32,9 @@ global $globals; 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 fonctions_def AS ef ON (e.fonction = ef.id) - LEFT JOIN geoloc_pays AS n ON (u.nationalite = n.a2) + LEFT JOIN geoloc_pays AS n1 ON (u.nationalite = n1.a2) + LEFT JOIN geoloc_pays AS n2 ON (u.nationalite2 = n2.a2) + LEFT JOIN geoloc_pays AS n3 ON (u.nationalite2 = n3.a2) 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.country = gp.a2) LEFT JOIN geoloc_region AS gr ON (adr.country = gr.a2 AND adr.region = gr.region) @@ -181,7 +183,9 @@ class MinificheView extends MultipageView 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, - IF(n.nat='',n.pays,n.nat) AS nat, n.a2 AS iso3166, + 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, ad0.text AS app0text, ad0.url AS app0url, ai0.type AS app0type, ad1.text AS app1text, ad1.url AS app1url, ai1.type AS app1type, adr.city, gp.a2, gp.pays AS countrytxt, gr.name AS region, @@ -195,7 +199,9 @@ class MinificheView extends MultipageView return "LEFT JOIN entreprises AS e ON (e.entrid = 0 AND e.uid = u.user_id".(S::logged() ? "" : " AND e.pub = 'public'").") LEFT JOIN emploi_secteur AS es ON (e.secteur = es.id) LEFT JOIN fonctions_def AS ef ON (e.fonction = ef.id) - LEFT JOIN geoloc_pays AS n ON (u.nationalite = n.a2) + LEFT JOIN geoloc_pays AS n1 ON (u.nationalite = n1.a2) + LEFT JOIN geoloc_pays AS n2 ON (u.nationalite2 = n2.a2) + LEFT JOIN geoloc_pays AS n3 ON (u.nationalite3 = n3.a2) LEFT JOIN applis_ins AS ai0 ON (u.user_id = ai0.uid AND ai0.ordre = 0) LEFT JOIN applis_def AS ad0 ON (ad0.id = ai0.aid) LEFT JOIN applis_ins AS ai1 ON (u.user_id = ai1.uid AND ai1.ordre = 1) diff --git a/templates/gadgets/ig-minifiche.tpl b/templates/gadgets/ig-minifiche.tpl index 244fda4..9ad99bd 100644 --- a/templates/gadgets/ig-minifiche.tpl +++ b/templates/gadgets/ig-minifiche.tpl @@ -29,8 +29,14 @@ {if !$c.dcd && $c.inscrit}{/if}
- {if $c.iso3166} - {$c.nat}  + {if $c.iso3166_1} + {$c.nat1}  + {/if} + {if $c.iso3166_2} + {$c.nat2}  + {/if} + {if $c.iso3166_3} + {$c.nat3}  {/if} (X {$c.promo}) {if $c.dcd}décédé{if $c.sexe}e{/if} le {$c.deces|date_format}{/if} diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl index cd4d8e4..41801aa 100644 --- a/templates/include/minifiche.tpl +++ b/templates/include/minifiche.tpl @@ -38,8 +38,14 @@
- {if $c.iso3166} - {$c.nat}  + {if $c.iso3166_1} + {$c.nat1}  + {/if} + {if $c.iso3166_2} + {$c.nat2}  + {/if} + {if $c.iso3166_3} + {$c.nat3}  {/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}) diff --git a/templates/profile/profile.tpl b/templates/profile/profile.tpl index 7c20986..7d23621 100644 --- a/templates/profile/profile.tpl +++ b/templates/profile/profile.tpl @@ -131,8 +131,14 @@ function chgMainWinLoc(strPage)
{/if}
- {if $x.iso3166} - {$x.nationalite}  + {if $x.iso3166_1} + {$x.nationalite}  + {/if} + {if $x.iso3166_2} + {$x.nationalite2}  + {/if} + {if $x.iso3166_3} + {$x.nationalite3}  {/if} X {$x.promo} {if ($x.promo_sortie-3 > $x.promo)}