<?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 *
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, 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> </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:" ");
}
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 {