X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=plugins%2Ffunction.select_db_table.php;h=85f86331c4867161e9f800bf42190b4cb0ab579e;hb=ca476935c2eed1151b14a783f2ca404218ebfae4;hp=4bb641cc5242d2b729e26f9465f307ddd54fe368;hpb=8a7fab54e8236fbe382d382d13a9676bd555e89e;p=platal.git

diff --git a/plugins/function.select_db_table.php b/plugins/function.select_db_table.php
index 4bb641c..85f8633 100644
--- a/plugins/function.select_db_table.php
+++ b/plugins/function.select_db_table.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2009 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -19,7 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-
 function select_options($table,$valeur,$champ="text",$pad=false,
                         $where="",$join="",$group="")
 {
@@ -27,11 +26,10 @@ function select_options($table,$valeur,$champ="text",$pad=false,
     $order = $champ;
     if ($group) {
         $fields .= ',' . $group;
-        $order = $group . ',' . $order; 
-    } 
+        $order = $group . ',' . $order;
+    }
     $sql = "SELECT $fields FROM $table AS t $join $where ORDER BY $order";
     $res = XDB::iterRow($sql);
-    echo $sql;
     $sel = ' selected="selected"';
 
     // on ajoute une entree vide si $pad est vrai
@@ -45,11 +43,11 @@ function select_options($table,$valeur,$champ="text",$pad=false,
             if (!is_null($optgrp)) {
                 $html .= '</optgroup>';
             }
-            $html .= '<optgroup label="' . addslashes(htmlentities($my_grp)) . '">';
+            $html .= '<optgroup label="' . pl_entities($my_grp, ENT_QUOTES) . '">';
             $optgrp = $my_grp;
         }
-        $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 : "", pl_entities($my_text));
     }
     if (!is_null($optgrp)) {
         $html .= '</optgroup>';
@@ -72,4 +70,5 @@ function smarty_function_select_db_table($params, &$smarty) {
                           $params['where'], $params['join'], $params['group']);
 }
 
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>