YetiForceCompany / YetiForceCRM

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

Indentation +30 added lines, -30 removed lines

@@ -27,40 +27,40 @@
  */
 function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false)
 {
-    if ($length == 0) {
-        return '';
-    }
+	if ($length == 0) {
+		return '';
+	}
 
-    if (Smarty::$_MBSTRING) {
-        if (mb_strlen($string, Smarty::$_CHARSET) > $length) {
-            $length -= min($length, mb_strlen($etc, Smarty::$_CHARSET));
-            if (!$break_words && !$middle) {
-                $string = preg_replace('/\s+?(\S+)?$/' . Smarty::$_UTF8_MODIFIER, '',
-                                       mb_substr($string, 0, $length + 1, Smarty::$_CHARSET));
-            }
-            if (!$middle) {
-                return mb_substr($string, 0, $length, Smarty::$_CHARSET) . $etc;
-            }
+	if (Smarty::$_MBSTRING) {
+		if (mb_strlen($string, Smarty::$_CHARSET) > $length) {
+			$length -= min($length, mb_strlen($etc, Smarty::$_CHARSET));
+			if (!$break_words && !$middle) {
+				$string = preg_replace('/\s+?(\S+)?$/' . Smarty::$_UTF8_MODIFIER, '',
+									   mb_substr($string, 0, $length + 1, Smarty::$_CHARSET));
+			}
+			if (!$middle) {
+				return mb_substr($string, 0, $length, Smarty::$_CHARSET) . $etc;
+			}
 
-            return mb_substr($string, 0, $length / 2, Smarty::$_CHARSET) . $etc .
-                   mb_substr($string, - $length / 2, $length, Smarty::$_CHARSET);
-        }
+			return mb_substr($string, 0, $length / 2, Smarty::$_CHARSET) . $etc .
+				   mb_substr($string, - $length / 2, $length, Smarty::$_CHARSET);
+		}
 
-        return $string;
-    }
+		return $string;
+	}
 
-    // no MBString fallback
-    if (isset($string[ $length ])) {
-        $length -= min($length, strlen($etc));
-        if (!$break_words && !$middle) {
-            $string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length + 1));
-        }
-        if (!$middle) {
-            return substr($string, 0, $length) . $etc;
-        }
+	// no MBString fallback
+	if (isset($string[ $length ])) {
+		$length -= min($length, strlen($etc));
+		if (!$break_words && !$middle) {
+			$string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length + 1));
+		}
+		if (!$middle) {
+			return substr($string, 0, $length) . $etc;
+		}
 
-        return substr($string, 0, $length / 2) . $etc . substr($string, - $length / 2);
-    }
+		return substr($string, 0, $length / 2) . $etc . substr($string, - $length / 2);
+	}
 
-    return $string;
+	return $string;
 }

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
     }
 
     // no MBString fallback
-    if (isset($string[ $length ])) {
+    if (isset($string[$length])) {
         $length -= min($length, strlen($etc));
         if (!$break_words && !$middle) {
             $string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length + 1));

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

Indentation +7 added lines, -7 removed lines

@@ -20,13 +20,13 @@
  */
 function smarty_modifiercompiler_to_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 ] . ', ' . $params[ 1 ] . ', "' . addslashes(Smarty::$_CHARSET) . '")';
+	return 'mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 1 ] . ', "' . addslashes(Smarty::$_CHARSET) . '")';
 }

Spacing +4 added lines, -4 removed lines

@@ -21,12 +21,12 @@
 function smarty_modifiercompiler_to_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 ] . ', ' . $params[ 1 ] . ', "' . addslashes(Smarty::$_CHARSET) . '")';
+    return 'mb_convert_encoding(' . $params[0] . ', ' . $params[1] . ', "' . addslashes(Smarty::$_CHARSET) . '")';
 }

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

Indentation +22 added lines, -22 removed lines

