* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
* Copyright (c) 2009 - 2011 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
// Private function to determine wether we have a special expression function avaible
// (mostly located in wrapper-functions.php)
function isExpressionFunctionAvaiable ($data) {
- // Get the enty we need
- $entry = $data['matches'][4][$data['key']];
+ // Get the enty we need and trim it
+ $entry = trim($data['matches'][4][$data['key']]);
// Do we have cache?
if (!isset($GLOBALS['expression_function_available'][$entry])) {
// Is that function there?
if (function_exists($functionName)) {
// Cache it all
- $GLOBALS['expression_function_name'][$entry] = $functionName;
+ $GLOBALS['expression_function_name'][$entry] = $functionName;
$GLOBALS['expression_function_available'][$entry] = true;
} else {
// Not avaiable
if ((empty($data['value'])) && ($data['value'] != '0')) {
// No value is set
$replacer = '{DQUOTE} . ' . $data['extra_func2'] . '(' . $data['extra_func'] . '(' . $data['callback'] . '())) . {DQUOTE}';
+ } elseif (isXmlTypeBool($data['value'])) {
+ // Boolean value detected
+ $replacer = '{DQUOTE} . ' . $data['extra_func2'] . '(' . $data['extra_func'] . '(' . $data['callback'] . '(' . $data['value'] . '))) . {DQUOTE}';
} else {
- // Some value is set
+ // Some string/integer value is set
$replacer = '{DQUOTE} . ' . $data['extra_func2'] . '(' . $data['extra_func'] . '(' . $data['callback'] . "('" . $data['value'] . "'))) . {DQUOTE}";
}
} // END - if
// Expression call-back for GET request
function doExpressionGet ($data) {
// Construct the replacer
- $replacer = '{%pipe,getRequestParameter=' . $data['value'] . '%}';
+ $replacer = '{%pipe,getRequestElement=' . $data['value'] . '%}';
// Replace the code
$code = replaceExpressionCode($data, $replacer);
// Expression call-back for POST request
function doExpressionPost ($data) {
// Construct the replacer
- $replacer = '{%pipe,postRequestParameter=' . $data['value'] . '%}';
+ $replacer = '{%pipe,postRequestElement=' . $data['value'] . '%}';
// Replace the code
$code = replaceExpressionCode($data, $replacer);