YetiForceCompany / YetiForceCRM

libraries/Smarty/libs/plugins/block.textformat.php

Indentation +66 added lines, -66 removed lines

@@ -35,78 +35,78 @@
  */
 function smarty_block_textformat($params, $content, $template, &$repeat)
 {
-    if (is_null($content)) {
-        return;
-    }
+	if (is_null($content)) {
+		return;
+	}
 
-    $style = null;
-    $indent = 0;
-    $indent_first = 0;
-    $indent_char = ' ';
-    $wrap = 80;
-    $wrap_char = "\n";
-    $wrap_cut = false;
-    $assign = null;
+	$style = null;
+	$indent = 0;
+	$indent_first = 0;
+	$indent_char = ' ';
+	$wrap = 80;
+	$wrap_char = "\n";
+	$wrap_cut = false;
+	$assign = null;
 
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
-            case 'style':
-            case 'indent_char':
-            case 'wrap_char':
-            case 'assign':
-                $$_key = (string) $_val;
-                break;
+	foreach ($params as $_key => $_val) {
+		switch ($_key) {
+			case 'style':
+			case 'indent_char':
+			case 'wrap_char':
+			case 'assign':
+				$$_key = (string) $_val;
+				break;
 
-            case 'indent':
-            case 'indent_first':
-            case 'wrap':
-                $$_key = (int) $_val;
-                break;
+			case 'indent':
+			case 'indent_first':
+			case 'wrap':
+				$$_key = (int) $_val;
+				break;
 
-            case 'wrap_cut':
-                $$_key = (bool) $_val;
-                break;
+			case 'wrap_cut':
+				$$_key = (bool) $_val;
+				break;
 
-            default:
-                trigger_error("textformat: unknown attribute '$_key'");
-        }
-    }
+			default:
+				trigger_error("textformat: unknown attribute '$_key'");
+		}
+	}
 
-    if ($style == 'email') {
-        $wrap = 72;
-    }
-    // split into paragraphs
-    $_paragraphs = preg_split('![\r\n]{2}!', $content);
+	if ($style == 'email') {
+		$wrap = 72;
+	}
+	// split into paragraphs
+	$_paragraphs = preg_split('![\r\n]{2}!', $content);
 
-    foreach ($_paragraphs as &$_paragraph) {
-        if (!$_paragraph) {
-            continue;
-        }
-        // convert mult. spaces & special chars to single space
-        $_paragraph =
-            preg_replace(array('!\s+!' . Smarty::$_UTF8_MODIFIER, '!(^\s+)|(\s+$)!' . Smarty::$_UTF8_MODIFIER),
-                         array(' ', ''), $_paragraph);
-        // indent first line
-        if ($indent_first > 0) {
-            $_paragraph = str_repeat($indent_char, $indent_first) . $_paragraph;
-        }
-        // wordwrap sentences
-        if (Smarty::$_MBSTRING) {
-            require_once(SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php');
-            $_paragraph = smarty_mb_wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
-        } else {
-            $_paragraph = wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
-        }
-        // indent lines
-        if ($indent > 0) {
-            $_paragraph = preg_replace('!^!m', str_repeat($indent_char, $indent), $_paragraph);
-        }
-    }
-    $_output = implode($wrap_char . $wrap_char, $_paragraphs);
+	foreach ($_paragraphs as &$_paragraph) {
+		if (!$_paragraph) {
+			continue;
+		}
+		// convert mult. spaces & special chars to single space
+		$_paragraph =
+			preg_replace(array('!\s+!' . Smarty::$_UTF8_MODIFIER, '!(^\s+)|(\s+$)!' . Smarty::$_UTF8_MODIFIER),
+						 array(' ', ''), $_paragraph);
+		// indent first line
+		if ($indent_first > 0) {
+			$_paragraph = str_repeat($indent_char, $indent_first) . $_paragraph;
+		}
+		// wordwrap sentences
+		if (Smarty::$_MBSTRING) {
+			require_once(SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php');
+			$_paragraph = smarty_mb_wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
+		} else {
+			$_paragraph = wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
+		}
+		// indent lines
+		if ($indent > 0) {
+			$_paragraph = preg_replace('!^!m', str_repeat($indent_char, $indent), $_paragraph);
+		}
+	}
+	$_output = implode($wrap_char . $wrap_char, $_paragraphs);
 
-    if ($assign) {
-        $template->assign($assign, $_output);
-    } else {
-        return $_output;
-    }
+	if ($assign) {
+		$template->assign($assign, $_output);
+	} else {
+		return $_output;
+	}
 }

libraries/Smarty/libs/plugins/modifiercompiler.count_paragraphs.php

Indentation +2 added lines, -2 removed lines

@@ -22,6 +22,6 @@
  */
 function smarty_modifiercompiler_count_paragraphs($params)
 {
-    // count \r or \n characters
-    return '(preg_match_all(\'#[\r\n]+#\', ' . $params[ 0 ] . ', $tmp)+1)';
+	// count \r or \n characters
+	return '(preg_match_all(\'#[\r\n]+#\', ' . $params[ 0 ] . ', $tmp)+1)';
 }

Spacing +1 added lines, -1 removed lines

@@ -23,5 +23,5 @@
 function smarty_modifiercompiler_count_paragraphs($params)
 {
     // count \r or \n characters
-    return '(preg_match_all(\'#[\r\n]+#\', ' . $params[ 0 ] . ', $tmp)+1)';
+    return '(preg_match_all(\'#[\r\n]+#\', ' . $params[0] . ', $tmp)+1)';
 }

libraries/Smarty/libs/plugins/modifiercompiler.count_words.php

Indentation +8 added lines, -8 removed lines

@@ -21,12 +21,12 @@
  */
 function smarty_modifiercompiler_count_words($params)
 {
-    if (Smarty::$_MBSTRING) {
-        // return 'preg_match_all(\'#[\w\pL]+#' . Smarty::$_UTF8_MODIFIER . '\', ' . $params[0] . ', $tmp)';
-        // expression taken from http://de.php.net/manual/en/function.str-word-count.php#85592
-        return 'preg_match_all(\'/\p{L}[\p{L}\p{Mn}\p{Pd}\\\'\x{2019}]*/' . Smarty::$_UTF8_MODIFIER . '\', ' .
-               $params[ 0 ] . ', $tmp)';
-    }
-    // no MBString fallback
-    return 'str_word_count(' . $params[ 0 ] . ')';
+	if (Smarty::$_MBSTRING) {
+		// return 'preg_match_all(\'#[\w\pL]+#' . Smarty::$_UTF8_MODIFIER . '\', ' . $params[0] . ', $tmp)';
+		// expression taken from http://de.php.net/manual/en/function.str-word-count.php#85592
+		return 'preg_match_all(\'/\p{L}[\p{L}\p{Mn}\p{Pd}\\\'\x{2019}]*/' . Smarty::$_UTF8_MODIFIER . '\', ' .
+			   $params[ 0 ] . ', $tmp)';
+	}
+	// no MBString fallback
+	return 'str_word_count(' . $params[ 0 ] . ')';
 }

Spacing +2 added lines, -2 removed lines

@@ -25,8 +25,8 @@
         // return 'preg_match_all(\'#[\w\pL]+#' . Smarty::$_UTF8_MODIFIER . '\', ' . $params[0] . ', $tmp)';
         // expression taken from http://de.php.net/manual/en/function.str-word-count.php#85592
         return 'preg_match_all(\'/\p{L}[\p{L}\p{Mn}\p{Pd}\\\'\x{2019}]*/' . Smarty::$_UTF8_MODIFIER . '\', ' .
-               $params[ 0 ] . ', $tmp)';
+               $params[0] . ', $tmp)';
     }
     // no MBString fallback
