X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ftemplate-functions.php;h=668f63f767e5479fbcb822df9fff71d74c03a7a7;hb=513fdc80ff9a624aafc31dcc52a0ee740a6c1448;hp=a9de28da56482b5a006b42690b6be9a031b1436c;hpb=94eb7e461c29c7050a41aa6d5edcd3a1707bf904;p=mailer.git

diff --git a/inc/template-functions.php b/inc/template-functions.php
index a9de28da56..668f63f767 100644
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -616,7 +616,7 @@ function getMenuCssClasses ($data) {
 
 // Generate XHTML code for the CAPTCHA
 function generateCaptchaCode ($code, $type, $urlId, $userid) {
-	return '<img border="0" alt="Code ' . $code . '" src="{%url=mailid_top.php?userid=' . $userid . '&amp;' . $type . '=' . $urlId . '&amp;do=img&amp;code=' . $code . '%}" />';
+	return '<img border="0" alt="Code ' . $code . '" src="{%url=mailid.php?userid=' . $userid . '&amp;' . $type . '=' . $urlId . '&amp;do=img&amp;code=' . $code . '%}" />';
 }
 
 // Compiles the given HTML/mail code
@@ -2075,13 +2075,13 @@ function doTemplateExtensionRegistrationLink ($templateName, $clear, $ext_name)
 // Helper function to create bonus mail admin links
 function doTemplateAdminBonusMailLinks ($templateName, $clear, $bonusId) {
 	// Call the inner function
-	return generateAdminMailLinks('bid', $bonusId);
+	return generateAdminMailLinks('bonus', $bonusId);
 }
 
 // Helper function to create member mail admin links
 function doTemplateAdminMemberMailLinks ($templateName, $clear, $mailId) {
 	// Call the inner function
-	return generateAdminMailLinks('mid', $mailId);
+	return generateAdminMailLinks('normal', $mailId);
 }
 
 // Helper function to create a selection box for YES/NO configuration entries
@@ -2295,7 +2295,7 @@ function anonymizeSensitiveData ($data) {
 }
 
 /**
- * Removes all commentd, tabs and new-line characters to compact the content
+ * Removes all comments, tabs and new-line characters to compact the content
  *
  * @param	$uncompactedContent		The uncompacted content
  * @return	$compactedContent		The compacted content
@@ -2304,6 +2304,9 @@ function compactContent ($uncompactedContent) {
 	// First, remove all tab/new-line/revert characters
 	$compactedContent = str_replace(chr(9), '', str_replace(PHP_EOL, '', str_replace(chr(13), '', $uncompactedContent)));
 
+	// Make a space after >
+	$compactedContent = str_replace(array('>', '  '), array('> ', ' '), $compactedContent);
+
 	// Then regex all comments like <!-- //--> away
 	preg_match_all('/<!--[\w\W]*?(\/\/){0,1}-->/', $compactedContent, $matches);
 
@@ -2316,9 +2319,6 @@ function compactContent ($uncompactedContent) {
 		} // END - foreach
 	} // END - if
 
-	// Set the content again
-	// @TODO Is this needed for e.g. $GLOBALS['template_content'] ? $this->setRawTemplateData($compactedContent);
-
 	// Return compacted content
 	return $compactedContent;
 }