smarty 3 - first pass for tests

git-svn-id: http://piwigo.org/svn/trunk@23384 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 46 insertions, 46 deletions

diff --git a/include/smarty/libs/plugins/function.html_table.php b/include/smarty/libs/plugins/function.html_table.php
index 32aeba83c..6b9cb9d12 100644
--- a/include/smarty/libs/plugins/function.html_table.php
+++ b/include/smarty/libs/plugins/function.html_table.php
@@ -1,11 +1,11 @@
 <?php
 /**
  * Smarty plugin
+ *
  * @package Smarty
- * @subpackage plugins
+ * @subpackage PluginsFunction
  */
 
-
 /**
  * Smarty {html_table} function plugin
  *
@@ -13,40 +13,41 @@
  * Name:     html_table<br>
  * Date:     Feb 17, 2003<br>
  * Purpose:  make an html table from an array of data<br>
- * Input:<br>
- *         - loop = array to loop through
- *         - cols = number of columns, comma separated list of column names
- *                  or array of column names
- *         - rows = number of rows
- *         - table_attr = table attributes
- *         - th_attr = table heading attributes (arrays are cycled)
- *         - tr_attr = table row attributes (arrays are cycled)
- *         - td_attr = table cell attributes (arrays are cycled)
- *         - trailpad = value to pad trailing cells with
- *         - caption = text for caption element 
- *         - vdir = vertical direction (default: "down", means top-to-bottom)
- *         - hdir = horizontal direction (default: "right", means left-to-right)
- *         - inner = inner loop (default "cols": print $loop line by line,
- *                   $loop will be printed column by column otherwise)
- *
- *
+ * Params:
+ * <pre>
+ * - loop       - array to loop through
+ * - cols       - number of columns, comma separated list of column names
+ *                or array of column names
+ * - rows       - number of rows
+ * - table_attr - table attributes
+ * - th_attr    - table heading attributes (arrays are cycled)
+ * - tr_attr    - table row attributes (arrays are cycled)
+ * - td_attr    - table cell attributes (arrays are cycled)
+ * - trailpad   - value to pad trailing cells with
+ * - caption    - text for caption element
+ * - vdir       - vertical direction (default: "down", means top-to-bottom)
+ * - hdir       - horizontal direction (default: "right", means left-to-right)
+ * - inner      - inner loop (default "cols": print $loop line by line,
+ *                $loop will be printed column by column otherwise)
+ * </pre>
  * Examples:
  * <pre>
  * {table loop=$data}
  * {table loop=$data cols=4 tr_attr='"bgcolor=red"'}
  * {table loop=$data cols="first,second,third" tr_attr=$colors}
  * </pre>
- * @author   Monte Ohrt <monte at ohrt dot com>
+ *
+ * @author Monte Ohrt <monte at ohrt dot com>
  * @author credit to Messju Mohr <messju at lammfellpuschen dot de>
  * @author credit to boots <boots dot smarty at yahoo dot com>
- * @version  1.1
- * @link http://smarty.php.net/manual/en/language.function.html.table.php {html_table}
+ * @version 1.1
+ * @link http://www.smarty.net/manual/en/language.function.html.table.php {html_table}
  *          (Smarty online manual)
- * @param array
- * @param Smarty
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
  * @return string
  */
-function smarty_function_html_table($params, &$smarty)
+function smarty_function_html_table($params, $template)
 {
     $table_attr = 'border="1"';
     $tr_attr = '';
@@ -59,13 +60,14 @@ function smarty_function_html_table($params, &$smarty)
     $hdir = 'right';
     $inner = 'cols';
     $caption = '';
+    $loop = null;
 
     if (!isset($params['loop'])) {
-        $smarty->trigger_error("html_table: missing 'loop' parameter");
+        trigger_error("html_table: missing 'loop' parameter",E_USER_WARNING);
         return;
     }
 
-    foreach ($params as $_key=>$_value) {
+    foreach ($params as $_key => $_value) {
         switch ($_key) {
             case 'loop':
                 $$_key = (array)$_value;
@@ -109,11 +111,11 @@ function smarty_function_html_table($params, &$smarty)
     $loop_count = count($loop);
     if (empty($params['rows'])) {
         /* no rows specified */
-        $rows = ceil($loop_count/$cols_count);
+        $rows = ceil($loop_count / $cols_count);
     } elseif (empty($params['cols'])) {
         if (!empty($params['rows'])) {
             /* no cols specified, but rows */
-            $cols_count = ceil($loop_count/$rows);
+            $cols_count = ceil($loop_count / $rows);
         }
     }
 
@@ -127,7 +129,7 @@ function smarty_function_html_table($params, &$smarty)
         $cols = ($hdir == 'right') ? $cols : array_reverse($cols);
         $output .= "<thead><tr>\n";
 
-        for ($r=0; $r<$cols_count; $r++) {
+        for ($r = 0; $r < $cols_count; $r++) {
             $output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>';
             $output .= $cols[$r];
             $output .= "</th>\n";
@@ -136,18 +138,18 @@ function smarty_function_html_table($params, &$smarty)
     }
 
     $output .= "<tbody>\n";
-    for ($r=0; $r<$rows; $r++) {
+    for ($r = 0; $r < $rows; $r++) {
         $output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n";
-        $rx =  ($vdir == 'down') ? $r*$cols_count : ($rows-1-$r)*$cols_count;
+        $rx = ($vdir == 'down') ? $r * $cols_count : ($rows-1 - $r) * $cols_count;
 
-        for ($c=0; $c<$cols_count; $c++) {
-            $x =  ($hdir == 'right') ? $rx+$c : $rx+$cols_count-1-$c;
-            if ($inner!='cols') {
+        for ($c = 0; $c < $cols_count; $c++) {
+            $x = ($hdir == 'right') ? $rx + $c : $rx + $cols_count-1 - $c;
+            if ($inner != 'cols') {
                 /* shuffle x to loop over rows*/
-                $x = floor($x/$cols_count) + ($x%$cols_count)*$rows;
+                $x = floor($x / $cols_count) + ($x % $cols_count) * $rows;
             }
 
-            if ($x<$loop_count) {
+            if ($x < $loop_count) {
                 $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">" . $loop[$x] . "</td>\n";
             } else {
                 $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">$trailpad</td>\n";
@@ -157,21 +159,19 @@ function smarty_function_html_table($params, &$smarty)
     }
     $output .= "</tbody>\n";
     $output .= "</table>\n";
-    
+
     return $output;
 }
 
-function smarty_function_html_table_cycle($name, $var, $no) {
-    if(!is_array($var)) {
+function smarty_function_html_table_cycle($name, $var, $no)
+{
+    if (!is_array($var)) {
         $ret = $var;
     } else {
         $ret = $var[$no % count($var)];
     }
-    
-    return ($ret) ? ' '.$ret : '';
-}
-
 
-/* vim: set expandtab: */
+    return ($ret) ? ' ' . $ret : '';
+}
 
-?>
+?>
\ No newline at end of file