YetiForceCompany / YetiForceCRM

libraries/Smarty/libs/plugins/outputfilter.trimwhitespace.php

Indentation +55 added lines, -55 removed lines

@@ -19,70 +19,70 @@
  */
 function smarty_outputfilter_trimwhitespace($source)
 {
-    $store = array();
-    $_store = 0;
-    $_offset = 0;
+	$store = array();
+	$_store = 0;
+	$_offset = 0;
 
-    // Unify Line-Breaks to \n
-    $source = preg_replace("/\015\012|\015|\012/", "\n", $source);
+	// Unify Line-Breaks to \n
+	$source = preg_replace("/\015\012|\015|\012/", "\n", $source);
 
-    // capture Internet Explorer and KnockoutJS Conditional Comments
-    if (preg_match_all('#<!--((\[[^\]]+\]>.*?<!\[[^\]]+\])|(\s*/?ko\s+.+))-->#is', $source, $matches,
-                       PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
-        foreach ($matches as $match) {
-            $store[] = $match[ 0 ][ 0 ];
-            $_length = strlen($match[ 0 ][ 0 ]);
-            $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
-            $source = substr_replace($source, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
+	// capture Internet Explorer and KnockoutJS Conditional Comments
+	if (preg_match_all('#<!--((\[[^\]]+\]>.*?<!\[[^\]]+\])|(\s*/?ko\s+.+))-->#is', $source, $matches,
+					   PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+		foreach ($matches as $match) {
+			$store[] = $match[ 0 ][ 0 ];
+			$_length = strlen($match[ 0 ][ 0 ]);
+			$replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
+			$source = substr_replace($source, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
 
-            $_offset += $_length - strlen($replace);
-            $_store ++;
-        }
-    }
+			$_offset += $_length - strlen($replace);
+			$_store ++;
+		}
+	}
 
-    // Strip all HTML-Comments
-    // yes, even the ones in <script> - see http://stackoverflow.com/a/808850/515124
-    $source = preg_replace('#<!--.*?-->#ms', '', $source);
+	// Strip all HTML-Comments
+	// yes, even the ones in <script> - see http://stackoverflow.com/a/808850/515124
+	$source = preg_replace('#<!--.*?-->#ms', '', $source);
 
-    // capture html elements not to be messed with
-    $_offset = 0;
-    if (preg_match_all('#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is',
-                       $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
-        foreach ($matches as $match) {
-            $store[] = $match[ 0 ][ 0 ];
-            $_length = strlen($match[ 0 ][ 0 ]);
-            $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
-            $source = substr_replace($source, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
+	// capture html elements not to be messed with
+	$_offset = 0;
+	if (preg_match_all('#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is',
+					   $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+		foreach ($matches as $match) {
+			$store[] = $match[ 0 ][ 0 ];
+			$_length = strlen($match[ 0 ][ 0 ]);
+			$replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
+			$source = substr_replace($source, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
 
-            $_offset += $_length - strlen($replace);
-            $_store ++;
-        }
-    }
+			$_offset += $_length - strlen($replace);
+			$_store ++;
+		}
+	}
 
-    $expressions = array(// replace multiple spaces between tags by a single space
-                         // can't remove them entirely, becaue that might break poorly implemented CSS display:inline-block elements
-                         '#(:SMARTY@!@|>)\s+(?=@!@SMARTY:|<)#s' => '\1 \2',
-                         // remove spaces between attributes (but not in attribute values!)
-                         '#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
-                         // note: for some very weird reason trim() seems to remove spaces inside attributes.
-                         // maybe a \0 byte or something is interfering?
-                         '#^\s+<#Ss' => '<', '#>\s+$#Ss' => '>',);
+	$expressions = array(// replace multiple spaces between tags by a single space
+						 // can't remove them entirely, becaue that might break poorly implemented CSS display:inline-block elements
+						 '#(:SMARTY@!@|>)\s+(?=@!@SMARTY:|<)#s' => '\1 \2',
+						 // remove spaces between attributes (but not in attribute values!)
+						 '#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
+						 // note: for some very weird reason trim() seems to remove spaces inside attributes.
+						 // maybe a \0 byte or something is interfering?
+						 '#^\s+<#Ss' => '<', '#>\s+$#Ss' => '>',);
 
-    $source = preg_replace(array_keys($expressions), array_values($expressions), $source);
-    // note: for some very weird reason trim() seems to remove spaces inside attributes.
-    // maybe a \0 byte or something is interfering?
+	$source = preg_replace(array_keys($expressions), array_values($expressions), $source);
+	// note: for some very weird reason trim() seems to remove spaces inside attributes.
+	// maybe a \0 byte or something is interfering?
 
-    $_offset = 0;
-    if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
-        foreach ($matches as $match) {
-            $_length = strlen($match[ 0 ][ 0 ]);
-            $replace = $store[ $match[ 1 ][ 0 ] ];
-            $source = substr_replace($source, $replace, $match[ 0 ][ 1 ] + $_offset, $_length);
+	$_offset = 0;
+	if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+		foreach ($matches as $match) {
+			$_length = strlen($match[ 0 ][ 0 ]);
+			$replace = $store[ $match[ 1 ][ 0 ] ];
+			$source = substr_replace($source, $replace, $match[ 0 ][ 1 ] + $_offset, $_length);
 
-            $_offset += strlen($replace) - $_length;
-            $_store ++;
-        }
-    }
+			$_offset += strlen($replace) - $_length;
+			$_store ++;
+		}
+	}
 
-    return $source;
+	return $source;
 }

Spacing +12 added lines, -12 removed lines

@@ -30,13 +30,13 @@ 
     if (preg_match_all('#<!--((\[[^\]]+\]>.*?<!\[[^\]]+\])|(\s*/?ko\s+.+))-->#is', $source, $matches,
                        PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
         foreach ($matches as $match) {
-            $store[] = $match[ 0 ][ 0 ];
-            $_length = strlen($match[ 0 ][ 0 ]);
+            $store[] = $match[0][0];
+            $_length = strlen($match[0][0]);
             $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
-            $source = substr_replace($source, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
+            $source = substr_replace($source, $replace, $match[0][1] - $_offset, $_length);
 
             $_offset += $_length - strlen($replace);
-            $_store ++;
+            $_store++;
         }
     }
 
@@ -49,13 +49,13 @@ 
     if (preg_match_all('#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is',
                        $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
         foreach ($matches as $match) {
-            $store[] = $match[ 0 ][ 0 ];
-            $_length = strlen($match[ 0 ][ 0 ]);
+            $store[] = $match[0][0];
+            $_length = strlen($match[0][0]);
             $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
-            $source = substr_replace($source, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
+            $source = substr_replace($source, $replace, $match[0][1] - $_offset, $_length);
 
             $_offset += $_length - strlen($replace);
-            $_store ++;
+            $_store++;
         }
     }
 
@@ -75,12 +75,12 @@ 
     $_offset = 0;
     if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
         foreach ($matches as $match) {
-            $_length = strlen($match[ 0 ][ 0 ]);
-            $replace = $store[ $match[ 1 ][ 0 ] ];
-            $source = substr_replace($source, $replace, $match[ 0 ][ 1 ] + $_offset, $_length);
+            $_length = strlen($match[0][0]);
+            $replace = $store[$match[1][0]];
+            $source = substr_replace($source, $replace, $match[0][1] + $_offset, $_length);
 
             $_offset += strlen($replace) - $_length;
-            $_store ++;
+            $_store++;
         }
     }
 

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

Indentation +2 added lines, -2 removed lines

@@ -22,6 +22,6 @@
  */
 function smarty_modifiercompiler_count_sentences($params)
 {
-    // find periods, question marks, exclamation marks with a word before but not after.
-    return 'preg_match_all("#\w[\.\?\!](\W|$)#S' . Smarty::$_UTF8_MODIFIER . '", ' . $params[ 0 ] . ', $tmp)';
+	// find periods, question marks, exclamation marks with a word before but not after.
+	return 'preg_match_all("#\w[\.\?\!](\W|$)#S' . Smarty::$_UTF8_MODIFIER . '", ' . $params[ 0 ] . ', $tmp)';
 }

Spacing +1 added lines, -1 removed lines

@@ -23,5 +23,5 @@
 function smarty_modifiercompiler_count_sentences($params)
 {
     // find periods, question marks, exclamation marks with a word before but not after.
-    return 'preg_match_all("#\w[\.\?\!](\W|$)#S' . Smarty::$_UTF8_MODIFIER . '", ' . $params[ 0 ] . ', $tmp)';
+    return 'preg_match_all("#\w[\.\?\!](\W|$)#S' . Smarty::$_UTF8_MODIFIER . '", ' . $params[0] . ', $tmp)';
 }

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

Indentation +9 added lines, -9 removed lines

@@ -21,15 +21,15 @@
  */
 function smarty_modifiercompiler_default($params)
 {
-    $output = $params[ 0 ];
-    if (!isset($params[ 1 ])) {
-        $params[ 1 ] = "''";
-    }
+	$output = $params[ 0 ];
+	if (!isset($params[ 1 ])) {
+		$params[ 1 ] = "''";
+	}
 
-    array_shift($params);
-    foreach ($params as $param) {
-        $output = '(($tmp = @' . $output . ')===null||$tmp===\'\' ? ' . $param . ' : $tmp)';
-    }
+	array_shift($params);
+	foreach ($params as $param) {
+		$output = '(($tmp = @' . $output . ')===null||$tmp===\'\' ? ' . $param . ' : $tmp)';
+	}
 
-    return $output;
+	return $output;
 }

Spacing +3 added lines, -3 removed lines

@@ -21,9 +21,9 @@
  */
 function smarty_modifiercompiler_default($params)
 {
-    $output = $params[ 0 ];
-    if (!isset($params[ 1 ])) {
-        $params[ 1 ] = "''";
+    $output = $params[0];
+    if (!isset($params[1])) {
+        $params[1] = "''";
     }
 
     array_shift($params);

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

Indentation +44 added lines, -44 removed lines

@@ -7,49 +7,49 @@
  */
 if (!function_exists('smarty_mb_str_replace')) {
 
-    /**
-     * Multibyte string replace
-     *
-     * @param  string $search  the string to be searched
-     * @param  string $replace the replacement string
-     * @param  string $subject the source string
-     * @param  int    &$count  number of matches found
-     *
-     * @return string replaced string
-     * @author Rodney Rehm
-     */
-    function smarty_mb_str_replace($search, $replace, $subject, &$count = 0)
-    {
-        if (!is_array($search) && is_array($replace)) {
-            return false;
-        }
-        if (is_array($subject)) {
-            // call mb_replace for each single string in $subject
-            foreach ($subject as &$string) {
-                $string = smarty_mb_str_replace($search, $replace, $string, $c);
-                $count += $c;
-            }
-        } elseif (is_array($search)) {
-            if (!is_array($replace)) {
-                foreach ($search as &$string) {
-                    $subject = smarty_mb_str_replace($string, $replace, $subject, $c);
-                    $count += $c;
-                }
-            } else {
-                $n = max(count($search), count($replace));
-                while ($n --) {
-                    $subject = smarty_mb_str_replace(current($search), current($replace), $subject, $c);
-                    $count += $c;
-                    next($search);
-                    next($replace);
-                }
-            }
-        } else {
-            $parts = mb_split(preg_quote($search), $subject);
-            $count = count($parts) - 1;
-            $subject = implode($replace, $parts);
-        }
+	/**
+	 * Multibyte string replace
+	 *
+	 * @param  string $search  the string to be searched
+	 * @param  string $replace the replacement string
+	 * @param  string $subject the source string
+	 * @param  int    &$count  number of matches found
+	 *
+	 * @return string replaced string
+	 * @author Rodney Rehm
+	 */
+	function smarty_mb_str_replace($search, $replace, $subject, &$count = 0)
+	{
+		if (!is_array($search) && is_array($replace)) {
+			return false;
+		}
+		if (is_array($subject)) {
+			// call mb_replace for each single string in $subject
+			foreach ($subject as &$string) {
+				$string = smarty_mb_str_replace($search, $replace, $string, $c);
+				$count += $c;
+			}
+		} elseif (is_array($search)) {
+			if (!is_array($replace)) {
+				foreach ($search as &$string) {
+					$subject = smarty_mb_str_replace($string, $replace, $subject, $c);
+					$count += $c;
+				}
+			} else {
+				$n = max(count($search), count($replace));
+				while ($n --) {
+					$subject = smarty_mb_str_replace(current($search), current($replace), $subject, $c);
+					$count += $c;
+					next($search);
+					next($replace);
+				}
+			}
+		} else {
+			$parts = mb_split(preg_quote($search), $subject);
+			$count = count($parts) - 1;
+			$subject = implode($replace, $parts);
+		}
 
-        return $subject;
-    }
+		return $subject;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
                 }
             } else {
                 $n = max(count($search), count($replace));
-                while ($n --) {
+                while ($n--) {
                     $subject = smarty_mb_str_replace(current($search), current($replace), $subject, $c);
                     $count += $c;
                     next($search);

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

Indentation +10 added lines, -10 removed lines

@@ -20,15 +20,15 @@
  */
 function smarty_function_escape_special_chars($string)
 {
-    if (!is_array($string)) {
-        if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
-            $string = htmlspecialchars($string, ENT_COMPAT, Smarty::$_CHARSET, false);
-        } else {
-            $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
-            $string = htmlspecialchars($string);
-            $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
-        }
-    }
+	if (!is_array($string)) {
+		if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
+			$string = htmlspecialchars($string, ENT_COMPAT, Smarty::$_CHARSET, false);
+		} else {
+			$string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
+			$string = htmlspecialchars($string);
+			$string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
+		}
+	}
 
-    return $string;
+	return $string;
 }

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

Indentation +5 added lines, -5 removed lines

@@ -24,11 +24,11 @@
  */
 function smarty_modifier_replace($string, $search, $replace)
 {
-    if (Smarty::$_MBSTRING) {
-        require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
+	if (Smarty::$_MBSTRING) {
+		require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
 
-        return smarty_mb_str_replace($search, $replace, $string);
-    }
+		return smarty_mb_str_replace($search, $replace, $string);
+	}
 
-    return str_replace($search, $replace, $string);
+	return str_replace($search, $replace, $string);
 }

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

Indentation +299 added lines, -299 removed lines

@@ -52,336 +52,336 @@
  */
 function smarty_function_html_select_date($params)
 {
-    // generate timestamps used for month names only
-    static $_month_timestamps = null;
-    static $_current_year = null;
-    if ($_month_timestamps === null) {
-        $_current_year = date('Y');
-        $_month_timestamps = array();
-        for ($i = 1; $i <= 12; $i ++) {
-            $_month_timestamps[ $i ] = mktime(0, 0, 0, $i, 1, 2000);
-        }
-    }
+	// generate timestamps used for month names only
+	static $_month_timestamps = null;
+	static $_current_year = null;
+	if ($_month_timestamps === null) {
+		$_current_year = date('Y');
+		$_month_timestamps = array();
+		for ($i = 1; $i <= 12; $i ++) {
+			$_month_timestamps[ $i ] = mktime(0, 0, 0, $i, 1, 2000);
+		}
+	}
 
-    /* Default values. */
-    $prefix = "Date_";
-    $start_year = null;
-    $end_year = null;
-    $display_days = true;
-    $display_months = true;
-    $display_years = true;
-    $month_format = "%B";
-    /* Write months as numbers by default  GL */
-    $month_value_format = "%m";
-    $day_format = "%02d";
-    /* Write day values using this format MB */
-    $day_value_format = "%d";
-    $year_as_text = false;
-    /* Display years in reverse order? Ie. 2000,1999,.... */
-    $reverse_years = false;
-    /* Should the select boxes be part of an array when returned from PHP?
+	/* Default values. */
+	$prefix = "Date_";
+	$start_year = null;
+	$end_year = null;
+	$display_days = true;
+	$display_months = true;
+	$display_years = true;
+	$month_format = "%B";
+	/* Write months as numbers by default  GL */
+	$month_value_format = "%m";
+	$day_format = "%02d";
+	/* Write day values using this format MB */
+	$day_value_format = "%d";
+	$year_as_text = false;
+	/* Display years in reverse order? Ie. 2000,1999,.... */
+	$reverse_years = false;
+	/* Should the select boxes be part of an array when returned from PHP?
        e.g. setting it to "birthday", would create "birthday[Day]",
        "birthday[Month]" & "birthday[Year]". Can be combined with prefix */
-    $field_array = null;
-    /* <select size>'s of the different <select> tags.
+	$field_array = null;
+	/* <select size>'s of the different <select> tags.
        If not set, uses default dropdown. */
-    $day_size = null;
-    $month_size = null;
-    $year_size = null;
-    /* Unparsed attributes common to *ALL* the <select>/<input> tags.
+	$day_size = null;
+	$month_size = null;
+	$year_size = null;
+	/* Unparsed attributes common to *ALL* the <select>/<input> tags.
        An example might be in the template: all_extra ='class ="foo"'. */
-    $all_extra = null;
-    /* Separate attributes for the tags. */
-    $day_extra = null;
-    $month_extra = null;
-    $year_extra = null;
-    /* Order in which to display the fields.
+	$all_extra = null;
+	/* Separate attributes for the tags. */
+	$day_extra = null;
+	$month_extra = null;
+	$year_extra = null;
+	/* Order in which to display the fields.
        "D" -> day, "M" -> month, "Y" -> year. */
-    $field_order = 'MDY';
-    /* String printed between the different fields. */
-    $field_separator = "\n";
-    $option_separator = "\n";
-    $time = null;
-    $extra_attrs = '';
-    $all_id = null;
-    $day_id = null;
-    $month_id = null;
-    $year_id = null;
+	$field_order = 'MDY';
+	/* String printed between the different fields. */
+	$field_separator = "\n";
+	$option_separator = "\n";
+	$time = null;
+	$extra_attrs = '';
+	$all_id = null;
+	$day_id = null;
+	$month_id = null;
+	$year_id = null;
 
-    foreach ($params as $_key => $_value) {
-        switch ($_key) {
-            case 'time':
-                if (!is_array($_value) && $_value !== null) {
-                    $time = smarty_make_timestamp($_value);
-                }
-                break;
+	foreach ($params as $_key => $_value) {
+		switch ($_key) {
+			case 'time':
+				if (!is_array($_value) && $_value !== null) {
+					$time = smarty_make_timestamp($_value);
+				}
+				break;
 
-            case 'month_names':
-                if (is_array($_value) && count($_value) == 12) {
-                    $$_key = $_value;
-                } else {
-                    trigger_error("html_select_date: month_names must be an array of 12 strings", E_USER_NOTICE);
-                }
-                break;
+			case 'month_names':
+				if (is_array($_value) && count($_value) == 12) {
+					$$_key = $_value;
+				} else {
+					trigger_error("html_select_date: month_names must be an array of 12 strings", E_USER_NOTICE);
+				}
+				break;
 
-            case 'prefix':
-            case 'field_array':
-            case 'start_year':
-            case 'end_year':
-            case 'day_format':
-            case 'day_value_format':
-            case 'month_format':
-            case 'month_value_format':
-            case 'day_size':
-            case 'month_size':
-            case 'year_size':
-            case 'all_extra':
-            case 'day_extra':
-            case 'month_extra':
-            case 'year_extra':
-            case 'field_order':
-            case 'field_separator':
-            case 'option_separator':
-            case 'all_empty':
-            case 'month_empty':
-            case 'day_empty':
-            case 'year_empty':
-            case 'all_id':
-            case 'month_id':
-            case 'day_id':
-            case 'year_id':
-                $$_key = (string) $_value;
-                break;
+			case 'prefix':
+			case 'field_array':
+			case 'start_year':
+			case 'end_year':
+			case 'day_format':
+			case 'day_value_format':
+			case 'month_format':
+			case 'month_value_format':
+			case 'day_size':
+			case 'month_size':
+			case 'year_size':
+			case 'all_extra':
+			case 'day_extra':
+			case 'month_extra':
+			case 'year_extra':
+			case 'field_order':
+			case 'field_separator':
+			case 'option_separator':
+			case 'all_empty':
+			case 'month_empty':
+			case 'day_empty':
+			case 'year_empty':
+			case 'all_id':
+			case 'month_id':
+			case 'day_id':
+			case 'year_id':
+				$$_key = (string) $_value;
+				break;
 
-            case 'display_days':
-            case 'display_months':
-            case 'display_years':
-            case 'year_as_text':
-            case 'reverse_years':
-                $$_key = (bool) $_value;
-                break;
+			case 'display_days':
+			case 'display_months':
+			case 'display_years':
+			case 'year_as_text':
+			case 'reverse_years':
+				$$_key = (bool) $_value;
+				break;
 
-            default:
-                if (!is_array($_value)) {
-                    $extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
-                } else {
-                    trigger_error("html_select_date: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
+			default:
+				if (!is_array($_value)) {
+					$extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
+				} else {
+					trigger_error("html_select_date: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+				}
+				break;
+		}
+	}
 
-    // Note: date() is faster than strftime()
-    // Note: explode(date()) is faster than date() date() date()
-    if (isset($params[ 'time' ]) && is_array($params[ 'time' ])) {
-        if (isset($params[ 'time' ][ $prefix . 'Year' ])) {
-            // $_REQUEST[$field_array] given
-            foreach (array('Y' => 'Year', 'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName =
-                    isset($params[ 'time' ][ $prefix . $_elementName ]) ? $params[ 'time' ][ $prefix . $_elementName ] :
-                        date($_elementKey);
-            }
-        } elseif (isset($params[ 'time' ][ $field_array ][ $prefix . 'Year' ])) {
-            // $_REQUEST given
-            foreach (array('Y' => 'Year', 'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName = isset($params[ 'time' ][ $field_array ][ $prefix . $_elementName ]) ?
-                    $params[ 'time' ][ $field_array ][ $prefix . $_elementName ] : date($_elementKey);
-            }
-        } else {
-            // no date found, use NOW
-            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
-        }
-    } elseif ($time === null) {
-        if (array_key_exists('time', $params)) {
-            $_year = $_month = $_day = $time = null;
-        } else {
-            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
-        }
-    } else {
-        list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d', $time));
-    }
+	// Note: date() is faster than strftime()
+	// Note: explode(date()) is faster than date() date() date()
+	if (isset($params[ 'time' ]) && is_array($params[ 'time' ])) {
+		if (isset($params[ 'time' ][ $prefix . 'Year' ])) {
+			// $_REQUEST[$field_array] given
+			foreach (array('Y' => 'Year', 'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
+				$_variableName = '_' . strtolower($_elementName);
+				$$_variableName =
+					isset($params[ 'time' ][ $prefix . $_elementName ]) ? $params[ 'time' ][ $prefix . $_elementName ] :
+						date($_elementKey);
+			}
+		} elseif (isset($params[ 'time' ][ $field_array ][ $prefix . 'Year' ])) {
+			// $_REQUEST given
+			foreach (array('Y' => 'Year', 'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
+				$_variableName = '_' . strtolower($_elementName);
+				$$_variableName = isset($params[ 'time' ][ $field_array ][ $prefix . $_elementName ]) ?
+					$params[ 'time' ][ $field_array ][ $prefix . $_elementName ] : date($_elementKey);
+			}
+		} else {
+			// no date found, use NOW
+			list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
+		}
+	} elseif ($time === null) {
+		if (array_key_exists('time', $params)) {
+			$_year = $_month = $_day = $time = null;
+		} else {
+			list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
+		}
+	} else {
+		list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d', $time));
+	}
 
-    // make syntax "+N" or "-N" work with $start_year and $end_year
-    // Note preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match) is slower than trim+substr
-    foreach (array('start', 'end') as $key) {
-        $key .= '_year';
-        $t = $$key;
-        if ($t === null) {
-            $$key = (int) $_current_year;
-        } elseif ($t[ 0 ] == '+') {
-            $$key = (int) ($_current_year + (int) trim(substr($t, 1)));
-        } elseif ($t[ 0 ] == '-') {
-            $$key = (int) ($_current_year - (int) trim(substr($t, 1)));
-        } else {
-            $$key = (int) $$key;
-        }
-    }
+	// make syntax "+N" or "-N" work with $start_year and $end_year
+	// Note preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match) is slower than trim+substr
+	foreach (array('start', 'end') as $key) {
+		$key .= '_year';
+		$t = $$key;
+		if ($t === null) {
+			$$key = (int) $_current_year;
+		} elseif ($t[ 0 ] == '+') {
+			$$key = (int) ($_current_year + (int) trim(substr($t, 1)));
+		} elseif ($t[ 0 ] == '-') {
+			$$key = (int) ($_current_year - (int) trim(substr($t, 1)));
+		} else {
+			$$key = (int) $$key;
+		}
+	}
 
-    // flip for ascending or descending
-    if (($start_year > $end_year && !$reverse_years) || ($start_year < $end_year && $reverse_years)) {
-        $t = $end_year;
-        $end_year = $start_year;
-        $start_year = $t;
-    }
+	// flip for ascending or descending
+	if (($start_year > $end_year && !$reverse_years) || ($start_year < $end_year && $reverse_years)) {
+		$t = $end_year;
+		$end_year = $start_year;
+		$start_year = $t;
+	}
 
-    // generate year <select> or <input>
-    if ($display_years) {
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Year]') : ($prefix . 'Year');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($year_extra) {
-            $_extra .= ' ' . $year_extra;
-        }
+	// generate year <select> or <input>
+	if ($display_years) {
+		$_extra = '';
+		$_name = $field_array ? ($field_array . '[' . $prefix . 'Year]') : ($prefix . 'Year');
+		if ($all_extra) {
+			$_extra .= ' ' . $all_extra;
+		}
+		if ($year_extra) {
+			$_extra .= ' ' . $year_extra;
+		}
 
-        if ($year_as_text) {
-            $_html_years =
-                '<input type="text" name="' . $_name . '" value="' . $_year . '" size="4" maxlength="4"' . $_extra .
-                $extra_attrs . ' />';
-        } else {
-            $_html_years = '<select name="' . $_name . '"';
-            if ($year_id !== null || $all_id !== null) {
-                $_html_years .= ' id="' . smarty_function_escape_special_chars($year_id !== null ?
-                                                                                   ($year_id ? $year_id : $_name) :
-                                                                                   ($all_id ? ($all_id . $_name) :
-                                                                                       $_name)) . '"';
-            }
-            if ($year_size) {
-                $_html_years .= ' size="' . $year_size . '"';
-            }
-            $_html_years .= $_extra . $extra_attrs . '>' . $option_separator;
+		if ($year_as_text) {
+			$_html_years =
+				'<input type="text" name="' . $_name . '" value="' . $_year . '" size="4" maxlength="4"' . $_extra .
+				$extra_attrs . ' />';
+		} else {
+			$_html_years = '<select name="' . $_name . '"';
+			if ($year_id !== null || $all_id !== null) {
+				$_html_years .= ' id="' . smarty_function_escape_special_chars($year_id !== null ?
+																				   ($year_id ? $year_id : $_name) :
+																				   ($all_id ? ($all_id . $_name) :
+																					   $_name)) . '"';
+			}
+			if ($year_size) {
+				$_html_years .= ' size="' . $year_size . '"';
+			}
+			$_html_years .= $_extra . $extra_attrs . '>' . $option_separator;
 
-            if (isset($year_empty) || isset($all_empty)) {
-                $_html_years .= '<option value="">' . (isset($year_empty) ? $year_empty : $all_empty) . '</option>' .
-                                $option_separator;
-            }
+			if (isset($year_empty) || isset($all_empty)) {
+				$_html_years .= '<option value="">' . (isset($year_empty) ? $year_empty : $all_empty) . '</option>' .
+								$option_separator;
+			}
 
-            $op = $start_year > $end_year ? - 1 : 1;
-            for ($i = $start_year; $op > 0 ? $i <= $end_year : $i >= $end_year; $i += $op) {
-                $_html_years .= '<option value="' . $i . '"' . ($_year == $i ? ' selected="selected"' : '') . '>' . $i .
-                                '</option>' . $option_separator;
-            }
+			$op = $start_year > $end_year ? - 1 : 1;
+			for ($i = $start_year; $op > 0 ? $i <= $end_year : $i >= $end_year; $i += $op) {
+				$_html_years .= '<option value="' . $i . '"' . ($_year == $i ? ' selected="selected"' : '') . '>' . $i .
+								'</option>' . $option_separator;
+			}
 
-            $_html_years .= '</select>';
-        }
-    }
+			$_html_years .= '</select>';
+		}
+	}
 
-    // generate month <select> or <input>
-    if ($display_months) {
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Month]') : ($prefix . 'Month');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($month_extra) {
-            $_extra .= ' ' . $month_extra;
-        }
+	// generate month <select> or <input>
+	if ($display_months) {
+		$_extra = '';
+		$_name = $field_array ? ($field_array . '[' . $prefix . 'Month]') : ($prefix . 'Month');
+		if ($all_extra) {
+			$_extra .= ' ' . $all_extra;
+		}
+		if ($month_extra) {
+			$_extra .= ' ' . $month_extra;
+		}
 
-        $_html_months = '<select name="' . $_name . '"';
-        if ($month_id !== null || $all_id !== null) {
-            $_html_months .= ' id="' . smarty_function_escape_special_chars($month_id !== null ?
-                                                                                ($month_id ? $month_id : $_name) :
-                                                                                ($all_id ? ($all_id . $_name) :
-                                                                                    $_name)) . '"';
-        }
-        if ($month_size) {
-            $_html_months .= ' size="' . $month_size . '"';
-        }
-        $_html_months .= $_extra . $extra_attrs . '>' . $option_separator;
+		$_html_months = '<select name="' . $_name . '"';
+		if ($month_id !== null || $all_id !== null) {
+			$_html_months .= ' id="' . smarty_function_escape_special_chars($month_id !== null ?
+																				($month_id ? $month_id : $_name) :
+																				($all_id ? ($all_id . $_name) :
+																					$_name)) . '"';
+		}
+		if ($month_size) {
+			$_html_months .= ' size="' . $month_size . '"';
+		}
+		$_html_months .= $_extra . $extra_attrs . '>' . $option_separator;
 
-        if (isset($month_empty) || isset($all_empty)) {
-            $_html_months .= '<option value="">' . (isset($month_empty) ? $month_empty : $all_empty) . '</option>' .
-                             $option_separator;
-        }
+		if (isset($month_empty) || isset($all_empty)) {
+			$_html_months .= '<option value="">' . (isset($month_empty) ? $month_empty : $all_empty) . '</option>' .
+							 $option_separator;
+		}
 
-        for ($i = 1; $i <= 12; $i ++) {
-            $_val = sprintf('%02d', $i);
-            $_text = isset($month_names) ? smarty_function_escape_special_chars($month_names[ $i ]) :
-                ($month_format == "%m" ? $_val : strftime($month_format, $_month_timestamps[ $i ]));
-            $_value = $month_value_format == "%m" ? $_val : strftime($month_value_format, $_month_timestamps[ $i ]);
-            $_html_months .= '<option value="' . $_value . '"' . ($_val == $_month ? ' selected="selected"' : '') .
-                             '>' . $_text . '</option>' . $option_separator;
-        }
+		for ($i = 1; $i <= 12; $i ++) {
+			$_val = sprintf('%02d', $i);
+			$_text = isset($month_names) ? smarty_function_escape_special_chars($month_names[ $i ]) :
+				($month_format == "%m" ? $_val : strftime($month_format, $_month_timestamps[ $i ]));
+			$_value = $month_value_format == "%m" ? $_val : strftime($month_value_format, $_month_timestamps[ $i ]);
+			$_html_months .= '<option value="' . $_value . '"' . ($_val == $_month ? ' selected="selected"' : '') .
+							 '>' . $_text . '</option>' . $option_separator;
+		}
 
-        $_html_months .= '</select>';
-    }
+		$_html_months .= '</select>';
+	}
 
-    // generate day <select> or <input>
-    if ($display_days) {
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Day]') : ($prefix . 'Day');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($day_extra) {
-            $_extra .= ' ' . $day_extra;
-        }
+	// generate day <select> or <input>
+	if ($display_days) {
+		$_extra = '';
+		$_name = $field_array ? ($field_array . '[' . $prefix . 'Day]') : ($prefix . 'Day');
+		if ($all_extra) {
+			$_extra .= ' ' . $all_extra;
+		}
+		if ($day_extra) {
+			$_extra .= ' ' . $day_extra;
+		}
 
-        $_html_days = '<select name="' . $_name . '"';
-        if ($day_id !== null || $all_id !== null) {
-            $_html_days .= ' id="' .
-                           smarty_function_escape_special_chars($day_id !== null ? ($day_id ? $day_id : $_name) :
-                                                                    ($all_id ? ($all_id . $_name) : $_name)) . '"';
-        }
-        if ($day_size) {
-            $_html_days .= ' size="' . $day_size . '"';
-        }
-        $_html_days .= $_extra . $extra_attrs . '>' . $option_separator;
+		$_html_days = '<select name="' . $_name . '"';
+		if ($day_id !== null || $all_id !== null) {
+			$_html_days .= ' id="' .
+						   smarty_function_escape_special_chars($day_id !== null ? ($day_id ? $day_id : $_name) :
+																	($all_id ? ($all_id . $_name) : $_name)) . '"';
+		}
+		if ($day_size) {
+			$_html_days .= ' size="' . $day_size . '"';
+		}
+		$_html_days .= $_extra . $extra_attrs . '>' . $option_separator;
 
-        if (isset($day_empty) || isset($all_empty)) {
-            $_html_days .= '<option value="">' . (isset($day_empty) ? $day_empty : $all_empty) . '</option>' .
-                           $option_separator;
-        }
+		if (isset($day_empty) || isset($all_empty)) {
+			$_html_days .= '<option value="">' . (isset($day_empty) ? $day_empty : $all_empty) . '</option>' .
+						   $option_separator;
+		}
 
-        for ($i = 1; $i <= 31; $i ++) {
-            $_val = sprintf('%02d', $i);
-            $_text = $day_format == '%02d' ? $_val : sprintf($day_format, $i);
-            $_value = $day_value_format == '%02d' ? $_val : sprintf($day_value_format, $i);
-            $_html_days .= '<option value="' . $_value . '"' . ($_val == $_day ? ' selected="selected"' : '') . '>' .
-                           $_text . '</option>' . $option_separator;
-        }
+		for ($i = 1; $i <= 31; $i ++) {
+			$_val = sprintf('%02d', $i);
+			$_text = $day_format == '%02d' ? $_val : sprintf($day_format, $i);
+			$_value = $day_value_format == '%02d' ? $_val : sprintf($day_value_format, $i);
+			$_html_days .= '<option value="' . $_value . '"' . ($_val == $_day ? ' selected="selected"' : '') . '>' .
+						   $_text . '</option>' . $option_separator;
+		}
 
-        $_html_days .= '</select>';
-    }
+		$_html_days .= '</select>';
+	}
 
-    // order the fields for output
-    $_html = '';
-    for ($i = 0; $i <= 2; $i ++) {
-        switch ($field_order[ $i ]) {
-            case 'Y':
-            case 'y':
-                if (isset($_html_years)) {
-                    if ($_html) {
-                        $_html .= $field_separator;
-                    }
-                    $_html .= $_html_years;
-                }
-                break;
+	// order the fields for output
+	$_html = '';
+	for ($i = 0; $i <= 2; $i ++) {
+		switch ($field_order[ $i ]) {
+			case 'Y':
+			case 'y':
+				if (isset($_html_years)) {
+					if ($_html) {
+						$_html .= $field_separator;
+					}
+					$_html .= $_html_years;
+				}
+				break;
 
-            case 'm':
-            case 'M':
-                if (isset($_html_months)) {
-                    if ($_html) {
-                        $_html .= $field_separator;
-                    }
-                    $_html .= $_html_months;
-                }
-                break;
+			case 'm':
+			case 'M':
+				if (isset($_html_months)) {
+					if ($_html) {
+						$_html .= $field_separator;
+					}
+					$_html .= $_html_months;
+				}
+				break;
 
-            case 'd':
-            case 'D':
-                if (isset($_html_days)) {
-                    if ($_html) {
-                        $_html .= $field_separator;
-                    }
-                    $_html .= $_html_days;
-                }
-                break;
-        }
-    }
+			case 'd':
+			case 'D':
+				if (isset($_html_days)) {
+					if ($_html) {
+						$_html .= $field_separator;
+					}
+					$_html .= $_html_days;
+				}
+				break;
+		}
+	}
 
-    return $_html;
+	return $_html;
 }

Spacing +20 added lines, -27 removed lines

@@ -58,8 +58,8 @@ 
     if ($_month_timestamps === null) {
         $_current_year = date('Y');
         $_month_timestamps = array();
-        for ($i = 1; $i <= 12; $i ++) {
-            $_month_timestamps[ $i ] = mktime(0, 0, 0, $i, 1, 2000);
+        for ($i = 1; $i <= 12; $i++) {
+            $_month_timestamps[$i] = mktime(0, 0, 0, $i, 1, 2000);
         }
     }
 
@@ -173,21 +173,20 @@ 
 
     // Note: date() is faster than strftime()
     // Note: explode(date()) is faster than date() date() date()
-    if (isset($params[ 'time' ]) && is_array($params[ 'time' ])) {
-        if (isset($params[ 'time' ][ $prefix . 'Year' ])) {
+    if (isset($params['time']) && is_array($params['time'])) {
+        if (isset($params['time'][$prefix . 'Year'])) {
             // $_REQUEST[$field_array] given
             foreach (array('Y' => 'Year', 'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
                 $_variableName = '_' . strtolower($_elementName);
                 $$_variableName =
-                    isset($params[ 'time' ][ $prefix . $_elementName ]) ? $params[ 'time' ][ $prefix . $_elementName ] :
-                        date($_elementKey);
+                    isset($params['time'][$prefix . $_elementName]) ? $params['time'][$prefix . $_elementName] : date($_elementKey);
             }
-        } elseif (isset($params[ 'time' ][ $field_array ][ $prefix . 'Year' ])) {
+        } elseif (isset($params['time'][$field_array][$prefix . 'Year'])) {
             // $_REQUEST given
             foreach (array('Y' => 'Year', 'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
                 $_variableName = '_' . strtolower($_elementName);
-                $$_variableName = isset($params[ 'time' ][ $field_array ][ $prefix . $_elementName ]) ?
-                    $params[ 'time' ][ $field_array ][ $prefix . $_elementName ] : date($_elementKey);
+                $$_variableName = isset($params['time'][$field_array][$prefix . $_elementName]) ?
+                    $params['time'][$field_array][$prefix . $_elementName] : date($_elementKey);
             }
         } else {
             // no date found, use NOW
@@ -210,9 +209,9 @@ 
         $t = $$key;
         if ($t === null) {
             $$key = (int) $_current_year;
-        } elseif ($t[ 0 ] == '+') {
+        } elseif ($t[0] == '+') {
             $$key = (int) ($_current_year + (int) trim(substr($t, 1)));
-        } elseif ($t[ 0 ] == '-') {
+        } elseif ($t[0] == '-') {
             $$key = (int) ($_current_year - (int) trim(substr($t, 1)));
         } else {
             $$key = (int) $$key;
@@ -245,9 +244,7 @@ 
             $_html_years = '<select name="' . $_name . '"';
             if ($year_id !== null || $all_id !== null) {
                 $_html_years .= ' id="' . smarty_function_escape_special_chars($year_id !== null ?
-                                                                                   ($year_id ? $year_id : $_name) :
-                                                                                   ($all_id ? ($all_id . $_name) :
-                                                                                       $_name)) . '"';
+                                                                                   ($year_id ? $year_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)) . '"';
             }
             if ($year_size) {
                 $_html_years .= ' size="' . $year_size . '"';
@@ -259,7 +256,7 @@ 
                                 $option_separator;
             }
 
-            $op = $start_year > $end_year ? - 1 : 1;
+            $op = $start_year > $end_year ? -1 : 1;
             for ($i = $start_year; $op > 0 ? $i <= $end_year : $i >= $end_year; $i += $op) {
                 $_html_years .= '<option value="' . $i . '"' . ($_year == $i ? ' selected="selected"' : '') . '>' . $i .
                                 '</option>' . $option_separator;
@@ -283,9 +280,7 @@ 
         $_html_months = '<select name="' . $_name . '"';
         if ($month_id !== null || $all_id !== null) {
             $_html_months .= ' id="' . smarty_function_escape_special_chars($month_id !== null ?
-                                                                                ($month_id ? $month_id : $_name) :
-                                                                                ($all_id ? ($all_id . $_name) :
-                                                                                    $_name)) . '"';
+                                                                                ($month_id ? $month_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)) . '"';
         }
         if ($month_size) {
             $_html_months .= ' size="' . $month_size . '"';
@@ -297,11 +292,10 @@ 
                              $option_separator;
         }
 
-        for ($i = 1; $i <= 12; $i ++) {
+        for ($i = 1; $i <= 12; $i++) {
             $_val = sprintf('%02d', $i);
-            $_text = isset($month_names) ? smarty_function_escape_special_chars($month_names[ $i ]) :
-                ($month_format == "%m" ? $_val : strftime($month_format, $_month_timestamps[ $i ]));
-            $_value = $month_value_format == "%m" ? $_val : strftime($month_value_format, $_month_timestamps[ $i ]);
+            $_text = isset($month_names) ? smarty_function_escape_special_chars($month_names[$i]) : ($month_format == "%m" ? $_val : strftime($month_format, $_month_timestamps[$i]));
+            $_value = $month_value_format == "%m" ? $_val : strftime($month_value_format, $_month_timestamps[$i]);
             $_html_months .= '<option value="' . $_value . '"' . ($_val == $_month ? ' selected="selected"' : '') .
                              '>' . $_text . '</option>' . $option_separator;
         }
@@ -323,8 +317,7 @@ 
         $_html_days = '<select name="' . $_name . '"';
         if ($day_id !== null || $all_id !== null) {
             $_html_days .= ' id="' .
-                           smarty_function_escape_special_chars($day_id !== null ? ($day_id ? $day_id : $_name) :
-                                                                    ($all_id ? ($all_id . $_name) : $_name)) . '"';
+                           smarty_function_escape_special_chars($day_id !== null ? ($day_id ? $day_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)) . '"';
         }
         if ($day_size) {
             $_html_days .= ' size="' . $day_size . '"';
@@ -336,7 +329,7 @@ 
                            $option_separator;
         }
 
-        for ($i = 1; $i <= 31; $i ++) {
+        for ($i = 1; $i <= 31; $i++) {
             $_val = sprintf('%02d', $i);
             $_text = $day_format == '%02d' ? $_val : sprintf($day_format, $i);
             $_value = $day_value_format == '%02d' ? $_val : sprintf($day_value_format, $i);
@@ -349,8 +342,8 @@ 
 
     // order the fields for output
     $_html = '';
-    for ($i = 0; $i <= 2; $i ++) {
-        switch ($field_order[ $i ]) {
+    for ($i = 0; $i <= 2; $i++) {
+        switch ($field_order[$i]) {
             case 'Y':
             case 'y':
                 if (isset($_html_years)) {

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

Indentation +15 added lines, -15 removed lines

@@ -19,13 +19,13 @@ 
  */
 function smarty_mb_to_unicode($string, $encoding = null)
 {
-    if ($encoding) {
-        $expanded = mb_convert_encoding($string, "UTF-32BE", $encoding);
-    } else {
-        $expanded = mb_convert_encoding($string, "UTF-32BE");
-    }
+	if ($encoding) {
+		$expanded = mb_convert_encoding($string, "UTF-32BE", $encoding);
+	} else {
+		$expanded = mb_convert_encoding($string, "UTF-32BE");
+	}
 
-    return unpack("N*", $expanded);
+	return unpack("N*", $expanded);
 }
 
 /**
@@ -41,14 +41,14 @@ 
  */
 function smarty_mb_from_unicode($unicode, $encoding = null)
 {
-    $t = '';
-    if (!$encoding) {
-        $encoding = mb_internal_encoding();
-    }
-    foreach ((array) $unicode as $utf32be) {
-        $character = pack("N*", $utf32be);
-        $t .= mb_convert_encoding($character, $encoding, "UTF-32BE");
-    }
+	$t = '';
+	if (!$encoding) {
+		$encoding = mb_internal_encoding();
+	}
+	foreach ((array) $unicode as $utf32be) {
+		$character = pack("N*", $utf32be);
+		$t .= mb_convert_encoding($character, $encoding, "UTF-32BE");
+	}
 
-    return $t;
+	return $t;
 }

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

Indentation +7 added lines, -7 removed lines

@@ -20,13 +20,13 @@
  */
 function smarty_modifiercompiler_from_charset($params)
 {
-    if (!Smarty::$_MBSTRING) {
-        return $params[ 0 ];
-    }
+	if (!Smarty::$_MBSTRING) {
+		return $params[ 0 ];
+	}
 
-    if (!isset($params[ 1 ])) {
-        $params[ 1 ] = '"ISO-8859-1"';
-    }
+	if (!isset($params[ 1 ])) {
+		$params[ 1 ] = '"ISO-8859-1"';
+	}
 
-    return 'mb_convert_encoding(' . $params[ 0 ] . ', "' . addslashes(Smarty::$_CHARSET) . '", ' . $params[ 1 ] . ')';
+	return 'mb_convert_encoding(' . $params[ 0 ] . ', "' . addslashes(Smarty::$_CHARSET) . '", ' . $params[ 1 ] . ')';
 }

Spacing +4 added lines, -4 removed lines

@@ -21,12 +21,12 @@
 function smarty_modifiercompiler_from_charset($params)
 {
     if (!Smarty::$_MBSTRING) {
-        return $params[ 0 ];
+        return $params[0];
     }
 
-    if (!isset($params[ 1 ])) {
-        $params[ 1 ] = '"ISO-8859-1"';
+    if (!isset($params[1])) {
+        $params[1] = '"ISO-8859-1"';
     }
 
-    return 'mb_convert_encoding(' . $params[ 0 ] . ', "' . addslashes(Smarty::$_CHARSET) . '", ' . $params[ 1 ] . ')';
+    return 'mb_convert_encoding(' . $params[0] . ', "' . addslashes(Smarty::$_CHARSET) . '", ' . $params[1] . ')';
 }