Some entities created. I have US layout here, but they will be converted to UTF-8...

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 57e2c1036496f8d6305bdaeabc192e9770edb98b..21938e565e2ac5a512350e0895d0abcc89252f25 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -353,7 +353,7 @@ function loadTemplate ($template, $return=false, $content=array()) {
                        $ret = '';
                        if ((strpos($GLOBALS['tpl_content'], '$') !== false) || (strpos($GLOBALS['tpl_content'], '{--') !== false) || (strpos($GLOBALS['tpl_content'], '{!') !== false) || (strpos($GLOBALS['tpl_content'], '{?') !== false)) {
                                // Normal HTML output?
-                               if ($GLOBALS['output_mode'] == 0) {
+                               if (getOutputMode() == 0) {
                                        // Add surrounding HTML comments to help finding bugs faster
                                        $ret = "<!-- Template " . $template . " - Start -->\n" . $GLOBALS['tpl_content'] . "<!-- Template " . $template . " - End -->\n";
 
@@ -670,6 +670,11 @@ function sendRawEmail ($toEmail, $subject, $message, $from) {
 
                // get new instance
                $mail = new PHPMailer();
+
+               // Set charset to UTF-8
+               $mail->CharSet('UTF-8');
+
+               // Path for PHPMailer
                $mail->PluginDir  = sprintf("%sinc/phpmailer/", getConfig('PATH'));
 
                $mail->IsSMTP();
@@ -2972,7 +2977,7 @@ function logDebugMessage ($funcFile, $line, $message, $force=true) {
 
                // Log this message away, we better don't call app_die() here to prevent an endless loop
                $fp = fopen(getConfig('CACHE_PATH') . 'debug.log', 'a') or die(__FUNCTION__.'['.__LINE__.']: Cannot write logfile debug.log!');
-               fwrite($fp, date('d.m.Y|H:i:s', time()) . '|' . getModule() . '|' . basename($funcFile) . '|' . $line . '|' . $message . "\n");
+               fwrite($fp, date('d.m.Y|H:i:s', time()) . '|' . getModule(false) . '|' . basename($funcFile) . '|' . $line . '|' . $message . "\n");
                fclose($fp);
        } // END - if
 }
@@ -3013,6 +3018,7 @@ function handleExtraValues ($filterFunction, $value, $extraValue) {
 // Converts timestamp selections into a timestamp
 function convertSelectionsToTimestamp (&$postData, &$DATA, &$id, &$skip) {
        // Init test variable
+       $skip  = false;
        $test2 = '';
 
        // Get last three chars
@@ -3025,21 +3031,20 @@ function convertSelectionsToTimestamp (&$postData, &$DATA, &$id, &$skip) {
                if ((isset($postData[$test.'_ye'])) && (isset($postData[$test.'_mo'])) && (isset($postData[$test.'_we'])) && (isset($postData[$test.'_da'])) && (isset($postData[$test.'_ho'])) && (isset($postData[$test.'_mi'])) && (isset($postData[$test.'_se'])) && ($test != $test2)) {
                        // Generate timestamp
                        $postData[$test] = createTimestampFromSelections($test, $postData);
-                       $DATA[] = sprintf("%s='%s'", $test, $postData[$test]);
+                       $DATA[] = sprintf("`%s`='%s'", $test, $postData[$test]);
+                       $GLOBALS['skip_config'][$test] = true;
 
                        // Remove data from array
                        foreach (array('ye', 'mo', 'we', 'da', 'ho', 'mi', 'se') as $rem) {
-                               unset($postData[$test.'_' . $rem]);
+                               unset($postData[$test . '_' . $rem]);
                        } // END - foreach
 
                        // Skip adding
-                       unset($id); $skip = true; $test2 = $test;
+                       unset($id);
+                       $skip = true;
+                       $test2 = $test;
                } // END - if
-       } else {
-               // Process this entry
-               $skip = false;
-               $test2 = '';
-       }
+       } // END - if
 }
 
 // Reverts the german decimal comma into Computer decimal dot