From bfdbab56f1487431424127937ecf10ad1a8080b7 Mon Sep 17 00:00:00 2001 From: x2000habouzit Date: Tue, 12 Oct 2004 17:23:01 +0000 Subject: [PATCH] joan wish --- htdocs/search.php | 33 ++++++++++------ templates/search.result.private.tpl | 77 ++++++++++++++++++++++++++----------- 2 files changed, 77 insertions(+), 33 deletions(-) diff --git a/htdocs/search.php b/htdocs/search.php index 502bba6..732199e 100644 --- a/htdocs/search.php +++ b/htdocs/search.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: search.php,v 1.17 2004-09-02 23:04:19 x2000bedo Exp $ + $Id: search.php,v 1.18 2004-10-12 17:23:01 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); @@ -64,29 +64,40 @@ if (array_key_exists('rechercher', $_REQUEST)) { r.matricule,i.matricule_ax, u.nom!="" AS inscrit, IF(u.nom!="",u.nom,i.nom) AS nom, - u.epouse, + u.*, ep.alias AS epouse, IF(u.prenom!="",u.prenom,i.prenom) AS prenom, IF(u.promo!="",u.promo,i.promo) AS promo, i.deces!=0 AS decede, a.alias AS forlife, - u.date, 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, + n.text AS nat, + adr.ville, gp.pays, gr.name AS region, c.uid AS contact FROM '.(($with_soundex)?'recherche_soundex':'recherche').' AS r - INNER JOIN identification AS i ON (i.matricule=r.matricule) - LEFT JOIN auth_user_md5 AS u ON (u.matricule=r.matricule) - LEFT JOIN aliases AS a ON (u.user_id = a.id AND a.type="a_vie") - LEFT JOIN contacts AS c ON (c.uid='.((array_key_exists('uid',$_SESSION))?$_SESSION['uid']:0).' AND c.contact=u.user_id) - 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) - LEFT JOIN applis_def AS ad1 ON (ad1.id = ai1.aid) + INNER JOIN identification AS i ON (i.matricule=r.matricule) + INNER JOIN auth_user_md5 AS u ON (u.matricule=r.matricule) + INNER JOIN aliases AS a ON (u.user_id = a.id AND a.type="a_vie") + LEFT JOIN aliases AS ep ON (u.user_id = a.id AND a.type="epouse") + LEFT JOIN contacts AS c ON (c.uid='.((array_key_exists('uid',$_SESSION))?$_SESSION['uid']:0).' AND c.contact=u.user_id) + 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) + LEFT JOIN applis_def AS ad1 ON (ad1.id = ai1.aid) + LEFT JOIN entreprises AS e ON (e.entrid = 1 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 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) + LEFT JOIN geoloc_region AS gr ON (adr.pays = gr.a2 AND adr.region = gr.region) WHERE '.$fields->get_where_statement().' ORDER BY '.implode(',',array_filter(array($fields->get_order_statement(),'promo DESC,nom,prenom'))).' LIMIT '.$offset->value.','.$globals->search_results_per_page; $page->mysql_assign($sql, 'resultats', 'nb_resultats','nb_resultats_total'); + echo mysql_error(); if (!logged() && $page->get_template_vars('nb_resultats_total')>$globals->public_max_search_results) diff --git a/templates/search.result.private.tpl b/templates/search.result.private.tpl index b69a7fb..5d042a9 100644 --- a/templates/search.result.private.tpl +++ b/templates/search.result.private.tpl @@ -17,35 +17,68 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: search.result.private.tpl,v 1.10 2004-10-12 15:25:32 x2000coic Exp $ + $Id: search.result.private.tpl,v 1.11 2004-10-12 17:23:02 x2000habouzit Exp $ ***************************************************************************}
{if $result.inscrit==1} - - Afficher les détails - - - Afficher la carte de visite - - - {if $result.contact!= - - {/if} - {if $is_admin==1} - - AX - + + Afficher les détails + + + Afficher la carte de visite + + + {if $result.contact!= + {/if} + {perms level='admin'} + + AX + + {/perms} {$result.date|date_format:"%d-%m-%Y"}
{if $result.inscrit!=1} - {if $result.decede != 1} -
- - clique ici si tu connais son adresse email ! - -
- {/if} +{if $result.decede != 1} +
+ + clique ici si tu connais son adresse email ! + +
{/if} +{/if} +
+ + {if $result.nat} + + + + + {/if} + {if $result.web} + + + + + {/if} + {if $result.pays || $result.ville || $result.pays} + + + + + {/if} + {if $result.entreprise} + + + + + {/if} +
Nationalité:{$result.nat}
Page web:{$result.web}
Géographie:{implode sep=", " s1=$result.ville s2=$result.region s3=$result.pays}
Profession: + {$result.entreprise} + {if $result.secteur}( {$result.secteur} ){/if} + {if $result.fonction}
{$result.fonction} ){/if} +
+
+ {* vim:set et sw=2 sts=2 sws=2: *} -- 2.1.4