X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ftemplate-functions.php;h=aff7a024c3568b76ef1b0206dedcd605f1129095;hp=4a3b1cb7b085aced2675e4a9c20d6170157fb2d3;hb=3010e02e68f51325da31625a29fe940646f6ff04;hpb=e4bb9dcc763483e7cc6a11d57cad79cf2425cc6d

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 4a3b1cb7b0..aff7a024c3 100644
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -331,7 +331,7 @@ function loadTemplate ($template, $return = false, $content = array(), $compileC
 	(' . $template . ')
 </div>
 <div class="para">
-	{--TEMPLATE_CONTENT--}
+	{--TEMPLATE_CONTENT--}:
 	<pre>' . print_r($content, true) . '</pre>
 </div>';
 		} else {
@@ -490,9 +490,9 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0', $loadU
 	{--TEMPLATE_404--}: ' . $template . '
 </div>
 <div class="para">
-	{--TEMPLATE_CONTENT--}
+	{--TEMPLATE_CONTENT--}:
 	<pre>' . print_r($content, true) . '</pre>
-	{--TEMPLATE_DATA--}
+	{--TEMPLATE_DATA--}:
 	<pre>' . print_r($DATA, true) . '</pre>
 </div>';
 
@@ -543,8 +543,8 @@ function getMenuCssClasses ($data) {
 }
 
 // Generate XHTML code for the CAPTCHA
-function generateCaptchaCode ($code, $type, $DATA, $userid) {
-	return '<img border="0" alt="Code ' . $code . '" src="{%url=mailid_top.php?userid=' . $userid . '&amp;' . $type . '=' . $DATA . '&amp;mode=img&amp;code=' . $code . '%}" />';
+function generateCaptchaCode ($code, $type, $type, $userid) {
+	return '<img border="0" alt="Code ' . $code . '" src="{%url=mailid_top.php?userid=' . $userid . '&amp;' . $type . '=' . $type . '&amp;mode=img&amp;code=' . $code . '%}" />';
 }
 
 // Compiles the given HTML/mail code
@@ -1588,7 +1588,7 @@ function sendModeMails ($mod, $modes) {
 	}
 
 	// Load template
-	loadTemplate('admin_settings_saved', false, $content['message']);
+	displayMessage($content['message']);
 }
 
 // Generates a 'selection box' from given array
@@ -1705,6 +1705,12 @@ function translatePoolType ($type) {
 	return sprintf("{--POOL_TYPE_%s--}", strtoupper($type));
 }
 
+// Displays given message in admin_settings_saved template
+function displayMessage ($message, $return = false) {
+	// Load the template
+	return loadTemplate('admin_settings_saved', $return, $message);
+}
+
 //-----------------------------------------------------------------------------
 //                      Template helper functions for EL
 //-----------------------------------------------------------------------------