[pLog-svn] r2880 - in plog/trunk/class/template/smarty: .
internals
Mark Wu
markplace at gmail.com
Wed Feb 1 17:11:22 GMT 2006
Hi Oscar:
As Christoph said, there are two issues when we upgrade to 2.6.12
1. core folder is rename to internals
2. smarty does not support realtive path (I change it to absolute path, it
works, but I am still find out the way to use reltive path)
Mark
> -----Original Message-----
> From: plog-svn-bounces at devel.lifetype.net
> [mailto:plog-svn-bounces at devel.lifetype.net] On Behalf Of
> oscar at devel.lifetype.net
> Sent: Thursday, February 02, 2006 12:50 AM
> To: plog-svn at devel.lifetype.net
> Subject: [pLog-svn] r2880 - in
> plog/trunk/class/template/smarty: . internals
>
> Author: oscar
> Date: 2006-02-01 16:49:33 +0000 (Wed, 01 Feb 2006)
> New Revision: 2880
>
> Added:
> plog/trunk/class/template/smarty/internals/
>
> plog/trunk/class/template/smarty/internals/core.assemble_plugi
> n_filepath.php
>
> plog/trunk/class/template/smarty/internals/core.assign_smarty_
> interface.php
>
> plog/trunk/class/template/smarty/internals/core.create_dir_str
> ucture.php
>
> plog/trunk/class/template/smarty/internals/core.display_debug_
> console.php
>
> plog/trunk/class/template/smarty/internals/core.get_include_path.php
> plog/trunk/class/template/smarty/internals/core.get_microtime.php
>
> plog/trunk/class/template/smarty/internals/core.get_php_resource.php
> plog/trunk/class/template/smarty/internals/core.is_secure.php
> plog/trunk/class/template/smarty/internals/core.is_trusted.php
> plog/trunk/class/template/smarty/internals/core.load_plugins.php
>
> plog/trunk/class/template/smarty/internals/core.load_resource_
> plugin.php
>
> plog/trunk/class/template/smarty/internals/core.process_cached
> _inserts.php
>
> plog/trunk/class/template/smarty/internals/core.process_compil
> ed_include.php
> plog/trunk/class/template/smarty/internals/core.read_cache_file.php
> plog/trunk/class/template/smarty/internals/core.rm_auto.php
> plog/trunk/class/template/smarty/internals/core.rmdir.php
>
> plog/trunk/class/template/smarty/internals/core.run_insert_handler.php
>
> plog/trunk/class/template/smarty/internals/core.smarty_include_php.php
>
> plog/trunk/class/template/smarty/internals/core.write_cache_file.php
>
> plog/trunk/class/template/smarty/internals/core.write_compiled
> _include.php
>
> plog/trunk/class/template/smarty/internals/core.write_compiled
> _resource.php
> plog/trunk/class/template/smarty/internals/core.write_file.php
> Removed:
> plog/trunk/class/template/smarty/core/
>
> plog/trunk/class/template/smarty/internals/core.assemble_plugi
> n_filepath.php
>
> plog/trunk/class/template/smarty/internals/core.assign_smarty_
> interface.php
>
> plog/trunk/class/template/smarty/internals/core.create_dir_str
> ucture.php
>
> plog/trunk/class/template/smarty/internals/core.display_debug_
> console.php
>
> plog/trunk/class/template/smarty/internals/core.get_include_path.php
> plog/trunk/class/template/smarty/internals/core.get_microtime.php
>
> plog/trunk/class/template/smarty/internals/core.get_php_resource.php
> plog/trunk/class/template/smarty/internals/core.is_secure.php
> plog/trunk/class/template/smarty/internals/core.is_trusted.php
> plog/trunk/class/template/smarty/internals/core.load_plugins.php
>
> plog/trunk/class/template/smarty/internals/core.load_resource_
> plugin.php
>
> plog/trunk/class/template/smarty/internals/core.process_cached
> _inserts.php
>
> plog/trunk/class/template/smarty/internals/core.process_compil
> ed_include.php
> plog/trunk/class/template/smarty/internals/core.read_cache_file.php
> plog/trunk/class/template/smarty/internals/core.rm_auto.php
> plog/trunk/class/template/smarty/internals/core.rmdir.php
>
> plog/trunk/class/template/smarty/internals/core.run_insert_handler.php
>
> plog/trunk/class/template/smarty/internals/core.smarty_include_php.php
>
> plog/trunk/class/template/smarty/internals/core.write_cache_file.php
>
> plog/trunk/class/template/smarty/internals/core.write_compiled
> _include.php
>
> plog/trunk/class/template/smarty/internals/core.write_compiled
> _resource.php
> plog/trunk/class/template/smarty/internals/core.write_file.php
> Log:
> changes in smarty 2.6.12
>
>
> Copied: plog/trunk/class/template/smarty/internals (from rev
> 2878, plog/trunk/class/template/smarty/core)
>
> Deleted:
> plog/trunk/class/template/smarty/internals/core.assemble_plugi
> n_filepath.php
> ===================================================================
> ---
> plog/trunk/class/template/smarty/core/core.assemble_plugin_fil
> epath.php 2006-01-31 22:34:25 UTC (rev 2878)
> +++
> plog/trunk/class/template/smarty/internals/core.assemble_plugi
> n_filepath.php 2006-02-01 16:49:33 UTC (rev 2880)
> @@ -1,66 +0,0 @@
> -<?php
> -/**
> - * Smarty plugin
> - * @package Smarty
> - * @subpackage plugins
> - */
> -
> -/**
> - * assemble filepath of requested plugin
> - *
> - * @param string $type
> - * @param string $name
> - * @return string|false
> - */
> -function smarty_core_assemble_plugin_filepath($params, &$smarty)
> -{
> - static $_filepaths_cache = array();
> -
> - $_plugin_filename = $params['type'] . '.' .
> $params['name'] . '.php';
> - if (isset($_filepaths_cache[$_plugin_filename])) {
> - return $_filepaths_cache[$_plugin_filename];
> - }
> - $_return = false;
> -
> - foreach ((array)$smarty->plugins_dir as $_plugin_dir) {
> -
> - $_plugin_filepath = $_plugin_dir .
> DIRECTORY_SEPARATOR . $_plugin_filename;
> -
> - // see if path is relative
> - if (!preg_match("/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/",
> $_plugin_dir)) {
> - $_relative_paths[] = $_plugin_dir;
> - // relative path, see if it is in the SMARTY_DIR
> - if (@is_readable(SMARTY_DIR . $_plugin_filepath)) {
> - $_return = SMARTY_DIR . $_plugin_filepath;
> - break;
> - }
> - }
> - // try relative to cwd (or absolute)
> - if (@is_readable($_plugin_filepath)) {
> - $_return = $_plugin_filepath;
> - break;
> - }
> - }
> -
> - if($_return === false) {
> - // still not found, try PHP include_path
> - if(isset($_relative_paths)) {
> - foreach ((array)$_relative_paths as $_plugin_dir) {
> -
> - $_plugin_filepath = $_plugin_dir .
> DIRECTORY_SEPARATOR . $_plugin_filename;
> -
> - $_params = array('file_path' => $_plugin_filepath);
> - require_once(SMARTY_DIR . 'core' .
> DIRECTORY_SEPARATOR . 'core.get_include_path.php');
> - if(smarty_core_get_include_path($_params, $smarty)) {
> - return $_params['new_file_path'];
> - }
> - }
> - }
> - }
> - $_filepaths_cache[$_plugin_filename] = $_return;
> - return $_return;
> -}
> -
> -/* vim: set expandtab: */
> -
> -?>
>
> Copied:
> plog/trunk/class/template/smarty/internals/core.assemble_plugi
> n_filepath.php (from rev 2879,
> plog/trunk/class/template/smarty/core/core.assemble_plugin_fil
> epath.php)
>
> Deleted:
> plog/trunk/class/template/smarty/internals/core.assign_smarty_
> interface.php
> ===================================================================
> ---
> plog/trunk/class/template/smarty/core/core.assign_smarty_inter
> face.php 2006-01-31 22:34:25 UTC (rev 2878)
> +++
> plog/trunk/class/template/smarty/internals/core.assign_smarty_
> interface.php 2006-02-01 16:49:33 UTC (rev 2880)
> @@ -1,43 +0,0 @@
> -<?php
> -/**
> - * Smarty plugin
> - * @package Smarty
> - * @subpackage plugins
> - */
> -
> -/**
> - * Smarty assign_smarty_interface core plugin
> - *
> - * Type: core<br>
> - * Name: assign_smarty_interface<br>
> - * Purpose: assign the $smarty interface variable
> - * @param array Format: null
> - * @param Smarty
> - */
> -function smarty_core_assign_smarty_interface($params, &$smarty)
> -{
> - if (isset($smarty->_smarty_vars) &&
> isset($smarty->_smarty_vars['request'])) {
> - return;
> - }
> -
> - $_globals_map = array('g' => 'HTTP_GET_VARS',
> - 'p' => 'HTTP_POST_VARS',
> - 'c' => 'HTTP_COOKIE_VARS',
> - 's' => 'HTTP_SERVER_VARS',
> - 'e' => 'HTTP_ENV_VARS');
> -
> - $_smarty_vars_request = array();
> -
> - foreach (preg_split('!!',
> strtolower($smarty->request_vars_order)) as $_c) {
> - if (isset($_globals_map[$_c])) {
> - $_smarty_vars_request =
> array_merge($_smarty_vars_request, $GLOBALS[$_globals_map[$_c]]);
> - }
> - }
> - $_smarty_vars_request =
> @array_merge($_smarty_vars_request, $GLOBALS['HTTP_SESSION_VARS']);
> -
> - $smarty->_smarty_vars['request'] = $_smarty_vars_request;
> -}
> -
> -/* vim: set expandtab: */
> -
> -?>
>
> Copied:
> plog/trunk/class/template/smarty/internals/core.assign_smarty_
> interface.php (from rev 2879,
> plog/trunk/class/template/smarty/core/core.assign_smarty_inter
> face.php)
>
> Deleted:
> plog/trunk/class/template/smarty/internals/core.create_dir_str
> ucture.php
> ===================================================================
> ---
> plog/trunk/class/template/smarty/core/core.create_dir_struct
> ure.php 2006-01-31 22:34:25 UTC (rev 2878)
> +++
> plog/trunk/class/template/smarty/internals/core.create_dir_str
> ucture.php 2006-02-01 16:49:33 UTC (rev 2880)
> @@ -1,79 +0,0 @@
> -<?php
> -/**
> - * Smarty plugin
> - * @package Smarty
> - * @subpackage plugins
> - */
> -
> -/**
> - * create full directory structure
> - *
> - * @param string $dir
> - */
> -
> -// $dir
> -
> -function smarty_core_create_dir_structure($params, &$smarty)
> -{
> - if (!file_exists($params['dir'])) {
> - $_open_basedir_ini = ini_get('open_basedir');
> -
> - if (DIRECTORY_SEPARATOR=='/') {
> - /* unix-style paths */
> - $_dir = $params['dir'];
> - $_dir_parts = preg_split('!/+!', $_dir, -1,
> PREG_SPLIT_NO_EMPTY);
> - $_new_dir = ($_dir{0}=='/') ? '/' : getcwd().'/';
> - if($_use_open_basedir = !empty($_open_basedir_ini)) {
> - $_open_basedirs = explode(':', $_open_basedir_ini);
> - }
> -
> - } else {
> - /* other-style paths */
> - $_dir = str_replace('\\','/', $params['dir']);
> - $_dir_parts = preg_split('!/+!', $_dir, -1,
> PREG_SPLIT_NO_EMPTY);
> - if (preg_match('!^((//)|([a-zA-Z]:/))!', $_dir,
> $_root_dir)) {
> - /* leading "//" for network volume, or
> "[letter]:/" for full path */
> - $_new_dir = $_root_dir[1];
> - /* remove drive-letter from _dir_parts */
> - if (isset($_root_dir[3])) array_shift($_dir_parts);
> -
> - } else {
> - $_new_dir = str_replace('\\', '/', getcwd()).'/';
> -
> - }
> -
> - if($_use_open_basedir = !empty($_open_basedir_ini)) {
> - $_open_basedirs = explode(';',
> str_replace('\\', '/', $_open_basedir_ini));
> - }
> -
> - }
> -
> - /* all paths use "/" only from here */
> - foreach ($_dir_parts as $_dir_part) {
> - $_new_dir .= $_dir_part;
> -
> - if ($_use_open_basedir) {
> - // do not attempt to test or make
> directories outside of open_basedir
> - $_make_new_dir = false;
> - foreach ($_open_basedirs as $_open_basedir) {
> - if (substr($_new_dir, 0,
> strlen($_open_basedir)) == $_open_basedir) {
> - $_make_new_dir = true;
> - break;
> - }
> - }
> - } else {
> - $_make_new_dir = true;
> - }
> -
> - if ($_make_new_dir && !file_exists($_new_dir) &&
> !@mkdir($_new_dir, $smarty->_dir_perms) && !is_dir($_new_dir)) {
> - $smarty->trigger_error("problem creating
> directory '" . $_new_dir . "'");
> - return false;
> - }
> - $_new_dir .= '/';
> - }
> - }
> -}
> -
> -/* vim: set expandtab: */
> -
> -?>
>
> Copied:
> plog/trunk/class/template/smarty/internals/core.create_dir_str
> ucture.php (from rev 2879,
> plog/trunk/class/template/smarty/core/core.create_dir_structure.php)
>
> Deleted:
> plog/trunk/class/template/smarty/internals/core.display_debug_
> console.php
> ===================================================================
> ---
> plog/trunk/class/template/smarty/core/core.display_debug_cons
> ole.php 2006-01-31 22:34:25 UTC (rev 2878)
> +++
> plog/trunk/class/template/smarty/internals/core.display_debug_
> console.php 2006-02-01 16:49:33 UTC (rev 2880)
> @@ -1,60 +0,0 @@
> -<?php
> -/**
> - * Smarty plugin
> - * @package Smarty
> - * @subpackage plugins
> - */
> -
> -/**
> - * Smarty debug_console function plugin
> - *
> - * Type: core<br>
> - * Name: display_debug_console<br>
> - * Purpose: display the javascript debug console window
> - * @param array Format: null
> - * @param Smarty
> - */
> -function smarty_core_display_debug_console($params, &$smarty)
> -{
> - // we must force compile the debug template in case the
> environment
> - // changed between separate applications.
> -
> - if(empty($smarty->debug_tpl)) {
> - // set path to debug template from SMARTY_DIR
> - $smarty->debug_tpl = SMARTY_DIR . 'debug.tpl';
> - if($smarty->security && is_file($smarty->debug_tpl)) {
> - $smarty->secure_dir[] =
> dirname(realpath($smarty->debug_tpl));
> - }
> - }
> -
> - $_ldelim_orig = $smarty->left_delimiter;
> - $_rdelim_orig = $smarty->right_delimiter;
> -
> - $smarty->left_delimiter = '{';
> - $smarty->right_delimiter = '}';
> -
> - $_compile_id_orig = $smarty->_compile_id;
> - $smarty->_compile_id = null;
> -
> - $_compile_path = $smarty->_get_compile_path($smarty->debug_tpl);
> - if ($smarty->_compile_resource($smarty->debug_tpl,
> $_compile_path))
> - {
> - ob_start();
> - $smarty->_include($_compile_path);
> - $_results = ob_get_contents();
> - ob_end_clean();
> - } else {
> - $_results = '';
> - }
> -
> - $smarty->_compile_id = $_compile_id_orig;
> -
> - $smarty->left_delimiter = $_ldelim_orig;
> - $smarty->right_delimiter = $_rdelim_orig;
> -
> - return $_results;
> -}
> -
> -/* vim: set expandtab: */
> -
> -?>
>
> Copied:
> plog/trunk/class/template/smarty/internals/core.display_debug_
> console.php (from rev 2879,
> plog/trunk/class/template/smarty/core/core.display_debug_console.php)
>
> Deleted:
> plog/trunk/class/template/smarty/internals/core.get_include_path.php
> ===================================================================
> ---
> plog/trunk/class/template/smarty/core/core.get_include_p
> ath.php 2006-01-31 22:34:25 UTC (rev 2878)
> +++
> plog/trunk/class/template/smarty/internals/core.get_include_p
> ath.php 2006-02-01 16:49:33 UTC (rev 2880)
> @@ -1,44 +0,0 @@
> -<?php
> -/**
> - * Smarty plugin
> - * @package Smarty
> - * @subpackage plugins
> - */
> -
> -/**
> - * Get path to file from include_path
> - *
> - * @param string $file_path
> - * @param string $new_file_path
> - * @return boolean
> - * @staticvar array|null
> - */
> -
> -// $file_path, &$new_file_path
> -
> -function smarty_core_get_include_path(&$params, &$smarty)
> -{
> - static $_path_array = null;
> -
> - if(!isset($_path_array)) {
> - $_ini_include_path = ini_get('include_path');
> -
> - if(strstr($_ini_include_path,';')) {
> - // windows pathnames
> - $_path_array = explode(';',$_ini_include_path);
> - } else {
> - $_path_array = explode(':',$_ini_include_path);
> - }
> - }
> - foreach ($_path_array as $_include_path) {
> - if (@is_readable($_include_path .
> DIRECTORY_SEPARATOR . $params['file_path'])) {
> - $params['new_file_path'] = $_include_path .
> DIRECTORY_SEPARATOR . $params['file_path'];
> - return true;
> - }
> - }
> - return false;
> -}
> -
> -/* vim: set expandtab: */
> -
> -?>
>
> Copied:
> plog/trunk/class/template/smarty/internals/core.get_include_pa
> th.php (from rev 2879,
> plog/trunk/class/template/smarty/core/core.get_include_path.php)
>
> Deleted:
> plog/trunk/class/template/smarty/internals/core.get_microtime.php
> ===================================================================
> ---
> plog/trunk/class/template/smarty/core/core.get_microtime.php
> 2006-01-31 22:34:25 UTC (rev 2878)
> +++
> plog/trunk/class/template/smarty/internals/core.get_microt
> ime.php 2006-02-01 16:49:33 UTC (rev 2880)
> @@ -1,23 +0,0 @@
> -<?php
> -/**
> - * Smarty plugin
> - * @package Smarty
> - * @subpackage plugins
> - */
> -
> -/**
> - * Get seconds and microseconds
> - * @return double
> - */
> -function smarty_core_get_microtime($params, &$smarty)
> -{
> - $mtime = microtime();
> - $mtime = explode(" ", $mtime);
> - $mtime = (double)($mtime[1]) + (double)($mtime[0]);
> - return ($mtime);
> -}
> -
> -
> -/* vim: set expandtab: */
> -
> -?>
>
> Copied:
> plog/trunk/class/template/smarty/internals/core.get_microtime.
> php (from rev 2879,
> plog/trunk/class/template/smarty/core/core.get_microtime.php)
>
> Deleted:
> plog/trunk/class/template/smarty/internals/core.get_php_resource.php
> ===================================================================
> ---
> plog/trunk/class/template/smarty/core/core.get_php_resou
> rce.php 2006-01-31 22:34:25 UTC (rev 2878)
> +++
> plog/trunk/class/template/smarty/internals/core.get_php_resou
> rce.php 2006-02-01 16:49:33 UTC (rev 2880)
> @@ -1,80 +0,0 @@
> -<?php
> -/**
> - * Smarty plugin
> - * @package Smarty
> - * @subpackage plugins
> - */
> -
> -/**
> - * Retrieves PHP script resource
> - *
> - * sets $php_resource to the returned resource
> - * @param string $resource
> - * @param string $resource_type
> - * @param $php_resource
> - * @return boolean
> - */
> -
> -function smarty_core_get_php_resource(&$params, &$smarty)
> -{
> -
> - $params['resource_base_path'] = $smarty->trusted_dir;
> - $smarty->_parse_resource_name($params, $smarty);
> -
> - /*
> - * Find out if the resource exists.
> - */
> -
> - if ($params['resource_type'] == 'file') {
> - $_readable = false;
> - if(file_exists($params['resource_name']) &&
> is_readable($params['resource_name'])) {
> - $_readable = true;
> - } else {
> - // test for file in include_path
> - $_params = array('file_path' =>
> $params['resource_name']);
> - require_once(SMARTY_DIR . 'core' .
> DIRECTORY_SEPARATOR . 'core.get_include_path.php');
> - if(smarty_core_get_include_path($_params, $smarty)) {
> - $_include_path = $_params['new_file_path'];
> - $_readable = true;
> - }
> - }
> - } else if ($params['resource_type'] != 'file') {
> - $_template_source = null;
> - $_readable =
> is_callable($smarty->_plugins['resource'][$params['resource_ty
> pe']][0][0])
> - &&
> call_user_func_array($smarty->_plugins['resource'][$params['re
> source_type']][0][0],
> -
> array($params['resource_name'], &$_template_source, &$smarty));
> - }
> -
> - /*
> - * Set the error function, depending on which class calls us.
> - */
> - if (method_exists($smarty, '_syntax_error')) {
> - $_error_funcc = '_syntax_error';
> - } else {
> - $_error_funcc = 'trigger_error';
> - }
> -
> - if ($_readable) {
> - if ($smarty->security) {
> - require_once(SMARTY_DIR . 'core' .
> DIRECTORY_SEPARATOR . 'core.is_trusted.php');
> - if (!smarty_core_is_trusted($params, $smarty)) {
> - $smarty->$_error_funcc('(secure mode) ' .
> $params['resource_type'] . ':' . $params['resource_name'] . '
> is not trusted');
> - return false;
> - }
> - }
> - } else {
> - $smarty->$_error_funcc($params['resource_type'] .
> ':' . $params['resource_name'] . ' is not readable');
> - return false;
> - }
> -
> - if ($params['resource_type'] == 'file') {
> - $params['php_resource'] = $params['resource_name'];
> - } else {
> - $params['php_resource'] = $_template_source;
> - }
> - return true;
> -}
> -
> -/* vim: set expandtab: */
> -
> -?>
>
> Copied:
> plog/trunk/class/template/smarty/internals/core.get_php_resour
> ce.php (from rev 2879,
> plog/trunk/class/template/smarty/core/core.get_php_resource.php)
>
> Deleted: plog/trunk/class/template/smarty/internals/core.is_secure.php
> ===================================================================
> --- plog/trunk/class/template/smarty/core/core.is_secure.php
> 2006-01-31 22:34:25 UTC (rev 2878)
> +++
> plog/trunk/class/template/smarty/internals/core.is_secure.php
> 2006-02-01 16:49:33 UTC (rev 2880)
> @@ -1,59 +0,0 @@
> -<?php
> -/**
> - * Smarty plugin
> - * @package Smarty
> - * @subpackage plugins
> - */
> -
> -/**
> - * determines if a resource is secure or not.
> - *
> - * @param string $resource_type
> - * @param string $resource_name
> - * @return boolean
> - */
> -
> -// $resource_type, $resource_name
> -
> -function smarty_core_is_secure($params, &$smarty)
> -{
> - static $check_template_dir = true;
> -
> - if (!$smarty->security ||
> $smarty->security_settings['INCLUDE_ANY']) {
> - return true;
> - }
> -
> - $_smarty_secure = false;
> - if ($params['resource_type'] == 'file') {
> - if($check_template_dir) {
> - if (!in_array($smarty->template_dir,
> $smarty->secure_dir))
> - // add template_dir to secure_dir array
> - array_unshift($smarty->secure_dir,
> $smarty->template_dir);
> - $check_template_dir = false;
> - }
> - if (!empty($smarty->secure_dir)) {
> - $_rp = realpath($params['resource_name']);
> - foreach ((array)$smarty->secure_dir as $curr_dir) {
> - if ( !empty($curr_dir) && is_readable ($curr_dir)) {
> - $_cd = realpath($curr_dir);
> - if (strncmp($_rp, $_cd, strlen($_cd)) == 0
> - && $_rp{strlen($_cd)} ==
> DIRECTORY_SEPARATOR ) {
> - $_smarty_secure = true;
> - break;
> - }
> - }
> - }
> - }
> - } else {
> - // resource is not on local file system
> - $_smarty_secure = call_user_func_array(
> -
> $smarty->_plugins['resource'][$params['resource_type']][0][2],
> - array($params['resource_name'],
> &$_smarty_secure, &$smarty));
> - }
> -
> - return $_smarty_secure;
> -}
> -
> -/* vim: set expandtab: */
> -
> -?>
>
> Copied:
> plog/trunk/class/template/smarty/internals/core.is_secure.php
> (from rev 2879,
> plog/trunk/class/template/smarty/core/core.is_secure.php)
>
> Deleted:
> plog/trunk/class/template/smarty/internals/core.is_trusted.php
> ===================================================================
> --- plog/trunk/class/template/smarty/core/core.is_trusted.php
> 2006-01-31 22:34:25 UTC (rev 2878)
> +++
> plog/trunk/class/template/smarty/internals/core.is_trus
> ted.php 2006-02-01 16:49:33 UTC (rev 2880)
> @@ -1,50 +0,0 @@
> -<?php
> -/**
> - * Smarty plugin
> - * @package Smarty
> - * @subpackage plugins
> - */
> -
> -/**#@+
> - * @access private
> - */
> -/**
> - * determines if a resource is trusted or not
> - *
> - * @param string $resource_type
> - * @param string $resource_name
> - * @return boolean
> - */
> -
> - // $resource_type, $resource_name
> -
> -function smarty_core_is_trusted($params, &$smarty)
> -{
> - $_smarty_trusted = false;
> - if ($params['resource_type'] == 'file') {
> - if (!empty($smarty->trusted_dir)) {
> - $_rp = realpath($params['resource_name']);
> - foreach ((array)$smarty->trusted_dir as $curr_dir) {
> - if (!empty($curr_dir) && is_readable ($curr_dir)) {
> - $_cd = realpath($curr_dir);
> - if (strncmp($_rp, $_cd, strlen($_cd)) == 0
> - && $_rp{strlen($_cd)} ==
> DIRECTORY_SEPARATOR ) {
> - $_smarty_trusted = true;
> - break;
> - }
> - }
> - }
> - }
> -
> - } else {
> - // resource is not on local file system
> - $_smarty_trusted =
> call_user_func_array($smarty->_plugins['resource'][$params['re
> source_type']][0][3],
> -
> array($params['resource_name'], $smarty));
> - }
> -
> - return $_smarty_trusted;
> -}
> -
> -/* vim: set expandtab: */
> -
> -?>
>
> Copied:
> plog/trunk/class/template/smarty/internals/core.is_trusted.php
> (from rev 2879,
> plog/trunk/class/template/smarty/core/core.is_trusted.php)
>
> Deleted:
> plog/trunk/class/template/smarty/internals/core.load_plugins.php
> ===================================================================
> ---
> plog/trunk/class/template/smarty/core/core.load_plugins.php
> 2006-01-31 22:34:25 UTC (rev 2878)
> +++
> plog/trunk/class/template/smarty/internals/core.load_plug
> ins.php 2006-02-01 16:49:33 UTC (rev 2880)
> @@ -1,125 +0,0 @@
> -<?php
> -/**
> - * Smarty plugin
> - * @package Smarty
> - * @subpackage plugins
> - */
> -
> -/**
> - * Load requested plugins
> - *
> - * @param array $plugins
> - */
> -
> -// $plugins
> -
> -function smarty_core_load_plugins($params, &$smarty)
> -{
> -
> - foreach ($params['plugins'] as $_plugin_info) {
> - list($_type, $_name, $_tpl_file, $_tpl_line,
> $_delayed_loading) = $_plugin_info;
> - $_plugin = &$smarty->_plugins[$_type][$_name];
> -
> - /*
> - * We do not load plugin more than once for each
> instance of Smarty.
> - * The following code checks for that. The plugin can also be
> - * registered dynamically at runtime, in which case
> template file
> - * and line number will be unknown, so we fill them in.
> - *
> - * The final element of the info array is a flag
> that indicates
> - * whether the dynamically registered plugin
> function has been
> - * checked for existence yet or not.
> - */
> - if (isset($_plugin)) {
> - if (empty($_plugin[3])) {
> - if (!is_callable($_plugin[0])) {
> - $smarty->_trigger_fatal_error("[plugin]
> $_type '$_name' is not implemented", $_tpl_file, $_tpl_line,
> __FILE__, __LINE__);
> - } else {
> - $_plugin[1] = $_tpl_file;
> - $_plugin[2] = $_tpl_line;
> - $_plugin[3] = true;
> - if (!isset($_plugin[4])) $_plugin[4] =
> true; /* cacheable */
> - }
> - }
> - continue;
> - } else if ($_type == 'insert') {
> - /*
> - * For backwards compatibility, we check for
> insert functions in
> - * the symbol table before trying to load them
> as a plugin.
> - */
> - $_plugin_func = 'insert_' . $_name;
> - if (function_exists($_plugin_func)) {
> - $_plugin = array($_plugin_func, $_tpl_file,
> $_tpl_line, true, false);
> - continue;
> - }
> - }
> -
> - $_plugin_file =
> $smarty->_get_plugin_filepath($_type, $_name);
> -
> - if (! $_found = ($_plugin_file != false)) {
> - $_message = "could not load plugin file
> '$_type.$_name.php'\n";
> - }
> -
> - /*
> - * If plugin file is found, it -must- provide the
> properly named
> - * plugin function. In case it doesn't, simply
> output the error and
> - * do not fall back on any other method.
> - */
> - if ($_found) {
> - include_once $_plugin_file;
> -
> - $_plugin_func = 'smarty_' . $_type . '_' . $_name;
> - if (!function_exists($_plugin_func)) {
> - $smarty->_trigger_fatal_error("[plugin]
> function $_plugin_func() not found in $_plugin_file",
> $_tpl_file, $_tpl_line, __FILE__, __LINE__);
> - continue;
> - }
> - }
> - /*
> - * In case of insert plugins, their code may be
> loaded later via
> - * 'script' attribute.
> - */
> - else if ($_type == 'insert' && $_delayed_loading) {
> - $_plugin_func = 'smarty_' . $_type . '_' . $_name;
> - $_found = true;
> - }
> -
> - /*
> - * Plugin specific processing and error checking.
> - */
> - if (!$_found) {
> - if ($_type == 'modifier') {
> - /*
> - * In case modifier falls back on using PHP functions
> - * directly, we only allow those specified
> in the security
> - * context.
> - */
> - if ($smarty->security && !in_array($_name,
> $smarty->security_settings['MODIFIER_FUNCS'])) {
> - $_message = "(secure mode) modifier
> '$_name' is not allowed";
> - } else {
> - if (!function_exists($_name)) {
> - $_message = "modifier '$_name' is
> not implemented";
> - } else {
> - $_plugin_func = $_name;
> - $_found = true;
> - }
> - }
> - } else if ($_type == 'function') {
> - /*
> - * This is a catch-all situation.
> - */
> - $_message = "unknown tag - '$_name'";
> - }
> - }
> -
> - if ($_found) {
> - $smarty->_plugins[$_type][$_name] =
> array($_plugin_func, $_tpl_file, $_tpl_line, true, true);
> - } else {
> - // output error
> - $smarty->_trigger_fatal_error('[plugin] ' .
> $_message, $_tpl_file, $_tpl_line, __FILE__, __LINE__);
> - }
> - }
> -}
> -
> -/* vim: set expandtab: */
> -
> -?>
>
> Copied:
> plog/trunk/class/template/smarty/internals/core.load_plugins.p
> hp (from rev 2879,
> plog/trunk/class/template/smarty/core/core.load_plugins.php)
>
> Deleted:
> plog/trunk/class/template/smarty/internals/core.load_resource_
> plugin.php
> ===================================================================
> ---
> plog/trunk/class/template/smarty/core/core.load_resource_plu
> gin.php 2006-01-31 22:34:25 UTC (rev 2878)
> +++
> plog/trunk/class/template/smarty/internals/core.load_resource_
> plugin.php 2006-02-01 16:49:33 UTC (rev 2880)
> @@ -1,74 +0,0 @@
> -<?php
> -/**
> - * Smarty plugin
> - * @package Smarty
> - * @subpackage plugins
> - */
> -
> -/**
> - * load a resource plugin
> - *
> - * @param string $type
> - */
> -
> -// $type
> -
> -function smarty_core_load_resource_plugin($params, &$smarty)
> -{
> - /*
> - * Resource plugins are not quite like the other ones,
> so they are
> - * handled differently. The first element of plugin info
> is the array of
> - * functions provided by the plugin, the second one
> indicates whether
> - * all of them exist or not.
> - */
> -
> - $_plugin = &$smarty->_plugins['resource'][$params['type']];
> - if (isset($_plugin)) {
> - if (!$_plugin[1] && count($_plugin[0])) {
> - $_plugin[1] = true;
> - foreach ($_plugin[0] as $_plugin_func) {
> - if (!is_callable($_plugin_func)) {
> - $_plugin[1] = false;
> - break;
> - }
> - }
> - }
> -
> - if (!$_plugin[1]) {
> - $smarty->_trigger_fatal_error("[plugin] resource
> '" . $params['type'] . "' is not implemented", null, null,
> __FILE__, __LINE__);
> - }
> -
> - return;
> - }
> -
> - $_plugin_file =
> $smarty->_get_plugin_filepath('resource', $params['type']);
> - $_found = ($_plugin_file != false);
> -
> - if ($_found) { /*
> - * If the plugin file is found, it -must- provide
> the properly named
> - * plugin functions.
> - */
> - include_once($_plugin_file);
> -
> - /*
> - * Locate functions that we require the plugin to provide.
> - */
> - $_resource_ops = array('source', 'timestamp',
> 'secure', 'trusted');
> - $_resource_funcs = array();
> - foreach ($_resource_ops as $_op) {
> - $_plugin_func = 'smarty_resource_' .
> $params['type'] . '_' . $_op;
> - if (!function_exists($_plugin_func)) {
> - $smarty->_trigger_fatal_error("[plugin]
> function $_plugin_func() not found in $_plugin_file", null,
> null, __FILE__, __LINE__);
> - return;
> - } else {
> - $_resource_funcs[] = $_plugin_func;
> - }
> - }
> -
> - $smarty->_plugins['resource'][$params['type']] =
> array($_resource_funcs, true);
> - }
> -}
> -
> -/* vim: set expandtab: */
> -
> -?>
>
> Copied:
> plog/trunk/class/template/smarty/internals/core.load_resource_
> plugin.php (from rev 2879,
> plog/trunk/class/template/smarty/core/core.load_resource_plugin.php)
>
> Deleted:
> plog/trunk/class/template/smarty/internals/core.process_cached
> _inserts.php
> ===================================================================
> ---
> plog/trunk/class/template/smarty/core/core.process_cached_inse
> rts.php 2006-01-31 22:34:25 UTC (rev 2878)
> +++
> plog/trunk/class/template/smarty/internals/core.process_cached
> _inserts.php 2006-02-01 16:49:33 UTC (rev 2880)
> @@ -1,71 +0,0 @@
> -<?php
> -/**
> - * Smarty plugin
> - * @package Smarty
> - * @subpackage plugins
> - */
> -
> -/**
> - * Replace cached inserts with the actual results
> - *
> - * @param string $results
> - * @return string
> - */
> -function smarty_core_process_cached_inserts($params, &$smarty)
> -{
> - preg_match_all('!'.$smarty->_smarty_md5.'{insert_cache
> (.*)}'.$smarty->_smarty_md5.'!Uis',
> - $params['results'], $match);
> - list($cached_inserts, $insert_args) = $match;
> -
> - for ($i = 0, $for_max = count($cached_inserts); $i <
> $for_max; $i++) {
> - if ($smarty->debugging) {
> - $_params = array();
> - require_once(SMARTY_DIR . 'core' .
> DIRECTORY_SEPARATOR . 'core.get_microtime.php');
> - $debug_start_time =
> smarty_core_get_microtime($_params, $smarty);
> - }
> -
> - $args = unserialize($insert_args[$i]);
> - $name = $args['name'];
> -
> - if (isset($args['script'])) {
> - $_params = array('resource_name' =>
> $smarty->_dequote($args['script']));
> - require_once(SMARTY_DIR . 'core' .
> DIRECTORY_SEPARATOR . 'core.get_php_resource.php');
> - if(!smarty_core_get_php_resource($_params, $smarty)) {
> - return false;
> - }
> - $resource_type = $_params['resource_type'];
> - $php_resource = $_params['php_resource'];
> -
> -
> - if ($resource_type == 'file') {
> - $smarty->_include($php_resource, true);
> - } else {
> - $smarty->_eval($php_resource);
> - }
> - }
> -
> - $function_name = $smarty->_plugins['insert'][$name][0];
> - if (empty($args['assign'])) {
> - $replace = $function_name($args, $smarty);
> - } else {
> - $smarty->assign($args['assign'],
> $function_name($args, $smarty));
> - $replace = '';
> - }
> -
> - $params['results'] =
> str_replace($cached_inserts[$i], $replace, $params['results']);
> - if ($smarty->debugging) {
> - $_params = array();
> - require_once(SMARTY_DIR . 'core' .
> DIRECTORY_SEPARATOR . 'core.get_microtime.php');
> - $smarty->_smarty_debug_info[] = array('type'
> => 'insert',
> - 'filename'
> => 'insert_'.$name,
> - 'depth'
> => $smarty->_inclusion_depth,
> - 'exec_time'
> => smarty_core_get_microtime($_params, $smarty) - $debug_start_time);
> - }
> - }
> -
> - return $params['results'];
> -}
> -
> -/* vim: set expandtab: */
> -
> -?>
>
> Copied:
> plog/trunk/class/template/smarty/internals/core.process_cached
> _inserts.php (from rev 2879,
> plog/trunk/class/template/smarty/core/core.process_cached_inserts.php)
>
> Deleted:
> plog/trunk/class/template/smarty/internals/core.process_compil
> ed_include.php
> ===================================================================
> ---
> plog/trunk/class/template/smarty/core/core.process_compiled_in
> clude.php 2006-01-31 22:34:25 UTC (rev 2878)
> +++
> plog/trunk/class/template/smarty/internals/core.process_compil
> ed_include.php 2006-02-01 16:49:33 UTC (rev 2880)
> @@ -1,32 +0,0 @@
> -<?php
> -/**
> - * Smarty plugin
> - * @package Smarty
> - * @subpackage plugins
> - */
> -
> -/**
> - * Replace nocache-tags by results of the corresponding non-cacheable
> - * functions and return it
> - *
> - * @param string $compiled_tpl
> - * @param string $cached_source
> - * @return string
> - */
> -
> -function smarty_core_process_compiled_include($params, &$smarty)
> -{
> - $_cache_including = $smarty->_cache_including;
> - $smarty->_cache_including = true;
> -
> - $_return = $params['results'];
> - foreach ($smarty->_cache_serials as
> $_include_file_path=>$_cache_serial) {
> - $_return =
> preg_replace_callback('!(\{nocache\:('.$_cache_serial.')#(\d+)\})!s',
> - array(&$smarty,
> '_process_compiled_include_callback'),
> - $_return);
> - }
> - $smarty->_cache_including = $_cache_including;
> - return $_return;
> -}
> -
> -?>
>
> Copied:
> plog/trunk/class/template/smarty/internals/core.process_compil
> ed_include.php (from rev 2879,
> plog/trunk/class/template/smarty/core/core.process_compiled_in
> clude.php)
>
> Deleted:
> plog/trunk/class/template/smarty/internals/core.read_cache_file.php
> ===================================================================
> ---
> plog/trunk/class/template/smarty/core/core.read_cache_f
> ile.php 2006-01-31 22:34:25 UTC (rev 2878)
> +++
> plog/trunk/class/template/smarty/internals/core.read_cache_f
> ile.php 2006-02-01 16:49:33 UTC (rev 2880)
> @@ -1,111 +0,0 @@
> -<?php
> -/**
> - * Smarty plugin
> - * @package Smarty
> - * @subpackage plugins
> - */
> -
> -/**
> - * read a cache file, determine if it needs to be
> - * regenerated or not
> - *
> - * @param string $tpl_file
> - * @param string $cache_id
> - * @param string $compile_id
> - * @param string $results
> - * @return boolean
> - */
> -
> -// $tpl_file, $cache_id, $compile_id, &$results
> -
> -function smarty_core_read_cache_file(&$params, &$smarty)
> -{
> - static $content_cache = array();
> -
> - if ($smarty->force_compile) {
> - // force compile enabled, always regenerate
> - return false;
> - }
> -
> - if
> (isset($content_cache[$params['tpl_file'].','.$params['cache_i
> d'].','.$params['compile_id']])) {
> - list($params['results'], $smarty->_cache_info) =
> $content_cache[$params['tpl_file'].','.$params['cache_id'].','
> .$params['compile_id']];
> - return true;
> - }
> -
> - if (!empty($smarty->cache_handler_func)) {
> - // use cache_handler function
> - call_user_func_array($smarty->cache_handler_func,
> - array('read', &$smarty,
> &$params['results'], $params['tpl_file'],
> $params['cache_id'], $params['compile_id'], null));
> - } else {
> - // use local cache file
> - $_auto_id =
> $smarty->_get_auto_id($params['cache_id'], $params['compile_id']);
> - $_cache_file =
> $smarty->_get_auto_filename($smarty->cache_dir,
> $params['tpl_file'], $_auto_id);
> - $params['results'] = $smarty->_read_file($_cache_file);
> - }
> -
> - if (empty($params['results'])) {
> - // nothing to parse (error?), regenerate cache
> - return false;
> - }
> -
> - $cache_split = explode("\n", $params['results'], 2);
> - $cache_header = $cache_split[0];
> -
> - $_cache_info = unserialize($cache_header);
> -
> - if ($smarty->caching == 2 && isset ($_cache_info['expires'])){
> - // caching by expiration time
> - if ($_cache_info['expires'] > -1 && (time() >
> $_cache_info['expires'])) {
> - // cache expired, regenerate
> - return false;
> - }
> - } else {
> - // caching by lifetime
> - if ($smarty->cache_lifetime > -1 && (time() -
> $_cache_info['timestamp'] > $smarty->cache_lifetime)) {
> - // cache expired, regenerate
> - return false;
> - }
> - }
> -
> - if ($smarty->compile_check) {
> - $_params = array('get_source' => false, 'quiet'=>true);
> - foreach (array_keys($_cache_info['template']) as
> $_template_dep) {
> - $_params['resource_name'] = $_template_dep;
> - if (!$smarty->_fetch_resource_info($_params) ||
> $_cache_info['timestamp'] < $_params['resource_timestamp']) {
> - // template file has changed, regenerate cache
> - return false;
> - }
> - }
> -
> - if (isset($_cache_info['config'])) {
> - $_params = array('resource_base_path' =>
> $smarty->config_dir, 'get_source' => false, 'quiet'=>true);
> - foreach (array_keys($_cache_info['config']) as
> $_config_dep) {
> - $_params['resource_name'] = $_config_dep;
> - if (!$smarty->_fetch_resource_info($_params)
> || $_cache_info['timestamp'] < $_params['resource_timestamp']) {
> - // config file has changed, regenerate cache
> - return false;
> - }
> - }
> - }
> - }
> -
> - 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;
> - }
> - }
> - $params['results'] = $cache_split[1];
> -
> $content_cache[$params['tpl_file'].','.$params['cache_id'].','
> .$params['compile_id']] = array($params['results'], $_cache_info);
> -
> - $smarty->_cache_info = $_cache_info;
> - return true;
> -}
> -
> -/* vim: set expandtab: */
> -
> -?>
>
> Copied:
> plog/trunk/class/template/smarty/internals/core.read_cache_fil
> e.php (from rev 2879,
> plog/trunk/class/template/smarty/core/core.read_cache_file.php)
>
> Deleted: plog/trunk/class/template/smarty/internals/core.rm_auto.php
> ===================================================================
> --- plog/trunk/class/template/smarty/core/core.rm_auto.php
> 2006-01-31 22:34:25 UTC (rev 2878)
> +++
> plog/trunk/class/template/smarty/internals/core.rm_auto.php
> 2006-02-01 16:49:33 UTC (rev 2880)
> @@ -1,71 +0,0 @@
> -<?php
> -/**
> - * Smarty plugin
> - * @package Smarty
> - * @subpackage plugins
> - */
> -
> -/**
> - * delete an automagically created file by name and id
> - *
> - * @param string $auto_base
> - * @param string $auto_source
> - * @param string $auto_id
> - * @param integer $exp_time
> - * @return boolean
> - */
> -
> -// $auto_base, $auto_source = null, $auto_id = null, $exp_time = null
> -
> -function smarty_core_rm_auto($params, &$smarty)
> -{
> - if (!@is_dir($params['auto_base']))
> - return false;
> -
> - if(!isset($params['auto_id']) &&
> !isset($params['auto_source'])) {
> - $_params = array(
> - 'dirname' => $params['auto_base'],
> - 'level' => 0,
> - 'exp_time' => $params['exp_time']
> - );
> - require_once(SMARTY_DIR . 'core' .
> DIRECTORY_SEPARATOR . 'core.rmdir.php');
> - $_res = smarty_core_rmdir($_params, $smarty);
> - } else {
> - $_tname =
> $smarty->_get_auto_filename($params['auto_base'],
> $params['auto_source'], $params['auto_id']);
> -
> - if(isset($params['auto_source'])) {
> - if (isset($params['extensions'])) {
> - $_res = false;
> - foreach ((array)$params['extensions'] as $_extension)
> - $_res |=
> $smarty->_unlink($_tname.$_extension, $params['exp_time']);
> - } else {
> - $_res = $smarty->_unlink($_tname,
> $params['exp_time']);
> - }
> - } elseif ($smarty->use_sub_dirs) {
> - $_params = array(
> - 'dirname' => $_tname,
> - 'level' => 1,
> - 'exp_time' => $params['exp_time']
> - );
> - require_once(SMARTY_DIR . 'core' .
> DIRECTORY_SEPARATOR . 'core.rmdir.php');
> - $_res = smarty_core_rmdir($_params, $smarty);
> - } else {
> - // remove matching file names
> - $_handle = opendir($params['auto_base']);
> - $_res = true;
> - while (false !== ($_filename = readdir($_handle))) {
> - if($_filename == '.' || $_filename == '..') {
> - continue;
> - } elseif (substr($params['auto_base'] .
> DIRECTORY_SEPARATOR . $_filename, 0, strlen($_tname)) == $_tname) {
> - $_res &=
> (bool)$smarty->_unlink($params['auto_base'] .
> DIRECTORY_SEPARATOR . $_filename, $params['exp_time']);
> - }
> - }
> - }
> - }
> -
> - return $_res;
> -}
> -
> -/* vim: set expandtab: */
> -
> -?>
>
> Copied:
> plog/trunk/class/template/smarty/internals/core.rm_auto.php
> (from rev 2879,
> plog/trunk/class/template/smarty/core/core.rm_auto.php)
>
> Deleted: plog/trunk/class/template/smarty/internals/core.rmdir.php
> ===================================================================
> --- plog/trunk/class/template/smarty/core/core.rmdir.php
> 2006-01-31 22:34:25 UTC (rev 2878)
> +++ plog/trunk/class/template/smarty/internals/core.rmdir.php
> 2006-02-01 16:49:33 UTC (rev 2880)
> @@ -1,55 +0,0 @@
> -<?php
> -/**
> - * Smarty plugin
> - * @package Smarty
> - * @subpackage plugins
> - */
> -
> -/**
> - * delete a dir recursively (level=0 -> keep root)
> - * WARNING: no tests, it will try to remove what you tell it!
> - *
> - * @param string $dirname
> - * @param integer $level
> - * @param integer $exp_time
> - * @return boolean
> - */
> -
> -// $dirname, $level = 1, $exp_time = null
> -
> -function smarty_core_rmdir($params, &$smarty)
> -{
> - if(!isset($params['level'])) { $params['level'] = 1; }
> - if(!isset($params['exp_time'])) { $params['exp_time'] = null; }
> -
> - if($_handle = @opendir($params['dirname'])) {
> -
> - while (false !== ($_entry = readdir($_handle))) {
> - if ($_entry != '.' && $_entry != '..') {
> - if (@is_dir($params['dirname'] .
> DIRECTORY_SEPARATOR . $_entry)) {
> - $_params = array(
> - 'dirname' => $params['dirname'] .
> DIRECTORY_SEPARATOR . $_entry,
> - 'level' => $params['level'] + 1,
> - 'exp_time' => $params['exp_time']
> - );
> - require_once(SMARTY_DIR . 'core' .
> DIRECTORY_SEPARATOR . 'core.rmdir.php');
> - smarty_core_rmdir($_params, $smarty);
> - }
> - else {
> - $smarty->_unlink($params['dirname'] .
> DIRECTORY_SEPARATOR . $_entry, $params['exp_time']);
> - }
> - }
> - }
> - closedir($_handle);
> - }
> -
> - if ($params['level']) {
> - return @rmdir($params['dirname']);
> - }
> - return (bool)$_handle;
> -
> -}
> -
> -/* vim: set expandtab: */
> -
> -?>
>
> Copied:
> plog/trunk/class/template/smarty/internals/core.rmdir.php
> (from rev 2879, plog/trunk/class/template/smarty/core/core.rmdir.php)
>
> Deleted:
> plog/trunk/class/template/smarty/internals/core.run_insert_handler.php
> ===================================================================
> ---
> plog/trunk/class/template/smarty/core/core.run_insert_hand
> ler.php 2006-01-31 22:34:25 UTC (rev 2878)
> +++
> plog/trunk/class/template/smarty/internals/core.run_insert_han
> dler.php 2006-02-01 16:49:33 UTC (rev 2880)
> @@ -1,71 +0,0 @@
> -<?php
> -/**
> - * Smarty plugin
> - * @package Smarty
> - * @subpackage plugins
> - */
> -
> -/**
> - * Handle insert tags
> - *
> - * @param array $args
> - * @return string
> - */
> -function smarty_core_run_insert_handler($params, &$smarty)
> -{
> -
> - require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR .
> 'core.get_microtime.php');
> - if ($smarty->debugging) {
> - $_params = array();
> - $_debug_start_time =
> smarty_core_get_microtime($_params, $smarty);
> - }
> -
> - if ($smarty->caching) {
> - $_arg_string = serialize($params['args']);
> - $_name = $params['args']['name'];
> - if (!isset($smarty->_cache_info['insert_tags'][$_name])) {
> - $smarty->_cache_info['insert_tags'][$_name] =
> array('insert',
> - $_name,
> -
> $smarty->_plugins['insert'][$_name][1],
> -
> $smarty->_plugins['insert'][$_name][2],
> -
> !empty($params['args']['script']) ? true : false);
> - }
> - return $smarty->_smarty_md5."{insert_cache
> $_arg_string}".$smarty->_smarty_md5;
> - } else {
> - if (isset($params['args']['script'])) {
> - $_params = array('resource_name' =>
> $smarty->_dequote($params['args']['script']));
> - require_once(SMARTY_DIR . 'core' .
> DIRECTORY_SEPARATOR . 'core.get_php_resource.php');
> - if(!smarty_core_get_php_resource($_params, $smarty)) {
> - return false;
> - }
> -
> - if ($_params['resource_type'] == 'file') {
> - $smarty->_include($_params['php_resource'], true);
> - } else {
> - $smarty->_eval($_params['php_resource']);
> - }
> - unset($params['args']['script']);
> - }
> -
> - $_funcname =
> $smarty->_plugins['insert'][$params['args']['name']][0];
> - $_content = $_funcname($params['args'], $smarty);
> - if ($smarty->debugging) {
> - $_params = array();
> - require_once(SMARTY_DIR . 'core' .
> DIRECTORY_SEPARATOR . 'core.get_microtime.php');
> - $smarty->_smarty_debug_info[] = array('type'
> => 'insert',
> - 'filename'
> => 'insert_'.$params['args']['name'],
> - 'depth'
> => $smarty->_inclusion_depth,
> - 'exec_time'
> => smarty_core_get_microtime($_params, $smarty) - $_debug_start_time);
> - }
> -
> - if (!empty($params['args']["assign"])) {
> - $smarty->assign($params['args']["assign"], $_content);
> - } else {
> - return $_content;
> - }
> - }
> -}
> -
> -/* vim: set expandtab: */
> -
> -?>
>
> Copied:
> plog/trunk/class/template/smarty/internals/core.run_insert_han
> dler.php (from rev 2879,
> plog/trunk/class/template/smarty/core/core.run_insert_handler.php)
>
> Deleted:
> plog/trunk/class/template/smarty/internals/core.smarty_include_php.php
> ===================================================================
> ---
> plog/trunk/class/template/smarty/core/core.smarty_include_
> php.php 2006-01-31 22:34:25 UTC (rev 2878)
> +++
> plog/trunk/class/template/smarty/internals/core.smarty_include
> _php.php 2006-02-01 16:49:33 UTC (rev 2880)
> @@ -1,50 +0,0 @@
> -<?php
> -/**
> - * Smarty plugin
> - * @package Smarty
> - * @subpackage plugins
> - */
> -
> -/**
> - * called for included php files within templates
> - *
> - * @param string $smarty_file
> - * @param string $smarty_assign variable to assign the
> included template's
> - * output into
> - * @param boolean $smarty_once uses include_once if this is true
> - * @param array $smarty_include_vars associative array of vars from
> - * {include file="blah" var=$var}
> - */
> -
> -// $file, $assign, $once, $_smarty_include_vars
> -
> -function smarty_core_smarty_include_php($params, &$smarty)
> -{
> - $_params = array('resource_name' => $params['smarty_file']);
> - require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR .
> 'core.get_php_resource.php');
> - smarty_core_get_php_resource($_params, $smarty);
> - $_smarty_resource_type = $_params['resource_type'];
> - $_smarty_php_resource = $_params['php_resource'];
> -
> - if (!empty($params['smarty_assign'])) {
> - ob_start();
> - if ($_smarty_resource_type == 'file') {
> - $smarty->_include($_smarty_php_resource,
> $params['smarty_once'], $params['smarty_include_vars']);
> - } else {
> - $smarty->_eval($_smarty_php_resource,
> $params['smarty_include_vars']);
> - }
> - $smarty->assign($params['smarty_assign'], ob_get_contents());
> - ob_end_clean();
> - } else {
> - if ($_smarty_resource_type == 'file') {
> - $smarty->_include($_smarty_php_resource,
> $params['smarty_once'], $params['smarty_include_vars']);
> - } else {
> - $smarty->_eval($_smarty_php_resource,
> $params['smarty_include_vars']);
> - }
> - }
> -}
> -
> -
> -/* vim: set expandtab: */
> -
> -?>
>
> Copied:
> plog/trunk/class/template/smarty/internals/core.smarty_include
> _php.php (from rev 2879,
> plog/trunk/class/template/smarty/core/core.smarty_include_php.php)
>
> Deleted:
> plog/trunk/class/template/smarty/internals/core.write_cache_file.php
> ===================================================================
> ---
> plog/trunk/class/template/smarty/core/core.write_cache_f
> ile.php 2006-01-31 22:34:25 UTC (rev 2878)
> +++
> plog/trunk/class/template/smarty/internals/core.write_cache_f
> ile.php 2006-02-01 16:49:33 UTC (rev 2880)
> @@ -1,73 +0,0 @@
> -<?php
> -/**
> - * Smarty plugin
> - * @package Smarty
> - * @subpackage plugins
> - */
> -
> -/**
> - * Prepend the cache information to the cache file
> - * and write it
> - *
> - * @param string $tpl_file
> - * @param string $cache_id
> - * @param string $compile_id
> - * @param string $results
> - * @return true|null
> - */
> -
> - // $tpl_file, $cache_id, $compile_id, $results
> -
> -function smarty_core_write_cache_file($params, &$smarty)
> -{
> -
> - // put timestamp in cache header
> - $smarty->_cache_info['timestamp'] = time();
> - if ($smarty->cache_lifetime > -1){
> - // expiration set
> - $smarty->_cache_info['expires'] =
> $smarty->_cache_info['timestamp'] + $smarty->cache_lifetime;
> - } else {
> - // cache will never expire
> - $smarty->_cache_info['expires'] = -1;
> - }
> -
> - // collapse {nocache...}-tags
> - $params['results'] =
> preg_replace('!((\{nocache\:([0-9a-f]{32})#(\d+)\})'
> - .'.*'
> - .'{/nocache\:\\3#\\4\})!Us'
> - ,'\\2'
> - ,$params['results']);
> - $smarty->_cache_info['cache_serials'] = $smarty->_cache_serials;
> -
> - // prepend the cache header info into cache file
> - $params['results'] =
> serialize($smarty->_cache_info)."\n".$params['results'];
> -
> - if (!empty($smarty->cache_handler_func)) {
> - // use cache_handler function
> - call_user_func_array($smarty->cache_handler_func,
> - array('write', &$smarty,
> &$params['results'], $params['tpl_file'],
> $params['cache_id'], $params['compile_id'], null));
> - } else {
> - // use local cache file
> -
> - if(!@is_writable($smarty->cache_dir)) {
> - // cache_dir not writable, see if it exists
> - if(!@is_dir($smarty->cache_dir)) {
> - $smarty->trigger_error('the $cache_dir \'' .
> $smarty->cache_dir . '\' does not exist, or is not a
> directory.', E_USER_ERROR);
> - return false;
> - }
> - $smarty->trigger_error('unable to write to
> $cache_dir \'' . realpath($smarty->cache_dir) . '\'. Be sure
> $cache_dir is writable by the web server user.', E_USER_ERROR);
> - return false;
> - }
> -
> - $_auto_id =
> $smarty->_get_auto_id($params['cache_id'], $params['compile_id']);
> - $_cache_file =
> $smarty->_get_auto_filename($smarty->cache_dir,
> $params['tpl_file'], $_auto_id);
> - $_params = array('filename' => $_cache_file,
> 'contents' => $params['results'], 'create_dirs' => true);
> - require_once(SMARTY_DIR . 'core' .
> DIRECTORY_SEPARATOR . 'core.write_file.php');
> - smarty_core_write_file($_params, $smarty);
> - return true;
> - }
> -}
> -
> -/* vim: set expandtab: */
> -
> -?>
>
> Copied:
> plog/trunk/class/template/smarty/internals/core.write_cache_fi
> le.php (from rev 2879,
> plog/trunk/class/template/smarty/core/core.write_cache_file.php)
>
> Deleted:
> plog/trunk/class/template/smarty/internals/core.write_compiled
> _include.php
> ===================================================================
> ---
> plog/trunk/class/template/smarty/core/core.write_compiled_incl
> ude.php 2006-01-31 22:34:25 UTC (rev 2878)
> +++
> plog/trunk/class/template/smarty/internals/core.write_compiled
> _include.php 2006-02-01 16:49:33 UTC (rev 2880)
> @@ -1,59 +0,0 @@
> -<?php
> -/**
> - * Smarty plugin
> - * @package Smarty
> - * @subpackage plugins
> - */
> -
> -/**
> - * Extract non-cacheable parts out of compiled template and write it
> - *
> - * @param string $compile_path
> - * @param string $template_compiled
> - * @param integer $template_timestamp
> - * @return boolean
> - */
> -
> -function smarty_core_write_compiled_include($params, &$smarty)
> -{
> - $_tag_start = 'if \(\$this->caching\) \{ echo
> \'\{nocache\:('.$params['cache_serial'].')#(\d+)\}\';\}';
> - $_tag_end = 'if \(\$this->caching\) \{ echo
> \'\{/nocache\:(\\2)#(\\3)\}\';\}';
> -
> - preg_match_all('!('.$_tag_start.'(.*)'.$_tag_end.')!Us',
> - $params['compiled_content'],
> $_match_source, PREG_SET_ORDER);
> -
> - // no nocache-parts found: done
> - if (count($_match_source)==0) return;
> -
> - // convert the matched php-code to functions
> - $_include_compiled = "<?php /* funky header here */\n\n";
> -
> - $_compile_path = $params['include_file_path'];
> -
> - $smarty->_cache_serials[$_compile_path] =
> $params['cache_serial'];
> - $_include_compiled .=
> "\$this->_cache_serials['".$_compile_path."'] =
> '".$params['cache_serial']."';\n\n?>";
> -
> - $_include_compiled .= $params['plugins_code'];
> - $_include_compiled .= "<?php";
> - for ($_i = 0, $_for_max = count($_match_source); $_i <
> $_for_max; $_i++) {
> - $_match =& $_match_source[$_i];
> - $_include_compiled .= "
> -function _smarty_tplfunc_$_match[2]_$_match[3](&\$this)
> -{
> -$_match[4]
> -}
> -
> -";
> - }
> - $_include_compiled .= "\n\n?>\n";
> -
> - $_params = array('filename' => $_compile_path,
> - 'contents' => $_include_compiled,
> 'create_dirs' => true);
> -
> - require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR .
> 'core.write_file.php');
> - smarty_core_write_file($_params, $smarty);
> - return true;
> -}
> -
> -
> -?>
>
> Copied:
> plog/trunk/class/template/smarty/internals/core.write_compiled
> _include.php (from rev 2879,
> plog/trunk/class/template/smarty/core/core.write_compiled_include.php)
>
> Deleted:
> plog/trunk/class/template/smarty/internals/core.write_compiled
> _resource.php
> ===================================================================
> ---
> plog/trunk/class/template/smarty/core/core.write_compiled_reso
> urce.php 2006-01-31 22:34:25 UTC (rev 2878)
> +++
> plog/trunk/class/template/smarty/internals/core.write_compiled
> _resource.php 2006-02-01 16:49:33 UTC (rev 2880)
> @@ -1,36 +0,0 @@
> -<?php
> -/**
> - * Smarty plugin
> - * @package Smarty
> - * @subpackage plugins
> - */
> -
> -/**
> - * write the compiled resource
> - *
> - * @param string $compile_path
> - * @param string $compiled_content
> - * @param integer $resource_timestamp
> - * @return true
> - */
> -function smarty_core_write_compiled_resource($params, &$smarty)
> -{
> - if(!@is_writable($smarty->compile_dir)) {
> - // compile_dir not writable, see if it exists
> - if(!@is_dir($smarty->compile_dir)) {
> - $smarty->trigger_error('the $compile_dir \'' .
> $smarty->compile_dir . '\' does not exist, or is not a
> directory.', E_USER_ERROR);
> - return false;
> - }
> - $smarty->trigger_error('unable to write to
> $compile_dir \'' . realpath($smarty->compile_dir) . '\'. Be
> sure $compile_dir is writable by the web server user.', E_USER_ERROR);
> - return false;
> - }
> -
> - $_params = array('filename' => $params['compile_path'],
> 'timestamp'=>$params['resource_timestamp'], 'contents' =>
> $params['compiled_content'], 'create_dirs' => true);
> - require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR .
> 'core.write_file.php');
> - smarty_core_write_file($_params, $smarty);
> - return true;
> -}
> -
> -/* vim: set expandtab: */
> -
> -?>
>
> Copied:
> plog/trunk/class/template/smarty/internals/core.write_compiled
> _resource.php (from rev 2879,
> plog/trunk/class/template/smarty/core/core.write_compiled_reso
> urce.php)
>
> Deleted:
> plog/trunk/class/template/smarty/internals/core.write_file.php
> ===================================================================
> --- plog/trunk/class/template/smarty/core/core.write_file.php
> 2006-01-31 22:34:25 UTC (rev 2878)
> +++
> plog/trunk/class/template/smarty/internals/core.write_f
> ile.php 2006-02-01 16:49:33 UTC (rev 2880)
> @@ -1,51 +0,0 @@
> -<?php
> -/**
> - * Smarty plugin
> - * @package Smarty
> - * @subpackage plugins
> - */
> -
> -/**
> - * write out a file to disk
> - *
> - * @param string $filename
> - * @param string $contents
> - * @param boolean $create_dirs
> - * @return boolean
> - */
> -function smarty_core_write_file($params, &$smarty)
> -{
> - $_dirname = dirname($params['filename']);
> -
> - if ($params['create_dirs']) {
> - $_params = array('dir' => $_dirname);
> - require_once(SMARTY_DIR . 'core' .
> DIRECTORY_SEPARATOR . 'core.create_dir_structure.php');
> - smarty_core_create_dir_structure($_params, $smarty);
> - }
> -
> - // write to tmp file, then rename it to avoid
> - // file locking race condition
> - $_tmp_file = $_dirname . DIRECTORY_SEPARATOR . uniqid('');
> -
> - if (!($fd = @fopen($_tmp_file, 'w'))) {
> - $smarty->trigger_error("problem writing temporary
> file '$_tmp_file'");
> - return false;
> - }
> -
> - fwrite($fd, $params['contents']);
> - if (isset($params['timestamp'])) {
> - touch($_tmp_file, $params['timestamp']);
> - }
> - fclose($fd);
> - if(file_exists($params['filename'])) {
> - @unlink($params['filename']);
> - }
> - @rename($_tmp_file, $params['filename']);
> - @chmod($params['filename'], $smarty->_file_perms);
> -
> - return true;
> -}
> -
> -/* vim: set expandtab: */
> -
> -?>
>
> Copied:
> plog/trunk/class/template/smarty/internals/core.write_file.php
> (from rev 2879,
> plog/trunk/class/template/smarty/core/core.write_file.php)
>
> _______________________________________________
> pLog-svn mailing list
> pLog-svn at devel.lifetype.net
> http://devel.lifetype.net/mailman/listinfo/plog-svn
More information about the pLog-svn
mailing list