diff options
Diffstat (limited to '')
| -rw-r--r-- | include/page_tail.php | 2 | ||||
| -rw-r--r-- | include/template.class.php | 135 |
2 files changed, 70 insertions, 67 deletions
diff --git a/include/page_tail.php b/include/page_tail.php index 4e5f88074..df0aa59a8 100644 --- a/include/page_tail.php +++ b/include/page_tail.php @@ -27,7 +27,7 @@ $template->set_filenames(array('tail'=>'footer.tpl')); trigger_action('loc_begin_page_tail'); -$template->assign_vars( +$template->assign( array( 'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '', 'PHPWG_URL' => PHPWG_URL, diff --git a/include/template.class.php b/include/template.class.php index b35d02c13..d4f0ef680 100644 --- a/include/template.class.php +++ b/include/template.class.php @@ -78,10 +78,9 @@ class Template { $this->smarty->compile_dir = $compile_dir; - $this->smarty->register_function( 'lang', array('Template', 'fn_l10n') ); - $this->smarty->assign_by_ref( 'pwg', new PwgTemplateAdapter() ); $this->smarty->register_modifier( 'translate', array('Template', 'mod_translate') ); + $this->smarty->register_modifier( 'explode', array('Template', 'mod_explode') ); if ( !empty($theme) ) { @@ -127,7 +126,6 @@ class Template { file_put_contents($this->smarty->compile_dir.'/index.htm', ''); } - /** DEPRECATED */ function get_themeconf($val) { $tc = $this->smarty->get_template_vars('themeconf'); @@ -183,18 +181,6 @@ class Template { } /** - * Inserts the uncompiled code for $handle as the value of $varname in the - * root-level. This can be used to effectively include a template in the - * middle of another template. - * This is equivalent to assign($varname, $this->parse($handle, true)) - */ - function assign_var_from_handle($varname, $handle) - { - $this->assign($varname, $this->parse($handle, true)); - return true; - } - - /** * DEPRECATED - backward compatibility only */ function assign_block_vars($blockname, $vararray) @@ -253,6 +239,66 @@ class Template { return true; } + /** see smarty assign http://www.smarty.net/manual/en/api.assign.php */ + function assign($tpl_var, $value = null) + { + $this->smarty->assign( $tpl_var, $value ); + + if ( is_array($tpl_var) ) + $this->_old->assign_vars( $tpl_var ); + else + $this->_old->assign_var( $tpl_var, $value ); + } + + /** + * Inserts the uncompiled code for $handle as the value of $varname in the + * root-level. This can be used to effectively include a template in the + * middle of another template. + * This is equivalent to assign($varname, $this->parse($handle, true)) + */ + function assign_var_from_handle($varname, $handle) + { + $this->assign($varname, $this->parse($handle, true)); + return true; + } + + /** see smarty append http://www.smarty.net/manual/en/api.append.php */ + function append($tpl_var, $value=null, $merge=false) + { + $this->smarty->append( $tpl_var, $value, $merge ); + } + + /** + * Root-level variable concatenation. Appends a string to an existing + * variable assignment with the same name. + */ + function concat($tpl_var, $value) + { + $old_val = & $this->smarty->get_template_vars($tpl_var); + if ( isset($old_val) ) + { + $old_val .= $value; + $this->_old->concat_var( $tpl_var, $value ); + } + else + { + $this->assign($tpl_var, $value); + } + } + + /** see smarty append http://www.smarty.net/manual/en/api.clear_assign.php */ + function clear_assign($tpl_var) + { + $this->smarty->clear_assign( $tpl_var ); + } + + /** see smarty get_template_vars http://www.smarty.net/manual/en/api.get_template_vars.php */ + function &get_template_vars($name=null) + { + return $this->smarty->get_template_vars( $name ); + } + + /** * Load the file for the handle, eventually compile the file and run the compiled * code. This will add the output to the results or return the result if $return @@ -330,64 +376,21 @@ class Template { } /** - * Root-level variable concatenation. Appends a string to an existing - * variable assignment with the same name. + * translate variable modifier - translates a text to the currently loaded + * language */ - function concat_var($tpl_var, $value) - { - $old_val = & $this->smarty->get_template_vars($tpl_var); - if ( isset($old_val) ) - { - $old_val .= $value; - $this->_old->concat_var( $tpl_var, $value ); - } - else - { - $this->assign($tpl_var, $value); - } - } - - /** see smarty assign http://www.smarty.net/manual/en/api.assign.php */ - function assign($tpl_var, $value = null) - { - $this->smarty->assign( $tpl_var, $value ); - - if ( is_array($tpl_var) ) - $this->_old->assign_vars( $tpl_var ); - else - $this->_old->assign_var( $tpl_var, $value ); - } - - /** see smarty append http://www.smarty.net/manual/en/api.append.php */ - function append($tpl_var, $value=null, $merge=false) - { - $this->smarty->append( $tpl_var, $value, $merge ); - } - - /** see smarty get_template_vars http://www.smarty.net/manual/en/api.get_template_vars.php */ - function &get_template_vars($name=null) - { - return $this->smarty->get_template_vars( $name ); - } - - /** see smarty append http://www.smarty.net/manual/en/api.clear_assign.php */ - function clear_assign($tpl_var) - { - $this->smarty->clear_assign( $tpl_var ); - } - - /*static*/ function fn_l10n($params, &$smarty) + /*static*/ function mod_translate($text) { - return l10n($params['t']); + return l10n($text); } /** - * translate variable modifiers - translates a text to the currently loaded - * language + * explode variable modifier - similar to php explode + * 'Yes;No'|@explode:';' -> array('Yes', 'No') */ - /*static*/ function mod_translate($text) + /*static*/ function mod_explode($text, $delimiter=',') { - return l10n($text); + return explode($delimiter, $text); } } |