Cleanup whitespace.

This commit is contained in:
andrey
2001-10-26 14:17:29 +00:00
parent 7bb141a0ce
commit 92a8a31260

View File

@@ -54,8 +54,8 @@ function smarty_mod_escape($string, $esc_type = 'html')
case 'url': case 'url':
return urlencode($string); return urlencode($string);
case 'quotes': case 'quotes':
// escape unescaped single quotes // escape unescaped single quotes
return preg_replace("%(?<!\\\\)'%", "\\'", $string); return preg_replace("%(?<!\\\\)'%", "\\'", $string);
default: default:
@@ -114,11 +114,11 @@ function smarty_mod_date_format($string, $format="%b %e, %Y")
function smarty_make_timestamp($string) function smarty_make_timestamp($string)
{ {
$time = strtotime($string); $time = strtotime($string);
if(is_numeric($time) && $time != -1) if (is_numeric($time) && $time != -1)
return $time; return $time;
// is mysql timestamp format of YYYYMMDDHHMMSS? // is mysql timestamp format of YYYYMMDDHHMMSS?
if(is_numeric($string) && strlen($string) == 14) { if (is_numeric($string) && strlen($string) == 14) {
$time = mktime(substr($string,8,2),substr($string,10,2),substr($string,12,2), $time = mktime(substr($string,8,2),substr($string,10,2),substr($string,12,2),
substr($string,4,2),substr($string,6,2),substr($string,0,4)); substr($string,4,2),substr($string,6,2),substr($string,0,4));
@@ -174,7 +174,7 @@ function smarty_mod_strip_tags($string, $replace_with_space = true)
\*======================================================================*/ \*======================================================================*/
function smarty_mod_default($string, $default="") function smarty_mod_default($string, $default="")
{ {
if(empty($string)) if (empty($string))
return $default; return $default;
else else
return $string; return $string;
@@ -186,20 +186,20 @@ function smarty_mod_default($string, $default="")
\*======================================================================*/ \*======================================================================*/
function smarty_func_assign($args, &$smarty_obj) function smarty_func_assign($args, &$smarty_obj)
{ {
extract($args); extract($args);
if (empty($var)) { if (empty($var)) {
$smarty_obj->_trigger_error_msg("assign: missing 'var' parameter"); $smarty_obj->_trigger_error_msg("assign: missing 'var' parameter");
return; return;
} }
if (empty($value)) { if (empty($value)) {
$smarty_obj->_trigger_error_msg("assign: missing 'value' parameter"); $smarty_obj->_trigger_error_msg("assign: missing 'value' parameter");
return; return;
} }
$smarty_obj->assign($var, $value); $smarty_obj->assign($var, $value);
return true; return true;
} }
/*============================================*\ /*============================================*\
@@ -503,7 +503,7 @@ function smarty_func_html_select_time()
\*======================================================================*/ \*======================================================================*/
function smarty_func_math($args, $smarty_obj) { function smarty_func_math($args, $smarty_obj) {
// be sure equation parameter is present // be sure equation parameter is present
if(empty($args["equation"])) { if (empty($args["equation"])) {
$smarty_obj->_trigger_error_msg("math: missing equation parameter"); $smarty_obj->_trigger_error_msg("math: missing equation parameter");
return; return;
} }
@@ -511,7 +511,7 @@ function smarty_func_math($args, $smarty_obj) {
$equation = $args["equation"]; $equation = $args["equation"];
// make sure parenthesis are balanced // make sure parenthesis are balanced
if(substr_count($equation,"(") != substr_count($equation,")")) { if (substr_count($equation,"(") != substr_count($equation,")")) {
$smarty_obj->_trigger_error_msg("math: unbalanced parenthesis"); $smarty_obj->_trigger_error_msg("math: unbalanced parenthesis");
return; return;
} }
@@ -522,20 +522,20 @@ function smarty_func_math($args, $smarty_obj) {
'max','min','pi','pow','rand','round','sin','sqrt','srand','tan'); 'max','min','pi','pow','rand','round','sin','sqrt','srand','tan');
foreach($match[0] as $curr_var) { foreach($match[0] as $curr_var) {
if(!in_array($curr_var,array_keys($args)) && !in_array($curr_var, $allowed_funcs)) { if (!in_array($curr_var,array_keys($args)) && !in_array($curr_var, $allowed_funcs)) {
$smarty_obj->_trigger_error_msg("math: parameter $curr_var not passed as argument"); $smarty_obj->_trigger_error_msg("math: parameter $curr_var not passed as argument");
return; return;
} }
} }
foreach($args as $key => $val) { foreach($args as $key => $val) {
if($key != "equation" && $key != "format") { if ($key != "equation" && $key != "format") {
// make sure value is not empty // make sure value is not empty
if(strlen($val)==0) { if (strlen($val)==0) {
$smarty_obj->_trigger_error_msg("math: parameter $key is empty"); $smarty_obj->_trigger_error_msg("math: parameter $key is empty");
return; return;
} }
if(!is_numeric($val)) { if (!is_numeric($val)) {
$smarty_obj->_trigger_error_msg("math: parameter $key: is not numeric"); $smarty_obj->_trigger_error_msg("math: parameter $key: is not numeric");
return; return;
} }
@@ -545,7 +545,7 @@ function smarty_func_math($args, $smarty_obj) {
eval("\$smarty_math_result = ".$equation.";"); eval("\$smarty_math_result = ".$equation.";");
if(empty($args["format"])) if (empty($args["format"]))
echo $smarty_math_result; echo $smarty_math_result;
else else
printf($args["format"],$smarty_math_result); printf($args["format"],$smarty_math_result);
@@ -563,23 +563,23 @@ function smarty_func_fetch($args, &$smarty_obj) {
return; return;
} }
if ($smarty_obj->security && !preg_match('!^(http|ftp)://!', $file)) { if ($smarty_obj->security && !preg_match('!^(http|ftp)://!', $file)) {
// make sure fetched file comes from secure directory // make sure fetched file comes from secure directory
foreach ($smarty_obj->secure_dir as $curr_dir) { foreach ($smarty_obj->secure_dir as $curr_dir) {
if (substr(realpath($file), 0, strlen(realpath($curr_dir))) == realpath($curr_dir)) { if (substr(realpath($file), 0, strlen(realpath($curr_dir))) == realpath($curr_dir)) {
$resource_is_secure = true; $resource_is_secure = true;
break; break;
} }
} }
if (!$resource_is_secure) { if (!$resource_is_secure) {
$smarty_obj->_trigger_error_msg("(secure mode) fetch '$file' is not allowed"); $smarty_obj->_trigger_error_msg("(secure mode) fetch '$file' is not allowed");
return; return;
} }
} }
if (!@is_readable($file)) { if (!@is_readable($file)) {
$smarty_obj->_trigger_error_msg("fetch cannot read file '$file'"); $smarty_obj->_trigger_error_msg("fetch cannot read file '$file'");
return; return;
} }
readfile($file); readfile($file);
} }
@@ -590,7 +590,7 @@ function smarty_func_fetch($args, &$smarty_obj) {
\*======================================================================*/ \*======================================================================*/
function smarty_mod_count_characters($string,$include_spaces=false) { function smarty_mod_count_characters($string,$include_spaces=false) {
if($include_spaces) if ($include_spaces)
return(strlen($string)); return(strlen($string));
return preg_match_all("/[^\s]/",$string,$match); return preg_match_all("/[^\s]/",$string,$match);
@@ -637,44 +637,44 @@ function smarty_mod_count_paragraphs($string,$include_spaces=false) {
\*======================================================================*/ \*======================================================================*/
function smarty_func_counter() { function smarty_func_counter() {
static $count = array(); static $count = array();
static $skipval = array(); static $skipval = array();
static $dir = array(); static $dir = array();
static $id = "default"; static $id = "default";
static $printval = array(); static $printval = array();
extract(func_get_arg(0)); extract(func_get_arg(0));
if(!isset($id)) if (!isset($id))
$id = "default"; $id = "default";
if(isset($start)) if (isset($start))
$count[$id] = $start; $count[$id] = $start;
elseif(!isset($count[$id])) elseif (!isset($count[$id]))
$count[$id]=1; $count[$id]=1;
if(!isset($print)) if (!isset($print))
$printval[$id]=true; $printval[$id]=true;
else else
$printval[$id]=$print; $printval[$id]=$print;
if($printval[$id]) if ($printval[$id])
echo $count[$id]; echo $count[$id];
if(isset($skip)) if (isset($skip))
$skipval[$id] = $skip; $skipval[$id] = $skip;
elseif(!isset($skipval)) elseif (!isset($skipval))
$skipval[$id] = 1; $skipval[$id] = 1;
if(isset($direction)) if (isset($direction))
$dir[$id] = $direction; $dir[$id] = $direction;
elseif(!isset($dir[$id])) elseif (!isset($dir[$id]))
$dir[$id] = "up"; $dir[$id] = "up";
if($dir[$id] == "down") if ($dir[$id] == "down")
$count[$id] -= $skipval[$id]; $count[$id] -= $skipval[$id];
else else
$count[$id] += $skipval[$id]; $count[$id] += $skipval[$id];
return true; return true;
} }
@@ -684,22 +684,22 @@ function smarty_func_counter() {
Purpose: assign debug info to the template Purpose: assign debug info to the template
\*======================================================================*/ \*======================================================================*/
function smarty_func_assign_debug_info($args, &$smarty_obj) { function smarty_func_assign_debug_info($args, &$smarty_obj) {
$assigned_vars = $smarty_obj->_tpl_vars; $assigned_vars = $smarty_obj->_tpl_vars;
ksort($assigned_vars); ksort($assigned_vars);
if(is_array($smarty_obj->_config[0])) { if (is_array($smarty_obj->_config[0])) {
$config_vars = $smarty_obj->_config[0]; $config_vars = $smarty_obj->_config[0];
ksort($config_vars); ksort($config_vars);
$smarty_obj->assign("_debug_config_keys",array_keys($config_vars)); $smarty_obj->assign("_debug_config_keys",array_keys($config_vars));
$smarty_obj->assign("_debug_config_vals",array_values($config_vars)); $smarty_obj->assign("_debug_config_vals",array_values($config_vars));
} }
$included_templates = $smarty_obj->_included_tpls; $included_templates = $smarty_obj->_included_tpls;
$smarty_obj->assign("_debug_keys",array_keys($assigned_vars)); $smarty_obj->assign("_debug_keys",array_keys($assigned_vars));
$smarty_obj->assign("_debug_vals",array_values($assigned_vars)); $smarty_obj->assign("_debug_vals",array_values($assigned_vars));
$smarty_obj->assign("_debug_tpls",$included_templates); $smarty_obj->assign("_debug_tpls",$included_templates);
return true; return true;
} }
/*======================================================================*\ /*======================================================================*\
@@ -707,12 +707,12 @@ function smarty_func_assign_debug_info($args, &$smarty_obj) {
Purpose: initialize use of overlib Purpose: initialize use of overlib
\*======================================================================*/ \*======================================================================*/
function smarty_func_overlib_init($args, &$smarty_obj) { function smarty_func_overlib_init($args, &$smarty_obj) {
// be sure to place overlib.js where Smarty can locate it. // be sure to place overlib.js where Smarty can locate it.
// overlib.js came with the distribution of Smarty. // overlib.js came with the distribution of Smarty.
echo '<DIV ID="overDiv" STYLE="position:absolute; visibility:hidden; z-index:1000;"></DIV>'."\n".'<SCRIPT LANGUAGE=javascript>'."\n".'<!--'."\n"; echo '<DIV ID="overDiv" STYLE="position:absolute; visibility:hidden; z-index:1000;"></DIV>'."\n".'<SCRIPT LANGUAGE=javascript>'."\n".'<!--'."\n";
readfile(SMARTY_DIR."overlib.js",1); readfile(SMARTY_DIR."overlib.js",1);
echo '// -->'."\n".'</SCRIPT>'."\n"; echo '// -->'."\n".'</SCRIPT>'."\n";
return; return;
} }
/*======================================================================*\ /*======================================================================*\
@@ -720,64 +720,64 @@ function smarty_func_overlib_init($args, &$smarty_obj) {
Purpose: make text pop up in windows via overlib Purpose: make text pop up in windows via overlib
\*======================================================================*/ \*======================================================================*/
function smarty_func_overlib($args, &$smarty_obj) { function smarty_func_overlib($args, &$smarty_obj) {
extract($args); extract($args);
if (empty($text)) { if (empty($text)) {
$smarty_obj->_trigger_error_msg("overlib: attribute 'text' required"); $smarty_obj->_trigger_error_msg("overlib: attribute 'text' required");
return false; return false;
} }
if(empty($trigger)) { $trigger = "onMouseOver"; } if (empty($trigger)) { $trigger = "onMouseOver"; }
echo $trigger.'="return overlib(\''.str_replace("'","\'",$text).'\''; echo $trigger.'="return overlib(\''.str_replace("'","\'",$text).'\'';
if($sticky) { echo ",STICKY"; } if ($sticky) { echo ",STICKY"; }
if(!empty($caption)) { echo ",CAPTION,'".str_replace("'","\'",$caption)."'"; } if (!empty($caption)) { echo ",CAPTION,'".str_replace("'","\'",$caption)."'"; }
if(!empty($fgcolor)) { echo ",FGCOLOR,'$fgcolor'"; } if (!empty($fgcolor)) { echo ",FGCOLOR,'$fgcolor'"; }
if(!empty($bgcolor)) { echo ",BGCOLOR,'$bgcolor'"; } if (!empty($bgcolor)) { echo ",BGCOLOR,'$bgcolor'"; }
if(!empty($textcolor)) { echo ",TEXTCOLOR,'$textcolor'"; } if (!empty($textcolor)) { echo ",TEXTCOLOR,'$textcolor'"; }
if(!empty($capcolor)) { echo ",CAPCOLOR,'$capcolor'"; } if (!empty($capcolor)) { echo ",CAPCOLOR,'$capcolor'"; }
if(!empty($closecolor)) { echo ",CLOSECOLOR,'$closecolor'"; } if (!empty($closecolor)) { echo ",CLOSECOLOR,'$closecolor'"; }
if(!empty($textfont)) { echo ",TEXTFONT,'$textfont'"; } if (!empty($textfont)) { echo ",TEXTFONT,'$textfont'"; }
if(!empty($captionfont)) { echo ",CAPTIONFONT,'$captionfont'"; } if (!empty($captionfont)) { echo ",CAPTIONFONT,'$captionfont'"; }
if(!empty($closefont)) { echo ",CLOSEFONT,'$closefont'"; } if (!empty($closefont)) { echo ",CLOSEFONT,'$closefont'"; }
if(!empty($textsize)) { echo ",TEXTSIZE,'$textsize'"; } if (!empty($textsize)) { echo ",TEXTSIZE,'$textsize'"; }
if(!empty($captionsize)) { echo ",CAPTIONSIZE,'$captionsize'"; } if (!empty($captionsize)) { echo ",CAPTIONSIZE,'$captionsize'"; }
if(!empty($closesize)) { echo ",CLOSESIZE,'$closesize'"; } if (!empty($closesize)) { echo ",CLOSESIZE,'$closesize'"; }
if(!empty($width)) { echo ",WIDTH,'$width'"; } if (!empty($width)) { echo ",WIDTH,'$width'"; }
if(!empty($height)) { echo ",HEIGHT,'$height'"; } if (!empty($height)) { echo ",HEIGHT,'$height'"; }
if(!empty($left)) { echo ",LEFT"; } if (!empty($left)) { echo ",LEFT"; }
if(!empty($right)) { echo ",RIGHT"; } if (!empty($right)) { echo ",RIGHT"; }
if(!empty($center)) { echo ",CENTER"; } if (!empty($center)) { echo ",CENTER"; }
if(!empty($above)) { echo ",ABOVE"; } if (!empty($above)) { echo ",ABOVE"; }
if(!empty($below)) { echo ",BELOW"; } if (!empty($below)) { echo ",BELOW"; }
if(!empty($border)) { echo ",BORDER,'$border'"; } if (!empty($border)) { echo ",BORDER,'$border'"; }
if(!empty($offsetx)) { echo ",OFFSETX,'$offsetx'"; } if (!empty($offsetx)) { echo ",OFFSETX,'$offsetx'"; }
if(!empty($offsety)) { echo ",OFFSETY,'$offsetxy'"; } if (!empty($offsety)) { echo ",OFFSETY,'$offsetxy'"; }
if(!empty($fgbackground)) { echo ",FGBACKGROUND,'$fgbackground'"; } if (!empty($fgbackground)) { echo ",FGBACKGROUND,'$fgbackground'"; }
if(!empty($bgbackground)) { echo ",BGBACKGROUND,'$bgbackground'"; } if (!empty($bgbackground)) { echo ",BGBACKGROUND,'$bgbackground'"; }
if(!empty($closetext)) { echo ",CLOSETEXT,'".str_replace("'","\'",$closetext)."'"; } if (!empty($closetext)) { echo ",CLOSETEXT,'".str_replace("'","\'",$closetext)."'"; }
if(!empty($noclose)) { echo ",NOCLOSE"; } if (!empty($noclose)) { echo ",NOCLOSE"; }
if(!empty($status)) { echo ",STATUS,'".str_replace("'","\'",$status)."'"; } if (!empty($status)) { echo ",STATUS,'".str_replace("'","\'",$status)."'"; }
if(!empty($autostatus)) { echo ",AUTOSTATUS"; } if (!empty($autostatus)) { echo ",AUTOSTATUS"; }
if(!empty($autostatuscap)) { echo ",AUTOSTATUSCAP"; } if (!empty($autostatuscap)) { echo ",AUTOSTATUSCAP"; }
if(!empty($inarray)) { echo ",INARRAY,'$inarray'"; } if (!empty($inarray)) { echo ",INARRAY,'$inarray'"; }
if(!empty($caparray)) { echo ",CAPARRAY,'$caparray'"; } if (!empty($caparray)) { echo ",CAPARRAY,'$caparray'"; }
if(!empty($capicaon)) { echo ",CAPICON,'$capicon'"; } if (!empty($capicaon)) { echo ",CAPICON,'$capicon'"; }
if(!empty($snapx)) { echo ",SNAPX,'$snapx'"; } if (!empty($snapx)) { echo ",SNAPX,'$snapx'"; }
if(!empty($snapy)) { echo ",SNAPY,'$snapy'"; } if (!empty($snapy)) { echo ",SNAPY,'$snapy'"; }
if(!empty($fixx)) { echo ",FIXX,'$fixx'"; } if (!empty($fixx)) { echo ",FIXX,'$fixx'"; }
if(!empty($fixy)) { echo ",FIXY,'$fixy'"; } if (!empty($fixy)) { echo ",FIXY,'$fixy'"; }
if(!empty($background)) { echo ",BACKGROUND,'$background'"; } if (!empty($background)) { echo ",BACKGROUND,'$background'"; }
if(!empty($padx)) { echo ",PADX,'$padx'"; } if (!empty($padx)) { echo ",PADX,'$padx'"; }
if(!empty($pady)) { echo ",PADY,'$pady'"; } if (!empty($pady)) { echo ",PADY,'$pady'"; }
if(!empty($fullhtml)) { echo ",FULLHTML"; } if (!empty($fullhtml)) { echo ",FULLHTML"; }
if(!empty($frame)) { echo ",FRAME,'$frame'"; } if (!empty($frame)) { echo ",FRAME,'$frame'"; }
if(!empty($timeout)) { echo ",TIMEOUT,'$timeout'"; } if (!empty($timeout)) { echo ",TIMEOUT,'$timeout'"; }
if(!empty($function)) { echo ",FUNCTION,'$function'"; } if (!empty($function)) { echo ",FUNCTION,'$function'"; }
if(!empty($delay)) { echo ",DELAY,'$delay'"; } if (!empty($delay)) { echo ",DELAY,'$delay'"; }
if(!empty($hauto)) { echo ",HAUTO"; } if (!empty($hauto)) { echo ",HAUTO"; }
if(!empty($vauto)) { echo ",VAUTO"; } if (!empty($vauto)) { echo ",VAUTO"; }
echo ');" onMouseOut="nd();"'; echo ');" onMouseOut="nd();"';
return; return;
} }
/* vim: set expandtab: */ /* vim: set expandtab: */