@@ -20,31 +20,31 @@
  */
 function smarty_modifiercompiler_unescape($params)
 {
-    if (!isset($params[ 1 ])) {
-        $params[ 1 ] = 'html';
-    }
-    if (!isset($params[ 2 ])) {
-        $params[ 2 ] = '\'' . addslashes(Smarty::$_CHARSET) . '\'';
-    } else {
-        $params[ 2 ] = "'" . $params[ 2 ] . "'";
-    }
+	if (!isset($params[ 1 ])) {
+		$params[ 1 ] = 'html';
+	}
+	if (!isset($params[ 2 ])) {
+		$params[ 2 ] = '\'' . addslashes(Smarty::$_CHARSET) . '\'';
+	} else {
+		$params[ 2 ] = "'" . $params[ 2 ] . "'";
+	}
 
-    switch (trim($params[ 1 ], '"\'')) {
-        case 'entity':
-        case 'htmlall':
-            if (Smarty::$_MBSTRING) {
-                return 'mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 2 ] . ', \'HTML-ENTITIES\')';
-            }
+	switch (trim($params[ 1 ], '"\'')) {
+		case 'entity':
+		case 'htmlall':
+			if (Smarty::$_MBSTRING) {
+				return 'mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 2 ] . ', \'HTML-ENTITIES\')';
+			}
 
-            return 'html_entity_decode(' . $params[ 0 ] . ', ENT_NOQUOTES, ' . $params[ 2 ] . ')';
+			return 'html_entity_decode(' . $params[ 0 ] . ', ENT_NOQUOTES, ' . $params[ 2 ] . ')';
 
-        case 'html':
-            return 'htmlspecialchars_decode(' . $params[ 0 ] . ', ENT_QUOTES)';
+		case 'html':
+			return 'htmlspecialchars_decode(' . $params[ 0 ] . ', ENT_QUOTES)';
 
-        case 'url':
-            return 'rawurldecode(' . $params[ 0 ] . ')';
+		case 'url':
+			return 'rawurldecode(' . $params[ 0 ] . ')';
 
-        default:
-            return $params[ 0 ];
-    }
+		default:
+			return $params[ 0 ];
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -20,31 +20,31 @@
  */
 function smarty_modifiercompiler_unescape($params)
 {
-    if (!isset($params[ 1 ])) {
-        $params[ 1 ] = 'html';
+    if (!isset($params[1])) {
+        $params[1] = 'html';
     }
-    if (!isset($params[ 2 ])) {
-        $params[ 2 ] = '\'' . addslashes(Smarty::$_CHARSET) . '\'';
+    if (!isset($params[2])) {
+        $params[2] = '\'' . addslashes(Smarty::$_CHARSET) . '\'';
     } else {
-        $params[ 2 ] = "'" . $params[ 2 ] . "'";
+        $params[2] = "'" . $params[2] . "'";
     }
 
-    switch (trim($params[ 1 ], '"\'')) {
+    switch (trim($params[1], '"\'')) {
         case 'entity':
         case 'htmlall':
             if (Smarty::$_MBSTRING) {
-                return 'mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 2 ] . ', \'HTML-ENTITIES\')';
+                return 'mb_convert_encoding(' . $params[0] . ', ' . $params[2] . ', \'HTML-ENTITIES\')';
             }
 
-            return 'html_entity_decode(' . $params[ 0 ] . ', ENT_NOQUOTES, ' . $params[ 2 ] . ')';
+            return 'html_entity_decode(' . $params[0] . ', ENT_NOQUOTES, ' . $params[2] . ')';
 
         case 'html':
-            return 'htmlspecialchars_decode(' . $params[ 0 ] . ', ENT_QUOTES)';
+            return 'htmlspecialchars_decode(' . $params[0] . ', ENT_QUOTES)';
 
         case 'url':
-            return 'rawurldecode(' . $params[ 0 ] . ')';
+            return 'rawurldecode(' . $params[0] . ')';
 
         default:
-            return $params[ 0 ];
+            return $params[0];
     }
 }

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

Indentation +2 added lines, -2 removed lines

@@ -22,6 +22,6 @@
  */
 function smarty_modifier_spacify($string, $spacify_char = ' ')
 {
-    // well… what about charsets besides latin and UTF-8?
-    return implode($spacify_char, preg_split('//' . Smarty::$_UTF8_MODIFIER, $string, - 1, PREG_SPLIT_NO_EMPTY));
+	// well… what about charsets besides latin and UTF-8?
+	return implode($spacify_char, preg_split('//' . Smarty::$_UTF8_MODIFIER, $string, - 1, PREG_SPLIT_NO_EMPTY));
 }

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

Indentation +77 added lines, -77 removed lines

@@ -24,89 +24,89 @@
  */
 function smarty_modifier_debug_print_var($var, $max = 10, $length = 40, $depth = 0, $objects = array())
 {
-    $_replace = array("\n" => '\n', "\r" => '\r', "\t" => '\t');
-    switch (gettype($var)) {
-        case 'array' :
-            $results = '<b>Array (' . count($var) . ')</b>';
-            if ($depth == $max) {
-                break;
-            }
-            foreach ($var as $curr_key => $curr_val) {
-                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2) . '<b>' . strtr($curr_key, $_replace) .
-                            '</b> =&gt; ' .
-                            smarty_modifier_debug_print_var($curr_val, $max, $length, ++ $depth, $objects);
-                $depth --;
-            }
-            break;
+	$_replace = array("\n" => '\n', "\r" => '\r', "\t" => '\t');
+	switch (gettype($var)) {
+		case 'array' :
+			$results = '<b>Array (' . count($var) . ')</b>';
+			if ($depth == $max) {
+				break;
+			}
+			foreach ($var as $curr_key => $curr_val) {
+				$results .= '<br>' . str_repeat('&nbsp;', $depth * 2) . '<b>' . strtr($curr_key, $_replace) .
+							'</b> =&gt; ' .
+							smarty_modifier_debug_print_var($curr_val, $max, $length, ++ $depth, $objects);
+				$depth --;
+			}
+			break;
 
-        case 'object' :
-            $object_vars = get_object_vars($var);
-            $results = '<b>' . get_class($var) . ' Object (' . count($object_vars) . ')</b>';
-            if (in_array($var, $objects)) {
-                $results .= ' called recursive';
-                break;
-            }
-            if ($depth == $max) {
-                break;
-            }
-            $objects[] = $var;
-            foreach ($object_vars as $curr_key => $curr_val) {
-                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2) . '<b> -&gt;' . strtr($curr_key, $_replace) .
-                            '</b> = ' . smarty_modifier_debug_print_var($curr_val, $max, $length, ++ $depth, $objects);
-                $depth --;
-            }
-            break;
+		case 'object' :
+			$object_vars = get_object_vars($var);
+			$results = '<b>' . get_class($var) . ' Object (' . count($object_vars) . ')</b>';
+			if (in_array($var, $objects)) {
+				$results .= ' called recursive';
+				break;
+			}
+			if ($depth == $max) {
+				break;
+			}
+			$objects[] = $var;
+			foreach ($object_vars as $curr_key => $curr_val) {
+				$results .= '<br>' . str_repeat('&nbsp;', $depth * 2) . '<b> -&gt;' . strtr($curr_key, $_replace) .
+							'</b> = ' . smarty_modifier_debug_print_var($curr_val, $max, $length, ++ $depth, $objects);
+				$depth --;
+			}
+			break;
 
-        case 'boolean' :
-        case 'NULL' :
-        case 'resource' :
-            if (true === $var) {
-                $results = 'true';
-            } elseif (false === $var) {
-                $results = 'false';
-            } elseif (null === $var) {
-                $results = 'null';
-            } else {
-                $results = htmlspecialchars((string) $var);
-            }
-            $results = '<i>' . $results . '</i>';
-            break;
+		case 'boolean' :
+		case 'NULL' :
+		case 'resource' :
+			if (true === $var) {
+				$results = 'true';
+			} elseif (false === $var) {
+				$results = 'false';
+			} elseif (null === $var) {
+				$results = 'null';
+			} else {
+				$results = htmlspecialchars((string) $var);
+			}
+			$results = '<i>' . $results . '</i>';
+			break;
 
-        case 'integer' :
-        case 'float' :
-            $results = htmlspecialchars((string) $var);
-            break;
+		case 'integer' :
+		case 'float' :
+			$results = htmlspecialchars((string) $var);
+			break;
 
-        case 'string' :
-            $results = strtr($var, $_replace);
-            if (Smarty::$_MBSTRING) {
-                if (mb_strlen($var, Smarty::$_CHARSET) > $length) {
-                    $results = mb_substr($var, 0, $length - 3, Smarty::$_CHARSET) . '...';
-                }
-            } else {
-                if (isset($var[ $length ])) {
-                    $results = substr($var, 0, $length - 3) . '...';
-                }
-            }
+		case 'string' :
+			$results = strtr($var, $_replace);
+			if (Smarty::$_MBSTRING) {
+				if (mb_strlen($var, Smarty::$_CHARSET) > $length) {
+					$results = mb_substr($var, 0, $length - 3, Smarty::$_CHARSET) . '...';
+				}
+			} else {
+				if (isset($var[ $length ])) {
+					$results = substr($var, 0, $length - 3) . '...';
+				}
+			}
 
-            $results = htmlspecialchars('"' . $results . '"', ENT_QUOTES, Smarty::$_CHARSET);
-            break;
+			$results = htmlspecialchars('"' . $results . '"', ENT_QUOTES, Smarty::$_CHARSET);
+			break;
 
-        case 'unknown type' :
-        default :
-            $results = strtr((string) $var, $_replace);
-            if (Smarty::$_MBSTRING) {
-                if (mb_strlen($results, Smarty::$_CHARSET) > $length) {
-                    $results = mb_substr($results, 0, $length - 3, Smarty::$_CHARSET) . '...';
-                }
-            } else {
-                if (strlen($results) > $length) {
-                    $results = substr($results, 0, $length - 3) . '...';
-                }
-            }
+		case 'unknown type' :
+		default :
+			$results = strtr((string) $var, $_replace);
+			if (Smarty::$_MBSTRING) {
+				if (mb_strlen($results, Smarty::$_CHARSET) > $length) {
+					$results = mb_substr($results, 0, $length - 3, Smarty::$_CHARSET) . '...';
+				}
+			} else {
+				if (strlen($results) > $length) {
+					$results = substr($results, 0, $length - 3) . '...';
+				}
+			}
 
-            $results = htmlspecialchars($results, ENT_QUOTES, Smarty::$_CHARSET);
-    }
+			$results = htmlspecialchars($results, ENT_QUOTES, Smarty::$_CHARSET);
+	}
 
-    return $results;
+	return $results;
 }

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
                 $results .= '<br>' . str_repeat('&nbsp;', $depth * 2) . '<b>' . strtr($curr_key, $_replace) .
                             '</b> =&gt; ' .
                             smarty_modifier_debug_print_var($curr_val, $max, $length, ++ $depth, $objects);
-                $depth --;
+                $depth--;
             }
             break;
 
@@ -53,7 +53,7 @@ 
             foreach ($object_vars as $curr_key => $curr_val) {
                 $results .= '<br>' . str_repeat('&nbsp;', $depth * 2) . '<b> -&gt;' . strtr($curr_key, $_replace) .
                             '</b> = ' . smarty_modifier_debug_print_var($curr_val, $max, $length, ++ $depth, $objects);
-                $depth --;
+                $depth--;
             }
             break;
 
@@ -84,7 +84,7 @@ 
                     $results = mb_substr($var, 0, $length - 3, Smarty::$_CHARSET) . '...';
                 }
             } else {
-                if (isset($var[ $length ])) {
+                if (isset($var[$length])) {
                     $results = substr($var, 0, $length - 3) . '...';
                 }
             }

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

Indentation +330 added lines, -330 removed lines

@@ -33,334 +33,334 @@
  */
 function smarty_function_html_select_time($params)
 {
-    $prefix = "Time_";
-    $field_array = null;
-    $field_separator = "\n";
-    $option_separator = "\n";
-    $time = null;
-
-    $display_hours = true;
-    $display_minutes = true;
-    $display_seconds = true;
-    $display_meridian = true;
-
-    $hour_format = '%02d';
-    $hour_value_format = '%02d';
-    $minute_format = '%02d';
-    $minute_value_format = '%02d';
-    $second_format = '%02d';
-    $second_value_format = '%02d';
-
-    $hour_size = null;
-    $minute_size = null;
-    $second_size = null;
-    $meridian_size = null;
-
-    $all_empty = null;
-    $hour_empty = null;
-    $minute_empty = null;
-    $second_empty = null;
-    $meridian_empty = null;
-
-    $all_id = null;
-    $hour_id = null;
-    $minute_id = null;
-    $second_id = null;
-    $meridian_id = null;
-
-    $use_24_hours = true;
-    $minute_interval = 1;
-    $second_interval = 1;
-
-    $extra_attrs = '';
-    $all_extra = null;
-    $hour_extra = null;
-    $minute_extra = null;
-    $second_extra = null;
-    $meridian_extra = null;
-
-    foreach ($params as $_key => $_value) {
-        switch ($_key) {
-            case 'time':
-                if (!is_array($_value) && $_value !== null) {
-                    $time = smarty_make_timestamp($_value);
-                }
-                break;
-
-            case 'prefix':
-            case 'field_array':
-
-            case 'field_separator':
-            case 'option_separator':
-
-            case 'all_extra':
-            case 'hour_extra':
-            case 'minute_extra':
-            case 'second_extra':
-            case 'meridian_extra':
-
-            case 'all_empty':
-            case 'hour_empty':
-            case 'minute_empty':
-            case 'second_empty':
-            case 'meridian_empty':
-
-            case 'all_id':
-            case 'hour_id':
-            case 'minute_id':
-            case 'second_id':
-            case 'meridian_id':
-
-            case 'hour_format':
-            case 'hour_value_format':
-            case 'minute_format':
-            case 'minute_value_format':
-            case 'second_format':
-            case 'second_value_format':
-                $$_key = (string) $_value;
-                break;
-
-            case 'display_hours':
-            case 'display_minutes':
-            case 'display_seconds':
-            case 'display_meridian':
-            case 'use_24_hours':
-                $$_key = (bool) $_value;
-                break;
-
-            case 'minute_interval':
-            case 'second_interval':
-
-            case 'hour_size':
-            case 'minute_size':
-            case 'second_size':
-            case 'meridian_size':
-                $$_key = (int) $_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;
-        }
-    }
-
-    if (isset($params[ 'time' ]) && is_array($params[ 'time' ])) {
-        if (isset($params[ 'time' ][ $prefix . 'Hour' ])) {
-            // $_REQUEST[$field_array] given
-            foreach (array('H' => 'Hour', 'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName =
-                    isset($params[ 'time' ][ $prefix . $_elementName ]) ? $params[ 'time' ][ $prefix . $_elementName ] :
-                        date($_elementKey);
-            }
-            $_meridian =
-                isset($params[ 'time' ][ $prefix . 'Meridian' ]) ? (' ' . $params[ 'time' ][ $prefix . 'Meridian' ]) :
-                    '';
-            $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
-            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
-        } elseif (isset($params[ 'time' ][ $field_array ][ $prefix . 'Hour' ])) {
-            // $_REQUEST given
-            foreach (array('H' => 'Hour', 'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName = isset($params[ 'time' ][ $field_array ][ $prefix . $_elementName ]) ?
-                    $params[ 'time' ][ $field_array ][ $prefix . $_elementName ] : date($_elementKey);
-            }
-            $_meridian = isset($params[ 'time' ][ $field_array ][ $prefix . 'Meridian' ]) ?
-                (' ' . $params[ 'time' ][ $field_array ][ $prefix . 'Meridian' ]) : '';
-            $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
-            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
-        } 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)) {
-            $_hour = $_minute = $_second = $time = null;
-        } else {
-            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s'));
-        }
-    } else {
-        list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
-    }
-
-    // generate hour <select>
-    if ($display_hours) {
-        $_html_hours = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Hour]') : ($prefix . 'Hour');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($hour_extra) {
-            $_extra .= ' ' . $hour_extra;
-        }
-
-        $_html_hours = '<select name="' . $_name . '"';
-        if ($hour_id !== null || $all_id !== null) {
-            $_html_hours .= ' id="' .
-                            smarty_function_escape_special_chars($hour_id !== null ? ($hour_id ? $hour_id : $_name) :
-                                                                     ($all_id ? ($all_id . $_name) : $_name)) . '"';
-        }
-        if ($hour_size) {
-            $_html_hours .= ' size="' . $hour_size . '"';
-        }
-        $_html_hours .= $_extra . $extra_attrs . '>' . $option_separator;
-
-        if (isset($hour_empty) || isset($all_empty)) {
-            $_html_hours .= '<option value="">' . (isset($hour_empty) ? $hour_empty : $all_empty) . '</option>' .
-                            $option_separator;
-        }
-
-        $start = $use_24_hours ? 0 : 1;
-        $end = $use_24_hours ? 23 : 12;
-        for ($i = $start; $i <= $end; $i ++) {
-            $_val = sprintf('%02d', $i);
-            $_text = $hour_format == '%02d' ? $_val : sprintf($hour_format, $i);
-            $_value = $hour_value_format == '%02d' ? $_val : sprintf($hour_value_format, $i);
-
-            if (!$use_24_hours) {
-                $_hour12 = $_hour == 0 ? 12 : ($_hour <= 12 ? $_hour : $_hour - 12);
-            }
-
-            $selected = $_hour !== null ? ($use_24_hours ? $_hour == $_val : $_hour12 == $_val) : null;
-            $_html_hours .= '<option value="' . $_value . '"' . ($selected ? ' selected="selected"' : '') . '>' .
-                            $_text . '</option>' . $option_separator;
-        }
-
-        $_html_hours .= '</select>';
-    }
-
-    // generate minute <select>
-    if ($display_minutes) {
-        $_html_minutes = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Minute]') : ($prefix . 'Minute');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($minute_extra) {
-            $_extra .= ' ' . $minute_extra;
-        }
-
-        $_html_minutes = '<select name="' . $_name . '"';
-        if ($minute_id !== null || $all_id !== null) {
-            $_html_minutes .= ' id="' . smarty_function_escape_special_chars($minute_id !== null ?
-                                                                                 ($minute_id ? $minute_id : $_name) :
-                                                                                 ($all_id ? ($all_id . $_name) :
-                                                                                     $_name)) . '"';
-        }
-        if ($minute_size) {
-            $_html_minutes .= ' size="' . $minute_size . '"';
-        }
-        $_html_minutes .= $_extra . $extra_attrs . '>' . $option_separator;
-
-        if (isset($minute_empty) || isset($all_empty)) {
-            $_html_minutes .= '<option value="">' . (isset($minute_empty) ? $minute_empty : $all_empty) . '</option>' .
-                              $option_separator;
-        }
-
-        $selected = $_minute !== null ? ($_minute - $_minute % $minute_interval) : null;
-        for ($i = 0; $i <= 59; $i += $minute_interval) {
-            $_val = sprintf('%02d', $i);
-            $_text = $minute_format == '%02d' ? $_val : sprintf($minute_format, $i);
-            $_value = $minute_value_format == '%02d' ? $_val : sprintf($minute_value_format, $i);
-            $_html_minutes .= '<option value="' . $_value . '"' . ($selected === $i ? ' selected="selected"' : '') .
-                              '>' . $_text . '</option>' . $option_separator;
-        }
-
-        $_html_minutes .= '</select>';
-    }
-
-    // generate second <select>
-    if ($display_seconds) {
-        $_html_seconds = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Second]') : ($prefix . 'Second');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($second_extra) {
-            $_extra .= ' ' . $second_extra;
-        }
-
-        $_html_seconds = '<select name="' . $_name . '"';
-        if ($second_id !== null || $all_id !== null) {
-            $_html_seconds .= ' id="' . smarty_function_escape_special_chars($second_id !== null ?
-                                                                                 ($second_id ? $second_id : $_name) :
-                                                                                 ($all_id ? ($all_id . $_name) :
-                                                                                     $_name)) . '"';
-        }
-        if ($second_size) {
-            $_html_seconds .= ' size="' . $second_size . '"';
-        }
-        $_html_seconds .= $_extra . $extra_attrs . '>' . $option_separator;
-
-        if (isset($second_empty) || isset($all_empty)) {
-            $_html_seconds .= '<option value="">' . (isset($second_empty) ? $second_empty : $all_empty) . '</option>' .
-                              $option_separator;
-        }
-
-        $selected = $_second !== null ? ($_second - $_second % $second_interval) : null;
-        for ($i = 0; $i <= 59; $i += $second_interval) {
-            $_val = sprintf('%02d', $i);
-            $_text = $second_format == '%02d' ? $_val : sprintf($second_format, $i);
-            $_value = $second_value_format == '%02d' ? $_val : sprintf($second_value_format, $i);
-            $_html_seconds .= '<option value="' . $_value . '"' . ($selected === $i ? ' selected="selected"' : '') .
-                              '>' . $_text . '</option>' . $option_separator;
-        }
-
-        $_html_seconds .= '</select>';
-    }
-
-    // generate meridian <select>
-    if ($display_meridian && !$use_24_hours) {
-        $_html_meridian = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Meridian]') : ($prefix . 'Meridian');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($meridian_extra) {
-            $_extra .= ' ' . $meridian_extra;
-        }
-
-        $_html_meridian = '<select name="' . $_name . '"';
-        if ($meridian_id !== null || $all_id !== null) {
-            $_html_meridian .= ' id="' . smarty_function_escape_special_chars($meridian_id !== null ?
-                                                                                  ($meridian_id ? $meridian_id :
-                                                                                      $_name) :
-                                                                                  ($all_id ? ($all_id . $_name) :
-                                                                                      $_name)) . '"';
-        }
-        if ($meridian_size) {
-            $_html_meridian .= ' size="' . $meridian_size . '"';
-        }
-        $_html_meridian .= $_extra . $extra_attrs . '>' . $option_separator;
-
-        if (isset($meridian_empty) || isset($all_empty)) {
-            $_html_meridian .= '<option value="">' . (isset($meridian_empty) ? $meridian_empty : $all_empty) .
-                               '</option>' . $option_separator;
-        }
-
-        $_html_meridian .= '<option value="am"' . ($_hour > 0 && $_hour < 12 ? ' selected="selected"' : '') .
-                           '>AM</option>' . $option_separator . '<option value="pm"' .
-                           ($_hour < 12 ? '' : ' selected="selected"') . '>PM</option>' . $option_separator .
-                           '</select>';
-    }
-
-    $_html = '';
-    foreach (array('_html_hours', '_html_minutes', '_html_seconds', '_html_meridian') as $k) {
-        if (isset($$k)) {
-            if ($_html) {
-                $_html .= $field_separator;
-            }
-            $_html .= $$k;
-        }
-    }
-
-    return $_html;
+	$prefix = "Time_";
+	$field_array = null;
+	$field_separator = "\n";
+	$option_separator = "\n";
+	$time = null;
+
+	$display_hours = true;
+	$display_minutes = true;
+	$display_seconds = true;
+	$display_meridian = true;
+
+	$hour_format = '%02d';
+	$hour_value_format = '%02d';
+	$minute_format = '%02d';
+	$minute_value_format = '%02d';
+	$second_format = '%02d';
+	$second_value_format = '%02d';
+
+	$hour_size = null;
+	$minute_size = null;
+	$second_size = null;
+	$meridian_size = null;
+
+	$all_empty = null;
+	$hour_empty = null;
+	$minute_empty = null;
+	$second_empty = null;
+	$meridian_empty = null;
+
+	$all_id = null;
+	$hour_id = null;
+	$minute_id = null;
+	$second_id = null;
+	$meridian_id = null;
+
+	$use_24_hours = true;
+	$minute_interval = 1;
+	$second_interval = 1;
+
+	$extra_attrs = '';
+	$all_extra = null;
+	$hour_extra = null;
+	$minute_extra = null;
+	$second_extra = null;
+	$meridian_extra = null;
+
+	foreach ($params as $_key => $_value) {
+		switch ($_key) {
+			case 'time':
+				if (!is_array($_value) && $_value !== null) {
+					$time = smarty_make_timestamp($_value);
+				}
+				break;
+
+			case 'prefix':
+			case 'field_array':
+
+			case 'field_separator':
+			case 'option_separator':
+
+			case 'all_extra':
+			case 'hour_extra':
+			case 'minute_extra':
+			case 'second_extra':
+			case 'meridian_extra':
+
+			case 'all_empty':
+			case 'hour_empty':
+			case 'minute_empty':
+			case 'second_empty':
+			case 'meridian_empty':
+
+			case 'all_id':
+			case 'hour_id':
+			case 'minute_id':
+			case 'second_id':
+			case 'meridian_id':
+
+			case 'hour_format':
+			case 'hour_value_format':
+			case 'minute_format':
+			case 'minute_value_format':
+			case 'second_format':
+			case 'second_value_format':
+				$$_key = (string) $_value;
+				break;
+
+			case 'display_hours':
+			case 'display_minutes':
+			case 'display_seconds':
+			case 'display_meridian':
+			case 'use_24_hours':
+				$$_key = (bool) $_value;
+				break;
+
+			case 'minute_interval':
+			case 'second_interval':
+
+			case 'hour_size':
+			case 'minute_size':
+			case 'second_size':
+			case 'meridian_size':
+				$$_key = (int) $_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;
+		}
+	}
+
+	if (isset($params[ 'time' ]) && is_array($params[ 'time' ])) {
+		if (isset($params[ 'time' ][ $prefix . 'Hour' ])) {
+			// $_REQUEST[$field_array] given
+			foreach (array('H' => 'Hour', 'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
+				$_variableName = '_' . strtolower($_elementName);
+				$$_variableName =
+					isset($params[ 'time' ][ $prefix . $_elementName ]) ? $params[ 'time' ][ $prefix . $_elementName ] :
+						date($_elementKey);
+			}
+			$_meridian =
+				isset($params[ 'time' ][ $prefix . 'Meridian' ]) ? (' ' . $params[ 'time' ][ $prefix . 'Meridian' ]) :
+					'';
+			$time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
+			list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
+		} elseif (isset($params[ 'time' ][ $field_array ][ $prefix . 'Hour' ])) {
+			// $_REQUEST given
+			foreach (array('H' => 'Hour', 'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
+				$_variableName = '_' . strtolower($_elementName);
+				$$_variableName = isset($params[ 'time' ][ $field_array ][ $prefix . $_elementName ]) ?
+					$params[ 'time' ][ $field_array ][ $prefix . $_elementName ] : date($_elementKey);
+			}
+			$_meridian = isset($params[ 'time' ][ $field_array ][ $prefix . 'Meridian' ]) ?
+				(' ' . $params[ 'time' ][ $field_array ][ $prefix . 'Meridian' ]) : '';
+			$time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
+			list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
+		} 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)) {
+			$_hour = $_minute = $_second = $time = null;
+		} else {
+			list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s'));
+		}
+	} else {
+		list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
+	}
+
+	// generate hour <select>
+	if ($display_hours) {
+		$_html_hours = '';
+		$_extra = '';
+		$_name = $field_array ? ($field_array . '[' . $prefix . 'Hour]') : ($prefix . 'Hour');
+		if ($all_extra) {
+			$_extra .= ' ' . $all_extra;
+		}
+		if ($hour_extra) {
+			$_extra .= ' ' . $hour_extra;
+		}
+
+		$_html_hours = '<select name="' . $_name . '"';
+		if ($hour_id !== null || $all_id !== null) {
+			$_html_hours .= ' id="' .
+							smarty_function_escape_special_chars($hour_id !== null ? ($hour_id ? $hour_id : $_name) :
+																	 ($all_id ? ($all_id . $_name) : $_name)) . '"';
+		}
+		if ($hour_size) {
+			$_html_hours .= ' size="' . $hour_size . '"';
+		}
+		$_html_hours .= $_extra . $extra_attrs . '>' . $option_separator;
+
+		if (isset($hour_empty) || isset($all_empty)) {
+			$_html_hours .= '<option value="">' . (isset($hour_empty) ? $hour_empty : $all_empty) . '</option>' .
+							$option_separator;
+		}
+
+		$start = $use_24_hours ? 0 : 1;
+		$end = $use_24_hours ? 23 : 12;
+		for ($i = $start; $i <= $end; $i ++) {
+			$_val = sprintf('%02d', $i);
+			$_text = $hour_format == '%02d' ? $_val : sprintf($hour_format, $i);
+			$_value = $hour_value_format == '%02d' ? $_val : sprintf($hour_value_format, $i);
+
+			if (!$use_24_hours) {
+				$_hour12 = $_hour == 0 ? 12 : ($_hour <= 12 ? $_hour : $_hour - 12);
+			}
+
+			$selected = $_hour !== null ? ($use_24_hours ? $_hour == $_val : $_hour12 == $_val) : null;
+			$_html_hours .= '<option value="' . $_value . '"' . ($selected ? ' selected="selected"' : '') . '>' .
+							$_text . '</option>' . $option_separator;
+		}
+
+		$_html_hours .= '</select>';
+	}
+
+	// generate minute <select>
+	if ($display_minutes) {
+		$_html_minutes = '';
+		$_extra = '';
+		$_name = $field_array ? ($field_array . '[' . $prefix . 'Minute]') : ($prefix . 'Minute');
+		if ($all_extra) {
+			$_extra .= ' ' . $all_extra;
+		}
+		if ($minute_extra) {
+			$_extra .= ' ' . $minute_extra;
+		}
+
+		$_html_minutes = '<select name="' . $_name . '"';
+		if ($minute_id !== null || $all_id !== null) {
+			$_html_minutes .= ' id="' . smarty_function_escape_special_chars($minute_id !== null ?
+																				 ($minute_id ? $minute_id : $_name) :
+																				 ($all_id ? ($all_id . $_name) :
+																					 $_name)) . '"';
+		}
+		if ($minute_size) {
+			$_html_minutes .= ' size="' . $minute_size . '"';
+		}
+		$_html_minutes .= $_extra . $extra_attrs . '>' . $option_separator;
+
+		if (isset($minute_empty) || isset($all_empty)) {
+			$_html_minutes .= '<option value="">' . (isset($minute_empty) ? $minute_empty : $all_empty) . '</option>' .
+							  $option_separator;
+		}
+
+		$selected = $_minute !== null ? ($_minute - $_minute % $minute_interval) : null;
+		for ($i = 0; $i <= 59; $i += $minute_interval) {
+			$_val = sprintf('%02d', $i);
+			$_text = $minute_format == '%02d' ? $_val : sprintf($minute_format, $i);
+			$_value = $minute_value_format == '%02d' ? $_val : sprintf($minute_value_format, $i);
+			$_html_minutes .= '<option value="' . $_value . '"' . ($selected === $i ? ' selected="selected"' : '') .
+							  '>' . $_text . '</option>' . $option_separator;
+		}
+
+		$_html_minutes .= '</select>';
+	}
+
+	// generate second <select>
+	if ($display_seconds) {
+		$_html_seconds = '';
+		$_extra = '';
+		$_name = $field_array ? ($field_array . '[' . $prefix . 'Second]') : ($prefix . 'Second');
+		if ($all_extra) {
+			$_extra .= ' ' . $all_extra;
+		}
+		if ($second_extra) {
+			$_extra .= ' ' . $second_extra;
+		}
+
+		$_html_seconds = '<select name="' . $_name . '"';
+		if ($second_id !== null || $all_id !== null) {
+			$_html_seconds .= ' id="' . smarty_function_escape_special_chars($second_id !== null ?
+																				 ($second_id ? $second_id : $_name) :
+																				 ($all_id ? ($all_id . $_name) :
+																					 $_name)) . '"';
+		}
+		if ($second_size) {
+			$_html_seconds .= ' size="' . $second_size . '"';
+		}
+		$_html_seconds .= $_extra . $extra_attrs . '>' . $option_separator;
+
+		if (isset($second_empty) || isset($all_empty)) {
+			$_html_seconds .= '<option value="">' . (isset($second_empty) ? $second_empty : $all_empty) . '</option>' .
+							  $option_separator;
+		}
+
+		$selected = $_second !== null ? ($_second - $_second % $second_interval) : null;
+		for ($i = 0; $i <= 59; $i += $second_interval) {
+			$_val = sprintf('%02d', $i);
+			$_text = $second_format == '%02d' ? $_val : sprintf($second_format, $i);
+			$_value = $second_value_format == '%02d' ? $_val : sprintf($second_value_format, $i);
+			$_html_seconds .= '<option value="' . $_value . '"' . ($selected === $i ? ' selected="selected"' : '') .
+							  '>' . $_text . '</option>' . $option_separator;
+		}
+
+		$_html_seconds .= '</select>';
+	}
+
+	// generate meridian <select>
+	if ($display_meridian && !$use_24_hours) {
+		$_html_meridian = '';
+		$_extra = '';
+		$_name = $field_array ? ($field_array . '[' . $prefix . 'Meridian]') : ($prefix . 'Meridian');
+		if ($all_extra) {
+			$_extra .= ' ' . $all_extra;
+		}
+		if ($meridian_extra) {
+			$_extra .= ' ' . $meridian_extra;
+		}
+
+		$_html_meridian = '<select name="' . $_name . '"';
+		if ($meridian_id !== null || $all_id !== null) {
+			$_html_meridian .= ' id="' . smarty_function_escape_special_chars($meridian_id !== null ?
+																				  ($meridian_id ? $meridian_id :
+																					  $_name) :
+																				  ($all_id ? ($all_id . $_name) :
+																					  $_name)) . '"';
+		}
+		if ($meridian_size) {
+			$_html_meridian .= ' size="' . $meridian_size . '"';
+		}
+		$_html_meridian .= $_extra . $extra_attrs . '>' . $option_separator;
+
+		if (isset($meridian_empty) || isset($all_empty)) {
+			$_html_meridian .= '<option value="">' . (isset($meridian_empty) ? $meridian_empty : $all_empty) .
+							   '</option>' . $option_separator;
+		}
+
+		$_html_meridian .= '<option value="am"' . ($_hour > 0 && $_hour < 12 ? ' selected="selected"' : '') .
+						   '>AM</option>' . $option_separator . '<option value="pm"' .
+						   ($_hour < 12 ? '' : ' selected="selected"') . '>PM</option>' . $option_separator .
+						   '</select>';
+	}
+
+	$_html = '';
+	foreach (array('_html_hours', '_html_minutes', '_html_seconds', '_html_meridian') as $k) {
+		if (isset($$k)) {
+			if ($_html) {
+				$_html .= $field_separator;
+			}
+			$_html .= $$k;
+		}
+	}
+
+	return $_html;
 }