-    return 'str_word_count(' . $params[ 0 ] . ')';
+    return 'str_word_count(' . $params[0] . ')';
 }

libraries/Smarty/libs/plugins/shared.make_timestamp.php

Indentation +23 added lines, -23 removed lines

@@ -18,28 +18,28 @@
  */
 function smarty_make_timestamp($string)
 {
-    if (empty($string)) {
-        // use "now":
-        return time();
-    } elseif ($string instanceof DateTime ||
-              (interface_exists('DateTimeInterface', false) && $string instanceof DateTimeInterface)
-    ) {
-        return (int) $string->format('U'); // PHP 5.2 BC
-    } elseif (strlen($string) == 14 && ctype_digit($string)) {
-        // it is mysql timestamp format of YYYYMMDDHHMMSS?
-        return mktime(substr($string, 8, 2), substr($string, 10, 2), substr($string, 12, 2), substr($string, 4, 2),
-                      substr($string, 6, 2), substr($string, 0, 4));
-    } elseif (is_numeric($string)) {
-        // it is a numeric string, we handle it as timestamp
-        return (int) $string;
-    } else {
-        // strtotime should handle it
-        $time = strtotime($string);
-        if ($time == - 1 || $time === false) {
-            // strtotime() was not able to parse $string, use "now":
-            return time();
-        }
+	if (empty($string)) {
+		// use "now":
+		return time();
+	} elseif ($string instanceof DateTime ||
+			  (interface_exists('DateTimeInterface', false) && $string instanceof DateTimeInterface)
+	) {
+		return (int) $string->format('U'); // PHP 5.2 BC
+	} elseif (strlen($string) == 14 && ctype_digit($string)) {
+		// it is mysql timestamp format of YYYYMMDDHHMMSS?
+		return mktime(substr($string, 8, 2), substr($string, 10, 2), substr($string, 12, 2), substr($string, 4, 2),
+					  substr($string, 6, 2), substr($string, 0, 4));
+	} elseif (is_numeric($string)) {
+		// it is a numeric string, we handle it as timestamp
+		return (int) $string;
+	} else {
+		// strtotime should handle it
+		$time = strtotime($string);
+		if ($time == - 1 || $time === false) {
+			// strtotime() was not able to parse $string, use "now":
+			return time();
+		}
 
-        return $time;
-    }
+		return $time;
+	}
 }

libraries/Smarty/libs/plugins/function.html_image.php

Indentation +120 added lines, -120 removed lines

