X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=plugins%2Ffunction.select_nat.php;h=a9720ed720b708c5e8b4fceaa69ed362978f8ef3;hb=c76545c351fae4e2298624ff9ee5bf854dc5a5b6;hp=60a9a8e56df000180fe88721f2cfc514f294b74b;hpb=f497128a7c26c25a64e05453ea479520149e2cb7;p=platal.git

diff --git a/plugins/function.select_nat.php b/plugins/function.select_nat.php
index 60a9a8e..a9720ed 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-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -21,17 +21,19 @@
 
 
 function select_nat($valeur, $pad=false) {
-    $sql = "SELECT a2 AS id,IF(nat='',pays,nat) AS text FROM geoloc_pays ORDER BY text";
-    $res = XDB::iterRow($sql);
+    $res = XDB::iterRow("SELECT  iso_3166_1_a2 AS id, nationalityFR AS text
+                           FROM  geoloc_countries
+                          WHERE  nationalityFR IS NOT NULL
+                       ORDER BY  nationalityFR");
     $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;