Spacing +14 added lines, -24 removed lines

@@ -148,29 +148,27 @@ 
         }
     }
 
-    if (isset($params[ 'time' ]) && is_array($params[ 'time' ])) {
-        if (isset($params[ 'time' ][ $prefix . 'Hour' ])) {
+    if (isset($params['time']) && is_array($params['time'])) {
+        if (isset($params['time'][$prefix . 'Hour'])) {
             // $_REQUEST[$field_array] given
             foreach (array('H' => 'Hour', 'i' => 'Minute', 's' => 'Second') 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);
             }
             $_meridian =
-                isset($params[ 'time' ][ $prefix . 'Meridian' ]) ? (' ' . $params[ 'time' ][ $prefix . 'Meridian' ]) :
-                    '';
+                isset($params['time'][$prefix . 'Meridian']) ? (' ' . $params['time'][$prefix . 'Meridian']) : '';
             $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
             list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
-        } elseif (isset($params[ 'time' ][ $field_array ][ $prefix . 'Hour' ])) {
+        } elseif (isset($params['time'][$field_array][$prefix . 'Hour'])) {
             // $_REQUEST given
             foreach (array('H' => 'Hour', 'i' => 'Minute', 's' => 'Second') 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);
             }
-            $_meridian = isset($params[ 'time' ][ $field_array ][ $prefix . 'Meridian' ]) ?
-                (' ' . $params[ 'time' ][ $field_array ][ $prefix . 'Meridian' ]) : '';
+            $_meridian = isset($params['time'][$field_array][$prefix . 'Meridian']) ?
+                (' ' . $params['time'][$field_array][$prefix . 'Meridian']) : '';
             $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
             list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
         } else {
@@ -202,8 +200,7 @@ 
         $_html_hours = '<select name="' . $_name . '"';
         if ($hour_id !== null || $all_id !== null) {
             $_html_hours .= ' id="' .
-                            smarty_function_escape_special_chars($hour_id !== null ? ($hour_id ? $hour_id : $_name) :
-                                                                     ($all_id ? ($all_id . $_name) : $_name)) . '"';
+                            smarty_function_escape_special_chars($hour_id !== null ? ($hour_id ? $hour_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)) . '"';
         }
         if ($hour_size) {
             $_html_hours .= ' size="' . $hour_size . '"';
@@ -217,7 +214,7 @@ 
 
         $start = $use_24_hours ? 0 : 1;
         $end = $use_24_hours ? 23 : 12;
-        for ($i = $start; $i <= $end; $i ++) {
+        for ($i = $start; $i <= $end; $i++) {
             $_val = sprintf('%02d', $i);
             $_text = $hour_format == '%02d' ? $_val : sprintf($hour_format, $i);
             $_value = $hour_value_format == '%02d' ? $_val : sprintf($hour_value_format, $i);
@@ -249,9 +246,7 @@ 
         $_html_minutes = '<select name="' . $_name . '"';
         if ($minute_id !== null || $all_id !== null) {
             $_html_minutes .= ' id="' . smarty_function_escape_special_chars($minute_id !== null ?
-                                                                                 ($minute_id ? $minute_id : $_name) :
-                                                                                 ($all_id ? ($all_id . $_name) :
-                                                                                     $_name)) . '"';
+                                                                                 ($minute_id ? $minute_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)) . '"';
         }
         if ($minute_size) {
             $_html_minutes .= ' size="' . $minute_size . '"';
@@ -290,9 +285,7 @@ 
         $_html_seconds = '<select name="' . $_name . '"';
         if ($second_id !== null || $all_id !== null) {
             $_html_seconds .= ' id="' . smarty_function_escape_special_chars($second_id !== null ?
-                                                                                 ($second_id ? $second_id : $_name) :
-                                                                                 ($all_id ? ($all_id . $_name) :
-                                                                                     $_name)) . '"';
+                                                                                 ($second_id ? $second_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)) . '"';
         }
         if ($second_size) {
             $_html_seconds .= ' size="' . $second_size . '"';
@@ -331,10 +324,7 @@ 
         $_html_meridian = '<select name="' . $_name . '"';
         if ($meridian_id !== null || $all_id !== null) {
             $_html_meridian .= ' id="' . smarty_function_escape_special_chars($meridian_id !== null ?
-                                                                                  ($meridian_id ? $meridian_id :
-                                                                                      $_name) :
-                                                                                  ($all_id ? ($all_id . $_name) :
-                                                                                      $_name)) . '"';
+                                                                                  ($meridian_id ? $meridian_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)) . '"';
         }
         if ($meridian_size) {
             $_html_meridian .= ' size="' . $meridian_size . '"';

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] . ')';
 }