From 48033754d3129a706ec0ecd02382b72a1381d5b2 Mon Sep 17 00:00:00 2001
From: x2000habouzit <x2000habouzit>
Date: Tue, 12 Oct 2004 18:18:19 +0000
Subject: [PATCH] not so minor fixes

---
 htdocs/search.php                   |  4 +--
 templates/search.result.private.tpl | 68 +++++++++++++++++++------------------
 2 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/htdocs/search.php b/htdocs/search.php
index 98095ac..23ccb6c 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.20 2004-10-12 17:37:09 x2000habouzit Exp $
+        $Id: search.php,v 1.21 2004-10-12 18:18:19 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -63,8 +63,8 @@ if (array_key_exists('rechercher', $_REQUEST)) {
     $sql = 'SELECT SQL_CALC_FOUND_ROWS
                        r.matricule,i.matricule_ax,
                        u.nom!="" AS inscrit,
-                       IF(u.nom!="",u.nom,i.nom) AS nom,
                        u.*,
+                       UPPER(IF(u.nom!="",u.nom,i.nom)) AS nom,
                        IF(u.prenom!="",u.prenom,i.prenom) AS prenom,
                        IF(u.promo!="",u.promo,i.promo) AS promo,
                        i.deces!=0 AS decede,
diff --git a/templates/search.result.private.tpl b/templates/search.result.private.tpl
index 5d042a9..f2b479c 100644
--- a/templates/search.result.private.tpl
+++ b/templates/search.result.private.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: search.result.private.tpl,v 1.11 2004-10-12 17:23:02 x2000habouzit Exp $
+        $Id: search.result.private.tpl,v 1.12 2004-10-12 18:18:20 x2000habouzit Exp $
  ***************************************************************************}
 
 <div class="bits">
@@ -46,39 +46,41 @@
     clique ici si tu connais son adresse email !
   </a>
 </div>
+<div class="long"></div>
 {/if}
+{else}
+<div class="long">
+  <table cellspacing="0" cellpadding="0">
+    {if $result.nat}
+    <tr>
+      <td class="lt">Nationalité:</td>
+      <td class="rt">{$result.nat}</td>
+    </tr>
+    {/if}
+    {if $result.web}
+    <tr>
+      <td class="lt">Page web:</td>
+      <td class="rt"><a href="{$result.web}">{$result.web}</a></td>
+    </tr>
+    {/if}
+    {if $result.pays || $result.ville || $result.pays}
+    <tr>
+      <td class="lt">Géographie:</td>
+      <td class="rt">{implode sep=", " s1=$result.ville s2=$result.region s3=$result.pays}</td>
+    </tr>
+    {/if}
+    {if $result.entreprise}
+    <tr>
+      <td class="lt">Profession:</td>
+      <td class="rt">
+        {$result.entreprise}
+        {if $result.secteur}( {$result.secteur} ){/if}
+        {if $result.fonction}<br />{$result.fonction} ){/if}
+      </td>
+    </tr>
+    {/if}
+  </table>
+</div>
 {/if}
-  <div class="long">
-    <table cellspacing="0" cellpadding="0">
-      {if $result.nat}
-      <tr>
-        <td class="lt">Nationalité:</td>
-        <td class="rt">{$result.nat}</td>
-      </tr>
-      {/if}
-      {if $result.web}
-      <tr>
-        <td class="lt">Page web:</td>
-        <td class="rt"><a href="{$result.web}">{$result.web}</a></td>
-      </tr>
-      {/if}
-      {if $result.pays || $result.ville || $result.pays}
-      <tr>
-        <td class="lt">Géographie:</td>
-        <td class="rt">{implode sep=", " s1=$result.ville s2=$result.region s3=$result.pays}</td>
-      </tr>
-      {/if}
-      {if $result.entreprise}
-      <tr>
-        <td class="lt">Profession:</td>
-        <td class="rt">
-          {$result.entreprise}
-          {if $result.secteur}( {$result.secteur} ){/if}
-          {if $result.fonction}<br />{$result.fonction} ){/if}
-        </td>
-      </tr>
-      {/if}
-    </table>
-  </div>
 
 {* vim:set et sw=2 sts=2 sws=2: *}
-- 
2.1.4