@@ -38,124 +38,124 @@
  */
 function smarty_function_html_image($params, $template)
 {
-    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-
-    $alt = '';
-    $file = '';
-    $height = '';
-    $width = '';
-    $extra = '';
-    $prefix = '';
-    $suffix = '';
-    $path_prefix = '';
-    $basedir = isset($_SERVER[ 'DOCUMENT_ROOT' ]) ? $_SERVER[ 'DOCUMENT_ROOT' ] : '';
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
-            case 'file':
-            case 'height':
-            case 'width':
-            case 'dpi':
-            case 'path_prefix':
-            case 'basedir':
-                $$_key = $_val;
-                break;
-
-            case 'alt':
-                if (!is_array($_val)) {
-                    $$_key = smarty_function_escape_special_chars($_val);
-                } else {
-                    throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-
-            case 'link':
-            case 'href':
-                $prefix = '<a href="' . $_val . '">';
-                $suffix = '</a>';
-                break;
-
-            default:
-                if (!is_array($_val)) {
-                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
-                } else {
-                    throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    if (empty($file)) {
-        trigger_error("html_image: missing 'file' parameter", E_USER_NOTICE);
-
-        return;
-    }
-
-    if ($file[ 0 ] == '/') {
-        $_image_path = $basedir . $file;
-    } else {
-        $_image_path = $file;
-    }
-
-    // strip file protocol
-    if (stripos($params[ 'file' ], 'file://') === 0) {
-        $params[ 'file' ] = substr($params[ 'file' ], 7);
-    }
-
-    $protocol = strpos($params[ 'file' ], '://');
-    if ($protocol !== false) {
-        $protocol = strtolower(substr($params[ 'file' ], 0, $protocol));
-    }
-
-    if (isset($template->smarty->security_policy)) {
-        if ($protocol) {
-            // remote resource (or php stream, …)
-            if (!$template->smarty->security_policy->isTrustedUri($params[ 'file' ])) {
-                return;
-            }
-        } else {
-            // local file
-            if (!$template->smarty->security_policy->isTrustedResourceDir($_image_path)) {
-                return;
-            }
-        }
-    }
-
-    if (!isset($params[ 'width' ]) || !isset($params[ 'height' ])) {
-        if (!$_image_data = @getimagesize($_image_path)) {
-            if (!file_exists($_image_path)) {
-                trigger_error("html_image: unable to find '$_image_path'", E_USER_NOTICE);
-
-                return;
-            } elseif (!is_readable($_image_path)) {
-                trigger_error("html_image: unable to read '$_image_path'", E_USER_NOTICE);
-
-                return;
-            } else {
-                trigger_error("html_image: '$_image_path' is not a valid image file", E_USER_NOTICE);
-
-                return;
-            }
-        }
-
-        if (!isset($params[ 'width' ])) {
-            $width = $_image_data[ 0 ];
-        }
-        if (!isset($params[ 'height' ])) {
-            $height = $_image_data[ 1 ];
-        }
-    }
-
-    if (isset($params[ 'dpi' ])) {
-        if (strstr($_SERVER[ 'HTTP_USER_AGENT' ], 'Mac')) {
-            $dpi_default = 72;
-        } else {
-            $dpi_default = 96;
-        }
-        $_resize = $dpi_default / $params[ 'dpi' ];
-        $width = round($width * $_resize);
-        $height = round($height * $_resize);
-    }
-
-    return $prefix . '<img src="' . $path_prefix . $file . '" alt="' . $alt . '" width="' . $width . '" height="' .
-           $height . '"' . $extra . ' />' . $suffix;
+	require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
+
+	$alt = '';
+	$file = '';
+	$height = '';
+	$width = '';
+	$extra = '';
+	$prefix = '';
+	$suffix = '';
+	$path_prefix = '';
+	$basedir = isset($_SERVER[ 'DOCUMENT_ROOT' ]) ? $_SERVER[ 'DOCUMENT_ROOT' ] : '';
+	foreach ($params as $_key => $_val) {
+		switch ($_key) {
+			case 'file':
+			case 'height':
+			case 'width':
+			case 'dpi':
+			case 'path_prefix':
+			case 'basedir':
+				$$_key = $_val;
+				break;
+
+			case 'alt':
+				if (!is_array($_val)) {
+					$$_key = smarty_function_escape_special_chars($_val);
+				} else {
+					throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+				}
+				break;
+
+			case 'link':
+			case 'href':
+				$prefix = '<a href="' . $_val . '">';
+				$suffix = '</a>';
+				break;
+
+			default:
+				if (!is_array($_val)) {
+					$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+				} else {
+					throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+				}
+				break;
+		}
+	}
+
+	if (empty($file)) {
+		trigger_error("html_image: missing 'file' parameter", E_USER_NOTICE);
+
+		return;
+	}
+
+	if ($file[ 0 ] == '/') {
+		$_image_path = $basedir . $file;
+	} else {
+		$_image_path = $file;
+	}
+
+	// strip file protocol
+	if (stripos($params[ 'file' ], 'file://') === 0) {
+		$params[ 'file' ] = substr($params[ 'file' ], 7);
+	}
+
+	$protocol = strpos($params[ 'file' ], '://');
+	if ($protocol !== false) {
+		$protocol = strtolower(substr($params[ 'file' ], 0, $protocol));
+	}
+
+	if (isset($template->smarty->security_policy)) {
+		if ($protocol) {
+			// remote resource (or php stream, …)
+			if (!$template->smarty->security_policy->isTrustedUri($params[ 'file' ])) {
+				return;
+			}
+		} else {
+			// local file
+			if (!$template->smarty->security_policy->isTrustedResourceDir($_image_path)) {
+				return;
+			}
+		}
+	}
+
+	if (!isset($params[ 'width' ]) || !isset($params[ 'height' ])) {
+		if (!$_image_data = @getimagesize($_image_path)) {
+			if (!file_exists($_image_path)) {
+				trigger_error("html_image: unable to find '$_image_path'", E_USER_NOTICE);
+
+				return;
+			} elseif (!is_readable($_image_path)) {
+				trigger_error("html_image: unable to read '$_image_path'", E_USER_NOTICE);
+
+				return;
+			} else {
+				trigger_error("html_image: '$_image_path' is not a valid image file", E_USER_NOTICE);
+
+				return;
+			}
+		}
+
+		if (!isset($params[ 'width' ])) {
+			$width = $_image_data[ 0 ];
+		}
+		if (!isset($params[ 'height' ])) {
+			$height = $_image_data[ 1 ];
+		}
+	}
+
+	if (isset($params[ 'dpi' ])) {
+		if (strstr($_SERVER[ 'HTTP_USER_AGENT' ], 'Mac')) {
+			$dpi_default = 72;
+		} else {
+			$dpi_default = 96;
+		}
+		$_resize = $dpi_default / $params[ 'dpi' ];
+		$width = round($width * $_resize);
+		$height = round($height * $_resize);
+	}
+
+	return $prefix . '<img src="' . $path_prefix . $file . '" alt="' . $alt . '" width="' . $width . '" height="' .
+		   $height . '"' . $extra . ' />' . $suffix;
 }

Spacing +17 added lines, -17 removed lines

@@ -48,7 +48,7 @@ 
     $prefix = '';
     $suffix = '';
     $path_prefix = '';
-    $basedir = isset($_SERVER[ 'DOCUMENT_ROOT' ]) ? $_SERVER[ 'DOCUMENT_ROOT' ] : '';
+    $basedir = isset($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT'] : '';
     foreach ($params as $_key => $_val) {
         switch ($_key) {
             case 'file':
@@ -64,7 +64,7 @@ 
                 if (!is_array($_val)) {
                     $$_key = smarty_function_escape_special_chars($_val);
                 } else {
-                    throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+                    throw new SmartyException("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
                 }
                 break;
 
@@ -78,7 +78,7 @@ 
                 if (!is_array($_val)) {
                     $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
                 } else {
-                    throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+                    throw new SmartyException("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
                 }
                 break;
         }
@@ -90,26 +90,26 @@ 
         return;
     }
 
-    if ($file[ 0 ] == '/') {
+    if ($file[0] == '/') {
         $_image_path = $basedir . $file;
     } else {
         $_image_path = $file;
     }
 
     // strip file protocol
-    if (stripos($params[ 'file' ], 'file://') === 0) {
-        $params[ 'file' ] = substr($params[ 'file' ], 7);
+    if (stripos($params['file'], 'file://') === 0) {
+        $params['file'] = substr($params['file'], 7);
     }
 
-    $protocol = strpos($params[ 'file' ], '://');
+    $protocol = strpos($params['file'], '://');
     if ($protocol !== false) {
-        $protocol = strtolower(substr($params[ 'file' ], 0, $protocol));
+        $protocol = strtolower(substr($params['file'], 0, $protocol));
     }
 
     if (isset($template->smarty->security_policy)) {
         if ($protocol) {
             // remote resource (or php stream, …)
-            if (!$template->smarty->security_policy->isTrustedUri($params[ 'file' ])) {
+            if (!$template->smarty->security_policy->isTrustedUri($params['file'])) {
                 return;
             }
         } else {
@@ -120,7 +120,7 @@ 
         }
     }
 
-    if (!isset($params[ 'width' ]) || !isset($params[ 'height' ])) {
+    if (!isset($params['width']) || !isset($params['height'])) {
         if (!$_image_data = @getimagesize($_image_path)) {
             if (!file_exists($_image_path)) {
                 trigger_error("html_image: unable to find '$_image_path'", E_USER_NOTICE);
@@ -137,21 +137,21 @@ 
             }
         }
 
-        if (!isset($params[ 'width' ])) {
-            $width = $_image_data[ 0 ];
+        if (!isset($params['width'])) {
+            $width = $_image_data[0];
         }
-        if (!isset($params[ 'height' ])) {
-            $height = $_image_data[ 1 ];
+        if (!isset($params['height'])) {
+            $height = $_image_data[1];
         }
     }
 
-    if (isset($params[ 'dpi' ])) {
-        if (strstr($_SERVER[ 'HTTP_USER_AGENT' ], 'Mac')) {
+    if (isset($params['dpi'])) {
+        if (strstr($_SERVER['HTTP_USER_AGENT'], 'Mac')) {
             $dpi_default = 72;
         } else {
             $dpi_default = 96;
         }
-        $_resize = $dpi_default / $params[ 'dpi' ];
+        $_resize = $dpi_default / $params['dpi'];
         $width = round($width * $_resize);
         $height = round($height * $_resize);
     }

libraries/Smarty/libs/plugins/modifier.capitalize.php

Indentation +50 added lines, -50 removed lines

@@ -23,53 +23,53 @@ 
  */
 function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = false)
 {
-    if (Smarty::$_MBSTRING) {
-        if ($lc_rest) {
-            // uppercase (including hyphenated words)
-            $upper_string = mb_convert_case($string, MB_CASE_TITLE, Smarty::$_CHARSET);
-        } else {
-            // uppercase word breaks
-            $upper_string = preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER,
-                                                  'smarty_mod_cap_mbconvert_cb', $string);
-        }
-        // check uc_digits case
-        if (!$uc_digits) {
-            if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches,
-                               PREG_OFFSET_CAPTURE)) {
-                foreach ($matches[ 1 ] as $match) {
-                    $upper_string =
-                        substr_replace($upper_string, mb_strtolower($match[ 0 ], Smarty::$_CHARSET), $match[ 1 ],
-                                       strlen($match[ 0 ]));
-                }
-            }
-        }
-        $upper_string =
-            preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_mbconvert2_cb',
-                                  $upper_string);
-        return $upper_string;
-    }
+	if (Smarty::$_MBSTRING) {
+		if ($lc_rest) {
+			// uppercase (including hyphenated words)
+			$upper_string = mb_convert_case($string, MB_CASE_TITLE, Smarty::$_CHARSET);
+		} else {
+			// uppercase word breaks
+			$upper_string = preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER,
+												  'smarty_mod_cap_mbconvert_cb', $string);
+		}
+		// check uc_digits case
+		if (!$uc_digits) {
+			if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches,
+							   PREG_OFFSET_CAPTURE)) {
+				foreach ($matches[ 1 ] as $match) {
+					$upper_string =
+						substr_replace($upper_string, mb_strtolower($match[ 0 ], Smarty::$_CHARSET), $match[ 1 ],
+									   strlen($match[ 0 ]));
+				}
+			}
+		}
+		$upper_string =
+			preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_mbconvert2_cb',
+								  $upper_string);
+		return $upper_string;
+	}
 
-    // lowercase first
-    if ($lc_rest) {
-        $string = strtolower($string);
-    }
-    // uppercase (including hyphenated words)
-    $upper_string =
-        preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_ucfirst_cb',
-                              $string);
-    // check uc_digits case
-    if (!$uc_digits) {
-        if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches,
-                           PREG_OFFSET_CAPTURE)) {
-            foreach ($matches[ 1 ] as $match) {
-                $upper_string =
-                    substr_replace($upper_string, strtolower($match[ 0 ]), $match[ 1 ], strlen($match[ 0 ]));
-            }
-        }
-    }
-    $upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_ucfirst2_cb',
-                                          $upper_string);
-    return $upper_string;
+	// lowercase first
+	if ($lc_rest) {
+		$string = strtolower($string);
+	}
+	// uppercase (including hyphenated words)
+	$upper_string =
+		preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_ucfirst_cb',
+							  $string);
+	// check uc_digits case
+	if (!$uc_digits) {
+		if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches,
+						   PREG_OFFSET_CAPTURE)) {
+			foreach ($matches[ 1 ] as $match) {
+				$upper_string =
+					substr_replace($upper_string, strtolower($match[ 0 ]), $match[ 1 ], strlen($match[ 0 ]));
+			}
+		}
+	}
+	$upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_ucfirst2_cb',
+										  $upper_string);
+	return $upper_string;
 }
 
 /* 
@@ -82,20 +82,20 @@ 
  */
 function smarty_mod_cap_mbconvert_cb($matches)
 {
-    return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 2 ]), MB_CASE_UPPER, Smarty::$_CHARSET);
+	return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 2 ]), MB_CASE_UPPER, Smarty::$_CHARSET);
 }
 
 function smarty_mod_cap_mbconvert2_cb($matches)
 {
-    return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 3 ]), MB_CASE_UPPER, Smarty::$_CHARSET);
+	return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 3 ]), MB_CASE_UPPER, Smarty::$_CHARSET);
 }
 
 function smarty_mod_cap_ucfirst_cb($matches)
 {
-    return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 2 ]));
+	return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 2 ]));
 }
 
 function smarty_mod_cap_ucfirst2_cb($matches)
 {
-    return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 3 ]));
+	return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 3 ]));
 }

