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

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index 743e4a450b..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 *
@@ -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 == 'formmethodpost') && (!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