X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=plugins%2Ffunction.select_nat.php;h=38bdb2e7404072cd7375547d0afb17edb5ab571a;hb=faea3db3053e54bbf91cedba3f048396aa725af1;hp=9e7edd5a75ccecd519b0cddeffcb241980b268d7;hpb=34062b64fa9f161dc071527b2e864496555d598d;p=platal.git

diff --git a/plugins/function.select_nat.php b/plugins/function.select_nat.php
index 9e7edd5..38bdb2e 100644
--- a/plugins/function.select_nat.php
+++ b/plugins/function.select_nat.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2013 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -21,23 +21,25 @@
 
 
 function select_nat($valeur, $pad=false) {
-    $sql = "SELECT a2 AS id, IF(nat='', pays, nat) AS text FROM geoloc_pays WHERE nat IS NOT NULL ORDER BY text";
-    $res = XDB::iterRow($sql);
+    $res = XDB::iterRow("SELECT  iso_3166_1_a2 AS id, nationality AS text
+                           FROM  geoloc_countries
+                          WHERE  nationality IS NOT NULL
+                       ORDER BY  nationality");
     $sel = ' selected="selected"';
 
     // on ajoute une entree vide si $pad est vrai
     $html = "";
     if ($pad) {
-	      $html .= sprintf("<option value=\"\"%s></option>\n", ($valeur ? $sel : ""));
+	      $html .= sprintf("<option value=\"\"%s>&nbsp;</option>\n", ($valeur ? $sel : ""));
     }
     while (list($my_id, $my_text) = $res->next()) {
-        $html .= sprintf("<option value=\"%s\"%s>%s</option>\n", $my_id, ($valeur==$my_id ? $sel : ""), $my_text);
+        $html .= sprintf("<option value=\"%s\"%s>%s</option>\n", $my_id, ($valeur==$my_id ? $sel : ""), $my_text?$my_text:"&nbsp;");
     }
 
     return $html;
 }
 
-function smarty_function_select_nat($params, &$smarty) {
+function smarty_function_select_nat($params, $smarty) {
     if (empty($params['pad']) || !($params['pad'])) {
 	      $pad = false;
     } else {