- bugfix fopen() error handling at stream resources

This commit is contained in:
uwe.tews@googlemail.com
2011-05-14 10:18:10 +00:00
parent 184557ed46
commit 86586e5af4
2 changed files with 59 additions and 54 deletions

View File

@@ -1,4 +1,7 @@
===== SVN trunk ===== ===== SVN trunk =====
14/05/2011
- bugfix fopen() error handling at stream resources
13/05/2011 13/05/2011
- bugfix condition starting with "-" did fail at {if} and {while} tags - bugfix condition starting with "-" did fail at {if} and {while} tags

View File

@@ -1,18 +1,18 @@
<?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
*/ */
/** /**
* Smarty Internal Plugin Resource Stream * Smarty Internal Plugin Resource Stream
*/ */
class Smarty_Internal_Resource_Stream { class Smarty_Internal_Resource_Stream {
public function __construct($smarty) public function __construct($smarty)
{ {
@@ -27,10 +27,10 @@ class Smarty_Internal_Resource_Stream {
public $isEvaluated = true; public $isEvaluated = true;
/** /**
* Return flag if template source is existing * Return flag if template source is existing
* *
* @return boolean true * @return boolean true
*/ */
public function isExisting($template) public function isExisting($template)
{ {
if ($template->getTemplateSource() == '') { if ($template->getTemplateSource() == '') {
@@ -40,11 +40,11 @@ class Smarty_Internal_Resource_Stream {
} }
} }
/** /**
* Get filepath to template source * Get filepath to template source
* *
* @param object $_template template object * @param object $_template template object
* @return string return 'string' as template source is not a file * @return string return 'string' as template source is not a file
*/ */
public function getTemplateFilepath($_template) public function getTemplateFilepath($_template)
{ {
// no filepath for strings // no filepath for strings
@@ -53,11 +53,11 @@ class Smarty_Internal_Resource_Stream {
} }
/** /**
* Get timestamp to template source * Get timestamp to template source
* *
* @param object $_template template object * @param object $_template template object
* @return boolean false as string resources have no timestamp * @return boolean false as string resources have no timestamp
*/ */
public function getTemplateTimestamp($_template) public function getTemplateTimestamp($_template)
{ {
// strings must always be compiled and have no timestamp // strings must always be compiled and have no timestamp
@@ -65,30 +65,32 @@ class Smarty_Internal_Resource_Stream {
} }
/** /**
* Retuen template source from resource name * Retuen template source from resource name
* *
* @param object $_template template object * @param object $_template template object
* @return string content of template source * @return string content of template source
*/ */
public function getTemplateSource($_template) public function getTemplateSource($_template)
{ {
// return template string // return template string
$_template->template_source = ''; $_template->template_source = '';
$fp = fopen(str_replace(':', '://', $_template->template_resource),'r+'); if ($fp = fopen(str_replace(':', '://', $_template->template_resource),'r+')) {
while (!feof($fp)) { while (!feof($fp)) {
$_template->template_source .= fgets($fp); $_template->template_source .= fgets($fp);
}
fclose($fp);
return true;
} else {
return false;
} }
fclose($fp);
return true;
} }
/** /**
* Get filepath to compiled template * Get filepath to compiled template
* *
* @param object $_template template object * @param object $_template template object
* @return boolean return false as compiled template is not stored * @return boolean return false as compiled template is not stored
*/ */
public function getCompiledFilepath($_template) public function getCompiledFilepath($_template)
{ {
// no filepath for strings // no filepath for strings