- Allow '://' URL syntax in template names of stream resources (Issue #129)

This commit is contained in:
uwe.tews@googlemail.com
2013-01-06 19:22:48 +00:00
parent 6ebd099041
commit b24eada147
2 changed files with 44 additions and 39 deletions

View File

@@ -1,4 +1,7 @@
===== trunk ===== ===== trunk =====
06.01.2013
- Allow '://' URL syntax in template names of stream resources (Issue #129)
27.11.2012 27.11.2012
- bugfix wrong variable usage in smarty_internal_utility.php (Issue #125) - bugfix wrong variable usage in smarty_internal_utility.php (Issue #125)

View File

@@ -1,36 +1,40 @@
<?php <?php
/** /**
* Smarty Internal Plugin Resource Stream * Smarty Internal Plugin Resource Stream
* *
* Implements the streams as resource for Smarty template * Implements the streams as resource for Smarty template
* *
* @package Smarty * @package Smarty
* @subpackage TemplateResources * @subpackage TemplateResources
* @author Uwe Tews * @author Uwe Tews
* @author Rodney Rehm * @author Rodney Rehm
*/ */
/** /**
* Smarty Internal Plugin Resource Stream * Smarty Internal Plugin Resource Stream
* *
* Implements the streams as resource for Smarty template * Implements the streams as resource for Smarty template
* *
* @link http://php.net/streams * @link http://php.net/streams
* @package Smarty * @package Smarty
* @subpackage TemplateResources * @subpackage TemplateResources
*/ */
class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled { class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled {
/** /**
* populate Source Object with meta data from Resource * populate Source Object with meta data from Resource
* *
* @param Smarty_Template_Source $source source object * @param Smarty_Template_Source $source source object
* @param Smarty_Internal_Template $_template template object * @param Smarty_Internal_Template $_template template object
* @return void * @return void
*/ */
public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
{ {
$source->filepath = str_replace(':', '://', $source->resource); if(strpos($source->resource, '://') !== false) {
$source->filepath = $source->resource;
} else {
$source->filepath = str_replace(':', '://', $source->resource);
}
$source->uid = false; $source->uid = false;
$source->content = $this->getContent($source); $source->content = $this->getContent($source);
$source->timestamp = false; $source->timestamp = false;
@@ -38,12 +42,12 @@ class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled {
} }
/** /**
* Load template's source from stream into current template object * Load template's source from stream into current template object
* *
* @param Smarty_Template_Source $source source object * @param Smarty_Template_Source $source source object
* @return string template source * @return string template source
* @throws SmartyException if source cannot be loaded * @throws SmartyException if source cannot be loaded
*/ */
public function getContent(Smarty_Template_Source $source) public function getContent(Smarty_Template_Source $source)
{ {
$t = ''; $t = '';
@@ -61,16 +65,14 @@ class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled {
} }
/** /**
* modify resource_name according to resource handlers specifications * modify resource_name according to resource handlers specifications
* *
* @param Smarty $smarty Smarty instance * @param Smarty $smarty Smarty instance
* @param string $resource_name resource_name to make unique * @param string $resource_name resource_name to make unique
* @return string unique resource name * @return string unique resource name
*/ */
protected function buildUniqueResourceName(Smarty $smarty, $resource_name) protected function buildUniqueResourceName(Smarty $smarty, $resource_name)
{ {
return get_class($this) . '#' . $resource_name; return get_class($this) . '#' . $resource_name;
} }
} }
?>