Spacing +9 added lines, -9 removed lines

@@ -36,10 +36,10 @@ 
         if (!$uc_digits) {
             if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches,
                                PREG_OFFSET_CAPTURE)) {
-                foreach ($matches[ 1 ] as $match) {
+                foreach ($matches[1] as $match) {
                     $upper_string =
-                        substr_replace($upper_string, mb_strtolower($match[ 0 ], Smarty::$_CHARSET), $match[ 1 ],
-                                       strlen($match[ 0 ]));
+                        substr_replace($upper_string, mb_strtolower($match[0], Smarty::$_CHARSET), $match[1],
+                                       strlen($match[0]));
                 }
             }
         }
@@ -61,9 +61,9 @@ 
     if (!$uc_digits) {
         if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches,
                            PREG_OFFSET_CAPTURE)) {
-            foreach ($matches[ 1 ] as $match) {
+            foreach ($matches[1] as $match) {
                 $upper_string =
-                    substr_replace($upper_string, strtolower($match[ 0 ]), $match[ 1 ], strlen($match[ 0 ]));
+                    substr_replace($upper_string, strtolower($match[0]), $match[1], strlen($match[0]));
             }
         }
     }
@@ -82,20 +82,20 @@ 
  */
 function smarty_mod_cap_mbconvert_cb($matches)
 {
-    return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 2 ]), MB_CASE_UPPER, Smarty::$_CHARSET);
+    return stripslashes($matches[1]) . mb_convert_case(stripslashes($matches[2]), MB_CASE_UPPER, Smarty::$_CHARSET);
 }
 
 function smarty_mod_cap_mbconvert2_cb($matches)
 {
-    return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 3 ]), MB_CASE_UPPER, Smarty::$_CHARSET);
+    return stripslashes($matches[1]) . mb_convert_case(stripslashes($matches[3]), MB_CASE_UPPER, Smarty::$_CHARSET);
 }
 
 function smarty_mod_cap_ucfirst_cb($matches)
 {
-    return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 2 ]));
+    return stripslashes($matches[1]) . ucfirst(stripslashes($matches[2]));
 }
 
 function smarty_mod_cap_ucfirst2_cb($matches)
 {
-    return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 3 ]));
+    return stripslashes($matches[1]) . ucfirst(stripslashes($matches[3]));
 }

