X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=79bb619c29916bc0b9020ec91cb957e9d725d6d4;hb=61f8fd5807163143e88d19c5fc4208ccffb6e774;hp=a81f011107945350090a43acd2a935e0dcf15504;hpb=ffe213c8e3f85119ddd5544214d0de9ecb833d98;p=mailer.git
diff --git a/inc/functions.php b/inc/functions.php
index a81f011107..79bb619c29 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -89,7 +89,7 @@ function addFatalMessage ($F, $L, $message, $extra = '') {
// Getter for total fatal message count
function getTotalFatalErrors () {
- // Init coun
+ // Init count
$count = '0';
// Do we have at least the first entry?
@@ -104,10 +104,7 @@ function getTotalFatalErrors () {
// Send mail out to an email address
function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '') {
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "TO={$toEmail},SUBJECT={$subject}
");
-
- // Compile subject line (for POINTS constant etc.)
- eval('$subject = decodeEntities("' . compileRawCode(escapeQuotes($subject)) . '");');
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'toEmail=' . $toEmail . ',subject=' . $subject . ',isHtml=' . $isHtml);
// Set from header
if ((!isInStringIgnoreCase('@', $toEmail)) && ($toEmail > 0)) {
@@ -151,10 +148,10 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
if (isDebugModeEnabled()) {
// In debug mode we want to display the mail instead of sending it away so we can debug this part
outputHtml('
-Headers : ' . encodeEntities(utf8_decode(trim($mailHeader))) . ' -To : ' . encodeEntities(utf8_decode($toEmail)) . ' -Subject : ' . encodeEntities(utf8_decode($subject)) . ' -Message : ' . encodeEntities(utf8_decode($message)) . ' +Headers : ' . htmlentities(utf8_decode(trim($mailHeader))) . ' +To : ' . htmlentities(utf8_decode($toEmail)) . ' +Subject : ' . htmlentities(utf8_decode($subject)) . ' +Message : ' . htmlentities(utf8_decode($message)) . ''); // This is always fine @@ -182,12 +179,17 @@ function checkPhpMailerUsage() { } // Send out a raw email with PHPMailer class or legacy mail() command -function sendRawEmail ($toEmail, $subject, $message, $from) { - // Just compile all again, to put out all configs, etc. - eval('$toEmail = decodeEntities("' . doFinalCompilation(compileRawCode(escapeQuotes($toEmail)), false) . '");'); - eval('$subject = decodeEntities("' . doFinalCompilation(compileRawCode(escapeQuotes($subject)), false) . '");'); - eval('$message = decodeEntities("' . doFinalCompilation(compileRawCode(escapeQuotes($message)), false) . '");'); - eval('$from = decodeEntities("' . doFinalCompilation(compileRawCode(escapeQuotes($from)) , false) . '");'); +function sendRawEmail ($toEmail, $subject, $message, $headers) { + // Just compile all to put out all configs, etc. + $eval = '$toEmail = decodeEntities("' . escapeQuotes(doFinalCompilation(compileRawCode($toEmail), false)) . '"); '; + $eval .= '$subject = decodeEntities("' . escapeQuotes(doFinalCompilation(compileRawCode($subject), false)) . '"); '; + $eval .= '$headers = decodeEntities("' . escapeQuotes(doFinalCompilation(compileRawCode($headers), false)) . '"); '; + + // Do not decode entities in the message because we also send HTML mails through this function + $eval .= '$message = "' . escapeQuotes(doFinalCompilation(compileRawCode($message), false)) . '";'; + + // Run the final eval() command + eval($eval); // Shall we use PHPMailer class or legacy mode? if (checkPhpMailerUsage()) { @@ -210,10 +212,10 @@ function sendRawEmail ($toEmail, $subject, $message, $from) { $mail->Port = 25; $mail->Username = getConfig('SMTP_USER'); $mail->Password = getConfig('SMTP_PASSWORD'); - if (empty($from)) { + if (empty($headers)) { $mail->From = getConfig('WEBMASTER'); } else { - $mail->From = $from; + $mail->From = $headers; } $mail->FromName = getMainTitle(); $mail->Subject = $subject; @@ -225,10 +227,12 @@ function sendRawEmail ($toEmail, $subject, $message, $from) { } else { $mail->Body = decodeEntities($message); } + $mail->AddAddress($toEmail, ''); $mail->AddReplyTo(getConfig('WEBMASTER'), getMainTitle()); $mail->AddCustomHeader('Errors-To:' . getConfig('WEBMASTER')); $mail->AddCustomHeader('X-Loop:' . getConfig('WEBMASTER')); + $mail->AddCustomHeader('Bounces-To:' . getConfig('WEBMASTER')); $mail->Send(); // Has an error occured? @@ -244,7 +248,7 @@ function sendRawEmail ($toEmail, $subject, $message, $from) { } } else { // Use legacy mail() command - return mail($toEmail, $subject, decodeEntities($message), $from); + return mail($toEmail, $subject, decodeEntities($message), $headers); } } @@ -376,25 +380,26 @@ function translateComma ($dotted, $cut = true, $max = '0') { if (count($com) < 2) { // Don't display commatas even if there are none... ;-) $maxComma = '0'; - } + } // END - if } // END - if // Debug log - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "dotted={$dotted},maxComma={$maxComma}"); // Translate it now + $translated = $dotted; switch (getLanguage()) { case 'de': // German language - $dotted = number_format($dotted, $maxComma, ',', '.'); + $translated = number_format($dotted, $maxComma, ',', '.'); break; default: // All others - $dotted = number_format($dotted, $maxComma, '.', ','); + $translated = number_format($dotted, $maxComma, '.', ','); break; } // END - switch // Return translated value - return $dotted; + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'dotted=' . $dotted . ',translated=' . $translated . ',maxComma=' . $maxComma); + return $translated; } // Translate Uni*-like gender to human-readable @@ -404,9 +409,12 @@ function translateGender ($gender) { // Male/female or company? switch ($gender) { - case 'M': $ret = '{--GENDER_M--}'; break; - case 'F': $ret = '{--GENDER_F--}'; break; - case 'C': $ret = '{--GENDER_C--}'; break; + case 'M': // Male + case 'F': // Female + case 'C': // Company + $ret = sprintf("{--GENDER_%s--}", $gender); + break; + default: // Please report bugs on unknown genders debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown gender %s detected.", $gender)); @@ -424,17 +432,17 @@ function translateUserStatus ($status) { case 'UNCONFIRMED': case 'CONFIRMED': case 'LOCKED': - $ret = sprintf("{--ACCOUNT_%s--}", $status); + $ret = sprintf("{--ACCOUNT_STATUS_%s--}", $status); break; case '': case null: - $ret = '{--ACCOUNT_DELETED--}'; + $ret = '{--ACCOUNT_STATUS_DELETED--}'; break; default: // Please report all unknown status - debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status)); + debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown status %s(%s) detected.", $status, gettype($status))); break; } // END - switch @@ -498,7 +506,7 @@ function countSelection ($array) { // Integrity check if (!is_array($array)) { // Not an array! - debug_report_bug(__FUNCTION__.': No array provided.'); + debug_report_bug(__FUNCTION__, __LINE__, 'No array provided.'); } // END - if // Init count @@ -550,7 +558,7 @@ function redirectToUrl ($URL, $allowSpider = true) { } // END - if // Three different ways to debug... - //* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, sprintf("%s[%s:] URL=%s", __FUNCTION__, __LINE__, $URL)); + //* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, 'URL=' . $URL); //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'URL=' . $URL); //* DEBUG: */ die($URL); @@ -759,7 +767,7 @@ function createFancyTime ($stamp) { foreach($data as $k => $v) { if ($v > 0) { // Value is greater than 0 "eval" data to return string - eval('$ret .= ", ".$v." {--_' . strtoupper($k) . '--}";'); + $ret .= ', ' . $v . ' {--_' . strtoupper($k) . '--}'; break; } // END - if } // END - foreach @@ -820,20 +828,23 @@ function sendGetRequest ($script, $data = array()) { // Add data $body = http_build_query($data, '', '&'); - // Do we have a question-mark in the script? - if (strpos($script, '?') === false) { - // No, so first char must be question mark - $body = '?' . $body; - } else { - // Ok, add & - $body = '&' . $body; - } + // There should be data, else we don't need to extend $script with $body + if (empty($body)) { + // Do we have a question-mark in the script? + if (strpos($script, '?') === false) { + // No, so first char must be question mark + $body = '?' . $body; + } else { + // Ok, add & + $body = '&' . $body; + } - // Add script data - $script .= $body; + // Add script data + $script .= $body; - // Remove trailed & to make it more conform - if (substr($script, -1, 1) == '&') $script = substr($script, 0, -1); + // Remove trailed & to make it more conform + if (substr($script, -1, 1) == '&') $script = substr($script, 0, -1); + } // END - if // Generate GET request header $request = 'GET /' . trim($script) . ' HTTP/1.1' . getConfig('HTTP_EOL'); @@ -907,7 +918,7 @@ function sendRawRequest ($host, $request) { $useProxy = false; // Are proxy settins set? - if ((isConfigEntrySet('proxy_host')) && (getConfig('proxy_host') != '') && (isConfigEntrySet('proxy_port')) && (getConfig('proxy_port') > 0)) { + if (isProxyUsed()) { // Then use it $useProxy = true; } // END - if @@ -1179,7 +1190,7 @@ function generateHash ($plainText, $salt = '', $hash = true) { // Sanity check on salt if (strlen($salt) != getSaltLength()) { // Not the same! - debug_report_bug(__FUNCTION__.': salt length mismatch! ('.strlen($salt).'/'.getSaltLength().')'); + debug_report_bug(__FUNCTION__, __LINE__, 'salt length mismatch! ('.strlen($salt).'/'.getSaltLength().')'); } // END - if } @@ -1194,7 +1205,7 @@ function generateHash ($plainText, $salt = '', $hash = true) { } // Scramble a string -function scrambleString($str) { +function scrambleString ($str) { // Init $scrambled = ''; @@ -1229,7 +1240,7 @@ function scrambleString($str) { } // De-scramble a string scrambled by scrambleString() -function descrambleString($str) { +function descrambleString ($str) { // Scramble only 40 chars long strings if (strlen($str) != 40) return $str; @@ -1357,7 +1368,7 @@ function getCurrentTheme () { } // Generates an error code from given account status -function generateErrorCodeFromUserStatus ($status='') { +function generateErrorCodeFromUserStatus ($status = '') { // If no status is provided, use the default, cached if ((empty($status)) && (isMember())) { // Get user status @@ -1365,10 +1376,10 @@ function generateErrorCodeFromUserStatus ($status='') { } // END - if // Default error code if unknown account status - $errorCode = getCode('UNKNOWN_STATUS'); + $errorCode = getCode('ACCOUNT_STATUS_UNKNOWN'); // Generate constant name - $codeName = sprintf("ACCOUNT_%s", strtoupper($status)); + $codeName = sprintf("ACCOUNT_STATUS_%s", strtoupper($status)); // Is the constant there? if (isCodeSet($codeName)) { @@ -1394,7 +1405,7 @@ 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 .= '