* $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 *
// Add non-empty parts
if (!empty($piece)) {
// Add it
- $functionName .= ucfirst(strtolower($piece));
+ $functionName .= capitalizeUnderscoreString($piece);
} // END - if
} // END - foreach
return $code;
}
-// Expression call-back function for fetching user data
-function doExpressionUser ($data) {
- // Use current userid by default
- $functionName = 'getMemberId()';
-
- // User-related data, so is there a userid?
- if (!empty($data['matches'][4][$data['key']])) {
- // Do we have a userid or $userid?
- if ($data['matches'][4][$data['key']] == '$userid') {
- // Use dynamic call
- $functionName = "getFetchedUserData('userid', \$userid, '" . $data['callback'] . "')";
- } elseif (!empty($data['matches'][4][$data['key']])) {
- // User data found
- $functionName = "getFetchedUserData('userid', " . $data['matches'][4][$data['key']] . ", '" . $data['callback'] . "')";
- }
- } elseif ((!empty($data['callback'])) && (isUserDataValid())) {
- // "Call-back" alias column for current logged in user's data
- $functionName = "getUserData('" . $data['callback'] . "')";
- }
-
- // Do we have another function to run (e.g. translations)
- if (!empty($data['extra_func'])) {
- // Surround the original function call with it
- $functionName = $data['extra_func'] . '(' . $functionName . ')';
- } // END - if
-
- // Generate replacer
- $replacer = '{DQUOTE} . ' . $functionName . ' . {DQUOTE}';
-
- // Now replace the code
- $code = replaceExpressionCode($data, $replacer);
-
- // Return replaced code
- return $code;
-}
-
// Expression call-back function for getting extension data
function doExpressionExt ($data) {
// Not installed is default
// Is the extension installed?
if (isExtensionInstalled($data['matches'][4][$data['key']])) {
// Construct call-back function name
- $functionName = 'getExtension' . ucfirst(strtolower($data['callback']));
+ $functionName = 'getExtension' . capitalizeUnderscoreString($data['callback']);
// Construct call of the function
$replacer = "{DQUOTE} . call_user_func_array('" . $functionName . "', array('" . $data['matches'][4][$data['key']] . "', true)) . {DQUOTE}";
} // 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);
// Do we have a special expression function for it?
if (isExpressionFunctionAvaiable($data)) {
// Then use it
- $replacer = '{DQUOTE} . ' . $data['callback'] . '('.getExpressionFunction($data).'(' . "'" . $data['matches'][4][$data['key']] . "'" . ')) . {DQUOTE}';
+ $replacer = '{DQUOTE} . ' . $data['callback'] . '(' . getExpressionFunction($data) . '()) . {DQUOTE}';
} else {
// Default replacer is the config value itself
$replacer = '{DQUOTE} . ' . $data['callback'] . '(getConfig(' . "'" . $data['matches'][4][$data['key']] . "'" . ')) . {DQUOTE}';
function doExpressionTemplate ($data) {
// Do the replacement
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'template='.$GLOBALS['current_template']);
- $replacer = '{DQUOTE} . doTemplate' . $data['callback'] . "('" . $GLOBALS['current_template'] . "', true) . {DQUOTE}";
+ $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}';
+
+ // Replace the code
+ $code = replaceExpressionCode($data, $replacer);
+
+ // Return the (maybe) replaced code
+ return $code;
+}
+
+// Expression call-back for math functions
+function doExpressionMath ($data) {
+ // Do the replacement
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'template='.$GLOBALS['current_template']);
+ $replacer = '{DQUOTE} . doCalculate' . $data['callback'] . '(' . $data['value'] . ') . {DQUOTE}';
+
+ // Replace the code
+ $code = replaceExpressionCode($data, $replacer);
+
+ // Load include once
+ loadIncludeOnce('inc/math-functions.php');
+
+ // Return the (maybe) replaced code
+ return $code;
+}
+
+// Expression call-back for GET request
+function doExpressionGet ($data) {
+ // Construct the replacer
+ $replacer = '{%pipe,getRequestParameter=' . $data['value'] . '%}';
+
+ // Replace the code
+ $code = replaceExpressionCode($data, $replacer);
+
+ // Return the (maybe) replaced code
+ return $code;
+}
+
+// Expression call-back for POST request
+function doExpressionPost ($data) {
+ // Construct the replacer
+ $replacer = '{%pipe,postRequestParameter=' . $data['value'] . '%}';
// Replace the code
$code = replaceExpressionCode($data, $replacer);