smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-04 10:24:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix error call

Browse Source
This commit is contained in:
mohrt
2003-01-28 14:33:50 +00:00
parent 8161894d2c
commit 89ef1e5b08
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libs/plugins/function.fetch.php
View File

@@ -13,7 +13,7 @@ function smarty_function_fetch($params, &$smarty)
$file = $params['file']; $file = $params['file'];
if (empty($file)) { if (empty($file)) {
$smarty->_trigger_plugin_error("parameter 'file' cannot be empty"); $smarty->_trigger_fatal_error("[plugin] parameter 'file' cannot be empty");
return; return;
} }
@@ -26,7 +26,7 @@ function smarty_function_fetch($params, &$smarty)
} }
} }
if (!$resource_is_secure) { if (!$resource_is_secure) {
$smarty->_trigger_plugin_error("(secure mode) fetch '$file' is not allowed"); $smarty->_trigger_fatal_error("[plugin] (secure mode) fetch '$file' is not allowed");
return; return;
} }
// fetch the file // fetch the file
@@ -36,7 +36,7 @@ function smarty_function_fetch($params, &$smarty)
} }
fclose($fp); fclose($fp);
} else { } else {
$smarty->_trigger_plugin_error("fetch cannot read file '$file'"); $smarty->_trigger_fatal_error("[plugin] fetch cannot read file '$file'");
return; return;
} }
} else { } else {
@@ -86,7 +86,7 @@ function smarty_function_fetch($params, &$smarty)
case "header": case "header":
if(!empty($param_value)) { if(!empty($param_value)) {
if(!preg_match('![\w\d-]+: .+!',$param_value)) { if(!preg_match('![\w\d-]+: .+!',$param_value)) {
$smarty->_trigger_plugin_error("invalid header format '".$param_value."'"); $smarty->_trigger_fatal_error("[plugin] invalid header format '".$param_value."'");
return; return;
} else { } else {
$extra_headers[] = $param_value; $extra_headers[] = $param_value;
@@ -102,7 +102,7 @@ function smarty_function_fetch($params, &$smarty)
if(!preg_match('!\D!', $param_value)) { if(!preg_match('!\D!', $param_value)) {
$proxy_port = (int) $param_value; $proxy_port = (int) $param_value;
} else { } else {
$smarty->_trigger_plugin_error("invalid value for attribute '".$param_key."'"); $smarty->_trigger_fatal_error("[plugin] invalid value for attribute '".$param_key."'");
return; return;
} }
break; break;
@@ -120,12 +120,12 @@ function smarty_function_fetch($params, &$smarty)
if(!preg_match('!\D!', $param_value)) { if(!preg_match('!\D!', $param_value)) {
$timeout = (int) $param_value; $timeout = (int) $param_value;
} else { } else {
$smarty->_trigger_plugin_error("invalid value for attribute '".$param_key."'"); $smarty->_trigger_fatal_error("[plugin] invalid value for attribute '".$param_key."'");
return; return;
} }
break; break;
default: default:
$smarty->_trigger_plugin_error("unrecognized attribute '".$param_key."'"); $smarty->_trigger_fatal_error("[plugin] unrecognized attribute '".$param_key."'");
return; return;
} }
} }
@@ -137,7 +137,7 @@ function smarty_function_fetch($params, &$smarty)
} }
if(!$fp) { if(!$fp) {
$smarty->_trigger_plugin_error("unable to fetch: $errstr ($errno)"); $smarty->_trigger_fatal_error("[plugin] unable to fetch: $errstr ($errno)");
return; return;
} else { } else {
if($_is_proxy) { if($_is_proxy) {
@@ -180,7 +180,7 @@ function smarty_function_fetch($params, &$smarty)
} }
} }
} else { } else {
$smarty->_trigger_plugin_error("unable to parse URL, check syntax"); $smarty->_trigger_fatal_error("[plugin] unable to parse URL, check syntax");
return; return;
} }
} else { } else {
@@ -191,7 +191,7 @@ function smarty_function_fetch($params, &$smarty)
} }
fclose($fp); fclose($fp);
} else { } else {
$smarty->_trigger_plugin_error("fetch cannot read file '$file'"); $smarty->_trigger_fatal_error("[plugin] fetch cannot read file '$file'");
return; return;
} }
} }

