X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=plugins%2Ffunction.select_nat.php;h=a9720ed720b708c5e8b4fceaa69ed362978f8ef3;hb=01bb23e6f5ae192ffaa6afbbd94b21b2b37f2138;hp=ebfa2f3b2c7c0ce0250046da8fdf3b5a927fc090;hpb=c3c43c0ebe734e2b43b5d5fdb6010d08358bc34b;p=platal.git

diff --git a/plugins/function.select_nat.php b/plugins/function.select_nat.php
index ebfa2f3..a9720ed 100644
--- a/plugins/function.select_nat.php
+++ b/plugins/function.select_nat.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -20,27 +20,32 @@
  ***************************************************************************/
 
 
-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);
+function select_nat($valeur, $pad=false) {
+    $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.= '<option value="0"'.($valeur==0?$sel:"")."></option>\n";
+	      $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);
+    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?$my_text:"&nbsp;");
     }
+
     return $html;
 }
 
 function smarty_function_select_nat($params, &$smarty) {
-    if(empty($params['pad']) || !($params['pad']))
-	$pad = false;
-    else
-	$pad = true;
+    if (empty($params['pad']) || !($params['pad'])) {
+	      $pad = false;
+    } else {
+	      $pad = true;
+    }
+
     return select_nat($params['valeur'], $pad);
 }