X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fexpression-functions.php;h=de71466a0277cb8215a2515207ec1c9af63d1c3f;hb=382df1e8685f2307b00724668e8cb66cb72500d8;hp=e70d284bd82fe6f1fdf3fb8c622822378d24bde1;hpb=acea81e3c47cceb7287758af74ebc5d95b04227b;p=mailer.git

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index e70d284bd8..de71466a02 100644
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Private function to replace the code
 function replaceExpressionCode ($data, $replacer) {
 	// Replace the code
-	// @TODO is escapeQuotes() enougth for strings with single/double quotes?
+	// @TODO is escapeQuotes() enough for strings with single/double quotes?
 	return str_replace($data['matches'][0][$data['key']], $replacer, escapeQuotes($data['code']));
 }
 
@@ -79,8 +79,8 @@ function isExpressionFunctionAvaiable ($data) {
 			// And cache it
 			$GLOBALS['expression_function_available'][$entry] = FALSE;
 		}
-	} elseif ($GLOBALS['expression_function_available'][$entry] == FALSE) {
-		// Debug message
+	} elseif (($GLOBALS['expression_function_available'][$entry] == FALSE) && (isDebugModeEnabled())) {
+		// Debug message in debug mode
 		logDebugMessage(__FUNCTION__, __LINE__, 'Expression function for entry ' . $entry . ' requested but does not exist.');
 	}
 
@@ -91,7 +91,7 @@ function isExpressionFunctionAvaiable ($data) {
 // Getter for above expression function
 function getExpressionFunction ($data) {
 	// Get the enty we need
-	$entry = $data['matches'][4][$data['key']];
+	$entry = trim($data['matches'][4][$data['key']]);
 
 	// Return it
 	return $GLOBALS['expression_function_name'][$entry];
@@ -281,7 +281,7 @@ function doExpressionMessage ($data) {
 // Expression call-back for template functions
 function doExpressionTemplate ($data) {
 	// Construct call-back function name
-	$callbackFunction = 'doTemplate' . $data['callback'];
+	$callbackFunction = 'doTemplate' . ucfirst($data['callback']);
 
 	// Init replacer
 	$replacer = '<!-- [' . __FUNCTION__ . ':' . __LINE__.'] Call-back function ' . $callbackFunction  . ' does not exist. //-->';
@@ -444,7 +444,7 @@ function doExpressionForm ($data) {
 		if ($value == 'formmethodpost') {
 			// Use it
 			$data['__form_method'] = 'post';
-		} elseif (($value == 'formmethodget') && (!isSpider()) && (!isSessionValid())) {
+		} elseif (($value == 'formmethodpost') && (!isSpider()) && (!isValidSession())) {
 			// Then expand 'value' with session id
 			if (strpos($data['value'], '?') !== FALSE) {
 				// '?' is set
@@ -467,7 +467,7 @@ function doExpressionForm ($data) {
 			$data['__form_id'] = substr($value, 6);
 		} elseif (substr($value, 0, 6) == 'server') {
 			// {%server,foo%} found
-			$data['__server'] = '{%server=' . substr($value, 6) . '%}';
+			$data['__server'] = '{%server,' . substr($value, 6) . '%}';
 		}
 	} // END - foreach
 
@@ -524,19 +524,32 @@ function doExpressionFormClose ($data) {
 // Expression call-back to handle jquery inclusion
 function doExpressionJquery ($data) {
 	// Default is compressed
-	$jquery = 'jquery.js';
+	$jquery = 'jquery';
+	$data['output_mode'] = '';
+
+	// Is there JS-mode?
+	if ($data['callback'] == 'js') {
+		// Switch to it
+		$data['output_mode'] = ',js';
+	} // END - if
+
+	// Is there a value?
+	if ($data['callback'] == 'js') {
+		// Then load special library
+		$jquery .= '-' . $data['value'];
+	} // END - if
 
 	// Is debug mode enabled?
 	if ((isGetRequestElementSet('jquery')) || (isSessionVariableSet('jquery'))) {
 		// Then use uncompressed
-		$jquery = 'jquery-uncompressed.js';
+		$jquery .= '.uncompressed';
 
 		// Remember it in session
 		setSession('jquery', '1');
 	} // END - if
 
 	// Add {%url%} around it
-	$replacer = '{%url=js/' . $jquery . '?dummy=1%}';
+	$replacer = '{%url' . $data['output_mode'] . '=js/' . $jquery . '.js?dummy=1%}';
 
 	// Replace the code
 	$code = replaceExpressionCode($data, $replacer);