X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ftemplate-functions.php;h=474a86baf0885cbcfce5f6bad0c3de1e2a7d2dda;hb=6ab597cf6eeb82241f57ca7d13871338dbb9bcaa;hp=c05eb5d06247b10892638aacacc58c9e17e1904a;hpb=839c74c5882de11b95046f6bca0ea0e02ea139c8;p=mailer.git

diff --git a/inc/template-functions.php b/inc/template-functions.php
index c05eb5d062..474a86baf0 100644
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -180,6 +180,15 @@ function outputHtml ($htmlCode = NULL, $newLine = TRUE) {
 // Compiles the final output
 function compileFinalOutput () {
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '__output(length)=' . strlen($GLOBALS['__output']) . ',getScriptOutputMode()=' . getScriptOutputMode() . ' - ENTERED!');
+	// Is this function called?
+	if (isset($GLOBALS[__FUNCTION__])) {
+		// Abort here
+		reportBug(__FUNCTION__, __LINE__, 'Double call of ' . __FUNCTION__ . ' causes problems with sent headers.');
+	} // END - if
+
+	// Mark this function as called
+	$GLOBALS[__FUNCTION__] = TRUE;
+
 	// Add page header and footer
 	addPageHeaderFooter();
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '__output(length)=' . strlen($GLOBALS['__output']) . ' - After addPageHeaderFooter() call.');
@@ -262,8 +271,9 @@ function doFinalCompilation ($code, $insertComments = TRUE, $enableCodes = TRUE)
 	} // END - while
 
 	// Add debugging data in HTML code, if mode is enabled