libraries/Smarty/libs/plugins/modifiercompiler.count_characters.php

Indentation +8 added lines, -8 removed lines

@@ -21,12 +21,12 @@
  */
 function smarty_modifiercompiler_count_characters($params)
 {
-    if (!isset($params[ 1 ]) || $params[ 1 ] != 'true') {
-        return 'preg_match_all(\'/[^\s]/' . Smarty::$_UTF8_MODIFIER . '\',' . $params[ 0 ] . ', $tmp)';
-    }
-    if (Smarty::$_MBSTRING) {
-        return 'mb_strlen(' . $params[ 0 ] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
-    }
-    // no MBString fallback
-    return 'strlen(' . $params[ 0 ] . ')';
+	if (!isset($params[ 1 ]) || $params[ 1 ] != 'true') {
+		return 'preg_match_all(\'/[^\s]/' . Smarty::$_UTF8_MODIFIER . '\',' . $params[ 0 ] . ', $tmp)';
+	}
+	if (Smarty::$_MBSTRING) {
+		return 'mb_strlen(' . $params[ 0 ] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
+	}
+	// no MBString fallback
+	return 'strlen(' . $params[ 0 ] . ')';
 }

Spacing +4 added lines, -4 removed lines

@@ -21,12 +21,12 @@
  */
 function smarty_modifiercompiler_count_characters($params)
 {
-    if (!isset($params[ 1 ]) || $params[ 1 ] != 'true') {
-        return 'preg_match_all(\'/[^\s]/' . Smarty::$_UTF8_MODIFIER . '\',' . $params[ 0 ] . ', $tmp)';
+    if (!isset($params[1]) || $params[1] != 'true') {
+        return 'preg_match_all(\'/[^\s]/' . Smarty::$_UTF8_MODIFIER . '\',' . $params[0] . ', $tmp)';
     }
     if (Smarty::$_MBSTRING) {
-        return 'mb_strlen(' . $params[ 0 ] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
+        return 'mb_strlen(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
     }
     // no MBString fallback
-    return 'strlen(' . $params[ 0 ] . ')';
+    return 'strlen(' . $params[0] . ')';
 }

libraries/Smarty/libs/plugins/function.mailto.php

Indentation +99 added lines, -99 removed lines

@@ -50,103 +50,103 @@
  */
 function smarty_function_mailto($params)
 {
-    static $_allowed_encoding =
-        array('javascript' => true, 'javascript_charcode' => true, 'hex' => true, 'none' => true);
-    $extra = '';
-
-    if (empty($params[ 'address' ])) {
-        trigger_error("mailto: missing 'address' parameter", E_USER_WARNING);
-
-        return;
-    } else {
-        $address = $params[ 'address' ];
-    }
-
-    $text = $address;
-    // netscape and mozilla do not decode %40 (@) in BCC field (bug?)
-    // so, don't encode it.
-    $search = array('%40', '%2C');
-    $replace = array('@', ',');
-    $mail_parms = array();
-    foreach ($params as $var => $value) {
-        switch ($var) {
-            case 'cc':
-            case 'bcc':
-            case 'followupto':
-                if (!empty($value)) {
-                    $mail_parms[] = $var . '=' . str_replace($search, $replace, rawurlencode($value));
-                }
-                break;
-
-            case 'subject':
-            case 'newsgroups':
-                $mail_parms[] = $var . '=' . rawurlencode($value);
-                break;
-
-            case 'extra':
-            case 'text':
-                $$var = $value;
-
-            default:
-        }
-    }
-
-    if ($mail_parms) {
-        $address .= '?' . join('&', $mail_parms);
-    }
-
-    $encode = (empty($params[ 'encode' ])) ? 'none' : $params[ 'encode' ];
-    if (!isset($_allowed_encoding[ $encode ])) {
-        trigger_error("mailto: 'encode' parameter must be none, javascript, javascript_charcode or hex",
-                      E_USER_WARNING);
-
-        return;
-    }
-    if ($encode == 'javascript') {
-        $string = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
-
-        $js_encode = '';
-        for ($x = 0, $_length = strlen($string); $x < $_length; $x ++) {
-            $js_encode .= '%' . bin2hex($string[ $x ]);
-        }
-
-        return '<script type="text/javascript">eval(unescape(\'' . $js_encode . '\'))</script>';
-    } elseif ($encode == 'javascript_charcode') {
-        $string = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
-
-        for ($x = 0, $y = strlen($string); $x < $y; $x ++) {
-            $ord[] = ord($string[ $x ]);
-        }
-
-        $_ret = "<script type=\"text/javascript\" language=\"javascript\">\n" . "{document.write(String.fromCharCode(" .
-                implode(',', $ord) . "))" . "}\n" . "</script>\n";
-
-        return $_ret;
-    } elseif ($encode == 'hex') {
-        preg_match('!^(.*)(\?.*)$!', $address, $match);
-        if (!empty($match[ 2 ])) {
-            trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.", E_USER_WARNING);
-
-            return;
-        }
-        $address_encode = '';
-        for ($x = 0, $_length = strlen($address); $x < $_length; $x ++) {
-            if (preg_match('!\w!' . Smarty::$_UTF8_MODIFIER, $address[ $x ])) {
-                $address_encode .= '%' . bin2hex($address[ $x ]);
-            } else {
-                $address_encode .= $address[ $x ];
-            }
-        }
-        $text_encode = '';
-        for ($x = 0, $_length = strlen($text); $x < $_length; $x ++) {
-            $text_encode .= '&#x' . bin2hex($text[ $x ]) . ';';
-        }
-
-        $mailto = "&#109;&#97;&#105;&#108;&#116;&#111;&#58;";
-
-        return '<a href="' . $mailto . $address_encode . '" ' . $extra . '>' . $text_encode . '</a>';
-    } else {
-        // no encoding
-        return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
-    }
+	static $_allowed_encoding =
+		array('javascript' => true, 'javascript_charcode' => true, 'hex' => true, 'none' => true);
+	$extra = '';
+
+	if (empty($params[ 'address' ])) {
+		trigger_error("mailto: missing 'address' parameter", E_USER_WARNING);
+
+		return;
+	} else {
+		$address = $params[ 'address' ];
+	}
+
+	$text = $address;
+	// netscape and mozilla do not decode %40 (@) in BCC field (bug?)
+	// so, don't encode it.
+	$search = array('%40', '%2C');
+	$replace = array('@', ',');
+	$mail_parms = array();
+	foreach ($params as $var => $value) {
+		switch ($var) {
+			case 'cc':
+			case 'bcc':
+			case 'followupto':
+				if (!empty($value)) {
+					$mail_parms[] = $var . '=' . str_replace($search, $replace, rawurlencode($value));
+				}
+				break;
+
+			case 'subject':
+			case 'newsgroups':
+				$mail_parms[] = $var . '=' . rawurlencode($value);
+				break;
+
+			case 'extra':
+			case 'text':
+				$$var = $value;
+
+			default:
+		}
+	}
+
+	if ($mail_parms) {
+		$address .= '?' . join('&', $mail_parms);
+	}
+
+	$encode = (empty($params[ 'encode' ])) ? 'none' : $params[ 'encode' ];
+	if (!isset($_allowed_encoding[ $encode ])) {
+		trigger_error("mailto: 'encode' parameter must be none, javascript, javascript_charcode or hex",
+					  E_USER_WARNING);
+
+		return;
+	}
+	if ($encode == 'javascript') {
+		$string = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
+
+		$js_encode = '';
+		for ($x = 0, $_length = strlen($string); $x < $_length; $x ++) {
+			$js_encode .= '%' . bin2hex($string[ $x ]);
+		}
+
+		return '<script type="text/javascript">eval(unescape(\'' . $js_encode . '\'))</script>';
+	} elseif ($encode == 'javascript_charcode') {
+		$string = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
+
+		for ($x = 0, $y = strlen($string); $x < $y; $x ++) {
+			$ord[] = ord($string[ $x ]);
+		}
+
+		$_ret = "<script type=\"text/javascript\" language=\"javascript\">\n" . "{document.write(String.fromCharCode(" .
+				implode(',', $ord) . "))" . "}\n" . "</script>\n";
+
+		return $_ret;
+	} elseif ($encode == 'hex') {
+		preg_match('!^(.*)(\?.*)$!', $address, $match);
+		if (!empty($match[ 2 ])) {
+			trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.", E_USER_WARNING);
+
+			return;
+		}
+		$address_encode = '';
+		for ($x = 0, $_length = strlen($address); $x < $_length; $x ++) {
+			if (preg_match('!\w!' . Smarty::$_UTF8_MODIFIER, $address[ $x ])) {
+				$address_encode .= '%' . bin2hex($address[ $x ]);
+			} else {
+				$address_encode .= $address[ $x ];
+			}
+		}
+		$text_encode = '';
+		for ($x = 0, $_length = strlen($text); $x < $_length; $x ++) {
+			$text_encode .= '&#x' . bin2hex($text[ $x ]) . ';';
+		}
+
+		$mailto = "&#109;&#97;&#105;&#108;&#116;&#111;&#58;";
+
+		return '<a href="' . $mailto . $address_encode . '" ' . $extra . '>' . $text_encode . '</a>';
+	} else {
+		// no encoding
+		return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
+	}
 }

Spacing +15 added lines, -15 removed lines

@@ -54,12 +54,12 @@ 
         array('javascript' => true, 'javascript_charcode' => true, 'hex' => true, 'none' => true);
     $extra = '';
 
-    if (empty($params[ 'address' ])) {
+    if (empty($params['address'])) {
         trigger_error("mailto: missing 'address' parameter", E_USER_WARNING);
 
         return;
     } else {
-        $address = $params[ 'address' ];
+        $address = $params['address'];
     }
 
     $text = $address;
@@ -95,8 +95,8 @@ 
         $address .= '?' . join('&', $mail_parms);
     }
 
-    $encode = (empty($params[ 'encode' ])) ? 'none' : $params[ 'encode' ];
-    if (!isset($_allowed_encoding[ $encode ])) {
+    $encode = (empty($params['encode'])) ? 'none' : $params['encode'];
+    if (!isset($_allowed_encoding[$encode])) {
         trigger_error("mailto: 'encode' parameter must be none, javascript, javascript_charcode or hex",
                       E_USER_WARNING);
 
@@ -106,16 +106,16 @@ 
         $string = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
 
         $js_encode = '';
-        for ($x = 0, $_length = strlen($string); $x < $_length; $x ++) {
-            $js_encode .= '%' . bin2hex($string[ $x ]);
+        for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
+            $js_encode .= '%' . bin2hex($string[$x]);
         }
 
         return '<script type="text/javascript">eval(unescape(\'' . $js_encode . '\'))</script>';
     } elseif ($encode == 'javascript_charcode') {
         $string = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
 
-        for ($x = 0, $y = strlen($string); $x < $y; $x ++) {
-            $ord[] = ord($string[ $x ]);
+        for ($x = 0, $y = strlen($string); $x < $y; $x++) {
+            $ord[] = ord($string[$x]);
         }
 
         $_ret = "<script type=\"text/javascript\" language=\"javascript\">\n" . "{document.write(String.fromCharCode(" .
@@ -124,22 +124,22 @@ 
         return $_ret;
     } elseif ($encode == 'hex') {
         preg_match('!^(.*)(\?.*)$!', $address, $match);
-        if (!empty($match[ 2 ])) {
+        if (!empty($match[2])) {
             trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.", E_USER_WARNING);
 
             return;
         }
         $address_encode = '';
-        for ($x = 0, $_length = strlen($address); $x < $_length; $x ++) {
-            if (preg_match('!\w!' . Smarty::$_UTF8_MODIFIER, $address[ $x ])) {
-                $address_encode .= '%' . bin2hex($address[ $x ]);
+        for ($x = 0, $_length = strlen($address); $x < $_length; $x++) {
+            if (preg_match('!\w!' . Smarty::$_UTF8_MODIFIER, $address[$x])) {
+                $address_encode .= '%' . bin2hex($address[$x]);
             } else {
-                $address_encode .= $address[ $x ];
+                $address_encode .= $address[$x];
             }
         }
         $text_encode = '';
-        for ($x = 0, $_length = strlen($text); $x < $_length; $x ++) {
-            $text_encode .= '&#x' . bin2hex($text[ $x ]) . ';';
+        for ($x = 0, $_length = strlen($text); $x < $_length; $x++) {
+            $text_encode .= '&#x' . bin2hex($text[$x]) . ';';
         }
 
         $mailto = "&#109;&#97;&#105;&#108;&#116;&#111;&#58;";

libraries/Smarty/libs/plugins/function.html_checkboxes.php

Indentation +197 added lines, -197 removed lines

@@ -45,205 +45,205 @@
  */
 function smarty_function_html_checkboxes($params, $template)
 {
-    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-
-    $name = 'checkbox';
-    $values = null;
-    $options = null;
-    $selected = array();
-    $separator = '';
-    $escape = true;
-    $labels = true;
-    $label_ids = false;
-    $output = null;
-
-    $extra = '';
-
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
-            case 'name':
-            case 'separator':
-                $$_key = (string) $_val;
-                break;
-
-            case 'escape':
-            case 'labels':
-            case 'label_ids':
-                $$_key = (bool) $_val;
-                break;
-
-            case 'options':
-                $$_key = (array) $_val;
-                break;
-
-            case 'values':
-            case 'output':
-                $$_key = array_values((array) $_val);
-                break;
-
-            case 'checked':
-            case 'selected':
-                if (is_array($_val)) {
-                    $selected = array();
-                    foreach ($_val as $_sel) {
-                        if (is_object($_sel)) {
-                            if (method_exists($_sel, "__toString")) {
-                                $_sel = smarty_function_escape_special_chars((string) $_sel->__toString());
-                            } else {
-                                trigger_error("html_checkboxes: selected attribute contains an object of class '" .
-                                              get_class($_sel) . "' without __toString() method", E_USER_NOTICE);
-                                continue;
-                            }
-                        } else {
-                            $_sel = smarty_function_escape_special_chars((string) $_sel);
-                        }
-                        $selected[ $_sel ] = true;
-                    }
-                } elseif (is_object($_val)) {
-                    if (method_exists($_val, "__toString")) {
-                        $selected = smarty_function_escape_special_chars((string) $_val->__toString());
-                    } else {
-                        trigger_error("html_checkboxes: selected attribute is an object of class '" . get_class($_val) .
-                                      "' without __toString() method", E_USER_NOTICE);
-                    }
-                } else {
-                    $selected = smarty_function_escape_special_chars((string) $_val);
-                }
-                break;
-
-            case 'checkboxes':
-                trigger_error('html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead',
-                              E_USER_WARNING);
-                $options = (array) $_val;
-                break;
-
-            case 'assign':
-                break;
-
-            case 'strict':
-                break;
-
-            case 'disabled':
-            case 'readonly':
-                if (!empty($params[ 'strict' ])) {
-                    if (!is_scalar($_val)) {
-                        trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
-                                      E_USER_NOTICE);
-                    }
-
-                    if ($_val === true || $_val === $_key) {
-                        $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
-                    }
-
-                    break;
-                }
-            // omit break; to fall through!
-
-            default:
-                if (!is_array($_val)) {
-                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
-                } else {
-                    trigger_error("html_checkboxes: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    if (!isset($options) && !isset($values)) {
-        return '';
-    } /* raise error here? */
-
-    $_html_result = array();
-
-    if (isset($options)) {
-        foreach ($options as $_key => $_val) {
-            $_html_result[] =
-                smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
-                                                       $label_ids, $escape);
-        }
-    } else {
-        foreach ($values as $_i => $_key) {
-            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
-            $_html_result[] =
-                smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
-                                                       $label_ids, $escape);
-        }
-    }
-
-    if (!empty($params[ 'assign' ])) {
-        $template->assign($params[ 'assign' ], $_html_result);
-    } else {
-        return implode("\n", $_html_result);
-    }
+	require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
+
+	$name = 'checkbox';
+	$values = null;
+	$options = null;
+	$selected = array();
+	$separator = '';
+	$escape = true;
+	$labels = true;
+	$label_ids = false;
+	$output = null;
+
+	$extra = '';
+
+	foreach ($params as $_key => $_val) {
+		switch ($_key) {
+			case 'name':
+			case 'separator':
+				$$_key = (string) $_val;
+				break;
+
+			case 'escape':
+			case 'labels':
+			case 'label_ids':
+				$$_key = (bool) $_val;
+				break;
+
+			case 'options':
+				$$_key = (array) $_val;
+				break;
+
+			case 'values':
+			case 'output':
+				$$_key = array_values((array) $_val);
+				break;
+
+			case 'checked':
+			case 'selected':
+				if (is_array($_val)) {
+					$selected = array();
+					foreach ($_val as $_sel) {
+						if (is_object($_sel)) {
+							if (method_exists($_sel, "__toString")) {
+								$_sel = smarty_function_escape_special_chars((string) $_sel->__toString());
+							} else {
+								trigger_error("html_checkboxes: selected attribute contains an object of class '" .
+											  get_class($_sel) . "' without __toString() method", E_USER_NOTICE);
+								continue;
+							}
+						} else {
+							$_sel = smarty_function_escape_special_chars((string) $_sel);
+						}
+						$selected[ $_sel ] = true;
+					}
+				} elseif (is_object($_val)) {
+					if (method_exists($_val, "__toString")) {
+						$selected = smarty_function_escape_special_chars((string) $_val->__toString());
+					} else {
+						trigger_error("html_checkboxes: selected attribute is an object of class '" . get_class($_val) .
+									  "' without __toString() method", E_USER_NOTICE);
+					}
+				} else {
+					$selected = smarty_function_escape_special_chars((string) $_val);
+				}
+				break;
+
+			case 'checkboxes':
+				trigger_error('html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead',
+							  E_USER_WARNING);
+				$options = (array) $_val;
+				break;
+
+			case 'assign':
+				break;
+
+			case 'strict':
+				break;
+
+			case 'disabled':
+			case 'readonly':
+				if (!empty($params[ 'strict' ])) {
+					if (!is_scalar($_val)) {
+						trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
+									  E_USER_NOTICE);
+					}
+
+					if ($_val === true || $_val === $_key) {
+						$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
+					}
+
+					break;
+				}
+			// omit break; to fall through!
+
+			default:
+				if (!is_array($_val)) {
+					$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+				} else {
+					trigger_error("html_checkboxes: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+				}
+				break;
+		}
+	}
+
+	if (!isset($options) && !isset($values)) {
+		return '';
+	} /* raise error here? */
+
+	$_html_result = array();
+
+	if (isset($options)) {
+		foreach ($options as $_key => $_val) {
+			$_html_result[] =
+				smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
+													   $label_ids, $escape);
+		}
+	} else {
+		foreach ($values as $_i => $_key) {
+			$_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
+			$_html_result[] =
+				smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
+													   $label_ids, $escape);
+		}
+	}
+
+	if (!empty($params[ 'assign' ])) {
+		$template->assign($params[ 'assign' ], $_html_result);
+	} else {
+		return implode("\n", $_html_result);
+	}
 }
 
 function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels,
-                                                $label_ids, $escape = true)
+												$label_ids, $escape = true)
 {
-    $_output = '';
-
-    if (is_object($value)) {
-        if (method_exists($value, "__toString")) {
-            $value = (string) $value->__toString();
-        } else {
-            trigger_error("html_options: value is an object of class '" . get_class($value) .
-                          "' without __toString() method", E_USER_NOTICE);
-
-            return '';
-        }
-    } else {
-        $value = (string) $value;
-    }
-
-    if (is_object($output)) {
-        if (method_exists($output, "__toString")) {
-            $output = (string) $output->__toString();
-        } else {
-            trigger_error("html_options: output is an object of class '" . get_class($output) .
-                          "' without __toString() method", E_USER_NOTICE);
-
-            return '';
-        }
-    } else {
-        $output = (string) $output;
-    }
-
-    if ($labels) {
-        if ($label_ids) {
-            $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_',
-                                                                     $name . '_' . $value));
-            $_output .= '<label for="' . $_id . '">';
-        } else {
-            $_output .= '<label>';
-        }
-    }
-
-    $name = smarty_function_escape_special_chars($name);
-    $value = smarty_function_escape_special_chars($value);
-    if ($escape) {
-        $output = smarty_function_escape_special_chars($output);
-    }
-
-    $_output .= '<input type="checkbox" name="' . $name . '[]" value="' . $value . '"';
-
-    if ($labels && $label_ids) {
-        $_output .= ' id="' . $_id . '"';
-    }
-
-    if (is_array($selected)) {
-        if (isset($selected[ $value ])) {
-            $_output .= ' checked="checked"';
-        }
-    } elseif ($value === $selected) {
-        $_output .= ' checked="checked"';
-    }
-
-    $_output .= $extra . ' />' . $output;
-    if ($labels) {
-        $_output .= '</label>';
-    }
-
-    $_output .= $separator;
-
-    return $_output;
+	$_output = '';
+
+	if (is_object($value)) {
+		if (method_exists($value, "__toString")) {
+			$value = (string) $value->__toString();
+		} else {
+			trigger_error("html_options: value is an object of class '" . get_class($value) .
+						  "' without __toString() method", E_USER_NOTICE);
+
+			return '';
+		}
+	} else {
+		$value = (string) $value;
+	}
+
+	if (is_object($output)) {
+		if (method_exists($output, "__toString")) {
+			$output = (string) $output->__toString();
+		} else {
+			trigger_error("html_options: output is an object of class '" . get_class($output) .
+						  "' without __toString() method", E_USER_NOTICE);
+
+			return '';
+		}
+	} else {
+		$output = (string) $output;
+	}
+
+	if ($labels) {
+		if ($label_ids) {
+			$_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_',
+																	 $name . '_' . $value));
+			$_output .= '<label for="' . $_id . '">';
+		} else {
+			$_output .= '<label>';
+		}
+	}
+
+	$name = smarty_function_escape_special_chars($name);
+	$value = smarty_function_escape_special_chars($value);
+	if ($escape) {
+		$output = smarty_function_escape_special_chars($output);
+	}
+
+	$_output .= '<input type="checkbox" name="' . $name . '[]" value="' . $value . '"';
+
+	if ($labels && $label_ids) {
+		$_output .= ' id="' . $_id . '"';
+	}
+
+	if (is_array($selected)) {
+		if (isset($selected[ $value ])) {
+			$_output .= ' checked="checked"';
+		}
+	} elseif ($value === $selected) {
+		$_output .= ' checked="checked"';
+	}
+
+	$_output .= $extra . ' />' . $output;
+	if ($labels) {
+		$_output .= '</label>';
+	}
+
+	$_output .= $separator;
+
+	return $_output;
 }

