Final fixes for admin logout

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 73928d96981e3554f082e5b24f1428cacbf8afe1..ef7e6388360f6dbb690db2549cdeea547a3b988e 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -169,7 +169,7 @@ function compileFinalOutput () {
                // Was that eval okay?
                if (empty($newContent)) {
                        // Something went wrong!
-                       debug_report_bug('Evaluation error:<pre>' . linenumberCode($eval) . '</pre>');
+                       debug_report_bug('Evaluation error:<pre>' . linenumberCode($eval) . '</pre>', false);
                } // END - if
                $GLOBALS['output'] = $newContent;
 
@@ -587,7 +587,7 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
        eval("\$toEmail = \"".compileRawCode(escapeQuotes($toEmail))."\";");
 
        // Compile "MSG"
-       eval("\$message = \"".compileRawCode(escapeQuotes($message))."\";");
+       eval("\$message = \"".str_replace('$', '&#36;', compileRawCode(escapeQuotes($message)))."\";");
 
        // Fix HTML parameter (default is no!)
        if (empty($isHtml)) $isHtml = 'N';
@@ -2559,7 +2559,7 @@ function debug_get_mailable_backtrace () {
 }
 
 // Output a debug backtrace to the user
-function debug_report_bug ($message = '') {
+function debug_report_bug ($message = '', $sendEmail = true) {
        // Is this already called?
        if (isset($GLOBALS[__FUNCTION__])) {
                // Other backtrace
@@ -2591,15 +2591,18 @@ function debug_report_bug ($message = '') {
        $debug .= "</pre>\nRequest-URI: " . getRequestUri()."<br />\n";
        $debug .= "Thank you for finding bugs.";
 
-       // Prepare content
-       $content = array(
-               'message'     => trim($message),
-               'backtrace'   => trim(debug_get_mailable_backtrace()),
-               'request_uri' => trim(getRequestUri())
-       );
+       // Send an email? (e.g. not wanted for evaluation errors)
+       if ($sendEmail === true) {
+               // Prepare content
+               $content = array(
+                       'message'     => trim($message),
+                       'backtrace'   => trim(debug_get_mailable_backtrace()),
+                       'request_uri' => trim(getRequestUri())
+               );
 
-       // Send email to webmaster
-       sendAdminNotification(getMessage('DEBUG_REPORT_BUG_SUBJECT'), 'admin_report_bug', $content);
+               // Send email to webmaster
+               sendAdminNotification(getMessage('DEBUG_REPORT_BUG_SUBJECT'), 'admin_report_bug', $content);
+       } // END - if
 
        // And abort here
        // @TODO This cannot be rewritten to app_die(), try to find a solution for this.
@@ -3847,7 +3850,9 @@ function encodeUrl ($url, $outputMode = '0') {
                }
 
                // Add it to URL
-               $url .= $seperator . session_name() . '=' . session_id();
+               if (session_id() != '') {
+                       $url .= $seperator . session_name() . '=' . session_id();
+               } // END - if
        } // END - if
 
        // Add {?URL?}