smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-06 11:24:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

update math function with format attribute

Browse Source
This commit is contained in:
mohrt
2001-03-11 21:20:14 +00:00
parent 354dba0f17
commit 9a3dcbe1cd
7 changed files with 143 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
NEWS
View File

@@ -1,8 +1,13 @@
- added html_select_time custom function. (Andrei) - added format attribute to math function (Monte)
- added html_select_time custom function. (Andrei)
- fixed minor PHP warning when attempting to unset an unset variable
(Monte)
- added count_characters, count_words, count_sentences, count_paragraphs
modifiers (Monte)
Version 1.3.1pl1 Version 1.3.1pl1
-------------- --------------
- bug fix, recovered missing _syntax_error function - bug fix, recovered missing _syntax_error function (Monte)
Version 1.3.1 Version 1.3.1
------------- -------------

179
Smarty.addons.php
View File

@@ -267,8 +267,8 @@ function smarty_func_html_select_date()
if ($display_days) { if ($display_days) {
$days = range(1, 31); $days = range(1, 31);
for ($i = 0; $i < count($days); $i++) for ($i = 0; $i < count($days); $i++)
$days[$i] = sprintf($day_format, $days[$i]); $days[$i] = sprintf($day_format, $days[$i]);
$html_result .= '<select name="'.$prefix.'Day">'."\n"; $html_result .= '<select name="'.$prefix.'Day">'."\n";
$html_result .= smarty_func_html_options(array('output' => $days, $html_result .= smarty_func_html_options(array('output' => $days,
@@ -304,69 +304,69 @@ function smarty_func_html_select_date()
function smarty_func_html_select_time() function smarty_func_html_select_time()
{ {
/* Default values. */ /* Default values. */
$prefix = "Time_"; $prefix = "Time_";
$time = time(); $time = time();
$display_hours = true; $display_hours = true;
$display_minutes = true; $display_minutes = true;
$display_seconds = true; $display_seconds = true;
$display_meridian = true; $display_meridian = true;
$use_24_hours = true; $use_24_hours = true;
$minute_interval = 1; $minute_interval = 1;
$second_interval = 1; $second_interval = 1;
extract(func_get_arg(0)); extract(func_get_arg(0));
$html_result = ''; $html_result = '';
if ($display_hours) { if ($display_hours) {
$hours = $use_24_hours ? range(0, 23) : range(1, 12); $hours = $use_24_hours ? range(0, 23) : range(1, 12);
$hour_fmt = $use_24_hours ? '%H' : '%I'; $hour_fmt = $use_24_hours ? '%H' : '%I';
for ($i = 0; $i < count($hours); $i++) for ($i = 0; $i < count($hours); $i++)
$hours[$i] = sprintf('%02d', $hours[$i]); $hours[$i] = sprintf('%02d', $hours[$i]);
$html_result .= '<select name="'.$prefix.'Hour">'."\n"; $html_result .= '<select name="'.$prefix.'Hour">'."\n";
$html_result .= smarty_func_html_options(array('output' => $hours, $html_result .= smarty_func_html_options(array('output' => $hours,
'values' => $hours, 'values' => $hours,
'selected' => strftime($hour_fmt, $time), 'selected' => strftime($hour_fmt, $time),
'print_result' => false)); 'print_result' => false));
$html_result .= "</select>\n"; $html_result .= "</select>\n";
} }
if ($display_minutes) { if ($display_minutes) {
$all_minutes = range(0, 59); $all_minutes = range(0, 59);
for ($i = 0; $i < count($all_minutes); $i+= $minute_interval) for ($i = 0; $i < count($all_minutes); $i+= $minute_interval)
$minutes[] = sprintf('%02d', $all_minutes[$i]); $minutes[] = sprintf('%02d', $all_minutes[$i]);
$selected = intval(floor(strftime('%M', $time) / $minute_interval) * $minute_interval); $selected = intval(floor(strftime('%M', $time) / $minute_interval) * $minute_interval);
$html_result .= '<select name="'.$prefix.'Minute">'."\n"; $html_result .= '<select name="'.$prefix.'Minute">'."\n";
$html_result .= smarty_func_html_options(array('output' => $minutes, $html_result .= smarty_func_html_options(array('output' => $minutes,
'values' => $minutes, 'values' => $minutes,
'selected' => $selected, 'selected' => $selected,
'print_result' => false)); 'print_result' => false));
$html_result .= "</select>\n"; $html_result .= "</select>\n";
} }
if ($display_seconds) { if ($display_seconds) {
$all_seconds = range(0, 59); $all_seconds = range(0, 59);
for ($i = 0; $i < count($all_seconds); $i+= $second_interval) for ($i = 0; $i < count($all_seconds); $i+= $second_interval)
$seconds[] = sprintf('%02d', $all_seconds[$i]); $seconds[] = sprintf('%02d', $all_seconds[$i]);
$selected = intval(floor(strftime('%S', $time) / $second_interval) * $second_interval); $selected = intval(floor(strftime('%S', $time) / $second_interval) * $second_interval);
$html_result .= '<select name="'.$prefix.'Second">'."\n"; $html_result .= '<select name="'.$prefix.'Second">'."\n";
$html_result .= smarty_func_html_options(array('output' => $seconds, $html_result .= smarty_func_html_options(array('output' => $seconds,
'values' => $seconds, 'values' => $seconds,
'selected' => $selected, 'selected' => $selected,
'print_result' => false)); 'print_result' => false));
$html_result .= "</select>\n"; $html_result .= "</select>\n";
} }
if ($display_meridian && !$use_24_hours) { if ($display_meridian && !$use_24_hours) {
$html_result .= '<select name="'.$prefix.'Meridian">'."\n"; $html_result .= '<select name="'.$prefix.'Meridian">'."\n";
$html_result .= smarty_func_html_options(array('output' => array('AM', 'PM'), $html_result .= smarty_func_html_options(array('output' => array('AM', 'PM'),
'values' => array('am', 'pm'), 'values' => array('am', 'pm'),
'selected' => strtolower(strftime('%p', $time)), 'selected' => strtolower(strftime('%p', $time)),
'print_result' => false)); 'print_result' => false));
$html_result .= "</select>\n"; $html_result .= "</select>\n";
} }
print $html_result; print $html_result;
} }
@@ -404,7 +404,7 @@ function smarty_func_math() {
} }
foreach($args as $key => $val) { foreach($args as $key => $val) {
if($key != "equation") { 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) {
trigger_error("math: parameter $key is empty"); trigger_error("math: parameter $key is empty");
@@ -418,7 +418,12 @@ function smarty_func_math() {
} }
} }
eval("echo ".$equation.";"); eval("\$smarty_math_result = ".$equation.";");
if(empty($args["format"]))
echo $smarty_math_result;
else
printf($args["format"],$smarty_math_result);
} }
/*======================================================================*\ /*======================================================================*\
@@ -428,12 +433,58 @@ function smarty_func_math() {
function smarty_func_fetch() { function smarty_func_fetch() {
extract(func_get_arg(0)); extract(func_get_arg(0));
if (empty($file)) { if(empty($file)) {
trigger_error("parameter 'file' cannot be empty"); trigger_error("parameter 'file' cannot be empty");
return; return;
} }
readfile($file);
}
readfile($file); /*======================================================================*\
Function: smarty_mod_count_characters
Purpose: count the number of characters in a text
\*======================================================================*/
function smarty_mod_count_characters($string,$include_spaces=false) {
if($include_spaces)
return(strlen($string));
return preg_match_all("/[^\s]/",$string,$match);
}
/*======================================================================*\
Function: smarty_mod_count_words
Purpose: count the number of words in a text
\*======================================================================*/
function smarty_mod_count_words($string) {
// split text by ' ',\r,\n,\f,\t
$split_array = preg_split("/\s+/",$string);
// count matches that contain alphanumerics
$word_count = preg_grep("/[a-zA-Z0-9]/",$split_array);
return count($word_count);
}
/*======================================================================*\
Function: smarty_mod_count_sentences
Purpose: count the number of sentences in a text
\*======================================================================*/
function smarty_mod_count_sentences($string,$include_spaces=false) {
// find periods with a word before but not after.
return preg_match_all("/[^\s]\.(?!\w)/",$string,$match);
}
/*======================================================================*\
Function: smarty_mod_count_paragraphs
Purpose: count the number of sentences in a text
\*======================================================================*/
function smarty_mod_count_paragraphs($string,$include_spaces=false) {
// count \r or \n characters
return count( preg_split("/[\r\n]+/",$string) );
} }
/* vim: set expandtab: */ /* vim: set expandtab: */

6
Smarty.class.php
View File

@@ -100,7 +100,11 @@ class Smarty
'string_format' => 'smarty_mod_string_format', 'string_format' => 'smarty_mod_string_format',
'replace' => 'smarty_mod_replace', 'replace' => 'smarty_mod_replace',
'strip_tags' => 'smarty_mod_strip_tags', 'strip_tags' => 'smarty_mod_strip_tags',
'default' => 'smarty_mod_default' 'default' => 'smarty_mod_default',
'count_characters' => 'smarty_mod_count_characters',
'count_words' => 'smarty_mod_count_words',
'count_sentences' => 'smarty_mod_count_sentences',
'count_paragraphs' => 'smarty_mod_count_paragraphs'
); );
// internal vars // internal vars