Spacing +6 added lines, -6 removed lines

@@ -97,7 +97,7 @@ 
                         } else {
                             $_sel = smarty_function_escape_special_chars((string) $_sel);
                         }
-                        $selected[ $_sel ] = true;
+                        $selected[$_sel] = true;
                     }
                 } elseif (is_object($_val)) {
                     if (method_exists($_val, "__toString")) {
@@ -125,7 +125,7 @@ 
 
             case 'disabled':
             case 'readonly':
-                if (!empty($params[ 'strict' ])) {
+                if (!empty($params['strict'])) {
                     if (!is_scalar($_val)) {
                         trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
                                       E_USER_NOTICE);
@@ -163,15 +163,15 @@ 
         }
     } else {
         foreach ($values as $_i => $_key) {
-            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
+            $_val = isset($output[$_i]) ? $output[$_i] : '';
             $_html_result[] =
                 smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
                                                        $label_ids, $escape);
         }
     }
 
-    if (!empty($params[ 'assign' ])) {
-        $template->assign($params[ 'assign' ], $_html_result);
+    if (!empty($params['assign'])) {
+        $template->assign($params['assign'], $_html_result);
     } else {
         return implode("\n", $_html_result);
     }
@@ -231,7 +231,7 @@ 
     }
 
     if (is_array($selected)) {
-        if (isset($selected[ $value ])) {
+        if (isset($selected[$value])) {
             $_output .= ' checked="checked"';
         }
     } elseif ($value === $selected) {