-	if ((isDebugModeEnabled()) && ($insertComments === TRUE) && ((isHtmlOutputMode()) || (isCssOutputMode()))) {
+	if ((isDebugModeEnabled()) && ($insertComments === TRUE) && (isHtmlOutputMode())) {
 		// Add loop count
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isDebugModeEnabled()=' . intval(isDebugModeEnabled()) . ',insertComments=' . intval($insertComments) . ',isHtmlOutputMode()=' . intval(isHtmlOutputMode()));
 		$code .= '<!-- Total compilation loop=' . $count . ' //-->';
 	} // END - if
 
@@ -606,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
@@ -754,39 +764,23 @@ function compileRawCode ($code, $full = TRUE, $compileCode = TRUE) {
 }
 
 //
-function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'form_select') {
+function addSelectionBox ($type, $default, $prefix = '', $id = NULL, $class = 'form_select') {
 	$OUT = '';
 
 	if ($type == 'yn') {
 		// This is a yes/no selection only!
-		if ($id > 0) $prefix .= '[' . $id . ']';
+		if (isValidId($id)) $prefix .= '[' . $id . ']';
 		$OUT .= '<select name="' . $prefix . '" class="' . $class . '" size="1">';
 	} else {
 		// Begin with regular selection box here
 		if (!empty($prefix)) $prefix .= '_';
 		$type2 = $type;
-		if ($id > 0) $type2 .= '[' . $id . ']';
+		if (isValidId($id)) $type2 .= '[' . $id . ']';
 		$OUT .= '<select name="' . strtolower($prefix . $type2) . '" class="' . $class . '" size="1">';
 	}
 
 	switch ($type) {
-		case 'day': // Day
-			for ($idx = 1; $idx < 32; $idx++) {
-				$OUT .= '<option value="' . $idx . '"';
-				if ($default == $idx) $OUT .= ' selected="selected"';
-				$OUT .= '>' . $idx . '</option>';
-			} // END - for
-			break;
-
-		case 'month': // Month
-			foreach ($GLOBALS['month_descr'] as $idx => $descr) {
-				$OUT .= '<option value="' . $idx . '"';
-				if ($default == $idx) $OUT .= ' selected="selected"';
-				$OUT .= '>' . $descr . '</option>';
-			} // END - for
-			break;
-
-		case 'year': // Year
+		case 'ye': // Years
 			// Get current year
 			$year = getYear();
 
@@ -817,17 +811,9 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'fo
 			} else {
 				// Get current year and subtract the configured minimum age
 				$OUT .= '<option value="' . ($minYear - 1) . '">&lt;' . $minYear . '</option>';
-				// Calculate earliest year depending on extension version
-				if (isExtensionInstalledAndNewer('other', '0.2.1')) {
-					// Use configured minimum age
-					$year = getYear() - getConfig('min_age');
-				} else {
-					// Use fixed 16 years age
-					$year = getYear() - 16;
-				}
 
 				// Construct year selection list
-				for ($idx = $minYear; $idx <= $year; $idx++) {
+				for ($idx = $minYear; $idx <= $startYear; $idx++) {
 					$OUT .= '<option value="' . $idx . '"';
 					if ($default == $idx) $OUT .= ' selected="selected"';
 					$OUT .= '>' . $idx . '</option>';
@@ -835,9 +821,40 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'fo
 			}
 			break;
 
-		case 'sec':
-		case 'min':
-			for ($idx = 0; $idx < 60; $idx+=5) {
+		case 'mo': // Months
+			foreach ($GLOBALS['month_descr'] as $idx => $descr) {
+				$OUT .= '<option value="' . $idx . '"';
+				if ($default == $idx) $OUT .= ' selected="selected"';
+				$OUT .= '>' . $descr . '</option>';
+			} // END - for
+			break;
+
+		case 'mn': // Months, numeric
+			for ($idx = 0; $idx <= 12; $idx++) {
+				$OUT .= '<option value="' . $idx . '"';
+				if ($default == $idx) $OUT .= ' selected="selected"';
+				$OUT .= '>{%pipe,padLeftZero=' . $idx . '%}</option>';
+			} // END - for
+			break;
+
+		case 'we': // Weeks
+			for ($idx = 0; $idx <= 4; $idx++) {
+				$OUT .= '  <option value="' . $idx . '"';
+				if ($default == $idx) $OUT .= ' selected="selected"';
+				$OUT .= '>' . $idx . '</option>';
+			} // END - for
+			break;
+
+		case 'da': // Days
+			for ($idx = 0; $idx <= 31; $idx++) {
+				$OUT .= '<option value="' . $idx . '"';
+				if ($default == $idx) $OUT .= ' selected="selected"';
+				$OUT .= '>{%pipe,padLeftZero=' . $idx . '%}</option>';
+			} // END - for
+			break;
+
+		case 'ho': // Hours
+			for ($idx = 0; $idx <= 23; $idx++) {
 				if (strlen($idx) == 1) $idx = 0 . $idx;
 				$OUT .= '<option value="' . $idx . '"';
 				if ($default == $idx) $OUT .= ' selected="selected"';
@@ -845,8 +862,9 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'fo
 			} // END - for
 			break;
 
-		case 'hour':
-			for ($idx = 0; $idx < 24; $idx++) {
+		case 'mi': // Minutes
+		case 'se': // Seconds
+			for ($idx = 0; $idx <= 59; $idx+=5) {
 				if (strlen($idx) == 1) $idx = 0 . $idx;
 				$OUT .= '<option value="' . $idx . '"';
 				if ($default == $idx) $OUT .= ' selected="selected"';
@@ -854,13 +872,17 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'fo
 			} // END - for
 			break;
 
-		case 'yn':
+		case 'yn': // Yes/No
 			$OUT .= '<option value="Y"';
 			if ($default == 'Y') $OUT .= ' selected="selected"';
 			$OUT .= '>{--YES--}</option><option value="N"';
 			if ($default != 'Y') $OUT .= ' selected="selected"';
 			$OUT .= '>{--NO--}</option>';
 			break;
+
+		default: // Not detected
+			reportBug(__FUNCTION__, __LINE__, 'type=' . $type . ',default=' . $default . ',prefix=' .  $prefix . ',id[' . gettype($id) . ']=' . $id . ',class=' . $class . ' - is not supported.');
+			break;
 	}
 	$OUT .= '</select>';
 	return $OUT;
@@ -945,180 +967,113 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 	} // END - switch
 
 	// First of all years...
-	$Y = abs(floor($timestamp / (31536000 + $SWITCH)));
-	//* DEBUG: */ debugOutput('Y=' . $Y);
+	$year = abs(floor($timestamp / (31536000 + $SWITCH)));
+	//* DEBUG: */ debugOutput('year=' . $year);
 	// Next months...
-	$M = abs(floor($timestamp / 2628000 - $Y * 12));
-	//* DEBUG: */ debugOutput('M=' . $M);
+	$month = abs(floor($timestamp / 2628000 - $year * 12));
+	//* DEBUG: */ debugOutput('month=' . $month);
 	// Next weeks
-	$W = abs(floor($timestamp / 604800 - $Y * ((365 + $SWITCH / getOneDay()) / 7) - ($M / 12 * (365 + $SWITCH / getOneDay()) / 7)));
-	//* DEBUG: */ debugOutput('W=' . $W);
+	$week = abs(floor($timestamp / 604800 - $year * ((365 + $SWITCH / getOneDay()) / 7) - ($month / 12 * (365 + $SWITCH / getOneDay()) / 7)));
+	//* DEBUG: */ debugOutput('week=' . $week);
 	// Next days...
-	$D = abs(floor($timestamp / 86400 - $Y * (365 + $SWITCH / getOneDay()) - ($M / 12 * (365 + $SWITCH / getOneDay())) - $W * 7));
-	//* DEBUG: */ debugOutput('D=' . $D);
+	$day = abs(floor($timestamp / 86400 - $year * (365 + $SWITCH / getOneDay()) - ($month / 12 * (365 + $SWITCH / getOneDay())) - $week * 7));
+	//* DEBUG: */ debugOutput('day=' . $day);
 	// Next hours...
-	$h = abs(floor($timestamp / 3600 - $Y * (365 + $SWITCH / getOneDay()) * 24 - ($M / 12 * (365 + $SWITCH / getOneDay()) * 24) - $W * 7 * 24 - $D * 24));
-	//* DEBUG: */ debugOutput('h=' . $h);
+	$hour = abs(floor($timestamp / 3600 - $year * (365 + $SWITCH / getOneDay()) * 24 - ($month / 12 * (365 + $SWITCH / getOneDay()) * 24) - $week * 7 * 24 - $day * 24));
+	//* DEBUG: */ debugOutput('hour=' . $hour);
 	// Next minutes..
-	$m = abs(floor($timestamp / 60 - $Y * (365 + $SWITCH / getOneDay()) * 24 * 60 - ($M / 12 * (365 + $SWITCH / getOneDay()) * 24 * 60) - $W * 7 * 24 * 60 - $D * 24 * 60 - $h * 60));
-	//* DEBUG: */ debugOutput('m=' . $m);
+	$minute = abs(floor($timestamp / 60 - $year * (365 + $SWITCH / getOneDay()) * 24 * 60 - ($month / 12 * (365 + $SWITCH / getOneDay()) * 24 * 60) - $week * 7 * 24 * 60 - $day * 24 * 60 - $hour * 60));
+	//* DEBUG: */ debugOutput('minute=' . $minute);
 	// And at last seconds...
-	$s = abs(floor($timestamp - $Y * (365 + $SWITCH / getOneDay()) * 24 * 3600 - ($M / 12 * (365 + $SWITCH / getOneDay()) * 24 * 3600) - $W * 7 * 24 * 3600 - $D * 24 * 3600 - $h * 3600 - $m * 60));
-	//* DEBUG: */ debugOutput('s=' . $s);
+	$second = abs(floor($timestamp - $year * (365 + $SWITCH / getOneDay()) * 24 * 3600 - ($month / 12 * (365 + $SWITCH / getOneDay()) * 24 * 3600) - $week * 7 * 24 * 3600 - $day * 24 * 3600 - $hour * 3600 - $minute * 60));
+	//* DEBUG: */ debugOutput('second=' . $second);
 
 	// Is seconds zero and time is < 60 seconds?
-	if (($s == '0') && ($timestamp < 60)) {
+	if (($second < 1) && ($timestamp < 60)) {
 		// Fix seconds
-		$s = round($timestamp);
+		$second = round($timestamp);
 	} // END - if
 
+	// Put all calculated values in array
+	$data = array(
+		'Y' => $year,
+		'M' => $month,
+		'W' => $week,
+		'D' => $day,
+		'h' => $hour,
+		'm' => $minute,
+		's' => $second
+	);
+
 	//
 	// Now we convert them in seconds...
 	//
 	if ($asArray === TRUE) {
-		// Just put all data in an array for later use
-		$OUT = array(
-			'Y' => $Y,
-			'M' => $M,
-			'W' => $W,
-			'D' => $D,
-			'h' => $h,
-			'm' => $m,
-			's' => $s
-		);
+		// Just put data array out
+		$OUT = $data;
 	} else {
+		// Init array
+		$units = array(
+			// Time unit -> field name
+			'unit_field' => array(
+				'Y' => 'ye',
+				'M' => 'mn',
+				'W' => 'we',
+				'D' => 'da',
+				'h' => 'ho',
+				'm' => 'mi',
+				's' => 'se'
+			),
+			// Time unit -> label
+			'unit_label' => array(
+				'Y' => 'YEAR',
+				'M' => 'MONTH',
+				'W' => 'WEEK',
+				'D' => 'DAY',
+				'h' => 'HOUR',
+				'm' => 'MINUTE',
+				's' => 'SECOND'
+			)
+		);
+
 		// Generate table
 		$OUT  = '<div align="' . $align . '">';
 		$OUT .= '<table border="0" cellspacing="0" cellpadding="0" class="timebox_table dashed">';
 		$OUT .= '<tr>';
 
-		if (isInString('Y', $display) || (empty($display))) {
-			$OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--TIME_UNIT_YEAR--}</strong></td>';
-		} // END - if
-
-		if (isInString('M', $display) || (empty($display))) {
-			$OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--TIME_UNIT_MONTH--}</strong></td>';
-		} // END - if
-
-		if (isInString('W', $display) || (empty($display))) {
-			$OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--TIME_UNIT_WEEK--}</strong></td>';
-		} // END - if
-
-		if (isInString('D', $display) || (empty($display))) {
-			$OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--TIME_UNIT_DAY--}</strong></td>';
-		} // END - if
-
-		if (isInString('h', $display) || (empty($display))) {
-			$OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--TIME_UNIT_HOUR--}</strong></td>';
-		} // END - if
-
-		if (isInString('m', $display) || (empty($display))) {
-			$OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--TIME_UNIT_MINUTE--}</strong></td>';
-		} // END - if
-
-		if (isInString('s', $display) || (empty($display))) {
-			$OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--TIME_UNIT_SECOND--}</strong></td>';
-		} // END - if
+		// "Walk" through all units
+		foreach ($units['unit_field'] as $unit => $field) {
+			// Is this displayed or zero?
+			if (isInString($unit, $display) || (empty($display))) {
+				// @TODO <label for="' . $prefix . '_' . $field . '"></<label> not working here
+				$OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--TIME_UNIT_' . $units['unit_label'][$unit] . '--}</div></td>';
+			} // END - if
+		} // END - foreach
 
+		// Close table row and open new one
 		$OUT .= '</tr>';
 		$OUT .= '<tr>';
 
-		if (isInString('Y', $display) || (empty($display))) {
-			// Generate year selection
-			$OUT .= '<td align="center"><select class="mini_select" name="' . $prefix . '_ye" size="1">';
-			for ($idx = 0; $idx <= 10; $idx++) {
-				$OUT .= '<option class="mini_select" value="' . $idx . '"';
-				if ($idx == $Y) $OUT .= ' selected="selected"';
-				$OUT .= '>' . $idx . '</option>';
-			} // END - for
-			$OUT .= '</select></td>';
-		} else {
-			$OUT .= '<input type="hidden" name="' . $prefix . '_ye" value="0" />';
-		}
-
-		if (isInString('M', $display) || (empty($display))) {
-			// Generate month selection
-			$OUT .= '<td align="center"><select class="mini_select" name="' . $prefix . '_mo" size="1">';
-			for ($idx = 0; $idx <= 11; $idx++) {
-				$OUT .= '  <option class="mini_select" value="' . $idx . '"';
-				if ($idx == $M) $OUT .= ' selected="selected"';
-				$OUT .= '>' . $idx . '</option>';
-			} // END - for
-			$OUT .= '</select></td>';
-		} else {
-			$OUT .= '<input type="hidden" name="' . $prefix . '_mo" value="0" />';
-		}
-
-		if (isInString('W', $display) || (empty($display))) {
-			// Generate week selection
-			$OUT .= '<td align="center"><select class="mini_select" name="' . $prefix . '_we" size="1">';
-			for ($idx = 0; $idx <= 4; $idx++) {
-				$OUT .= '  <option class="mini_select" value="' . $idx . '"';
-				if ($idx == $W) $OUT .= ' selected="selected"';
-				$OUT .= '>' . $idx . '</option>';
-			} // END - for
-			$OUT .= '</select></td>';
-		} else {
-			$OUT .= '<input type="hidden" name="' . $prefix . '_we" value="0" />';
-		}
-
-		if (isInString('D', $display) || (empty($display))) {
-			// Generate day selection
-			$OUT .= '<td align="center"><select class="mini_select" name="' . $prefix . '_da" size="1">';
-			for ($idx = 0; $idx <= 31; $idx++) {
-				$OUT .= '  <option class="mini_select" value="' . $idx . '"';
-				if ($idx == $D) $OUT .= ' selected="selected"';
-				$OUT .= '>' . $idx . '</option>';
-			} // END - for
-			$OUT .= '</select></td>';
-		} else {
-			$OUT .= '<input type="hidden" name="' . $prefix . '_da" value="0" />';
-		}
-
-		if (isInString('h', $display) || (empty($display))) {
-			// Generate hour selection
-			$OUT .= '<td align="center"><select class="mini_select" name="' . $prefix . '_ho" size="1">';
-			for ($idx = 0; $idx <= 23; $idx++) {
-				$OUT .= '  <option class="mini_select" value="' . $idx . '"';
-				if ($idx == $h) $OUT .= ' selected="selected"';
-				$OUT .= '>' . $idx . '</option>';
-			} // END - for
-			$OUT .= '</select></td>';
-		} else {
-			$OUT .= '<input type="hidden" name="' . $prefix . '_ho" value="0" />';
-		}
-
-		if (isInString('m', $display) || (empty($display))) {
-			// Generate minute selection
-			$OUT .= '<td align="center"><select class="mini_select" name="' . $prefix . '_mi" size="1">';
-			for ($idx = 0; $idx <= 59; $idx++) {
-				$OUT .= '  <option class="mini_select" value="' . $idx . '"';
-				if ($idx == $m) $OUT .= ' selected="selected"';
-				$OUT .= '>' . $idx . '</option>';
-			} // END - for
-			$OUT .= '</select></td>';
-		} else {
-			$OUT .= '<input type="hidden" name="' . $prefix . '_mi" value="0" />';
-		}
+		// "Walk" through all units again
+		foreach ($units['unit_field'] as $unit => $field) {
+			// Is this used?
+			if (isInString($unit, $display) || (empty($display))) {
+				// Generate year selection
+				$OUT .= '<td align="center">';
+				$OUT .= addSelectionBox($field, $data[$unit], $prefix, NULL, 'mini_select');
+				$OUT .= '</td>';
+			} else {
+				$OUT .= '<input type="hidden" name="' . $prefix . '_' . $field . '" value="0" />';
+			}
+		} // END - foreach
 
-		if (isInString('s', $display) || (empty($display))) {
-			// Generate second selection
-			$OUT .= '<td align="center"><select class="mini_select" name="' . $prefix . '_se" size="1">';
-			for ($idx = 0; $idx <= 59; $idx++) {
-				$OUT .= '  <option class="mini_select" value="' . $idx . '"';
-				if ($idx == $s) $OUT .= ' selected="selected"';
-				$OUT .= '>' . $idx . '</option>';
-			} // END - for
-			$OUT .= '</select></td>';
-		} else {
-			$OUT .= '<input type="hidden" name="' . $prefix . '_se" value="0" />';
-		}
+		// Close all tags
 		$OUT .= '</tr>';
 		$OUT .= '</table>';
 		$OUT .= '</div>';
 	}
 
-	// Return generated HTML code
+	// Return generated HTML code or data array
 	return $OUT;
 }
 
@@ -1351,7 +1306,7 @@ function reportBug ($F, $L, $message = '', $sendEmail = TRUE) {
 	} // END - if
 
 	// Is there HTML/CSS/AJAX mode?
-	if ((isHtmlOutputMode()) || (isCssOutputMode()) || (isAjaxOutputMode())) {
+	if (((isHtmlOutputMode()) || (isCssOutputMode()) || (isAjaxOutputMode())) && (isDebugModeEnabled())) {
 		// And abort here
 		app_exit($F, $L, $debug);
 	} else {
@@ -2001,6 +1956,12 @@ function displayMessage ($message, $return = FALSE) {
 	return loadTemplate('admin_settings_saved', $return, $message);
 }
 
+// Displays given error message in admin_settings_saved template
+function displayErrorMessage ($message, $return = FALSE) {
+	// Load the template
+	return loadTemplate('admin_settings_unsaved', $return, $message);
+}
+
 // Generates a selection box for (maybe) given gender
 function generateGenderSelectionBox ($selectedGender = '', $fieldName = 'gender') {
 	// Start the HTML code
@@ -2128,13 +2089,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
@@ -2305,6 +2266,12 @@ function doTemplateDereferrerUrl ($templateName, $clear = FALSE, $url = NULL) {
 	return fixEmptyContentToDashes($url);
 }
 
+// Load another template and return its content
+function doTemplateLoadTemplate ($templateName, $clear = FALSE, $theTemplate, $content = array()) {
+	// Load "the" template
+	return loadTemplate($theTemplate, TRUE, $content);
+}
+
 // Tries to anonymize some sensitive data (e.g. IP address, user agent, referrer, etc.)
 function anonymizeSensitiveData ($data) {
 	// Trim it
@@ -2319,7 +2286,7 @@ function anonymizeSensitiveData ($data) {
 		if (isAdmin()) {
 			// Is admin, has always priority
 			$data = '[<a href="{%pipe,generateFrametesterUrl=' . $data . '%}" target="_blank">{--ADMIN_TEST_URL--}</a>]';
-		} elseif (isUrlBlacklisted($data)) {
+		} elseif ((isExtensionActive('blacklist')) && (isUrlBlacklisted($data))) {
 			// Yes, so replace it with text
 			$data = '<em>{--URL_IS_BLACKLISTED--}</em>';
 		} else {
@@ -2342,7 +2309,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
@@ -2351,6 +2318,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);
 
@@ -2363,9 +2333,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;
 }