2
Smarty_Compiler.class.php
View File

@@ -463,7 +463,7 @@ class Smarty_Compiler extends Smarty {
$this->_syntax_error("missing section name"); $this->_syntax_error("missing section name");
} }
$output .= "unset(\$_sections[$section_name]);\n"; $output .= "if(isset(\$_sections[$section_name])) { unset(\$_sections[$section_name]); }\n";
$section_props = "\$_sections[$section_name]['properties']"; $section_props = "\$_sections[$section_name]['properties']";
foreach ($attrs as $attr_name => $attr_value) { foreach ($attrs as $attr_name => $attr_value) {

9
docs.sgml
View File

@@ -2356,6 +2356,15 @@ OUTPUT:
6 6
{* you can supply a format paramter in sprintf format *}
{math equation="x + y" x=4.4444 y=5.0000 format="%.2f"}
OUTPUT:
9.44
</programlisting> </programlisting>
</example> </example>
</sect2> </sect2>

6
libs/Smarty.class.php
View File

@@ -100,7 +100,11 @@ class Smarty
'string_format' => 'smarty_mod_string_format', 'string_format' => 'smarty_mod_string_format',
'replace' => 'smarty_mod_replace', 'replace' => 'smarty_mod_replace',
'strip_tags' => 'smarty_mod_strip_tags', 'strip_tags' => 'smarty_mod_strip_tags',
'default' => 'smarty_mod_default' 'default' => 'smarty_mod_default',
'count_characters' => 'smarty_mod_count_characters',
'count_words' => 'smarty_mod_count_words',
'count_sentences' => 'smarty_mod_count_sentences',
'count_paragraphs' => 'smarty_mod_count_paragraphs'
); );
// internal vars // internal vars

2
libs/Smarty_Compiler.class.php
View File

@@ -463,7 +463,7 @@ class Smarty_Compiler extends Smarty {
$this->_syntax_error("missing section name"); $this->_syntax_error("missing section name");
} }
$output .= "unset(\$_sections[$section_name]);\n"; $output .= "if(isset(\$_sections[$section_name])) { unset(\$_sections[$section_name]); }\n";
$section_props = "\$_sections[$section_name]['properties']"; $section_props = "\$_sections[$section_name]['properties']";
foreach ($attrs as $attr_name => $attr_value) { foreach ($attrs as $attr_name => $attr_value) {