X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fexpression-functions.php;h=82ba0ca9a33403dc99b7afd651096295efafbfd0;hb=e255180539a9fdfac8a8b51d1aefc6f4909d8e07;hp=c8129ddb21dc2072b52edb1ff0b8cff43c2481f0;hpb=0a85b0c192bba91ebb61059dfc2c9ca3cf403aed;p=mailer.git
diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index c8129ddb21..82ba0ca9a3 100644
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -14,12 +14,10 @@
* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009, 2010 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team *
+ * 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 *
@@ -49,11 +47,11 @@ function replaceExpressionCode ($data, $replacer) {
return str_replace($data['matches'][0][$data['key']], $replacer, escapeQuotes($data['code']));
}
-// Private function to determine wether we have a special expression function avaible
+// Private function to determine whether 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])) {
@@ -72,7 +70,7 @@ function isExpressionFunctionAvaiable ($data) {
// 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
@@ -83,7 +81,7 @@ function isExpressionFunctionAvaiable ($data) {
}
} elseif ($GLOBALS['expression_function_available'][$entry] == false) {
// Debug message
- logDebugMessage(__FUNCTION__, __LINE__, 'Expression function for entry ' . $entry . ' requested but not found.');
+ logDebugMessage(__FUNCTION__, __LINE__, 'Expression function for entry ' . $entry . ' requested but does not exist.');
}
// Return cache
@@ -111,10 +109,16 @@ function doExpressionCode ($data) {
// Expression call-back function for URLs
function doExpressionUrl ($data) {
// Do we have JS-mode?
- if ($data['callback'] == 'js') $data['mode'] = 1;
+ if ($data['callback'] == 'js') {
+ // Switch to it
+ $data['output_mode'] = '1';
+ } // END - if
// Handle an URL here
- $replacer = "{DQUOTE} . encodeUrl('" . $data['matches'][4][$data['key']] . "', " . $data['mode'] . ') . {DQUOTE}';
+ $replacer = "{DQUOTE} . encodeUrl('" . $data['matches'][4][$data['key']] . "', " . $data['output_mode'] . ') . {DQUOTE}';
+
+ // Debug log
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'replacer=' . $replacer . ',callback=' . $data['callback']);
// Replace it
$code = replaceExpressionCode($data, $replacer);
@@ -126,7 +130,7 @@ function doExpressionUrl ($data) {
// Expression call-back function for reading data from $_SERVER
function doExpressionServer ($data) {
// This will make 'foo_bar' to detectFooBar()
- $functionName = "'detect' . implode('', array_map('ucfirst', explode('_', '" . $data['callback'] . "')))";
+ $functionName = "'detect' . implode('', array_map('firstCharUpperCase', explode('_', '" . $data['callback'] . "')))";
// Generate replacer
$replacer = '{DQUOTE} . call_user_func(' . $functionName . ') . {DQUOTE}';
@@ -153,7 +157,7 @@ function doExpressionExt ($data) {
} // END - if
// Generate replacer
- $replacer = sprintf("&ext=%s&ver=%s&rev={?CURR_SVN_REVISION?}", $data['matches'][4][$data['key']], $replacer);
+ $replacer = sprintf("&ext=%s&ver=%s&rev={?CURRENT_REPOSITORY_REVISION?}", $data['matches'][4][$data['key']], $replacer);
// Replace it and insert parameter for GET request
$code = replaceExpressionCode($data, $replacer);
@@ -169,9 +173,12 @@ function doExpressionConfig ($data) {
if (isExpressionFunctionAvaiable($data)) {
// Then use it
$replacer = '{DQUOTE} . ' . $data['callback'] . '(' . getExpressionFunction($data) . '()) . {DQUOTE}';
+ } elseif (!isConfigEntrySet($data['matches'][4][$data['key']])) {
+ // Config entry is not set
+ $replacer = '{DQUOTE} . ' . $data['callback'] . '(NULL) . {DQUOTE}';
} else {
// Default replacer is the config value itself
- $replacer = '{DQUOTE} . ' . $data['callback'] . '(getConfig(' . "'" . $data['matches'][4][$data['key']] . "'" . ')) . {DQUOTE}';
+ $replacer = '{DQUOTE} . ' . $data['callback'] . '(getConfig(' . chr(39) . $data['matches'][4][$data['key']] . chr(39) . ')) . {DQUOTE}';
}
// Replace the config entry
@@ -188,13 +195,17 @@ function doExpressionPipe ($data) {
// Do we have a call-back? Should always be there!
if (!empty($data['callback'])) {
- //if ($data['callback'] == 'getMemberId') die(''.encodeEntities(print_r($data, true)).'
');
+ //* DEBUG: */ if ($data['callback'] == 'getMemberId') die(''.encodeEntities(print_r($data, true)).'
');
// If the value is empty, we don't add it
- if (empty($data['value'])) {
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value[' . gettype($data['value']) . ']=' . $data['value']);
+ 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
@@ -245,7 +256,7 @@ function doExpressionMessage ($data) {
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'callback=' . $data['callback'] . ',extra_func=' . $data['extra_func'] . ',value=' . $data['value']);
// Message string replacement depends on if message is masked
- if ((isMessageMasked($data['callback'])) && ((!empty($data['extra_func'])) || ($data['extra_func'] == '0'))) {
+ if ((isMessageMasked($data['callback'], false)) && ((!empty($data['extra_func'])) || ($data['extra_func'] == '0'))) {
// Message should be masked
$replacer = "{DQUOTE} . getMaskedMessage('" . $data['callback'] . "', '" . $data['extra_func'] . "') . {DQUOTE}";
} elseif (!empty($data['value'])) {
@@ -265,18 +276,33 @@ function doExpressionMessage ($data) {
// Expression call-back for template functions
function doExpressionTemplate ($data) {
- // Do the replacement
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'template='.$GLOBALS['current_template']);
- $replacer = '{DQUOTE} . doTemplate' . $data['callback'] . "('" . $GLOBALS['current_template'] . "', true";
-
- // Is 'value' set?
- if (!empty($data['value'])) {
- // Then include it as well
- $replacer .= ", '" . $data['value'] . "'";
- } // END - if
-
- // Replacer is ready
- $replacer .= ') . {DQUOTE}';
+ // Construct call-back function name
+ $callbackFunction = 'doTemplate' . $data['callback'];
+
+ // Init replacer
+ $replacer = '';
+
+ // Is the function there?
+ if (!isset($GLOBALS['current_template'])) {
+ // This is very bad and needs fixing
+ reportBug(__FUNCTION__, __LINE__, 'current_template in GLOBALS not set, callbackFunction=' . $callbackFunction . ',function_exists()=' . intval(function_exists($callbackFunction)));
+ } elseif (!function_exists($callbackFunction)) {
+ // Log missing function
+ logDebugMessage(__FUNCTION__, __LINE__, 'Call-back function ' . $callbackFunction . ' does not exist.');
+ } else {
+ // Do the replacement
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'template='.$GLOBALS['current_template']);
+ $replacer = '{DQUOTE} . ' . $callbackFunction . '(' . chr(39) . $GLOBALS['current_template'] . chr(39) . ', true';
+
+ // Is 'value' set?
+ if (!empty($data['value'])) {
+ // Then include it as well
+ $replacer .= ', ' . chr(39) . $data['value'] . chr(39);
+ } // END - if
+
+ // Replacer is ready
+ $replacer .= ') . {DQUOTE}';
+ }
// Replace the code
$code = replaceExpressionCode($data, $replacer);
@@ -304,7 +330,7 @@ function doExpressionMath ($data) {
// 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);
@@ -316,7 +342,45 @@ function doExpressionGet ($data) {
// 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);
+
+ // Return the (maybe) replaced code
+ return $code;
+}
+
+// Expression call-back for session data
+function doExpressionSession ($data) {
+ // Construct the replacer
+ $replacer = '{%pipe,getSession=' . $data['value'] . '%}';
+
+ // Debug message
+ //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value=' . $data['value'] . ',replacer=' . $replacer);
+
+ // Replace the code
+ $code = replaceExpressionCode($data, $replacer);
+
+ // Return the (maybe) replaced code
+ return $code;
+}
+
+/**
+ * Expression call-back for session piplining, this means:
+ *
+ * 1) Read session data
+ * 2) Wrap the raw data into {%pipe,fooFunction=$rawValue%}
+ */
+function doExpressionSessionPipe ($data) {
+ // Get the session data
+ $rawValue = getSession($data['value']);
+
+ // Construct the replacer
+ $replacer = '{%pipe,' . $data['callback'] . '=' . $rawValue . '%}';
+
+ // Debug message
+ //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value=' . $data['value'] . ',rawValue=' . $rawValue . ',replacer=' . $replacer);
// Replace the code
$code = replaceExpressionCode($data, $replacer);