20
plugins/function.fetch.php
View File

@@ -13,7 +13,7 @@ function smarty_function_fetch($params, &$smarty)
$file = $params['file']; $file = $params['file'];
if (empty($file)) { if (empty($file)) {
$smarty->_trigger_plugin_error("parameter 'file' cannot be empty"); $smarty->_trigger_fatal_error("[plugin] parameter 'file' cannot be empty");
return; return;
} }
@@ -26,7 +26,7 @@ function smarty_function_fetch($params, &$smarty)
} }
} }
if (!$resource_is_secure) { if (!$resource_is_secure) {
$smarty->_trigger_plugin_error("(secure mode) fetch '$file' is not allowed"); $smarty->_trigger_fatal_error("[plugin] (secure mode) fetch '$file' is not allowed");
return; return;
} }
// fetch the file // fetch the file
@@ -36,7 +36,7 @@ function smarty_function_fetch($params, &$smarty)
} }
fclose($fp); fclose($fp);
} else { } else {
$smarty->_trigger_plugin_error("fetch cannot read file '$file'"); $smarty->_trigger_fatal_error("[plugin] fetch cannot read file '$file'");
return; return;
} }
} else { } else {
@@ -86,7 +86,7 @@ function smarty_function_fetch($params, &$smarty)
case "header": case "header":
if(!empty($param_value)) { if(!empty($param_value)) {
if(!preg_match('![\w\d-]+: .+!',$param_value)) { if(!preg_match('![\w\d-]+: .+!',$param_value)) {
$smarty->_trigger_plugin_error("invalid header format '".$param_value."'"); $smarty->_trigger_fatal_error("[plugin] invalid header format '".$param_value."'");
return; return;
} else { } else {
$extra_headers[] = $param_value; $extra_headers[] = $param_value;
@@ -102,7 +102,7 @@ function smarty_function_fetch($params, &$smarty)
if(!preg_match('!\D!', $param_value)) { if(!preg_match('!\D!', $param_value)) {
$proxy_port = (int) $param_value; $proxy_port = (int) $param_value;
} else { } else {
$smarty->_trigger_plugin_error("invalid value for attribute '".$param_key."'"); $smarty->_trigger_fatal_error("[plugin] invalid value for attribute '".$param_key."'");
return; return;
} }
break; break;
@@ -120,12 +120,12 @@ function smarty_function_fetch($params, &$smarty)
if(!preg_match('!\D!', $param_value)) { if(!preg_match('!\D!', $param_value)) {
$timeout = (int) $param_value; $timeout = (int) $param_value;
} else { } else {
$smarty->_trigger_plugin_error("invalid value for attribute '".$param_key."'"); $smarty->_trigger_fatal_error("[plugin] invalid value for attribute '".$param_key."'");
return; return;
} }
break; break;
default: default:
$smarty->_trigger_plugin_error("unrecognized attribute '".$param_key."'"); $smarty->_trigger_fatal_error("[plugin] unrecognized attribute '".$param_key."'");
return; return;
} }
} }
@@ -137,7 +137,7 @@ function smarty_function_fetch($params, &$smarty)
} }
if(!$fp) { if(!$fp) {
$smarty->_trigger_plugin_error("unable to fetch: $errstr ($errno)"); $smarty->_trigger_fatal_error("[plugin] unable to fetch: $errstr ($errno)");
return; return;
} else { } else {
if($_is_proxy) { if($_is_proxy) {
@@ -180,7 +180,7 @@ function smarty_function_fetch($params, &$smarty)
} }
} }
} else { } else {
$smarty->_trigger_plugin_error("unable to parse URL, check syntax"); $smarty->_trigger_fatal_error("[plugin] unable to parse URL, check syntax");
return; return;
} }
} else { } else {
@@ -191,7 +191,7 @@ function smarty_function_fetch($params, &$smarty)
} }
fclose($fp); fclose($fp);
} else { } else {
$smarty->_trigger_plugin_error("fetch cannot read file '$file'"); $smarty->_trigger_fatal_error("[plugin] fetch cannot read file '$file'");
return; return;
} }
} }