Update smarty for admin to 2.6.28
--HG-- branch : develop
This commit is contained in:
botanic
parent
53ea877a50
commit
07933bf52c
55 changed files with 5229 additions and 4882 deletions
|
|
@ -1,389 +1,393 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Config_File class.
|
* Config_File class.
|
||||||
*
|
*
|
||||||
* This library is free software; you can redistribute it and/or
|
* This library is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
* License as published by the Free Software Foundation; either
|
* License as published by the Free Software Foundation; either
|
||||||
* version 2.1 of the License, or (at your option) any later version.
|
* version 2.1 of the License, or (at your option) any later version.
|
||||||
*
|
*
|
||||||
* This library is distributed in the hope that it will be useful,
|
* This library is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
* Lesser General Public License for more details.
|
* Lesser General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
* License along with this library; if not, write to the Free Software
|
* License along with this library; if not, write to the Free Software
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*
|
*
|
||||||
* @link http://smarty.php.net/
|
* For questions, help, comments, discussion, etc., please join the
|
||||||
* @version 2.6.9
|
* Smarty mailing list. Send a blank e-mail to
|
||||||
* @copyright Copyright: 2001-2005 New Digital Group, Inc.
|
* smarty-discussion-subscribe@googlegroups.com
|
||||||
* @author Andrei Zmievski <andrei@php.net>
|
*
|
||||||
* @access public
|
* @link http://www.smarty.net/
|
||||||
* @package Smarty
|
* @version 2.6.25-dev
|
||||||
*/
|
* @copyright Copyright: 2001-2005 New Digital Group, Inc.
|
||||||
|
* @author Andrei Zmievski <andrei@php.net>
|
||||||
/* $Id: Config_File.class.php,v 1.1 2006/05/29 16:38:21 powles Exp $ */
|
* @access public
|
||||||
|
* @package Smarty
|
||||||
/**
|
*/
|
||||||
* Config file reading class
|
|
||||||
* @package Smarty
|
/* $Id: Config_File.class.php 3149 2009-05-23 20:59:25Z monte.ohrt $ */
|
||||||
*/
|
|
||||||
class Config_File {
|
/**
|
||||||
/**#@+
|
* Config file reading class
|
||||||
* Options
|
* @package Smarty
|
||||||
* @var boolean
|
*/
|
||||||
*/
|
class Config_File {
|
||||||
/**
|
/**#@+
|
||||||
* Controls whether variables with the same name overwrite each other.
|
* Options
|
||||||
*/
|
* @var boolean
|
||||||
var $overwrite = true;
|
*/
|
||||||
|
/**
|
||||||
/**
|
* Controls whether variables with the same name overwrite each other.
|
||||||
* Controls whether config values of on/true/yes and off/false/no get
|
*/
|
||||||
* converted to boolean values automatically.
|
var $overwrite = true;
|
||||||
*/
|
|
||||||
var $booleanize = true;
|
/**
|
||||||
|
* Controls whether config values of on/true/yes and off/false/no get
|
||||||
/**
|
* converted to boolean values automatically.
|
||||||
* Controls whether hidden config sections/vars are read from the file.
|
*/
|
||||||
*/
|
var $booleanize = true;
|
||||||
var $read_hidden = true;
|
|
||||||
|
/**
|
||||||
/**
|
* Controls whether hidden config sections/vars are read from the file.
|
||||||
* Controls whether or not to fix mac or dos formatted newlines.
|
*/
|
||||||
* If set to true, \r or \r\n will be changed to \n.
|
var $read_hidden = true;
|
||||||
*/
|
|
||||||
var $fix_newlines = true;
|
/**
|
||||||
/**#@-*/
|
* Controls whether or not to fix mac or dos formatted newlines.
|
||||||
|
* If set to true, \r or \r\n will be changed to \n.
|
||||||
/** @access private */
|
*/
|
||||||
var $_config_path = "";
|
var $fix_newlines = true;
|
||||||
var $_config_data = array();
|
/**#@-*/
|
||||||
/**#@-*/
|
|
||||||
|
/** @access private */
|
||||||
/**
|
var $_config_path = "";
|
||||||
* Constructs a new config file class.
|
var $_config_data = array();
|
||||||
*
|
/**#@-*/
|
||||||
* @param string $config_path (optional) path to the config files
|
|
||||||
*/
|
/**
|
||||||
function Config_File($config_path = NULL)
|
* Constructs a new config file class.
|
||||||
{
|
*
|
||||||
if (isset($config_path))
|
* @param string $config_path (optional) path to the config files
|
||||||
$this->set_path($config_path);
|
*/
|
||||||
}
|
function Config_File($config_path = NULL)
|
||||||
|
{
|
||||||
|
if (isset($config_path))
|
||||||
/**
|
$this->set_path($config_path);
|
||||||
* Set the path where configuration files can be found.
|
}
|
||||||
*
|
|
||||||
* @param string $config_path path to the config files
|
|
||||||
*/
|
/**
|
||||||
function set_path($config_path)
|
* Set the path where configuration files can be found.
|
||||||
{
|
*
|
||||||
if (!empty($config_path)) {
|
* @param string $config_path path to the config files
|
||||||
if (!is_string($config_path) || !file_exists($config_path) || !is_dir($config_path)) {
|
*/
|
||||||
$this->_trigger_error_msg("Bad config file path '$config_path'");
|
function set_path($config_path)
|
||||||
return;
|
{
|
||||||
}
|
if (!empty($config_path)) {
|
||||||
if(substr($config_path, -1) != DIRECTORY_SEPARATOR) {
|
if (!is_string($config_path) || !file_exists($config_path) || !is_dir($config_path)) {
|
||||||
$config_path .= DIRECTORY_SEPARATOR;
|
$this->_trigger_error_msg("Bad config file path '$config_path'");
|
||||||
}
|
return;
|
||||||
|
}
|
||||||
$this->_config_path = $config_path;
|
if(substr($config_path, -1) != DIRECTORY_SEPARATOR) {
|
||||||
}
|
$config_path .= DIRECTORY_SEPARATOR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$this->_config_path = $config_path;
|
||||||
/**
|
}
|
||||||
* Retrieves config info based on the file, section, and variable name.
|
}
|
||||||
*
|
|
||||||
* @param string $file_name config file to get info for
|
|
||||||
* @param string $section_name (optional) section to get info for
|
/**
|
||||||
* @param string $var_name (optional) variable to get info for
|
* Retrieves config info based on the file, section, and variable name.
|
||||||
* @return string|array a value or array of values
|
*
|
||||||
*/
|
* @param string $file_name config file to get info for
|
||||||
function &get($file_name, $section_name = NULL, $var_name = NULL)
|
* @param string $section_name (optional) section to get info for
|
||||||
{
|
* @param string $var_name (optional) variable to get info for
|
||||||
if (empty($file_name)) {
|
* @return string|array a value or array of values
|
||||||
$this->_trigger_error_msg('Empty config file name');
|
*/
|
||||||
return;
|
function get($file_name, $section_name = NULL, $var_name = NULL)
|
||||||
} else {
|
{
|
||||||
$file_name = $this->_config_path . $file_name;
|
if (empty($file_name)) {
|
||||||
if (!isset($this->_config_data[$file_name]))
|
$this->_trigger_error_msg('Empty config file name');
|
||||||
$this->load_file($file_name, false);
|
return;
|
||||||
}
|
} else {
|
||||||
|
$file_name = $this->_config_path . $file_name;
|
||||||
if (!empty($var_name)) {
|
if (!isset($this->_config_data[$file_name]))
|
||||||
if (empty($section_name)) {
|
$this->load_file($file_name, false);
|
||||||
return $this->_config_data[$file_name]["vars"][$var_name];
|
}
|
||||||
} else {
|
|
||||||
if(isset($this->_config_data[$file_name]["sections"][$section_name]["vars"][$var_name]))
|
if (!empty($var_name)) {
|
||||||
return $this->_config_data[$file_name]["sections"][$section_name]["vars"][$var_name];
|
if (empty($section_name)) {
|
||||||
else
|
return $this->_config_data[$file_name]["vars"][$var_name];
|
||||||
return array();
|
} else {
|
||||||
}
|
if(isset($this->_config_data[$file_name]["sections"][$section_name]["vars"][$var_name]))
|
||||||
} else {
|
return $this->_config_data[$file_name]["sections"][$section_name]["vars"][$var_name];
|
||||||
if (empty($section_name)) {
|
else
|
||||||
return (array)$this->_config_data[$file_name]["vars"];
|
return array();
|
||||||
} else {
|
}
|
||||||
if(isset($this->_config_data[$file_name]["sections"][$section_name]["vars"]))
|
} else {
|
||||||
return (array)$this->_config_data[$file_name]["sections"][$section_name]["vars"];
|
if (empty($section_name)) {
|
||||||
else
|
return (array)$this->_config_data[$file_name]["vars"];
|
||||||
return array();
|
} else {
|
||||||
}
|
if(isset($this->_config_data[$file_name]["sections"][$section_name]["vars"]))
|
||||||
}
|
return (array)$this->_config_data[$file_name]["sections"][$section_name]["vars"];
|
||||||
}
|
else
|
||||||
|
return array();
|
||||||
|
}
|
||||||
/**
|
}
|
||||||
* Retrieves config info based on the key.
|
}
|
||||||
*
|
|
||||||
* @param $file_name string config key (filename/section/var)
|
|
||||||
* @return string|array same as get()
|
/**
|
||||||
* @uses get() retrieves information from config file and returns it
|
* Retrieves config info based on the key.
|
||||||
*/
|
*
|
||||||
function &get_key($config_key)
|
* @param $file_name string config key (filename/section/var)
|
||||||
{
|
* @return string|array same as get()
|
||||||
list($file_name, $section_name, $var_name) = explode('/', $config_key, 3);
|
* @uses get() retrieves information from config file and returns it
|
||||||
$result = &$this->get($file_name, $section_name, $var_name);
|
*/
|
||||||
return $result;
|
function &get_key($config_key)
|
||||||
}
|
{
|
||||||
|
list($file_name, $section_name, $var_name) = explode('/', $config_key, 3);
|
||||||
/**
|
$result = &$this->get($file_name, $section_name, $var_name);
|
||||||
* Get all loaded config file names.
|
return $result;
|
||||||
*
|
}
|
||||||
* @return array an array of loaded config file names
|
|
||||||
*/
|
/**
|
||||||
function get_file_names()
|
* Get all loaded config file names.
|
||||||
{
|
*
|
||||||
return array_keys($this->_config_data);
|
* @return array an array of loaded config file names
|
||||||
}
|
*/
|
||||||
|
function get_file_names()
|
||||||
|
{
|
||||||
/**
|
return array_keys($this->_config_data);
|
||||||
* Get all section names from a loaded file.
|
}
|
||||||
*
|
|
||||||
* @param string $file_name config file to get section names from
|
|
||||||
* @return array an array of section names from the specified file
|
/**
|
||||||
*/
|
* Get all section names from a loaded file.
|
||||||
function get_section_names($file_name)
|
*
|
||||||
{
|
* @param string $file_name config file to get section names from
|
||||||
$file_name = $this->_config_path . $file_name;
|
* @return array an array of section names from the specified file
|
||||||
if (!isset($this->_config_data[$file_name])) {
|
*/
|
||||||
$this->_trigger_error_msg("Unknown config file '$file_name'");
|
function get_section_names($file_name)
|
||||||
return;
|
{
|
||||||
}
|
$file_name = $this->_config_path . $file_name;
|
||||||
|
if (!isset($this->_config_data[$file_name])) {
|
||||||
return array_keys($this->_config_data[$file_name]["sections"]);
|
$this->_trigger_error_msg("Unknown config file '$file_name'");
|
||||||
}
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
return array_keys($this->_config_data[$file_name]["sections"]);
|
||||||
* Get all global or section variable names.
|
}
|
||||||
*
|
|
||||||
* @param string $file_name config file to get info for
|
|
||||||
* @param string $section_name (optional) section to get info for
|
/**
|
||||||
* @return array an array of variables names from the specified file/section
|
* Get all global or section variable names.
|
||||||
*/
|
*
|
||||||
function get_var_names($file_name, $section = NULL)
|
* @param string $file_name config file to get info for
|
||||||
{
|
* @param string $section_name (optional) section to get info for
|
||||||
if (empty($file_name)) {
|
* @return array an array of variables names from the specified file/section
|
||||||
$this->_trigger_error_msg('Empty config file name');
|
*/
|
||||||
return;
|
function get_var_names($file_name, $section = NULL)
|
||||||
} else if (!isset($this->_config_data[$file_name])) {
|
{
|
||||||
$this->_trigger_error_msg("Unknown config file '$file_name'");
|
if (empty($file_name)) {
|
||||||
return;
|
$this->_trigger_error_msg('Empty config file name');
|
||||||
}
|
return;
|
||||||
|
} else if (!isset($this->_config_data[$file_name])) {
|
||||||
if (empty($section))
|
$this->_trigger_error_msg("Unknown config file '$file_name'");
|
||||||
return array_keys($this->_config_data[$file_name]["vars"]);
|
return;
|
||||||
else
|
}
|
||||||
return array_keys($this->_config_data[$file_name]["sections"][$section]["vars"]);
|
|
||||||
}
|
if (empty($section))
|
||||||
|
return array_keys($this->_config_data[$file_name]["vars"]);
|
||||||
|
else
|
||||||
/**
|
return array_keys($this->_config_data[$file_name]["sections"][$section]["vars"]);
|
||||||
* Clear loaded config data for a certain file or all files.
|
}
|
||||||
*
|
|
||||||
* @param string $file_name file to clear config data for
|
|
||||||
*/
|
/**
|
||||||
function clear($file_name = NULL)
|
* Clear loaded config data for a certain file or all files.
|
||||||
{
|
*
|
||||||
if ($file_name === NULL)
|
* @param string $file_name file to clear config data for
|
||||||
$this->_config_data = array();
|
*/
|
||||||
else if (isset($this->_config_data[$file_name]))
|
function clear($file_name = NULL)
|
||||||
$this->_config_data[$file_name] = array();
|
{
|
||||||
}
|
if ($file_name === NULL)
|
||||||
|
$this->_config_data = array();
|
||||||
|
else if (isset($this->_config_data[$file_name]))
|
||||||
/**
|
$this->_config_data[$file_name] = array();
|
||||||
* Load a configuration file manually.
|
}
|
||||||
*
|
|
||||||
* @param string $file_name file name to load
|
|
||||||
* @param boolean $prepend_path whether current config path should be
|
/**
|
||||||
* prepended to the filename
|
* Load a configuration file manually.
|
||||||
*/
|
*
|
||||||
function load_file($file_name, $prepend_path = true)
|
* @param string $file_name file name to load
|
||||||
{
|
* @param boolean $prepend_path whether current config path should be
|
||||||
if ($prepend_path && $this->_config_path != "")
|
* prepended to the filename
|
||||||
$config_file = $this->_config_path . $file_name;
|
*/
|
||||||
else
|
function load_file($file_name, $prepend_path = true)
|
||||||
$config_file = $file_name;
|
{
|
||||||
|
if ($prepend_path && $this->_config_path != "")
|
||||||
ini_set('track_errors', true);
|
$config_file = $this->_config_path . $file_name;
|
||||||
$fp = @fopen($config_file, "r");
|
else
|
||||||
if (!is_resource($fp)) {
|
$config_file = $file_name;
|
||||||
$this->_trigger_error_msg("Could not open config file '$config_file'");
|
|
||||||
return false;
|
ini_set('track_errors', true);
|
||||||
}
|
$fp = @fopen($config_file, "r");
|
||||||
|
if (!is_resource($fp)) {
|
||||||
$contents = ($size = filesize($config_file)) ? fread($fp, $size) : '';
|
$this->_trigger_error_msg("Could not open config file '$config_file'");
|
||||||
fclose($fp);
|
return false;
|
||||||
|
}
|
||||||
$this->_config_data[$config_file] = $this->parse_contents($contents);
|
|
||||||
return true;
|
$contents = ($size = filesize($config_file)) ? fread($fp, $size) : '';
|
||||||
}
|
fclose($fp);
|
||||||
|
|
||||||
/**
|
$this->_config_data[$config_file] = $this->parse_contents($contents);
|
||||||
* Store the contents of a file manually.
|
return true;
|
||||||
*
|
}
|
||||||
* @param string $config_file file name of the related contents
|
|
||||||
* @param string $contents the file-contents to parse
|
/**
|
||||||
*/
|
* Store the contents of a file manually.
|
||||||
function set_file_contents($config_file, $contents)
|
*
|
||||||
{
|
* @param string $config_file file name of the related contents
|
||||||
$this->_config_data[$config_file] = $this->parse_contents($contents);
|
* @param string $contents the file-contents to parse
|
||||||
return true;
|
*/
|
||||||
}
|
function set_file_contents($config_file, $contents)
|
||||||
|
{
|
||||||
/**
|
$this->_config_data[$config_file] = $this->parse_contents($contents);
|
||||||
* parse the source of a configuration file manually.
|
return true;
|
||||||
*
|
}
|
||||||
* @param string $contents the file-contents to parse
|
|
||||||
*/
|
/**
|
||||||
function parse_contents($contents)
|
* parse the source of a configuration file manually.
|
||||||
{
|
*
|
||||||
if($this->fix_newlines) {
|
* @param string $contents the file-contents to parse
|
||||||
// fix mac/dos formatted newlines
|
*/
|
||||||
$contents = preg_replace('!\r\n?!', "\n", $contents);
|
function parse_contents($contents)
|
||||||
}
|
{
|
||||||
|
if($this->fix_newlines) {
|
||||||
$config_data = array();
|
// fix mac/dos formatted newlines
|
||||||
$config_data['sections'] = array();
|
$contents = preg_replace('!\r\n?!', "\n", $contents);
|
||||||
$config_data['vars'] = array();
|
}
|
||||||
|
|
||||||
/* reference to fill with data */
|
$config_data = array();
|
||||||
$vars =& $config_data['vars'];
|
$config_data['sections'] = array();
|
||||||
|
$config_data['vars'] = array();
|
||||||
/* parse file line by line */
|
|
||||||
preg_match_all('!^.*\r?\n?!m', $contents, $match);
|
/* reference to fill with data */
|
||||||
$lines = $match[0];
|
$vars =& $config_data['vars'];
|
||||||
for ($i=0, $count=count($lines); $i<$count; $i++) {
|
|
||||||
$line = $lines[$i];
|
/* parse file line by line */
|
||||||
if (empty($line)) continue;
|
preg_match_all('!^.*\r?\n?!m', $contents, $match);
|
||||||
|
$lines = $match[0];
|
||||||
if ( $line{0} == '[' && preg_match('!^\[(.*?)\]!', $line, $match) ) {
|
for ($i=0, $count=count($lines); $i<$count; $i++) {
|
||||||
/* section found */
|
$line = $lines[$i];
|
||||||
if ($match[1]{0} == '.') {
|
if (empty($line)) continue;
|
||||||
/* hidden section */
|
|
||||||
if ($this->read_hidden) {
|
if ( substr($line, 0, 1) == '[' && preg_match('!^\[(.*?)\]!', $line, $match) ) {
|
||||||
$section_name = substr($match[1], 1);
|
/* section found */
|
||||||
} else {
|
if (substr($match[1], 0, 1) == '.') {
|
||||||
/* break reference to $vars to ignore hidden section */
|
/* hidden section */
|
||||||
unset($vars);
|
if ($this->read_hidden) {
|
||||||
$vars = array();
|
$section_name = substr($match[1], 1);
|
||||||
continue;
|
} else {
|
||||||
}
|
/* break reference to $vars to ignore hidden section */
|
||||||
} else {
|
unset($vars);
|
||||||
$section_name = $match[1];
|
$vars = array();
|
||||||
}
|
continue;
|
||||||
if (!isset($config_data['sections'][$section_name]))
|
}
|
||||||
$config_data['sections'][$section_name] = array('vars' => array());
|
} else {
|
||||||
$vars =& $config_data['sections'][$section_name]['vars'];
|
$section_name = $match[1];
|
||||||
continue;
|
}
|
||||||
}
|
if (!isset($config_data['sections'][$section_name]))
|
||||||
|
$config_data['sections'][$section_name] = array('vars' => array());
|
||||||
if (preg_match('/^\s*(\.?\w+)\s*=\s*(.*)/s', $line, $match)) {
|
$vars =& $config_data['sections'][$section_name]['vars'];
|
||||||
/* variable found */
|
continue;
|
||||||
$var_name = rtrim($match[1]);
|
}
|
||||||
if (strpos($match[2], '"""') === 0) {
|
|
||||||
/* handle multiline-value */
|
if (preg_match('/^\s*(\.?\w+)\s*=\s*(.*)/s', $line, $match)) {
|
||||||
$lines[$i] = substr($match[2], 3);
|
/* variable found */
|
||||||
$var_value = '';
|
$var_name = rtrim($match[1]);
|
||||||
while ($i<$count) {
|
if (strpos($match[2], '"""') === 0) {
|
||||||
if (($pos = strpos($lines[$i], '"""')) === false) {
|
/* handle multiline-value */
|
||||||
$var_value .= $lines[$i++];
|
$lines[$i] = substr($match[2], 3);
|
||||||
} else {
|
$var_value = '';
|
||||||
/* end of multiline-value */
|
while ($i<$count) {
|
||||||
$var_value .= substr($lines[$i], 0, $pos);
|
if (($pos = strpos($lines[$i], '"""')) === false) {
|
||||||
break;
|
$var_value .= $lines[$i++];
|
||||||
}
|
} else {
|
||||||
}
|
/* end of multiline-value */
|
||||||
$booleanize = false;
|
$var_value .= substr($lines[$i], 0, $pos);
|
||||||
|
break;
|
||||||
} else {
|
}
|
||||||
/* handle simple value */
|
}
|
||||||
$var_value = preg_replace('/^([\'"])(.*)\1$/', '\2', rtrim($match[2]));
|
$booleanize = false;
|
||||||
$booleanize = $this->booleanize;
|
|
||||||
|
} else {
|
||||||
}
|
/* handle simple value */
|
||||||
$this->_set_config_var($vars, $var_name, $var_value, $booleanize);
|
$var_value = preg_replace('/^([\'"])(.*)\1$/', '\2', rtrim($match[2]));
|
||||||
}
|
$booleanize = $this->booleanize;
|
||||||
/* else unparsable line / means it is a comment / means ignore it */
|
|
||||||
}
|
}
|
||||||
return $config_data;
|
$this->_set_config_var($vars, $var_name, $var_value, $booleanize);
|
||||||
}
|
}
|
||||||
|
/* else unparsable line / means it is a comment / means ignore it */
|
||||||
/**#@+ @access private */
|
}
|
||||||
/**
|
return $config_data;
|
||||||
* @param array &$container
|
}
|
||||||
* @param string $var_name
|
|
||||||
* @param mixed $var_value
|
/**#@+ @access private */
|
||||||
* @param boolean $booleanize determines whether $var_value is converted to
|
/**
|
||||||
* to true/false
|
* @param array &$container
|
||||||
*/
|
* @param string $var_name
|
||||||
function _set_config_var(&$container, $var_name, $var_value, $booleanize)
|
* @param mixed $var_value
|
||||||
{
|
* @param boolean $booleanize determines whether $var_value is converted to
|
||||||
if ($var_name{0} == '.') {
|
* to true/false
|
||||||
if (!$this->read_hidden)
|
*/
|
||||||
return;
|
function _set_config_var(&$container, $var_name, $var_value, $booleanize)
|
||||||
else
|
{
|
||||||
$var_name = substr($var_name, 1);
|
if (substr($var_name, 0, 1) == '.') {
|
||||||
}
|
if (!$this->read_hidden)
|
||||||
|
return;
|
||||||
if (!preg_match("/^[a-zA-Z_]\w*$/", $var_name)) {
|
else
|
||||||
$this->_trigger_error_msg("Bad variable name '$var_name'");
|
$var_name = substr($var_name, 1);
|
||||||
return;
|
}
|
||||||
}
|
|
||||||
|
if (!preg_match("/^[a-zA-Z_]\w*$/", $var_name)) {
|
||||||
if ($booleanize) {
|
$this->_trigger_error_msg("Bad variable name '$var_name'");
|
||||||
if (preg_match("/^(on|true|yes)$/i", $var_value))
|
return;
|
||||||
$var_value = true;
|
}
|
||||||
else if (preg_match("/^(off|false|no)$/i", $var_value))
|
|
||||||
$var_value = false;
|
if ($booleanize) {
|
||||||
}
|
if (preg_match("/^(on|true|yes)$/i", $var_value))
|
||||||
|
$var_value = true;
|
||||||
if (!isset($container[$var_name]) || $this->overwrite)
|
else if (preg_match("/^(off|false|no)$/i", $var_value))
|
||||||
$container[$var_name] = $var_value;
|
$var_value = false;
|
||||||
else {
|
}
|
||||||
settype($container[$var_name], 'array');
|
|
||||||
$container[$var_name][] = $var_value;
|
if (!isset($container[$var_name]) || $this->overwrite)
|
||||||
}
|
$container[$var_name] = $var_value;
|
||||||
}
|
else {
|
||||||
|
settype($container[$var_name], 'array');
|
||||||
/**
|
$container[$var_name][] = $var_value;
|
||||||
* @uses trigger_error() creates a PHP warning/error
|
}
|
||||||
* @param string $error_msg
|
}
|
||||||
* @param integer $error_type one of
|
|
||||||
*/
|
/**
|
||||||
function _trigger_error_msg($error_msg, $error_type = E_USER_WARNING)
|
* @uses trigger_error() creates a PHP warning/error
|
||||||
{
|
* @param string $error_msg
|
||||||
trigger_error("Config_File error: $error_msg", $error_type);
|
* @param integer $error_type one of
|
||||||
}
|
*/
|
||||||
/**#@-*/
|
function _trigger_error_msg($error_msg, $error_type = E_USER_WARNING)
|
||||||
}
|
{
|
||||||
|
trigger_error("Config_File error: $error_msg", $error_type);
|
||||||
?>
|
}
|
||||||
|
/**#@-*/
|
||||||
|
}
|
||||||
|
|
||||||
|
?>
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -1,64 +1,157 @@
|
||||||
{* Smarty *}
|
{* Smarty *}
|
||||||
|
{* debug.tpl, last updated version 2.1.0 *}
|
||||||
{* debug.tpl, last updated version 2.0.1 *}
|
|
||||||
|
|
||||||
{assign_debug_info}
|
{assign_debug_info}
|
||||||
|
{capture assign=debug_output}
|
||||||
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
|
||||||
|
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
|
||||||
|
<head>
|
||||||
|
<title>Smarty Debug Console</title>
|
||||||
|
{literal}
|
||||||
|
<style type="text/css">
|
||||||
|
/* <![CDATA[ */
|
||||||
|
body, h1, h2, td, th, p {
|
||||||
|
font-family: sans-serif;
|
||||||
|
font-weight: normal;
|
||||||
|
font-size: 0.9em;
|
||||||
|
margin: 1px;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
margin: 0;
|
||||||
|
text-align: left;
|
||||||
|
padding: 2px;
|
||||||
|
background-color: #f0c040;
|
||||||
|
color: black;
|
||||||
|
font-weight: bold;
|
||||||
|
font-size: 1.2em;
|
||||||
|
}
|
||||||
|
|
||||||
|
h2 {
|
||||||
|
background-color: #9B410E;
|
||||||
|
color: white;
|
||||||
|
text-align: left;
|
||||||
|
font-weight: bold;
|
||||||
|
padding: 2px;
|
||||||
|
border-top: 1px solid black;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
background: black;
|
||||||
|
}
|
||||||
|
|
||||||
|
p, table, div {
|
||||||
|
background: #f0ead8;
|
||||||
|
}
|
||||||
|
|
||||||
|
p {
|
||||||
|
margin: 0;
|
||||||
|
font-style: italic;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
table {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
th, td {
|
||||||
|
font-family: monospace;
|
||||||
|
vertical-align: top;
|
||||||
|
text-align: left;
|
||||||
|
width: 50%;
|
||||||
|
}
|
||||||
|
|
||||||
|
td {
|
||||||
|
color: green;
|
||||||
|
}
|
||||||
|
|
||||||
|
.odd {
|
||||||
|
background-color: #eeeeee;
|
||||||
|
}
|
||||||
|
|
||||||
|
.even {
|
||||||
|
background-color: #fafafa;
|
||||||
|
}
|
||||||
|
|
||||||
|
.exectime {
|
||||||
|
font-size: 0.8em;
|
||||||
|
font-style: italic;
|
||||||
|
}
|
||||||
|
|
||||||
|
#table_assigned_vars th {
|
||||||
|
color: blue;
|
||||||
|
}
|
||||||
|
|
||||||
|
#table_config_vars th {
|
||||||
|
color: maroon;
|
||||||
|
}
|
||||||
|
/* ]]> */
|
||||||
|
</style>
|
||||||
|
{/literal}
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
|
||||||
|
<h1>Smarty Debug Console</h1>
|
||||||
|
|
||||||
|
<h2>included templates & config files (load time in seconds)</h2>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
{section name=templates loop=$_debug_tpls}
|
||||||
|
{section name=indent loop=$_debug_tpls[templates].depth} {/section}
|
||||||
|
<font color={if $_debug_tpls[templates].type eq "template"}brown{elseif $_debug_tpls[templates].type eq "insert"}black{else}green{/if}>
|
||||||
|
{$_debug_tpls[templates].filename|escape:html}</font>
|
||||||
|
{if isset($_debug_tpls[templates].exec_time)}
|
||||||
|
<span class="exectime">
|
||||||
|
({$_debug_tpls[templates].exec_time|string_format:"%.5f"})
|
||||||
|
{if %templates.index% eq 0}(total){/if}
|
||||||
|
</span>
|
||||||
|
{/if}
|
||||||
|
<br />
|
||||||
|
{sectionelse}
|
||||||
|
<p>no templates included</p>
|
||||||
|
{/section}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<h2>assigned template variables</h2>
|
||||||
|
|
||||||
|
<table id="table_assigned_vars">
|
||||||
|
{section name=vars loop=$_debug_keys}
|
||||||
|
<tr class="{cycle values="odd,even"}">
|
||||||
|
<th>{ldelim}${$_debug_keys[vars]|escape:'html'}{rdelim}</th>
|
||||||
|
<td>{$_debug_vals[vars]|@debug_print_var}</td></tr>
|
||||||
|
{sectionelse}
|
||||||
|
<tr><td><p>no template variables assigned</p></td></tr>
|
||||||
|
{/section}
|
||||||
|
</table>
|
||||||
|
|
||||||
|
<h2>assigned config file variables (outer template scope)</h2>
|
||||||
|
|
||||||
|
<table id="table_config_vars">
|
||||||
|
{section name=config_vars loop=$_debug_config_keys}
|
||||||
|
<tr class="{cycle values="odd,even"}">
|
||||||
|
<th>{ldelim}#{$_debug_config_keys[config_vars]|escape:'html'}#{rdelim}</th>
|
||||||
|
<td>{$_debug_config_vals[config_vars]|@debug_print_var}</td></tr>
|
||||||
|
{sectionelse}
|
||||||
|
<tr><td><p>no config vars assigned</p></td></tr>
|
||||||
|
{/section}
|
||||||
|
</table>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
{/capture}
|
||||||
{if isset($_smarty_debug_output) and $_smarty_debug_output eq "html"}
|
{if isset($_smarty_debug_output) and $_smarty_debug_output eq "html"}
|
||||||
<table border=0 width=100%>
|
{$debug_output}
|
||||||
<tr bgcolor=#cccccc><th colspan=2>Smarty Debug Console</th></tr>
|
|
||||||
<tr bgcolor=#cccccc><td colspan=2><b>included templates & config files (load time in seconds):</b></td></tr>
|
|
||||||
{section name=templates loop=$_debug_tpls}
|
|
||||||
<tr bgcolor={if %templates.index% is even}#eeeeee{else}#fafafa{/if}><td colspan=2><tt>{section name=indent loop=$_debug_tpls[templates].depth} {/section}<font color={if $_debug_tpls[templates].type eq "template"}brown{elseif $_debug_tpls[templates].type eq "insert"}black{else}green{/if}>{$_debug_tpls[templates].filename|escape:html}</font>{if isset($_debug_tpls[templates].exec_time)} <font size=-1><i>({$_debug_tpls[templates].exec_time|string_format:"%.5f"}){if %templates.index% eq 0} (total){/if}</i></font>{/if}</tt></td></tr>
|
|
||||||
{sectionelse}
|
|
||||||
<tr bgcolor=#eeeeee><td colspan=2><tt><i>no templates included</i></tt></td></tr>
|
|
||||||
{/section}
|
|
||||||
<tr bgcolor=#cccccc><td colspan=2><b>assigned template variables:</b></td></tr>
|
|
||||||
{section name=vars loop=$_debug_keys}
|
|
||||||
<tr bgcolor={if %vars.index% is even}#eeeeee{else}#fafafa{/if}><td valign=top><tt><font color=blue>{ldelim}${$_debug_keys[vars]}{rdelim}</font></tt></td><td nowrap><tt><font color=green>{$_debug_vals[vars]|@debug_print_var}</font></tt></td></tr>
|
|
||||||
{sectionelse}
|
|
||||||
<tr bgcolor=#eeeeee><td colspan=2><tt><i>no template variables assigned</i></tt></td></tr>
|
|
||||||
{/section}
|
|
||||||
<tr bgcolor=#cccccc><td colspan=2><b>assigned config file variables (outer template scope):</b></td></tr>
|
|
||||||
{section name=config_vars loop=$_debug_config_keys}
|
|
||||||
<tr bgcolor={if %config_vars.index% is even}#eeeeee{else}#fafafa{/if}><td valign=top><tt><font color=maroon>{ldelim}#{$_debug_config_keys[config_vars]}#{rdelim}</font></tt></td><td><tt><font color=green>{$_debug_config_vals[config_vars]|@debug_print_var}</font></tt></td></tr>
|
|
||||||
{sectionelse}
|
|
||||||
<tr bgcolor=#eeeeee><td colspan=2><tt><i>no config vars assigned</i></tt></td></tr>
|
|
||||||
{/section}
|
|
||||||
</table>
|
|
||||||
</BODY></HTML>
|
|
||||||
{else}
|
{else}
|
||||||
<SCRIPT language=javascript>
|
<script type="text/javascript">
|
||||||
if( self.name == '' ) {ldelim}
|
// <![CDATA[
|
||||||
var title = 'Console';
|
if ( self.name == '' ) {ldelim}
|
||||||
{rdelim}
|
var title = 'Console';
|
||||||
else {ldelim}
|
{rdelim}
|
||||||
var title = 'Console_' + self.name;
|
else {ldelim}
|
||||||
{rdelim}
|
var title = 'Console_' + self.name;
|
||||||
_smarty_console = window.open("",title.value,"width=680,height=600,resizable,scrollbars=yes");
|
{rdelim}
|
||||||
_smarty_console.document.write("<HTML><HEAD><TITLE>Smarty Debug Console_"+self.name+"</TITLE></HEAD><BODY bgcolor=#ffffff>");
|
_smarty_console = window.open("",title.value,"width=680,height=600,resizable,scrollbars=yes");
|
||||||
_smarty_console.document.write("<table border=0 width=100%>");
|
_smarty_console.document.write('{$debug_output|escape:'javascript'}');
|
||||||
_smarty_console.document.write("<tr bgcolor=#cccccc><th colspan=2>Smarty Debug Console</th></tr>");
|
_smarty_console.document.close();
|
||||||
_smarty_console.document.write("<tr bgcolor=#cccccc><td colspan=2><b>included templates & config files (load time in seconds):</b></td></tr>");
|
// ]]>
|
||||||
{section name=templates loop=$_debug_tpls}
|
</script>
|
||||||
_smarty_console.document.write("<tr bgcolor={if %templates.index% is even}#eeeeee{else}#fafafa{/if}><td colspan=2><tt>{section name=indent loop=$_debug_tpls[templates].depth} {/section}<font color={if $_debug_tpls[templates].type eq "template"}brown{elseif $_debug_tpls[templates].type eq "insert"}black{else}green{/if}>{$_debug_tpls[templates].filename|escape:html|escape:javascript}</font>{if isset($_debug_tpls[templates].exec_time)} <font size=-1><i>({$_debug_tpls[templates].exec_time|string_format:"%.5f"}){if %templates.index% eq 0} (total){/if}</i></font>{/if}</tt></td></tr>");
|
{/if}
|
||||||
{sectionelse}
|
|
||||||
_smarty_console.document.write("<tr bgcolor=#eeeeee><td colspan=2><tt><i>no templates included</i></tt></td></tr>");
|
|
||||||
{/section}
|
|
||||||
_smarty_console.document.write("<tr bgcolor=#cccccc><td colspan=2><b>assigned template variables:</b></td></tr>");
|
|
||||||
{section name=vars loop=$_debug_keys}
|
|
||||||
_smarty_console.document.write("<tr bgcolor={if %vars.index% is even}#eeeeee{else}#fafafa{/if}><td valign=top><tt><font color=blue>{ldelim}${$_debug_keys[vars]}{rdelim}</font></tt></td><td nowrap><tt><font color=green>{$_debug_vals[vars]|@debug_print_var|escape:javascript}</font></tt></td></tr>");
|
|
||||||
{sectionelse}
|
|
||||||
_smarty_console.document.write("<tr bgcolor=#eeeeee><td colspan=2><tt><i>no template variables assigned</i></tt></td></tr>");
|
|
||||||
{/section}
|
|
||||||
_smarty_console.document.write("<tr bgcolor=#cccccc><td colspan=2><b>assigned config file variables (outer template scope):</b></td></tr>");
|
|
||||||
{section name=config_vars loop=$_debug_config_keys}
|
|
||||||
_smarty_console.document.write("<tr bgcolor={if %config_vars.index% is even}#eeeeee{else}#fafafa{/if}><td valign=top><tt><font color=maroon>{ldelim}#{$_debug_config_keys[config_vars]}#{rdelim}</font></tt></td><td><tt><font color=green>{$_debug_config_vals[config_vars]|@debug_print_var|escape:javascript}</font></tt></td></tr>");
|
|
||||||
{sectionelse}
|
|
||||||
_smarty_console.document.write("<tr bgcolor=#eeeeee><td colspan=2><tt><i>no config vars assigned</i></tt></td></tr>");
|
|
||||||
{/section}
|
|
||||||
_smarty_console.document.write("</table>");
|
|
||||||
_smarty_console.document.write("</BODY></HTML>");
|
|
||||||
_smarty_console.document.close();
|
|
||||||
</SCRIPT>
|
|
||||||
{/if}
|
|
||||||
|
|
@ -22,7 +22,7 @@ function smarty_core_create_dir_structure($params, &$smarty)
|
||||||
/* unix-style paths */
|
/* unix-style paths */
|
||||||
$_dir = $params['dir'];
|
$_dir = $params['dir'];
|
||||||
$_dir_parts = preg_split('!/+!', $_dir, -1, PREG_SPLIT_NO_EMPTY);
|
$_dir_parts = preg_split('!/+!', $_dir, -1, PREG_SPLIT_NO_EMPTY);
|
||||||
$_new_dir = ($_dir{0}=='/') ? '/' : getcwd().'/';
|
$_new_dir = (substr($_dir, 0, 1)=='/') ? '/' : getcwd().'/';
|
||||||
if($_use_open_basedir = !empty($_open_basedir_ini)) {
|
if($_use_open_basedir = !empty($_open_basedir_ini)) {
|
||||||
$_open_basedirs = explode(':', $_open_basedir_ini);
|
$_open_basedirs = explode(':', $_open_basedir_ini);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ function smarty_core_display_debug_console($params, &$smarty)
|
||||||
// set path to debug template from SMARTY_DIR
|
// set path to debug template from SMARTY_DIR
|
||||||
$smarty->debug_tpl = SMARTY_DIR . 'debug.tpl';
|
$smarty->debug_tpl = SMARTY_DIR . 'debug.tpl';
|
||||||
if($smarty->security && is_file($smarty->debug_tpl)) {
|
if($smarty->security && is_file($smarty->debug_tpl)) {
|
||||||
$smarty->secure_dir[] = dirname(realpath($smarty->debug_tpl));
|
$smarty->secure_dir[] = realpath($smarty->debug_tpl);
|
||||||
}
|
}
|
||||||
$smarty->debug_tpl = 'file:' . SMARTY_DIR . 'debug.tpl';
|
$smarty->debug_tpl = 'file:' . SMARTY_DIR . 'debug.tpl';
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -27,18 +27,21 @@ function smarty_core_is_secure($params, &$smarty)
|
||||||
foreach ((array)$params['resource_base_path'] as $curr_dir) {
|
foreach ((array)$params['resource_base_path'] as $curr_dir) {
|
||||||
if ( ($_cd = realpath($curr_dir)) !== false &&
|
if ( ($_cd = realpath($curr_dir)) !== false &&
|
||||||
strncmp($_rp, $_cd, strlen($_cd)) == 0 &&
|
strncmp($_rp, $_cd, strlen($_cd)) == 0 &&
|
||||||
$_rp{strlen($_cd)} == DIRECTORY_SEPARATOR ) {
|
substr($_rp, strlen($_cd), 1) == DIRECTORY_SEPARATOR ) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!empty($smarty->secure_dir)) {
|
if (!empty($smarty->secure_dir)) {
|
||||||
foreach ((array)$smarty->secure_dir as $curr_dir) {
|
foreach ((array)$smarty->secure_dir as $curr_dir) {
|
||||||
if ( ($_cd = realpath($curr_dir)) !== false &&
|
if ( ($_cd = realpath($curr_dir)) !== false) {
|
||||||
strncmp($_rp, $_cd, strlen($_cd)) == 0 &&
|
if($_cd == $_rp) {
|
||||||
$_rp{strlen($_cd)} == DIRECTORY_SEPARATOR ) {
|
return true;
|
||||||
return true;
|
} elseif (strncmp($_rp, $_cd, strlen($_cd)) == 0 &&
|
||||||
}
|
substr($_rp, strlen($_cd), 1) == DIRECTORY_SEPARATOR) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ function smarty_core_is_trusted($params, &$smarty)
|
||||||
if (!empty($curr_dir) && is_readable ($curr_dir)) {
|
if (!empty($curr_dir) && is_readable ($curr_dir)) {
|
||||||
$_cd = realpath($curr_dir);
|
$_cd = realpath($curr_dir);
|
||||||
if (strncmp($_rp, $_cd, strlen($_cd)) == 0
|
if (strncmp($_rp, $_cd, strlen($_cd)) == 0
|
||||||
&& $_rp{strlen($_cd)} == DIRECTORY_SEPARATOR ) {
|
&& substr($_rp, strlen($_cd), 1) == DIRECTORY_SEPARATOR ) {
|
||||||
$_smarty_trusted = true;
|
$_smarty_trusted = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -52,7 +52,7 @@ function smarty_core_process_cached_inserts($params, &$smarty)
|
||||||
$replace = '';
|
$replace = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
$params['results'] = str_replace($cached_inserts[$i], $replace, $params['results']);
|
$params['results'] = substr_replace($params['results'], $replace, strpos($params['results'], $cached_inserts[$i]), strlen($cached_inserts[$i]));
|
||||||
if ($smarty->debugging) {
|
if ($smarty->debugging) {
|
||||||
$_params = array();
|
$_params = array();
|
||||||
require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
|
require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,12 @@ function smarty_core_process_compiled_include($params, &$smarty)
|
||||||
$smarty->_cache_including = true;
|
$smarty->_cache_including = true;
|
||||||
|
|
||||||
$_return = $params['results'];
|
$_return = $params['results'];
|
||||||
foreach ($smarty->_cache_serials as $_include_file_path=>$_cache_serial) {
|
|
||||||
|
foreach ($smarty->_cache_info['cache_serials'] as $_include_file_path=>$_cache_serial) {
|
||||||
|
$smarty->_include($_include_file_path, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($smarty->_cache_info['cache_serials'] as $_include_file_path=>$_cache_serial) {
|
||||||
$_return = preg_replace_callback('!(\{nocache\:('.$_cache_serial.')#(\d+)\})!s',
|
$_return = preg_replace_callback('!(\{nocache\:('.$_cache_serial.')#(\d+)\})!s',
|
||||||
array(&$smarty, '_process_compiled_include_callback'),
|
array(&$smarty, '_process_compiled_include_callback'),
|
||||||
$_return);
|
$_return);
|
||||||
|
|
|
||||||
|
|
@ -90,16 +90,6 @@ function smarty_core_read_cache_file(&$params, &$smarty)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($_cache_info['cache_serials'] as $_include_file_path=>$_cache_serial) {
|
|
||||||
if (empty($smarty->_cache_serials[$_include_file_path])) {
|
|
||||||
$smarty->_include($_include_file_path, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($smarty->_cache_serials[$_include_file_path] != $_cache_serial) {
|
|
||||||
/* regenerate */
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$content_cache[$params['tpl_file'].','.$params['cache_id'].','.$params['compile_id']] = array($params['results'], $_cache_info);
|
$content_cache[$params['tpl_file'].','.$params['cache_id'].','.$params['compile_id']] = array($params['results'], $_cache_info);
|
||||||
|
|
||||||
$smarty->_cache_info = $_cache_info;
|
$smarty->_cache_info = $_cache_info;
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,6 @@ function smarty_core_rmdir($params, &$smarty)
|
||||||
'level' => $params['level'] + 1,
|
'level' => $params['level'] + 1,
|
||||||
'exp_time' => $params['exp_time']
|
'exp_time' => $params['exp_time']
|
||||||
);
|
);
|
||||||
require_once(SMARTY_CORE_DIR . 'core.rmdir.php');
|
|
||||||
smarty_core_rmdir($_params, $smarty);
|
smarty_core_rmdir($_params, $smarty);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,7 @@ function smarty_core_write_cache_file($params, &$smarty)
|
||||||
if (!empty($smarty->cache_handler_func)) {
|
if (!empty($smarty->cache_handler_func)) {
|
||||||
// use cache_handler function
|
// use cache_handler function
|
||||||
call_user_func_array($smarty->cache_handler_func,
|
call_user_func_array($smarty->cache_handler_func,
|
||||||
array('write', &$smarty, &$params['results'], $params['tpl_file'], $params['cache_id'], $params['compile_id'], null));
|
array('write', &$smarty, &$params['results'], $params['tpl_file'], $params['cache_id'], $params['compile_id'], $smarty->_cache_info['expires']));
|
||||||
} else {
|
} else {
|
||||||
// use local cache file
|
// use local cache file
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,12 +15,12 @@
|
||||||
|
|
||||||
function smarty_core_write_compiled_include($params, &$smarty)
|
function smarty_core_write_compiled_include($params, &$smarty)
|
||||||
{
|
{
|
||||||
$_tag_start = 'if \(\$this->caching && \!\$this->_cache_including\) \{ echo \'\{nocache\:('.$params['cache_serial'].')#(\d+)\}\';\}';
|
$_tag_start = 'if \(\$this->caching && \!\$this->_cache_including\)\: echo \'\{nocache\:('.$params['cache_serial'].')#(\d+)\}\'; endif;';
|
||||||
$_tag_end = 'if \(\$this->caching && \!\$this->_cache_including\) \{ echo \'\{/nocache\:(\\2)#(\\3)\}\';\}';
|
$_tag_end = 'if \(\$this->caching && \!\$this->_cache_including\)\: echo \'\{/nocache\:(\\2)#(\\3)\}\'; endif;';
|
||||||
|
|
||||||
preg_match_all('!('.$_tag_start.'(.*)'.$_tag_end.')!Us',
|
preg_match_all('!('.$_tag_start.'(.*)'.$_tag_end.')!Us',
|
||||||
$params['compiled_content'], $_match_source, PREG_SET_ORDER);
|
$params['compiled_content'], $_match_source, PREG_SET_ORDER);
|
||||||
|
|
||||||
// no nocache-parts found: done
|
// no nocache-parts found: done
|
||||||
if (count($_match_source)==0) return;
|
if (count($_match_source)==0) return;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -23,8 +23,7 @@ function smarty_core_write_file($params, &$smarty)
|
||||||
smarty_core_create_dir_structure($_params, $smarty);
|
smarty_core_create_dir_structure($_params, $smarty);
|
||||||
}
|
}
|
||||||
|
|
||||||
// write to tmp file, then rename it to avoid
|
// write to tmp file, then rename it to avoid file locking race condition
|
||||||
// file locking race condition
|
|
||||||
$_tmp_file = tempnam($_dirname, 'wrt');
|
$_tmp_file = tempnam($_dirname, 'wrt');
|
||||||
|
|
||||||
if (!($fd = @fopen($_tmp_file, 'wb'))) {
|
if (!($fd = @fopen($_tmp_file, 'wb'))) {
|
||||||
|
|
@ -38,12 +37,13 @@ function smarty_core_write_file($params, &$smarty)
|
||||||
fwrite($fd, $params['contents']);
|
fwrite($fd, $params['contents']);
|
||||||
fclose($fd);
|
fclose($fd);
|
||||||
|
|
||||||
// Delete the file if it allready exists (this is needed on Win,
|
if (DIRECTORY_SEPARATOR == '\\' || !@rename($_tmp_file, $params['filename'])) {
|
||||||
// because it cannot overwrite files with rename()
|
// On platforms and filesystems that cannot overwrite with rename()
|
||||||
if (file_exists($params['filename'])) {
|
// delete the file before renaming it -- because windows always suffers
|
||||||
|
// this, it is short-circuited to avoid the initial rename() attempt
|
||||||
@unlink($params['filename']);
|
@unlink($params['filename']);
|
||||||
|
@rename($_tmp_file, $params['filename']);
|
||||||
}
|
}
|
||||||
@rename($_tmp_file, $params['filename']);
|
|
||||||
@chmod($params['filename'], $smarty->_file_perms);
|
@chmod($params['filename'], $smarty->_file_perms);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|
@ -51,4 +51,4 @@ function smarty_core_write_file($params, &$smarty)
|
||||||
|
|
||||||
/* vim: set expandtab: */
|
/* vim: set expandtab: */
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
@ -23,6 +23,7 @@
|
||||||
* indent_char: string (" ")
|
* indent_char: string (" ")
|
||||||
* wrap_boundary: boolean (true)
|
* wrap_boundary: boolean (true)
|
||||||
* </pre>
|
* </pre>
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param string contents of the block
|
* @param string contents of the block
|
||||||
* @param Smarty clever simulation of a method
|
* @param Smarty clever simulation of a method
|
||||||
* @return string string $content re-formatted
|
* @return string string $content re-formatted
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,8 @@
|
||||||
* Purpose: assign a value to a template variable
|
* Purpose: assign a value to a template variable
|
||||||
* @link http://smarty.php.net/manual/en/language.custom.functions.php#LANGUAGE.FUNCTION.ASSIGN {assign}
|
* @link http://smarty.php.net/manual/en/language.custom.functions.php#LANGUAGE.FUNCTION.ASSIGN {assign}
|
||||||
* (Smarty online manual)
|
* (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com> (initial author)
|
||||||
|
* @author messju mohr <messju at lammfellpuschen dot de> (conversion to compiler function)
|
||||||
* @param string containing var-attribute and value-attribute
|
* @param string containing var-attribute and value-attribute
|
||||||
* @param Smarty_Compiler
|
* @param Smarty_Compiler
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@
|
||||||
* Type: function<br>
|
* Type: function<br>
|
||||||
* Name: assign_debug_info<br>
|
* Name: assign_debug_info<br>
|
||||||
* Purpose: assign debug info to the template<br>
|
* Purpose: assign debug info to the template<br>
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param array unused in this plugin, this plugin uses {@link Smarty::$_config},
|
* @param array unused in this plugin, this plugin uses {@link Smarty::$_config},
|
||||||
* {@link Smarty::$_tpl_vars} and {@link Smarty::$_smarty_debug_info}
|
* {@link Smarty::$_tpl_vars} and {@link Smarty::$_smarty_debug_info}
|
||||||
* @param Smarty
|
* @param Smarty
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,8 @@
|
||||||
* Purpose: load config file vars
|
* Purpose: load config file vars
|
||||||
* @link http://smarty.php.net/manual/en/language.function.config.load.php {config_load}
|
* @link http://smarty.php.net/manual/en/language.function.config.load.php {config_load}
|
||||||
* (Smarty online manual)
|
* (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
|
* @author messju mohr <messju at lammfellpuschen dot de> (added use of resources)
|
||||||
* @param array Format:
|
* @param array Format:
|
||||||
* <pre>
|
* <pre>
|
||||||
* array('file' => required config file name,
|
* array('file' => required config file name,
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@
|
||||||
* Type: function<br>
|
* Type: function<br>
|
||||||
* Name: counter<br>
|
* Name: counter<br>
|
||||||
* Purpose: print out a counter value
|
* Purpose: print out a counter value
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @link http://smarty.php.net/manual/en/language.function.counter.php {counter}
|
* @link http://smarty.php.net/manual/en/language.function.counter.php {counter}
|
||||||
* (Smarty online manual)
|
* (Smarty online manual)
|
||||||
* @param array parameters
|
* @param array parameters
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,11 @@ function smarty_function_cycle($params, &$smarty)
|
||||||
$cycle_vars[$name]['values'] = $params['values'];
|
$cycle_vars[$name]['values'] = $params['values'];
|
||||||
}
|
}
|
||||||
|
|
||||||
$cycle_vars[$name]['delimiter'] = (isset($params['delimiter'])) ? $params['delimiter'] : ',';
|
if (isset($params['delimiter'])) {
|
||||||
|
$cycle_vars[$name]['delimiter'] = $params['delimiter'];
|
||||||
|
} elseif (!isset($cycle_vars[$name]['delimiter'])) {
|
||||||
|
$cycle_vars[$name]['delimiter'] = ',';
|
||||||
|
}
|
||||||
|
|
||||||
if(is_array($cycle_vars[$name]['values'])) {
|
if(is_array($cycle_vars[$name]['values'])) {
|
||||||
$cycle_array = $cycle_vars[$name]['values'];
|
$cycle_array = $cycle_vars[$name]['values'];
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
* Purpose: evaluate a template variable as a template<br>
|
* Purpose: evaluate a template variable as a template<br>
|
||||||
* @link http://smarty.php.net/manual/en/language.function.eval.php {eval}
|
* @link http://smarty.php.net/manual/en/language.function.eval.php {eval}
|
||||||
* (Smarty online manual)
|
* (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param array
|
* @param array
|
||||||
* @param Smarty
|
* @param Smarty
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
* Purpose: fetch file, web or ftp data and display results
|
* Purpose: fetch file, web or ftp data and display results
|
||||||
* @link http://smarty.php.net/manual/en/language.function.fetch.php {fetch}
|
* @link http://smarty.php.net/manual/en/language.function.fetch.php {fetch}
|
||||||
* (Smarty online manual)
|
* (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param array
|
* @param array
|
||||||
* @param Smarty
|
* @param Smarty
|
||||||
* @return string|null if the assign parameter is passed, Smarty assigns the
|
* @return string|null if the assign parameter is passed, Smarty assigns the
|
||||||
|
|
@ -180,12 +181,12 @@ function smarty_function_fetch($params, &$smarty)
|
||||||
$content .= fgets($fp,4096);
|
$content .= fgets($fp,4096);
|
||||||
}
|
}
|
||||||
fclose($fp);
|
fclose($fp);
|
||||||
$csplit = split("\r\n\r\n",$content,2);
|
$csplit = preg_split("!\r\n\r\n!",$content,2);
|
||||||
|
|
||||||
$content = $csplit[1];
|
$content = $csplit[1];
|
||||||
|
|
||||||
if(!empty($params['assign_headers'])) {
|
if(!empty($params['assign_headers'])) {
|
||||||
$smarty->assign($params['assign_headers'],split("\r\n",$csplit[0]));
|
$smarty->assign($params['assign_headers'],preg_split("!\r\n!",$csplit[0]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -19,9 +19,10 @@
|
||||||
* - width = image width (optional, default actual width)
|
* - width = image width (optional, default actual width)
|
||||||
* - basedir = base directory for absolute paths, default
|
* - basedir = base directory for absolute paths, default
|
||||||
* is environment variable DOCUMENT_ROOT
|
* is environment variable DOCUMENT_ROOT
|
||||||
|
* - path_prefix = prefix for path output (optional, default empty)
|
||||||
*
|
*
|
||||||
* Examples: {html_image file="images/masthead.gif"}
|
* Examples: {html_image file="/images/masthead.gif"}
|
||||||
* Output: <img src="images/masthead.gif" width=400 height=23>
|
* Output: <img src="/images/masthead.gif" width=400 height=23>
|
||||||
* @link http://smarty.php.net/manual/en/language.function.html.image.php {html_image}
|
* @link http://smarty.php.net/manual/en/language.function.html.image.php {html_image}
|
||||||
* (Smarty online manual)
|
* (Smarty online manual)
|
||||||
* @author Monte Ohrt <monte at ohrt dot com>
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
|
|
@ -44,6 +45,7 @@ function smarty_function_html_image($params, &$smarty)
|
||||||
$extra = '';
|
$extra = '';
|
||||||
$prefix = '';
|
$prefix = '';
|
||||||
$suffix = '';
|
$suffix = '';
|
||||||
|
$path_prefix = '';
|
||||||
$server_vars = ($smarty->request_use_auto_globals) ? $_SERVER : $GLOBALS['HTTP_SERVER_VARS'];
|
$server_vars = ($smarty->request_use_auto_globals) ? $_SERVER : $GLOBALS['HTTP_SERVER_VARS'];
|
||||||
$basedir = isset($server_vars['DOCUMENT_ROOT']) ? $server_vars['DOCUMENT_ROOT'] : '';
|
$basedir = isset($server_vars['DOCUMENT_ROOT']) ? $server_vars['DOCUMENT_ROOT'] : '';
|
||||||
foreach($params as $_key => $_val) {
|
foreach($params as $_key => $_val) {
|
||||||
|
|
@ -52,6 +54,7 @@ function smarty_function_html_image($params, &$smarty)
|
||||||
case 'height':
|
case 'height':
|
||||||
case 'width':
|
case 'width':
|
||||||
case 'dpi':
|
case 'dpi':
|
||||||
|
case 'path_prefix':
|
||||||
case 'basedir':
|
case 'basedir':
|
||||||
$$_key = $_val;
|
$$_key = $_val;
|
||||||
break;
|
break;
|
||||||
|
|
@ -90,15 +93,9 @@ function smarty_function_html_image($params, &$smarty)
|
||||||
} else {
|
} else {
|
||||||
$_image_path = $file;
|
$_image_path = $file;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!isset($params['width']) || !isset($params['height'])) {
|
if(!isset($params['width']) || !isset($params['height'])) {
|
||||||
if ($smarty->security &&
|
if(!$_image_data = @getimagesize($_image_path)) {
|
||||||
($_params = array('resource_type' => 'file', 'resource_name' => $_image_path)) &&
|
|
||||||
(require_once(SMARTY_CORE_DIR . 'core.is_secure.php')) &&
|
|
||||||
(!smarty_core_is_secure($_params, $smarty)) ) {
|
|
||||||
$smarty->trigger_error("html_image: (secure) '$_image_path' not in secure directory", E_USER_NOTICE);
|
|
||||||
|
|
||||||
} elseif (!$_image_data = @getimagesize($_image_path)) {
|
|
||||||
if(!file_exists($_image_path)) {
|
if(!file_exists($_image_path)) {
|
||||||
$smarty->trigger_error("html_image: unable to find '$_image_path'", E_USER_NOTICE);
|
$smarty->trigger_error("html_image: unable to find '$_image_path'", E_USER_NOTICE);
|
||||||
return;
|
return;
|
||||||
|
|
@ -110,7 +107,13 @@ function smarty_function_html_image($params, &$smarty)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if ($smarty->security &&
|
||||||
|
($_params = array('resource_type' => 'file', 'resource_name' => $_image_path)) &&
|
||||||
|
(require_once(SMARTY_CORE_DIR . 'core.is_secure.php')) &&
|
||||||
|
(!smarty_core_is_secure($_params, $smarty)) ) {
|
||||||
|
$smarty->trigger_error("html_image: (secure) '$_image_path' not in secure directory", E_USER_NOTICE);
|
||||||
|
}
|
||||||
|
|
||||||
if(!isset($params['width'])) {
|
if(!isset($params['width'])) {
|
||||||
$width = $_image_data[0];
|
$width = $_image_data[0];
|
||||||
}
|
}
|
||||||
|
|
@ -131,7 +134,7 @@ function smarty_function_html_image($params, &$smarty)
|
||||||
$height = round($height * $_resize);
|
$height = round($height * $_resize);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $prefix . '<img src="'.$file.'" alt="'.$alt.'" width="'.$width.'" height="'.$height.'"'.$extra.' />' . $suffix;
|
return $prefix . '<img src="'.$path_prefix.$file.'" alt="'.$alt.'" width="'.$width.'" height="'.$height.'"'.$extra.' />' . $suffix;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* vim: set expandtab: */
|
/* vim: set expandtab: */
|
||||||
|
|
|
||||||
|
|
@ -17,11 +17,11 @@
|
||||||
* - options (required if no values supplied) - associative array
|
* - options (required if no values supplied) - associative array
|
||||||
* - selected (optional) - string default not set
|
* - selected (optional) - string default not set
|
||||||
* - output (required if not options supplied) - array
|
* - output (required if not options supplied) - array
|
||||||
* - disabled (optional) - string default not set (added by Yogin)
|
|
||||||
* Purpose: Prints the list of <option> tags generated from
|
* Purpose: Prints the list of <option> tags generated from
|
||||||
* the passed parameters
|
* the passed parameters
|
||||||
* @link http://smarty.php.net/manual/en/language.function.html.options.php {html_image}
|
* @link http://smarty.php.net/manual/en/language.function.html.options.php {html_image}
|
||||||
* (Smarty online manual)
|
* (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param array
|
* @param array
|
||||||
* @param Smarty
|
* @param Smarty
|
||||||
* @return string
|
* @return string
|
||||||
|
|
@ -30,26 +30,25 @@
|
||||||
function smarty_function_html_options($params, &$smarty)
|
function smarty_function_html_options($params, &$smarty)
|
||||||
{
|
{
|
||||||
require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
|
require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
|
||||||
|
|
||||||
$name = null;
|
$name = null;
|
||||||
$values = null;
|
$values = null;
|
||||||
$options = null;
|
$options = null;
|
||||||
$selected = array();
|
$selected = array();
|
||||||
$disabled = array();
|
|
||||||
$output = null;
|
$output = null;
|
||||||
|
|
||||||
$extra = '';
|
$extra = '';
|
||||||
|
|
||||||
foreach($params as $_key => $_val) {
|
foreach($params as $_key => $_val) {
|
||||||
switch($_key) {
|
switch($_key) {
|
||||||
case 'name':
|
case 'name':
|
||||||
$$_key = (string)$_val;
|
$$_key = (string)$_val;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'options':
|
case 'options':
|
||||||
$$_key = (array)$_val;
|
$$_key = (array)$_val;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'values':
|
case 'values':
|
||||||
case 'output':
|
case 'output':
|
||||||
$$_key = array_values((array)$_val);
|
$$_key = array_values((array)$_val);
|
||||||
|
|
@ -58,12 +57,7 @@ function smarty_function_html_options($params, &$smarty)
|
||||||
case 'selected':
|
case 'selected':
|
||||||
$$_key = array_map('strval', array_values((array)$_val));
|
$$_key = array_map('strval', array_values((array)$_val));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'disabled':
|
|
||||||
$$_key = array_map('strval', array_values((array)$_val));
|
|
||||||
break;
|
|
||||||
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
if(!is_array($_val)) {
|
if(!is_array($_val)) {
|
||||||
$extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
|
$extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
|
||||||
|
|
@ -80,15 +74,15 @@ function smarty_function_html_options($params, &$smarty)
|
||||||
$_html_result = '';
|
$_html_result = '';
|
||||||
|
|
||||||
if (isset($options)) {
|
if (isset($options)) {
|
||||||
|
|
||||||
foreach ($options as $_key=>$_val)
|
foreach ($options as $_key=>$_val)
|
||||||
$_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $disabled);
|
$_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
foreach ($values as $_i=>$_key) {
|
foreach ($values as $_i=>$_key) {
|
||||||
$_val = isset($output[$_i]) ? $output[$_i] : '';
|
$_val = isset($output[$_i]) ? $output[$_i] : '';
|
||||||
$_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $disabled);
|
$_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -101,27 +95,23 @@ function smarty_function_html_options($params, &$smarty)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function smarty_function_html_options_optoutput($key, $value, $selected, $disabled) {
|
function smarty_function_html_options_optoutput($key, $value, $selected) {
|
||||||
if(!is_array($value)) {
|
if(!is_array($value)) {
|
||||||
$_html_result = '<option label="' . smarty_function_escape_special_chars($value) . '" value="' .
|
$_html_result = '<option label="' . smarty_function_escape_special_chars($value) . '" value="' .
|
||||||
smarty_function_escape_special_chars($key) . '"';
|
smarty_function_escape_special_chars($key) . '"';
|
||||||
if (in_array((string)$key, $selected))
|
if (in_array((string)$key, $selected))
|
||||||
$_html_result .= ' selected="selected"';
|
$_html_result .= ' selected="selected"';
|
||||||
|
|
||||||
if (in_array((string)$key, $disabled))
|
|
||||||
$_html_result .= ' disabled';
|
|
||||||
|
|
||||||
$_html_result .= '>' . smarty_function_escape_special_chars($value) . '</option>' . "\n";
|
$_html_result .= '>' . smarty_function_escape_special_chars($value) . '</option>' . "\n";
|
||||||
} else {
|
} else {
|
||||||
$_html_result = smarty_function_html_options_optgroup($key, $value, $selected, $disabled);
|
$_html_result = smarty_function_html_options_optgroup($key, $value, $selected);
|
||||||
}
|
}
|
||||||
return $_html_result;
|
return $_html_result;
|
||||||
}
|
}
|
||||||
|
|
||||||
function smarty_function_html_options_optgroup($key, $values, $selected, $disabled) {
|
function smarty_function_html_options_optgroup($key, $values, $selected) {
|
||||||
$optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";
|
$optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";
|
||||||
foreach ($values as $key => $value) {
|
foreach ($values as $key => $value) {
|
||||||
$optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected, $disabled);
|
$optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected);
|
||||||
}
|
}
|
||||||
$optgroup_html .= "</optgroup>\n";
|
$optgroup_html .= "</optgroup>\n";
|
||||||
return $optgroup_html;
|
return $optgroup_html;
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,7 @@ function smarty_function_html_radios($params, &$smarty)
|
||||||
$selected = null;
|
$selected = null;
|
||||||
$separator = '';
|
$separator = '';
|
||||||
$labels = true;
|
$labels = true;
|
||||||
|
$label_ids = false;
|
||||||
$output = null;
|
$output = null;
|
||||||
$extra = '';
|
$extra = '';
|
||||||
|
|
||||||
|
|
@ -68,6 +69,7 @@ function smarty_function_html_radios($params, &$smarty)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'labels':
|
case 'labels':
|
||||||
|
case 'label_ids':
|
||||||
$$_key = (bool)$_val;
|
$$_key = (bool)$_val;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
@ -106,13 +108,13 @@ function smarty_function_html_radios($params, &$smarty)
|
||||||
if (isset($options)) {
|
if (isset($options)) {
|
||||||
|
|
||||||
foreach ($options as $_key=>$_val)
|
foreach ($options as $_key=>$_val)
|
||||||
$_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels);
|
$_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
foreach ($values as $_i=>$_key) {
|
foreach ($values as $_i=>$_key) {
|
||||||
$_val = isset($output[$_i]) ? $output[$_i] : '';
|
$_val = isset($output[$_i]) ? $output[$_i] : '';
|
||||||
$_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels);
|
$_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -125,19 +127,23 @@ function smarty_function_html_radios($params, &$smarty)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels) {
|
function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids) {
|
||||||
$_output = '';
|
$_output = '';
|
||||||
if ($labels) {
|
if ($labels) {
|
||||||
$_id = smarty_function_escape_special_chars($name . '_' . $value);
|
if($label_ids) {
|
||||||
$_output .= '<label for="' . $_id . '">';
|
$_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name . '_' . $value));
|
||||||
|
$_output .= '<label for="' . $_id . '">';
|
||||||
|
} else {
|
||||||
|
$_output .= '<label>';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
$_output .= '<input type="radio" name="'
|
$_output .= '<input type="radio" name="'
|
||||||
. smarty_function_escape_special_chars($name) . '" value="'
|
. smarty_function_escape_special_chars($name) . '" value="'
|
||||||
. smarty_function_escape_special_chars($value) . '"';
|
. smarty_function_escape_special_chars($value) . '"';
|
||||||
|
|
||||||
if ($labels) $_output .= ' id="' . $_id . '"';
|
if ($labels && $label_ids) $_output .= ' id="' . $_id . '"';
|
||||||
|
|
||||||
if ($value==$selected) {
|
if ((string)$value==$selected) {
|
||||||
$_output .= ' checked="checked"';
|
$_output .= ' checked="checked"';
|
||||||
}
|
}
|
||||||
$_output .= $extra . ' />' . $output;
|
$_output .= $extra . ' />' . $output;
|
||||||
|
|
|
||||||
|
|
@ -22,18 +22,22 @@
|
||||||
* month values (Gary Loescher)
|
* month values (Gary Loescher)
|
||||||
* - 1.3.1 added support for choosing format for
|
* - 1.3.1 added support for choosing format for
|
||||||
* day values (Marcus Bointon)
|
* day values (Marcus Bointon)
|
||||||
* - 1.3.2 suppport negative timestamps, force year
|
* - 1.3.2 support negative timestamps, force year
|
||||||
* dropdown to include given date unless explicitly set (Monte)
|
* dropdown to include given date unless explicitly set (Monte)
|
||||||
|
* - 1.3.4 fix behaviour of 0000-00-00 00:00:00 dates to match that
|
||||||
|
* of 0000-00-00 dates (cybot, boots)
|
||||||
* @link http://smarty.php.net/manual/en/language.function.html.select.date.php {html_select_date}
|
* @link http://smarty.php.net/manual/en/language.function.html.select.date.php {html_select_date}
|
||||||
* (Smarty online manual)
|
* (Smarty online manual)
|
||||||
* @version 1.3.2
|
* @version 1.3.4
|
||||||
* @author Andrei Zmievski
|
* @author Andrei Zmievski
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param array
|
* @param array
|
||||||
* @param Smarty
|
* @param Smarty
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function smarty_function_html_select_date($params, &$smarty)
|
function smarty_function_html_select_date($params, &$smarty)
|
||||||
{
|
{
|
||||||
|
require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
|
||||||
require_once $smarty->_get_plugin_filepath('shared','make_timestamp');
|
require_once $smarty->_get_plugin_filepath('shared','make_timestamp');
|
||||||
require_once $smarty->_get_plugin_filepath('function','html_options');
|
require_once $smarty->_get_plugin_filepath('function','html_options');
|
||||||
/* Default values. */
|
/* Default values. */
|
||||||
|
|
@ -78,6 +82,7 @@ function smarty_function_html_select_date($params, &$smarty)
|
||||||
$day_empty = null;
|
$day_empty = null;
|
||||||
$month_empty = null;
|
$month_empty = null;
|
||||||
$year_empty = null;
|
$year_empty = null;
|
||||||
|
$extra_attrs = '';
|
||||||
|
|
||||||
foreach ($params as $_key=>$_value) {
|
foreach ($params as $_key=>$_value) {
|
||||||
switch ($_key) {
|
switch ($_key) {
|
||||||
|
|
@ -119,24 +124,30 @@ function smarty_function_html_select_date($params, &$smarty)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
$smarty->trigger_error("[html_select_date] unknown parameter $_key", E_USER_WARNING);
|
if(!is_array($_value)) {
|
||||||
|
$extra_attrs .= ' '.$_key.'="'.smarty_function_escape_special_chars($_value).'"';
|
||||||
|
} else {
|
||||||
|
$smarty->trigger_error("html_select_date: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(preg_match('!^-\d+$!',$time)) {
|
if (preg_match('!^-\d+$!', $time)) {
|
||||||
// negative timestamp, use date()
|
// negative timestamp, use date()
|
||||||
$time = date('Y-m-d',$time);
|
$time = date('Y-m-d', $time);
|
||||||
}
|
}
|
||||||
// If $time is not in format yyyy-mm-dd
|
// If $time is not in format yyyy-mm-dd
|
||||||
if (!preg_match('/^\d{0,4}-\d{0,2}-\d{0,2}$/', $time)) {
|
if (preg_match('/^(\d{0,4}-\d{0,2}-\d{0,2})/', $time, $found)) {
|
||||||
|
$time = $found[1];
|
||||||
|
} else {
|
||||||
// use smarty_make_timestamp to get an unix timestamp and
|
// use smarty_make_timestamp to get an unix timestamp and
|
||||||
// strftime to make yyyy-mm-dd
|
// strftime to make yyyy-mm-dd
|
||||||
$time = strftime('%Y-%m-%d', smarty_make_timestamp($time));
|
$time = strftime('%Y-%m-%d', smarty_make_timestamp($time));
|
||||||
}
|
}
|
||||||
// Now split this in pieces, which later can be used to set the select
|
// Now split this in pieces, which later can be used to set the select
|
||||||
$time = explode("-", $time);
|
$time = explode("-", $time);
|
||||||
|
|
||||||
// make syntax "+N" or "-N" work with start_year and end_year
|
// make syntax "+N" or "-N" work with start_year and end_year
|
||||||
if (preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match)) {
|
if (preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match)) {
|
||||||
if ($match[1] == '+') {
|
if ($match[1] == '+') {
|
||||||
|
|
@ -152,7 +163,7 @@ function smarty_function_html_select_date($params, &$smarty)
|
||||||
$start_year = strftime('%Y') - $match[2];
|
$start_year = strftime('%Y') - $match[2];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (strlen($time[0]) > 0) {
|
if (strlen($time[0]) > 0) {
|
||||||
if ($start_year > $time[0] && !isset($params['start_year'])) {
|
if ($start_year > $time[0] && !isset($params['start_year'])) {
|
||||||
// force start year to include given date if not explicitly set
|
// force start year to include given date if not explicitly set
|
||||||
$start_year = $time[0];
|
$start_year = $time[0];
|
||||||
|
|
@ -167,7 +178,9 @@ function smarty_function_html_select_date($params, &$smarty)
|
||||||
|
|
||||||
$html_result = $month_result = $day_result = $year_result = "";
|
$html_result = $month_result = $day_result = $year_result = "";
|
||||||
|
|
||||||
|
$field_separator_count = -1;
|
||||||
if ($display_months) {
|
if ($display_months) {
|
||||||
|
$field_separator_count++;
|
||||||
$month_names = array();
|
$month_names = array();
|
||||||
$month_values = array();
|
$month_values = array();
|
||||||
if(isset($month_empty)) {
|
if(isset($month_empty)) {
|
||||||
|
|
@ -194,17 +207,18 @@ function smarty_function_html_select_date($params, &$smarty)
|
||||||
if (null !== $all_extra){
|
if (null !== $all_extra){
|
||||||
$month_result .= ' ' . $all_extra;
|
$month_result .= ' ' . $all_extra;
|
||||||
}
|
}
|
||||||
$month_result .= '>'."\n";
|
$month_result .= $extra_attrs . '>'."\n";
|
||||||
|
|
||||||
$month_result .= smarty_function_html_options(array('output' => $month_names,
|
$month_result .= smarty_function_html_options(array('output' => $month_names,
|
||||||
'values' => $month_values,
|
'values' => $month_values,
|
||||||
'selected' => $a=$time[1] ? strftime($month_value_format, mktime(0, 0, 0, (int)$time[1], 1, 2000)) : '',
|
'selected' => (int)$time[1] ? strftime($month_value_format, mktime(0, 0, 0, (int)$time[1], 1, 2000)) : '',
|
||||||
'print_result' => false),
|
'print_result' => false),
|
||||||
$smarty);
|
$smarty);
|
||||||
$month_result .= '</select>';
|
$month_result .= '</select>';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($display_days) {
|
if ($display_days) {
|
||||||
|
$field_separator_count++;
|
||||||
$days = array();
|
$days = array();
|
||||||
if (isset($day_empty)) {
|
if (isset($day_empty)) {
|
||||||
$days[''] = $day_empty;
|
$days[''] = $day_empty;
|
||||||
|
|
@ -230,7 +244,7 @@ function smarty_function_html_select_date($params, &$smarty)
|
||||||
if (null !== $day_extra){
|
if (null !== $day_extra){
|
||||||
$day_result .= ' ' . $day_extra;
|
$day_result .= ' ' . $day_extra;
|
||||||
}
|
}
|
||||||
$day_result .= '>'."\n";
|
$day_result .= $extra_attrs . '>'."\n";
|
||||||
$day_result .= smarty_function_html_options(array('output' => $days,
|
$day_result .= smarty_function_html_options(array('output' => $days,
|
||||||
'values' => $day_values,
|
'values' => $day_values,
|
||||||
'selected' => $time[2],
|
'selected' => $time[2],
|
||||||
|
|
@ -240,6 +254,7 @@ function smarty_function_html_select_date($params, &$smarty)
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($display_years) {
|
if ($display_years) {
|
||||||
|
$field_separator_count++;
|
||||||
if (null !== $field_array){
|
if (null !== $field_array){
|
||||||
$year_name = $field_array . '[' . $prefix . 'Year]';
|
$year_name = $field_array . '[' . $prefix . 'Year]';
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -253,7 +268,7 @@ function smarty_function_html_select_date($params, &$smarty)
|
||||||
if (null !== $year_extra){
|
if (null !== $year_extra){
|
||||||
$year_result .= ' ' . $year_extra;
|
$year_result .= ' ' . $year_extra;
|
||||||
}
|
}
|
||||||
$year_result .= '>';
|
$year_result .= ' />';
|
||||||
} else {
|
} else {
|
||||||
$years = range((int)$start_year, (int)$end_year);
|
$years = range((int)$start_year, (int)$end_year);
|
||||||
if ($reverse_years) {
|
if ($reverse_years) {
|
||||||
|
|
@ -276,7 +291,7 @@ function smarty_function_html_select_date($params, &$smarty)
|
||||||
if (null !== $year_extra){
|
if (null !== $year_extra){
|
||||||
$year_result .= ' ' . $year_extra;
|
$year_result .= ' ' . $year_extra;
|
||||||
}
|
}
|
||||||
$year_result .= '>'."\n";
|
$year_result .= $extra_attrs . '>'."\n";
|
||||||
$year_result .= smarty_function_html_options(array('output' => $years,
|
$year_result .= smarty_function_html_options(array('output' => $years,
|
||||||
'values' => $yearvals,
|
'values' => $yearvals,
|
||||||
'selected' => $time[0],
|
'selected' => $time[0],
|
||||||
|
|
@ -303,7 +318,7 @@ function smarty_function_html_select_date($params, &$smarty)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
// Add the field seperator
|
// Add the field seperator
|
||||||
if($i != 2) {
|
if($i < $field_separator_count) {
|
||||||
$html_result .= $field_separator;
|
$html_result .= $field_separator;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,8 @@
|
||||||
* Purpose: Prints the dropdowns for time selection
|
* Purpose: Prints the dropdowns for time selection
|
||||||
* @link http://smarty.php.net/manual/en/language.function.html.select.time.php {html_select_time}
|
* @link http://smarty.php.net/manual/en/language.function.html.select.time.php {html_select_time}
|
||||||
* (Smarty online manual)
|
* (Smarty online manual)
|
||||||
|
* @author Roberto Berto <roberto@berto.net>
|
||||||
|
* @credits Monte Ohrt <monte AT ohrt DOT com>
|
||||||
* @param array
|
* @param array
|
||||||
* @param Smarty
|
* @param Smarty
|
||||||
* @return string
|
* @return string
|
||||||
|
|
|
||||||
|
|
@ -15,12 +15,15 @@
|
||||||
* Purpose: make an html table from an array of data<br>
|
* Purpose: make an html table from an array of data<br>
|
||||||
* Input:<br>
|
* Input:<br>
|
||||||
* - loop = array to loop through
|
* - loop = array to loop through
|
||||||
* - cols = number of columns
|
* - cols = number of columns, comma separated list of column names
|
||||||
|
* or array of column names
|
||||||
* - rows = number of rows
|
* - rows = number of rows
|
||||||
* - table_attr = table attributes
|
* - table_attr = table attributes
|
||||||
|
* - th_attr = table heading attributes (arrays are cycled)
|
||||||
* - tr_attr = table row attributes (arrays are cycled)
|
* - tr_attr = table row attributes (arrays are cycled)
|
||||||
* - td_attr = table cell attributes (arrays are cycled)
|
* - td_attr = table cell attributes (arrays are cycled)
|
||||||
* - trailpad = value to pad trailing cells with
|
* - trailpad = value to pad trailing cells with
|
||||||
|
* - caption = text for caption element
|
||||||
* - vdir = vertical direction (default: "down", means top-to-bottom)
|
* - vdir = vertical direction (default: "down", means top-to-bottom)
|
||||||
* - hdir = horizontal direction (default: "right", means left-to-right)
|
* - hdir = horizontal direction (default: "right", means left-to-right)
|
||||||
* - inner = inner loop (default "cols": print $loop line by line,
|
* - inner = inner loop (default "cols": print $loop line by line,
|
||||||
|
|
@ -31,10 +34,12 @@
|
||||||
* <pre>
|
* <pre>
|
||||||
* {table loop=$data}
|
* {table loop=$data}
|
||||||
* {table loop=$data cols=4 tr_attr='"bgcolor=red"'}
|
* {table loop=$data cols=4 tr_attr='"bgcolor=red"'}
|
||||||
* {table loop=$data cols=4 tr_attr=$colors}
|
* {table loop=$data cols="first,second,third" tr_attr=$colors}
|
||||||
* </pre>
|
* </pre>
|
||||||
* @author Monte Ohrt <monte at ohrt dot com>
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @version 1.0
|
* @author credit to Messju Mohr <messju at lammfellpuschen dot de>
|
||||||
|
* @author credit to boots <boots dot smarty at yahoo dot com>
|
||||||
|
* @version 1.1
|
||||||
* @link http://smarty.php.net/manual/en/language.function.html.table.php {html_table}
|
* @link http://smarty.php.net/manual/en/language.function.html.table.php {html_table}
|
||||||
* (Smarty online manual)
|
* (Smarty online manual)
|
||||||
* @param array
|
* @param array
|
||||||
|
|
@ -45,13 +50,15 @@ function smarty_function_html_table($params, &$smarty)
|
||||||
{
|
{
|
||||||
$table_attr = 'border="1"';
|
$table_attr = 'border="1"';
|
||||||
$tr_attr = '';
|
$tr_attr = '';
|
||||||
|
$th_attr = '';
|
||||||
$td_attr = '';
|
$td_attr = '';
|
||||||
$cols = 3;
|
$cols = $cols_count = 3;
|
||||||
$rows = 3;
|
$rows = 3;
|
||||||
$trailpad = ' ';
|
$trailpad = ' ';
|
||||||
$vdir = 'down';
|
$vdir = 'down';
|
||||||
$hdir = 'right';
|
$hdir = 'right';
|
||||||
$inner = 'cols';
|
$inner = 'cols';
|
||||||
|
$caption = '';
|
||||||
|
|
||||||
if (!isset($params['loop'])) {
|
if (!isset($params['loop'])) {
|
||||||
$smarty->trigger_error("html_table: missing 'loop' parameter");
|
$smarty->trigger_error("html_table: missing 'loop' parameter");
|
||||||
|
|
@ -65,6 +72,19 @@ function smarty_function_html_table($params, &$smarty)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'cols':
|
case 'cols':
|
||||||
|
if (is_array($_value) && !empty($_value)) {
|
||||||
|
$cols = $_value;
|
||||||
|
$cols_count = count($_value);
|
||||||
|
} elseif (!is_numeric($_value) && is_string($_value) && !empty($_value)) {
|
||||||
|
$cols = explode(',', $_value);
|
||||||
|
$cols_count = count($cols);
|
||||||
|
} elseif (!empty($_value)) {
|
||||||
|
$cols_count = (int)$_value;
|
||||||
|
} else {
|
||||||
|
$cols_count = $cols;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
case 'rows':
|
case 'rows':
|
||||||
$$_key = (int)$_value;
|
$$_key = (int)$_value;
|
||||||
break;
|
break;
|
||||||
|
|
@ -74,11 +94,13 @@ function smarty_function_html_table($params, &$smarty)
|
||||||
case 'hdir':
|
case 'hdir':
|
||||||
case 'vdir':
|
case 'vdir':
|
||||||
case 'inner':
|
case 'inner':
|
||||||
|
case 'caption':
|
||||||
$$_key = (string)$_value;
|
$$_key = (string)$_value;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'tr_attr':
|
case 'tr_attr':
|
||||||
case 'td_attr':
|
case 'td_attr':
|
||||||
|
case 'th_attr':
|
||||||
$$_key = $_value;
|
$$_key = $_value;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -87,25 +109,42 @@ function smarty_function_html_table($params, &$smarty)
|
||||||
$loop_count = count($loop);
|
$loop_count = count($loop);
|
||||||
if (empty($params['rows'])) {
|
if (empty($params['rows'])) {
|
||||||
/* no rows specified */
|
/* no rows specified */
|
||||||
$rows = ceil($loop_count/$cols);
|
$rows = ceil($loop_count/$cols_count);
|
||||||
} elseif (empty($params['cols'])) {
|
} elseif (empty($params['cols'])) {
|
||||||
if (!empty($params['rows'])) {
|
if (!empty($params['rows'])) {
|
||||||
/* no cols specified, but rows */
|
/* no cols specified, but rows */
|
||||||
$cols = ceil($loop_count/$rows);
|
$cols_count = ceil($loop_count/$rows);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$output = "<table $table_attr>\n";
|
$output = "<table $table_attr>\n";
|
||||||
|
|
||||||
|
if (!empty($caption)) {
|
||||||
|
$output .= '<caption>' . $caption . "</caption>\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (is_array($cols)) {
|
||||||
|
$cols = ($hdir == 'right') ? $cols : array_reverse($cols);
|
||||||
|
$output .= "<thead><tr>\n";
|
||||||
|
|
||||||
|
for ($r=0; $r<$cols_count; $r++) {
|
||||||
|
$output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>';
|
||||||
|
$output .= $cols[$r];
|
||||||
|
$output .= "</th>\n";
|
||||||
|
}
|
||||||
|
$output .= "</tr></thead>\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
$output .= "<tbody>\n";
|
||||||
for ($r=0; $r<$rows; $r++) {
|
for ($r=0; $r<$rows; $r++) {
|
||||||
$output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n";
|
$output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n";
|
||||||
$rx = ($vdir == 'down') ? $r*$cols : ($rows-1-$r)*$cols;
|
$rx = ($vdir == 'down') ? $r*$cols_count : ($rows-1-$r)*$cols_count;
|
||||||
|
|
||||||
for ($c=0; $c<$cols; $c++) {
|
for ($c=0; $c<$cols_count; $c++) {
|
||||||
$x = ($hdir == 'right') ? $rx+$c : $rx+$cols-1-$c;
|
$x = ($hdir == 'right') ? $rx+$c : $rx+$cols_count-1-$c;
|
||||||
if ($inner!='cols') {
|
if ($inner!='cols') {
|
||||||
/* shuffle x to loop over rows*/
|
/* shuffle x to loop over rows*/
|
||||||
$x = floor($x/$cols) + ($x%$cols)*$rows;
|
$x = floor($x/$cols_count) + ($x%$cols_count)*$rows;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($x<$loop_count) {
|
if ($x<$loop_count) {
|
||||||
|
|
@ -116,6 +155,7 @@ function smarty_function_html_table($params, &$smarty)
|
||||||
}
|
}
|
||||||
$output .= "</tr>\n";
|
$output .= "</tr>\n";
|
||||||
}
|
}
|
||||||
|
$output .= "</tbody>\n";
|
||||||
$output .= "</table>\n";
|
$output .= "</table>\n";
|
||||||
|
|
||||||
return $output;
|
return $output;
|
||||||
|
|
|
||||||
|
|
@ -62,6 +62,8 @@ function smarty_function_mailto($params, &$smarty)
|
||||||
|
|
||||||
// netscape and mozilla do not decode %40 (@) in BCC field (bug?)
|
// netscape and mozilla do not decode %40 (@) in BCC field (bug?)
|
||||||
// so, don't encode it.
|
// so, don't encode it.
|
||||||
|
$search = array('%40', '%2C');
|
||||||
|
$replace = array('@', ',');
|
||||||
$mail_parms = array();
|
$mail_parms = array();
|
||||||
foreach ($params as $var=>$value) {
|
foreach ($params as $var=>$value) {
|
||||||
switch ($var) {
|
switch ($var) {
|
||||||
|
|
@ -69,7 +71,7 @@ function smarty_function_mailto($params, &$smarty)
|
||||||
case 'bcc':
|
case 'bcc':
|
||||||
case 'followupto':
|
case 'followupto':
|
||||||
if (!empty($value))
|
if (!empty($value))
|
||||||
$mail_parms[] = $var.'='.str_replace('%40','@',rawurlencode($value));
|
$mail_parms[] = $var.'='.str_replace($search,$replace,rawurlencode($value));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'subject':
|
case 'subject':
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
* Purpose: handle math computations in template<br>
|
* Purpose: handle math computations in template<br>
|
||||||
* @link http://smarty.php.net/manual/en/language.function.math.php {math}
|
* @link http://smarty.php.net/manual/en/language.function.math.php {math}
|
||||||
* (Smarty online manual)
|
* (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param array
|
* @param array
|
||||||
* @param Smarty
|
* @param Smarty
|
||||||
* @return string
|
* @return string
|
||||||
|
|
@ -26,7 +27,8 @@ function smarty_function_math($params, &$smarty)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$equation = $params['equation'];
|
// strip out backticks, not necessary for math
|
||||||
|
$equation = str_replace('`','',$params['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,")")) {
|
||||||
|
|
@ -35,7 +37,7 @@ function smarty_function_math($params, &$smarty)
|
||||||
}
|
}
|
||||||
|
|
||||||
// match all vars in equation, make sure all are passed
|
// match all vars in equation, make sure all are passed
|
||||||
preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]+)!",$equation, $match);
|
preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]*)!",$equation, $match);
|
||||||
$allowed_funcs = array('int','abs','ceil','cos','exp','floor','log','log10',
|
$allowed_funcs = array('int','abs','ceil','cos','exp','floor','log','log10',
|
||||||
'max','min','pi','pow','rand','round','sin','sqrt','srand','tan');
|
'max','min','pi','pow','rand','round','sin','sqrt','srand','tan');
|
||||||
|
|
||||||
|
|
@ -57,7 +59,7 @@ function smarty_function_math($params, &$smarty)
|
||||||
$smarty->trigger_error("math: parameter $key: is not numeric");
|
$smarty->trigger_error("math: parameter $key: is not numeric");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$equation = preg_replace("/\b$key\b/",$val, $equation);
|
$equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -80,4 +82,4 @@ function smarty_function_math($params, &$smarty)
|
||||||
|
|
||||||
/* vim: set expandtab: */
|
/* vim: set expandtab: */
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
* Purpose: make text pop up in windows via overlib
|
* Purpose: make text pop up in windows via overlib
|
||||||
* @link http://smarty.php.net/manual/en/language.function.popup.php {popup}
|
* @link http://smarty.php.net/manual/en/language.function.popup.php {popup}
|
||||||
* (Smarty online manual)
|
* (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param array
|
* @param array
|
||||||
* @param Smarty
|
* @param Smarty
|
||||||
* @return string
|
* @return string
|
||||||
|
|
@ -88,6 +89,7 @@ function smarty_function_popup($params, &$smarty)
|
||||||
case 'vauto':
|
case 'vauto':
|
||||||
case 'mouseoff':
|
case 'mouseoff':
|
||||||
case 'followmouse':
|
case 'followmouse':
|
||||||
|
case 'closeclick':
|
||||||
if ($_value) $append .= ',' . strtoupper($_key);
|
if ($_value) $append .= ',' . strtoupper($_key);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
* Purpose: initialize overlib
|
* Purpose: initialize overlib
|
||||||
* @link http://smarty.php.net/manual/en/language.function.popup.init.php {popup_init}
|
* @link http://smarty.php.net/manual/en/language.function.popup.init.php {popup_init}
|
||||||
* (Smarty online manual)
|
* (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param array
|
* @param array
|
||||||
* @param Smarty
|
* @param Smarty
|
||||||
* @return string
|
* @return string
|
||||||
|
|
|
||||||
|
|
@ -14,13 +14,14 @@
|
||||||
* Purpose: capitalize words in the string
|
* Purpose: capitalize words in the string
|
||||||
* @link http://smarty.php.net/manual/en/language.modifiers.php#LANGUAGE.MODIFIER.CAPITALIZE
|
* @link http://smarty.php.net/manual/en/language.modifiers.php#LANGUAGE.MODIFIER.CAPITALIZE
|
||||||
* capitalize (Smarty online manual)
|
* capitalize (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param string
|
* @param string
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function smarty_modifier_capitalize($string, $uc_digits = false)
|
function smarty_modifier_capitalize($string, $uc_digits = false)
|
||||||
{
|
{
|
||||||
smarty_modifier_capitalize_ucfirst(null, $uc_digits);
|
smarty_modifier_capitalize_ucfirst(null, $uc_digits);
|
||||||
return preg_replace_callback('!\b\w+\b!', 'smarty_modifier_capitalize_ucfirst', $string);
|
return preg_replace_callback('!\'?\b\w(\w|\')*\b!', 'smarty_modifier_capitalize_ucfirst', $string);
|
||||||
}
|
}
|
||||||
|
|
||||||
function smarty_modifier_capitalize_ucfirst($string, $uc_digits = null)
|
function smarty_modifier_capitalize_ucfirst($string, $uc_digits = null)
|
||||||
|
|
@ -32,7 +33,7 @@ function smarty_modifier_capitalize_ucfirst($string, $uc_digits = null)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!preg_match('!\d!',$string[0]) || $_uc_digits)
|
if(substr($string[0],0,1) != "'" && !preg_match("!\d!",$string[0]) || $_uc_digits)
|
||||||
return ucfirst($string[0]);
|
return ucfirst($string[0]);
|
||||||
else
|
else
|
||||||
return $string[0];
|
return $string[0];
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
* Purpose: count the number of characters in a text
|
* Purpose: count the number of characters in a text
|
||||||
* @link http://smarty.php.net/manual/en/language.modifier.count.characters.php
|
* @link http://smarty.php.net/manual/en/language.modifier.count.characters.php
|
||||||
* count_characters (Smarty online manual)
|
* count_characters (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param string
|
* @param string
|
||||||
* @param boolean include whitespace in the character count
|
* @param boolean include whitespace in the character count
|
||||||
* @return integer
|
* @return integer
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
* Purpose: count the number of paragraphs in a text
|
* Purpose: count the number of paragraphs in a text
|
||||||
* @link http://smarty.php.net/manual/en/language.modifier.count.paragraphs.php
|
* @link http://smarty.php.net/manual/en/language.modifier.count.paragraphs.php
|
||||||
* count_paragraphs (Smarty online manual)
|
* count_paragraphs (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param string
|
* @param string
|
||||||
* @return integer
|
* @return integer
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
* Purpose: count the number of sentences in a text
|
* Purpose: count the number of sentences in a text
|
||||||
* @link http://smarty.php.net/manual/en/language.modifier.count.paragraphs.php
|
* @link http://smarty.php.net/manual/en/language.modifier.count.paragraphs.php
|
||||||
* count_sentences (Smarty online manual)
|
* count_sentences (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param string
|
* @param string
|
||||||
* @return integer
|
* @return integer
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
* Purpose: count the number of words in a text
|
* Purpose: count the number of words in a text
|
||||||
* @link http://smarty.php.net/manual/en/language.modifier.count.words.php
|
* @link http://smarty.php.net/manual/en/language.modifier.count.words.php
|
||||||
* count_words (Smarty online manual)
|
* count_words (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param string
|
* @param string
|
||||||
* @return integer
|
* @return integer
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
/**
|
/**
|
||||||
* Include the {@link shared.make_timestamp.php} plugin
|
* Include the {@link shared.make_timestamp.php} plugin
|
||||||
*/
|
*/
|
||||||
require_once $smarty->_get_plugin_filepath('shared','make_timestamp');
|
require_once $smarty->_get_plugin_filepath('shared', 'make_timestamp');
|
||||||
/**
|
/**
|
||||||
* Smarty date_format modifier plugin
|
* Smarty date_format modifier plugin
|
||||||
*
|
*
|
||||||
|
|
@ -21,26 +21,36 @@ require_once $smarty->_get_plugin_filepath('shared','make_timestamp');
|
||||||
* - default_date: default date if $string is empty
|
* - default_date: default date if $string is empty
|
||||||
* @link http://smarty.php.net/manual/en/language.modifier.date.format.php
|
* @link http://smarty.php.net/manual/en/language.modifier.date.format.php
|
||||||
* date_format (Smarty online manual)
|
* date_format (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param string
|
* @param string
|
||||||
* @param string
|
* @param string
|
||||||
* @param string
|
* @param string
|
||||||
* @return string|void
|
* @return string|void
|
||||||
* @uses smarty_make_timestamp()
|
* @uses smarty_make_timestamp()
|
||||||
*/
|
*/
|
||||||
function smarty_modifier_date_format($string, $format="%b %e, %Y", $default_date=null)
|
function smarty_modifier_date_format($string, $format = '%b %e, %Y', $default_date = '')
|
||||||
{
|
{
|
||||||
if (substr(PHP_OS,0,3) == 'WIN') {
|
if ($string != '') {
|
||||||
$_win_from = array ('%e', '%T', '%D');
|
$timestamp = smarty_make_timestamp($string);
|
||||||
$_win_to = array ('%#d', '%H:%M:%S', '%m/%d/%y');
|
} elseif ($default_date != '') {
|
||||||
$format = str_replace($_win_from, $_win_to, $format);
|
$timestamp = smarty_make_timestamp($default_date);
|
||||||
}
|
|
||||||
if($string != '') {
|
|
||||||
return strftime($format, smarty_make_timestamp($string));
|
|
||||||
} elseif (isset($default_date) && $default_date != '') {
|
|
||||||
return strftime($format, smarty_make_timestamp($default_date));
|
|
||||||
} else {
|
} else {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (DIRECTORY_SEPARATOR == '\\') {
|
||||||
|
$_win_from = array('%D', '%h', '%n', '%r', '%R', '%t', '%T');
|
||||||
|
$_win_to = array('%m/%d/%y', '%b', "\n", '%I:%M:%S %p', '%H:%M', "\t", '%H:%M:%S');
|
||||||
|
if (strpos($format, '%e') !== false) {
|
||||||
|
$_win_from[] = '%e';
|
||||||
|
$_win_to[] = sprintf('%\' 2d', date('j', $timestamp));
|
||||||
|
}
|
||||||
|
if (strpos($format, '%l') !== false) {
|
||||||
|
$_win_from[] = '%l';
|
||||||
|
$_win_to[] = sprintf('%\' 2d', date('h', $timestamp));
|
||||||
|
}
|
||||||
|
$format = str_replace($_win_from, $_win_to, $format);
|
||||||
|
}
|
||||||
|
return strftime($format, $timestamp);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* vim: set expandtab: */
|
/* vim: set expandtab: */
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
* Purpose: formats variable contents for display in the console
|
* Purpose: formats variable contents for display in the console
|
||||||
* @link http://smarty.php.net/manual/en/language.modifier.debug.print.var.php
|
* @link http://smarty.php.net/manual/en/language.modifier.debug.print.var.php
|
||||||
* debug_print_var (Smarty online manual)
|
* debug_print_var (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param array|object
|
* @param array|object
|
||||||
* @param integer
|
* @param integer
|
||||||
* @param integer
|
* @param integer
|
||||||
|
|
@ -21,33 +22,66 @@
|
||||||
*/
|
*/
|
||||||
function smarty_modifier_debug_print_var($var, $depth = 0, $length = 40)
|
function smarty_modifier_debug_print_var($var, $depth = 0, $length = 40)
|
||||||
{
|
{
|
||||||
$_replace = array("\n"=>'<i>\n</i>', "\r"=>'<i>\r</i>', "\t"=>'<i>\t</i>');
|
$_replace = array(
|
||||||
if (is_array($var)) {
|
"\n" => '<i>\n</i>',
|
||||||
$results = "<b>Array (".count($var).")</b>";
|
"\r" => '<i>\r</i>',
|
||||||
foreach ($var as $curr_key => $curr_val) {
|
"\t" => '<i>\t</i>'
|
||||||
$return = smarty_modifier_debug_print_var($curr_val, $depth+1, $length);
|
);
|
||||||
$results .= "<br>".str_repeat(' ', $depth*2)."<b>".strtr($curr_key, $_replace)."</b> => $return";
|
|
||||||
}
|
switch (gettype($var)) {
|
||||||
} else if (is_object($var)) {
|
case 'array' :
|
||||||
$object_vars = get_object_vars($var);
|
$results = '<b>Array (' . count($var) . ')</b>';
|
||||||
$results = "<b>".get_class($var)." Object (".count($object_vars).")</b>";
|
foreach ($var as $curr_key => $curr_val) {
|
||||||
foreach ($object_vars as $curr_key => $curr_val) {
|
$results .= '<br>' . str_repeat(' ', $depth * 2)
|
||||||
$return = smarty_modifier_debug_print_var($curr_val, $depth+1, $length);
|
. '<b>' . strtr($curr_key, $_replace) . '</b> => '
|
||||||
$results .= "<br>".str_repeat(' ', $depth*2)."<b>$curr_key</b> => $return";
|
. smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
|
||||||
}
|
$depth--;
|
||||||
} else if (is_resource($var)) {
|
}
|
||||||
$results = '<i>'.(string)$var.'</i>';
|
break;
|
||||||
} else if (empty($var) && $var != "0") {
|
case 'object' :
|
||||||
$results = '<i>empty</i>';
|
$object_vars = get_object_vars($var);
|
||||||
} else {
|
$results = '<b>' . get_class($var) . ' Object (' . count($object_vars) . ')</b>';
|
||||||
if (strlen($var) > $length ) {
|
foreach ($object_vars as $curr_key => $curr_val) {
|
||||||
$results = substr($var, 0, $length-3).'...';
|
$results .= '<br>' . str_repeat(' ', $depth * 2)
|
||||||
} else {
|
. '<b> ->' . strtr($curr_key, $_replace) . '</b> = '
|
||||||
$results = $var;
|
. smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
|
||||||
}
|
$depth--;
|
||||||
$results = htmlspecialchars($results);
|
}
|
||||||
$results = strtr($results, $_replace);
|
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 'string' :
|
||||||
|
$results = strtr($var, $_replace);
|
||||||
|
if (strlen($var) > $length ) {
|
||||||
|
$results = substr($var, 0, $length - 3) . '...';
|
||||||
|
}
|
||||||
|
$results = htmlspecialchars('"' . $results . '"');
|
||||||
|
break;
|
||||||
|
case 'unknown type' :
|
||||||
|
default :
|
||||||
|
$results = strtr((string) $var, $_replace);
|
||||||
|
if (strlen($results) > $length ) {
|
||||||
|
$results = substr($results, 0, $length - 3) . '...';
|
||||||
|
}
|
||||||
|
$results = htmlspecialchars($results);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $results;
|
return $results;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
* Purpose: designate default value for empty variables
|
* Purpose: designate default value for empty variables
|
||||||
* @link http://smarty.php.net/manual/en/language.modifier.default.php
|
* @link http://smarty.php.net/manual/en/language.modifier.default.php
|
||||||
* default (Smarty online manual)
|
* default (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param string
|
* @param string
|
||||||
* @param string
|
* @param string
|
||||||
* @return string
|
* @return string
|
||||||
|
|
|
||||||
|
|
@ -14,22 +14,26 @@
|
||||||
* Purpose: Escape the string according to escapement type
|
* Purpose: Escape the string according to escapement type
|
||||||
* @link http://smarty.php.net/manual/en/language.modifier.escape.php
|
* @link http://smarty.php.net/manual/en/language.modifier.escape.php
|
||||||
* escape (Smarty online manual)
|
* escape (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param string
|
* @param string
|
||||||
* @param html|htmlall|url|quotes|hex|hexentity|javascript
|
* @param html|htmlall|url|quotes|hex|hexentity|javascript
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function smarty_modifier_escape($string, $esc_type = 'html')
|
function smarty_modifier_escape($string, $esc_type = 'html', $char_set = 'ISO-8859-1')
|
||||||
{
|
{
|
||||||
switch ($esc_type) {
|
switch ($esc_type) {
|
||||||
case 'html':
|
case 'html':
|
||||||
return htmlspecialchars($string, ENT_QUOTES);
|
return htmlspecialchars($string, ENT_QUOTES, $char_set);
|
||||||
|
|
||||||
case 'htmlall':
|
case 'htmlall':
|
||||||
return htmlentities($string, ENT_QUOTES);
|
return htmlentities($string, ENT_QUOTES, $char_set);
|
||||||
|
|
||||||
case 'url':
|
case 'url':
|
||||||
return rawurlencode($string);
|
return rawurlencode($string);
|
||||||
|
|
||||||
|
case 'urlpathinfo':
|
||||||
|
return str_replace('%2F','/',rawurlencode($string));
|
||||||
|
|
||||||
case 'quotes':
|
case 'quotes':
|
||||||
// escape unescaped single quotes
|
// escape unescaped single quotes
|
||||||
return preg_replace("%(?<!\\\\)'%", "\\'", $string);
|
return preg_replace("%(?<!\\\\)'%", "\\'", $string);
|
||||||
|
|
@ -68,13 +72,13 @@ function smarty_modifier_escape($string, $esc_type = 'html')
|
||||||
// escape non-standard chars, such as ms document quotes
|
// escape non-standard chars, such as ms document quotes
|
||||||
$_res = '';
|
$_res = '';
|
||||||
for($_i = 0, $_len = strlen($string); $_i < $_len; $_i++) {
|
for($_i = 0, $_len = strlen($string); $_i < $_len; $_i++) {
|
||||||
$_ord = ord($string{$_i});
|
$_ord = ord(substr($string, $_i, 1));
|
||||||
// non-standard char, escape it
|
// non-standard char, escape it
|
||||||
if($_ord >= 126){
|
if($_ord >= 126){
|
||||||
$_res .= '&#' . $_ord . ';';
|
$_res .= '&#' . $_ord . ';';
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$_res .= $string{$_i};
|
$_res .= substr($string, $_i, 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return $_res;
|
return $_res;
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
* Purpose: indent lines of text
|
* Purpose: indent lines of text
|
||||||
* @link http://smarty.php.net/manual/en/language.modifier.indent.php
|
* @link http://smarty.php.net/manual/en/language.modifier.indent.php
|
||||||
* indent (Smarty online manual)
|
* indent (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param string
|
* @param string
|
||||||
* @param integer
|
* @param integer
|
||||||
* @param string
|
* @param string
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
* Purpose: convert string to lowercase
|
* Purpose: convert string to lowercase
|
||||||
* @link http://smarty.php.net/manual/en/language.modifier.lower.php
|
* @link http://smarty.php.net/manual/en/language.modifier.lower.php
|
||||||
* lower (Smarty online manual)
|
* lower (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param string
|
* @param string
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -11,9 +11,10 @@
|
||||||
*
|
*
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: regex_replace<br>
|
* Name: regex_replace<br>
|
||||||
* Purpose: regular epxression search/replace
|
* Purpose: regular expression search/replace
|
||||||
* @link http://smarty.php.net/manual/en/language.modifier.regex.replace.php
|
* @link http://smarty.php.net/manual/en/language.modifier.regex.replace.php
|
||||||
* regex_replace (Smarty online manual)
|
* regex_replace (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param string
|
* @param string
|
||||||
* @param string|array
|
* @param string|array
|
||||||
* @param string|array
|
* @param string|array
|
||||||
|
|
@ -21,13 +22,27 @@
|
||||||
*/
|
*/
|
||||||
function smarty_modifier_regex_replace($string, $search, $replace)
|
function smarty_modifier_regex_replace($string, $search, $replace)
|
||||||
{
|
{
|
||||||
if (preg_match('!\W(\w+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) {
|
if(is_array($search)) {
|
||||||
/* remove eval-modifier from $search */
|
foreach($search as $idx => $s)
|
||||||
$search = substr($search, 0, -strlen($match[1])) . str_replace('e', '', $match[1]);
|
$search[$idx] = _smarty_regex_replace_check($s);
|
||||||
}
|
} else {
|
||||||
|
$search = _smarty_regex_replace_check($search);
|
||||||
|
}
|
||||||
|
|
||||||
return preg_replace($search, $replace, $string);
|
return preg_replace($search, $replace, $string);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function _smarty_regex_replace_check($search)
|
||||||
|
{
|
||||||
|
if (($pos = strpos($search,"\0")) !== false)
|
||||||
|
$search = substr($search,0,$pos);
|
||||||
|
if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) {
|
||||||
|
/* remove eval-modifier from $search */
|
||||||
|
$search = substr($search, 0, -strlen($match[1])) . preg_replace('![e\s]+!', '', $match[1]);
|
||||||
|
}
|
||||||
|
return $search;
|
||||||
|
}
|
||||||
|
|
||||||
/* vim: set expandtab: */
|
/* vim: set expandtab: */
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
* Purpose: simple search/replace
|
* Purpose: simple search/replace
|
||||||
* @link http://smarty.php.net/manual/en/language.modifier.replace.php
|
* @link http://smarty.php.net/manual/en/language.modifier.replace.php
|
||||||
* replace (Smarty online manual)
|
* replace (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param string
|
* @param string
|
||||||
* @param string
|
* @param string
|
||||||
* @param string
|
* @param string
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
* Purpose: add spaces between characters in a string
|
* Purpose: add spaces between characters in a string
|
||||||
* @link http://smarty.php.net/manual/en/language.modifier.spacify.php
|
* @link http://smarty.php.net/manual/en/language.modifier.spacify.php
|
||||||
* spacify (Smarty online manual)
|
* spacify (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param string
|
* @param string
|
||||||
* @param string
|
* @param string
|
||||||
* @return string
|
* @return string
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
* Purpose: format strings via sprintf
|
* Purpose: format strings via sprintf
|
||||||
* @link http://smarty.php.net/manual/en/language.modifier.string.format.php
|
* @link http://smarty.php.net/manual/en/language.modifier.string.format.php
|
||||||
* string_format (Smarty online manual)
|
* string_format (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param string
|
* @param string
|
||||||
* @param string
|
* @param string
|
||||||
* @return string
|
* @return string
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
* Purpose: strip html tags from text
|
* Purpose: strip html tags from text
|
||||||
* @link http://smarty.php.net/manual/en/language.modifier.strip.tags.php
|
* @link http://smarty.php.net/manual/en/language.modifier.strip.tags.php
|
||||||
* strip_tags (Smarty online manual)
|
* strip_tags (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param string
|
* @param string
|
||||||
* @param boolean
|
* @param boolean
|
||||||
* @return string
|
* @return string
|
||||||
|
|
|
||||||
|
|
@ -13,29 +13,36 @@
|
||||||
* Name: truncate<br>
|
* Name: truncate<br>
|
||||||
* Purpose: Truncate a string to a certain length if necessary,
|
* Purpose: Truncate a string to a certain length if necessary,
|
||||||
* optionally splitting in the middle of a word, and
|
* optionally splitting in the middle of a word, and
|
||||||
* appending the $etc string.
|
* appending the $etc string or inserting $etc into the middle.
|
||||||
* @link http://smarty.php.net/manual/en/language.modifier.truncate.php
|
* @link http://smarty.php.net/manual/en/language.modifier.truncate.php
|
||||||
* truncate (Smarty online manual)
|
* truncate (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param string
|
* @param string
|
||||||
* @param integer
|
* @param integer
|
||||||
* @param string
|
* @param string
|
||||||
* @param boolean
|
* @param boolean
|
||||||
|
* @param boolean
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function smarty_modifier_truncate($string, $length = 80, $etc = '...',
|
function smarty_modifier_truncate($string, $length = 80, $etc = '...',
|
||||||
$break_words = false)
|
$break_words = false, $middle = false)
|
||||||
{
|
{
|
||||||
if ($length == 0)
|
if ($length == 0)
|
||||||
return '';
|
return '';
|
||||||
|
|
||||||
if (strlen($string) > $length) {
|
if (strlen($string) > $length) {
|
||||||
$length -= strlen($etc);
|
$length -= min($length, strlen($etc));
|
||||||
if (!$break_words)
|
if (!$break_words && !$middle) {
|
||||||
$string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length+1));
|
$string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length+1));
|
||||||
|
}
|
||||||
return substr($string, 0, $length).$etc;
|
if(!$middle) {
|
||||||
} else
|
return substr($string, 0, $length) . $etc;
|
||||||
|
} else {
|
||||||
|
return substr($string, 0, $length/2) . $etc . substr($string, -$length/2);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
return $string;
|
return $string;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* vim: set expandtab: */
|
/* vim: set expandtab: */
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
* Purpose: convert string to uppercase
|
* Purpose: convert string to uppercase
|
||||||
* @link http://smarty.php.net/manual/en/language.modifier.upper.php
|
* @link http://smarty.php.net/manual/en/language.modifier.upper.php
|
||||||
* upper (Smarty online manual)
|
* upper (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param string
|
* @param string
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
* Purpose: wrap a string of text at a given length
|
* Purpose: wrap a string of text at a given length
|
||||||
* @link http://smarty.php.net/manual/en/language.modifier.wordwrap.php
|
* @link http://smarty.php.net/manual/en/language.modifier.wordwrap.php
|
||||||
* wordwrap (Smarty online manual)
|
* wordwrap (Smarty online manual)
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param string
|
* @param string
|
||||||
* @param integer
|
* @param integer
|
||||||
* @param string
|
* @param string
|
||||||
|
|
|
||||||
|
|
@ -28,35 +28,35 @@
|
||||||
function smarty_outputfilter_trimwhitespace($source, &$smarty)
|
function smarty_outputfilter_trimwhitespace($source, &$smarty)
|
||||||
{
|
{
|
||||||
// Pull out the script blocks
|
// Pull out the script blocks
|
||||||
preg_match_all("!<script[^>]+>.*?</script>!is", $source, $match);
|
preg_match_all("!<script[^>]*?>.*?</script>!is", $source, $match);
|
||||||
$_script_blocks = $match[0];
|
$_script_blocks = $match[0];
|
||||||
$source = preg_replace("!<script[^>]+>.*?</script>!is",
|
$source = preg_replace("!<script[^>]*?>.*?</script>!is",
|
||||||
'@@@SMARTY:TRIM:SCRIPT@@@', $source);
|
'@@@SMARTY:TRIM:SCRIPT@@@', $source);
|
||||||
|
|
||||||
// Pull out the pre blocks
|
// Pull out the pre blocks
|
||||||
preg_match_all("!<pre>.*?</pre>!is", $source, $match);
|
preg_match_all("!<pre[^>]*?>.*?</pre>!is", $source, $match);
|
||||||
$_pre_blocks = $match[0];
|
$_pre_blocks = $match[0];
|
||||||
$source = preg_replace("!<pre>.*?</pre>!is",
|
$source = preg_replace("!<pre[^>]*?>.*?</pre>!is",
|
||||||
'@@@SMARTY:TRIM:PRE@@@', $source);
|
'@@@SMARTY:TRIM:PRE@@@', $source);
|
||||||
|
|
||||||
// Pull out the textarea blocks
|
// Pull out the textarea blocks
|
||||||
preg_match_all("!<textarea[^>]+>.*?</textarea>!is", $source, $match);
|
preg_match_all("!<textarea[^>]*?>.*?</textarea>!is", $source, $match);
|
||||||
$_textarea_blocks = $match[0];
|
$_textarea_blocks = $match[0];
|
||||||
$source = preg_replace("!<textarea[^>]+>.*?</textarea>!is",
|
$source = preg_replace("!<textarea[^>]*?>.*?</textarea>!is",
|
||||||
'@@@SMARTY:TRIM:TEXTAREA@@@', $source);
|
'@@@SMARTY:TRIM:TEXTAREA@@@', $source);
|
||||||
|
|
||||||
// remove all leading spaces, tabs and carriage returns NOT
|
// remove all leading spaces, tabs and carriage returns NOT
|
||||||
// preceeded by a php close tag.
|
// preceeded by a php close tag.
|
||||||
$source = trim(preg_replace('/((?<!\?>)\n)[\s]+/m', '\1', $source));
|
$source = trim(preg_replace('/((?<!\?>)\n)[\s]+/m', '\1', $source));
|
||||||
|
|
||||||
// replace script blocks
|
// replace textarea blocks
|
||||||
smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:SCRIPT@@@",$_script_blocks, $source);
|
smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:TEXTAREA@@@",$_textarea_blocks, $source);
|
||||||
|
|
||||||
// replace pre blocks
|
// replace pre blocks
|
||||||
smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:PRE@@@",$_pre_blocks, $source);
|
smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:PRE@@@",$_pre_blocks, $source);
|
||||||
|
|
||||||
// replace textarea blocks
|
// replace script blocks
|
||||||
smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:TEXTAREA@@@",$_textarea_blocks, $source);
|
smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:SCRIPT@@@",$_script_blocks, $source);
|
||||||
|
|
||||||
return $source;
|
return $source;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@
|
||||||
* Function: smarty_function_escape_special_chars<br>
|
* Function: smarty_function_escape_special_chars<br>
|
||||||
* Purpose: used by other smarty functions to escape
|
* Purpose: used by other smarty functions to escape
|
||||||
* special chars except for already escaped ones
|
* special chars except for already escaped ones
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param string
|
* @param string
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -10,32 +10,35 @@
|
||||||
* Function: smarty_make_timestamp<br>
|
* Function: smarty_make_timestamp<br>
|
||||||
* Purpose: used by other smarty functions to make a timestamp
|
* Purpose: used by other smarty functions to make a timestamp
|
||||||
* from a string.
|
* from a string.
|
||||||
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @param string
|
* @param string
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function smarty_make_timestamp($string)
|
function smarty_make_timestamp($string)
|
||||||
{
|
{
|
||||||
if(empty($string)) {
|
if(empty($string)) {
|
||||||
$string = "now";
|
// use "now":
|
||||||
|
$time = time();
|
||||||
|
|
||||||
|
} elseif (preg_match('/^\d{14}$/', $string)) {
|
||||||
|
// it is mysql timestamp format of YYYYMMDDHHMMSS?
|
||||||
|
$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));
|
||||||
|
|
||||||
|
} elseif (is_numeric($string)) {
|
||||||
|
// it is a numeric string, we handle it as timestamp
|
||||||
|
$time = (int)$string;
|
||||||
|
|
||||||
|
} else {
|
||||||
|
// strtotime should handle it
|
||||||
|
$time = strtotime($string);
|
||||||
|
if ($time == -1 || $time === false) {
|
||||||
|
// strtotime() was not able to parse $string, use "now":
|
||||||
|
$time = time();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
$time = strtotime($string);
|
return $time;
|
||||||
if (is_numeric($time) && $time != -1)
|
|
||||||
return $time;
|
|
||||||
|
|
||||||
// is mysql timestamp format of YYYYMMDDHHMMSS?
|
|
||||||
if (preg_match('/^\d{14}$/', $string)) {
|
|
||||||
$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));
|
|
||||||
|
|
||||||
return $time;
|
|
||||||
}
|
|
||||||
|
|
||||||
// couldn't recognize it, try to return a time
|
|
||||||
$time = (int) $string;
|
|
||||||
if ($time > 0)
|
|
||||||
return $time;
|
|
||||||
else
|
|
||||||
return time();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* vim: set expandtab: */
|
/* vim: set expandtab: */
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue