X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=f010daf758244f3a06b1538c472f104d1515ac69;hp=a1577f58a7e5b6caedd1817a0c10ae43e4f6cf49;hb=76fd13e5938a334f08e43893eb9a4ff49f72bf07;hpb=4707e8e1d5511597b3d425bca0fd5addbb6fe2a8

diff --git a/inc/functions.php b/inc/functions.php
index a1577f58a7..f010daf758 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -171,7 +171,7 @@ function compileFinalOutput () {
 
 // Main compilation loop
 function doFinalCompilation ($code, $insertComments = true) {
-	// Insert comments?
+	// Insert comments? (Only valid with HTML templates, of course)
 	enableTemplateHtml($insertComments);
 
 	// Init counter
@@ -186,7 +186,7 @@ function doFinalCompilation ($code, $insertComments = true) {
 		// Compile it
 		//* DEBUG: */ print '<pre>'.htmlentities($code).'</pre>';
 		$eval = '$newContent = "' . str_replace('{DQUOTE}', '"', compileCode(escapeQuotes($code))) . '";';
-		//* DEBUG: */ die('<pre>'.htmlentities($eval).'</pre>');
+		//* DEBUG: */ if ($insertComments) die('<pre>'.linenumberCode($eval).'</pre>');
 		eval($eval);
 		//* DEBUG: */ die('<pre>'.htmlentities($newContent).'</pre>');
 
@@ -987,6 +987,9 @@ function redirectToUrl ($URL, $allowSpider = true) {
 
 	// Simple probe for bots/spiders from search engines
 	if ((isSpider()) && ($allowSpider === true)) {
+		// Set HTTP-Status
+		setHttpStatus('200 OK');
+
 		// Set content-type here to fix a missing array element
 		setContentType('text/html');
 
@@ -2499,7 +2502,7 @@ function generateErrorCodeFromUserStatus ($status='') {
 // Back-ported from the new ship-simu engine. :-)
 function debug_get_printable_backtrace () {
 	// Init variable
-	$backtrace = "<ol>\n";
+	$backtrace = '<ol>';
 
 	// Get and prepare backtrace for output
 	$backtraceArray = debug_backtrace();
@@ -2507,11 +2510,11 @@ function debug_get_printable_backtrace () {
 		if (!isset($trace['file'])) $trace['file'] = __FUNCTION__;
 		if (!isset($trace['line'])) $trace['line'] = __LINE__;
 		if (!isset($trace['args'])) $trace['args'] = array();
-		$backtrace .= "<li class=\"debug_list\"><span class=\"backtrace_file\">".basename($trace['file'])."</span>:" . $trace['line'].", <span class=\"backtrace_function\">" . $trace['function'].'('.count($trace['args']).")</span></li>\n";
+		$backtrace .= '<li class="debug_list"><span class="backtrace_file">' . basename($trace['file']) . '</span>:' . $trace['line'].", <span class=\"backtrace_function\">" . $trace['function'] . '(' . count($trace['args']) . ')</span></li>';
 	} // END - foreach
 
 	// Close it
-	$backtrace .= "</ol>\n";
+	$backtrace .= '</ol>';
 
 	// Return the backtrace
 	return $backtrace;
@@ -2563,17 +2566,17 @@ function debug_report_bug ($F, $L, $message = '', $sendEmail = true) {
 	} // END - if
 
 	// Add output
-	$debug .= "Please report this bug at <a title=\"Direct link to the bug-tracker\" href=\"http://bugs.mxchange.org\" rel=\"external\" target=\"_blank\">http://bugs.mxchange.org</a> and include the logfile from <strong>" . str_replace(getConfig('PATH'), '', getConfig('CACHE_PATH')) . "debug.log</strong> in your report (you can now attach files):<pre>";
+	$debug .= 'Please report this bug at <a title="Direct link to the bug-tracker" href="http://bugs.mxchange.org" rel="external" target="_blank">http://bugs.mxchange.org</a> and include the logfile from <strong>' . str_replace(getConfig('PATH'), '', getConfig('CACHE_PATH')) . 'debug.log</strong> in your report (you can now attach files):<pre>';
 	$debug .= debug_get_printable_backtrace();
-	$debug .= "</pre>\nRequest-URI: " . getRequestUri()."<br />\n";
-	$debug .= "Thank you for finding bugs.";
+	$debug .= '</pre>Request-URI: ' . getRequestUri() . '<br />';
+	$debug .= 'Thank you for finding bugs.';
 
 	// Send an email? (e.g. not wanted for evaluation errors)
 	if (($sendEmail === true) && (!isInstallationPhase())) {
 		// Prepare content
 		$content = array(
-			'message'     => trim($message),
-			'backtrace'   => trim(debug_get_mailable_backtrace())
+			'message'   => trim($message),
+			'backtrace' => trim(debug_get_mailable_backtrace())
 		);
 
 		// Send email to webmaster