X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=f1a41e67ec3832f3ca075d7962fd13ffc361478a;hb=4b2090a4cedf39aafa708025c493685fab1036b5;hp=e1b5a9ca363ad074e1419e570afa344346c42bbf;hpb=8d4176053d397a86baca20b4d7ab7ed526355be8;p=mailer.git diff --git a/inc/functions.php b/inc/functions.php index e1b5a9ca36..f1a41e67ec 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)) { @@ -134,13 +131,22 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = ' // Check for PHPMailer or debug-mode if ((!checkPhpMailerUsage()) || (isDebugModeEnabled())) { + // Prefix is '' for text mails + $prefix = ''; + + // Is HTML? + if ($isHtml == 'Y') { + // Set prefix + $prefix = 'html_'; + } // END - if + // Not in PHPMailer-Mode if (empty($mailHeader)) { // Load email header template - $mailHeader = loadEmailTemplate('header'); + $mailHeader = loadEmailTemplate($prefix . 'header'); } else { // Append header - $mailHeader .= loadEmailTemplate('header'); + $mailHeader .= loadEmailTemplate($prefix . 'header'); } } // END - if @@ -151,17 +157,14 @@ 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 return true; - } elseif (($isHtml == 'Y') && (isExtensionActive('html_mail'))) { - // Send mail as HTML away - return sendHtmlEmail($toEmail, $subject, $message, $mailHeader); } elseif (!empty($toEmail)) { // Send Mail away return sendRawEmail($toEmail, $subject, $message, $mailHeader); @@ -182,12 +185,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()) { @@ -202,7 +210,7 @@ function sendRawEmail ($toEmail, $subject, $message, $from) { $mail->CharSet = 'UTF-8'; // Path for PHPMailer - $mail->PluginDir = sprintf("%sinc/phpmailer/", getConfig('PATH')); + $mail->PluginDir = sprintf("%sinc/phpmailer/", getPath()); $mail->IsSMTP(); $mail->SMTPAuth = true; @@ -210,12 +218,12 @@ 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 = getConfig('MAIN_TITLE'); + $mail->FromName = getMainTitle(); $mail->Subject = $subject; if ((isExtensionActive('html_mail')) && (secureString($message) != $message)) { $mail->Body = $message; @@ -225,10 +233,12 @@ function sendRawEmail ($toEmail, $subject, $message, $from) { } else { $mail->Body = decodeEntities($message); } + $mail->AddAddress($toEmail, ''); - $mail->AddReplyTo(getConfig('WEBMASTER'), getConfig('MAIN_TITLE')); + $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 +254,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 +386,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 +415,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 +438,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 @@ -473,7 +487,7 @@ function translateMenuVisibleLocked ($content, $prefix = '') { // Generates an URL for the dereferer function generateDerefererUrl ($URL) { // Don't de-refer our own links! - if (substr($URL, 0, strlen(getConfig('URL'))) != getConfig('URL')) { + if (substr($URL, 0, strlen(getUrl())) != getUrl()) { // De-refer this link $URL = '{%url=modules.php?module=loader&url=' . encodeString(compileUriCode($URL)) . '%}'; } // END - if @@ -498,7 +512,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 @@ -544,13 +558,13 @@ function redirectToUrl ($URL, $allowSpider = true) { $rel = ' rel="external"'; // Do we have internal or external URL? - if (substr($URL, 0, strlen(getConfig('URL'))) == getConfig('URL')) { + if (substr($URL, 0, strlen(getUrl())) == getUrl()) { // Own (=internal) URL $rel = ''; } // 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); @@ -571,9 +585,6 @@ function redirectToUrl ($URL, $allowSpider = true) { // Clear own output buffer $GLOBALS['output'] = ''; - // Set header - setHttpStatus('302 Found'); - // Load URL when headers are not sent sendRawRedirect(doFinalCompilation(str_replace('&', '&', $URL), false)); } else { @@ -645,39 +656,39 @@ function array_pk_sort (&$array, $a_sort, $primary_key = '0', $order = -1, $nums // function generateRandomCode ($length, $code, $userid, $DATA = '') { // Build server string - $server = $_SERVER['PHP_SELF'] . getConfig('ENCRYPT_SEPERATOR') . detectUserAgent() . getConfig('ENCRYPT_SEPERATOR') . getenv('SERVER_SOFTWARE') . getConfig('ENCRYPT_SEPERATOR') . detectRemoteAddr(); + $server = $_SERVER['PHP_SELF'] . getEncryptSeperator() . detectUserAgent() . getEncryptSeperator() . getenv('SERVER_SOFTWARE') . getEncryptSeperator() . detectRemoteAddr(); // Build key string - $keys = getConfig('SITE_KEY') . getConfig('ENCRYPT_SEPERATOR') . getConfig('DATE_KEY'); - if (isConfigEntrySet('secret_key')) $keys .= getConfig('ENCRYPT_SEPERATOR').getConfig('secret_key'); - if (isConfigEntrySet('file_hash')) $keys .= getConfig('ENCRYPT_SEPERATOR').getConfig('file_hash'); - $keys .= getConfig('ENCRYPT_SEPERATOR') . getDateFromPatchTime(); - if (isConfigEntrySet('master_salt')) $keys .= getConfig('ENCRYPT_SEPERATOR').getConfig('master_salt'); + $keys = getConfig('SITE_KEY') . getEncryptSeperator() . getConfig('DATE_KEY'); + if (isConfigEntrySet('secret_key')) $keys .= getEncryptSeperator().getSecretKey(); + if (isConfigEntrySet('file_hash')) $keys .= getEncryptSeperator().getFileHash(); + $keys .= getEncryptSeperator() . getDateFromPatchTime(); + if (isConfigEntrySet('master_salt')) $keys .= getEncryptSeperator().getMasterSalt(); // Build string from misc data - $data = $code . getConfig('ENCRYPT_SEPERATOR') . $userid . getConfig('ENCRYPT_SEPERATOR') . $DATA; + $data = $code . getEncryptSeperator() . $userid . getEncryptSeperator() . $DATA; // Add more additional data - if (isSessionVariableSet('u_hash')) $data .= getConfig('ENCRYPT_SEPERATOR') . getSession('u_hash'); + if (isSessionVariableSet('u_hash')) $data .= getEncryptSeperator() . getSession('u_hash'); // Add referal id, language, theme and userid - $data .= getConfig('ENCRYPT_SEPERATOR') . determineReferalId(); - $data .= getConfig('ENCRYPT_SEPERATOR') . getLanguage(); - $data .= getConfig('ENCRYPT_SEPERATOR') . getCurrentTheme(); - $data .= getConfig('ENCRYPT_SEPERATOR') . getMemberId(); + $data .= getEncryptSeperator() . determineReferalId(); + $data .= getEncryptSeperator() . getLanguage(); + $data .= getEncryptSeperator() . getCurrentTheme(); + $data .= getEncryptSeperator() . getMemberId(); // Calculate number for generating the code $a = $code + getConfig('_ADD') - 1; if (isConfigEntrySet('master_salt')) { // Generate hash with master salt from modula of number with the prime number and other data - $saltedHash = generateHash(($a % getConfig('_PRIME')) . getConfig('ENCRYPT_SEPERATOR') . $server . getConfig('ENCRYPT_SEPERATOR') . $keys . getConfig('ENCRYPT_SEPERATOR') . $data . getConfig('ENCRYPT_SEPERATOR') . getConfig('DATE_KEY') . getConfig('ENCRYPT_SEPERATOR') . $a, getConfig('master_salt')); + $saltedHash = generateHash(($a % getPrime()) . getEncryptSeperator() . $server . getEncryptSeperator() . $keys . getEncryptSeperator() . $data . getEncryptSeperator() . getConfig('DATE_KEY') . getEncryptSeperator() . $a, getMasterSalt()); // Create number from hash - $rcode = hexdec(substr($saltedHash, strlen(getConfig('master_salt')), 9)) / abs(getConfig('rand_no') - $a + sqrt(getConfig('_ADD'))) / pi(); + $rcode = hexdec(substr($saltedHash, strlen(getMasterSalt()), 9)) / abs(getConfig('rand_no') - $a + sqrt(getConfig('_ADD'))) / pi(); } else { // Generate hash with "hash of site key" from modula of number with the prime number and other data - $saltedHash = generateHash(($a % getConfig('_PRIME')) . getConfig('ENCRYPT_SEPERATOR') . $server . getConfig('ENCRYPT_SEPERATOR') . $keys . getConfig('ENCRYPT_SEPERATOR') . $data . getConfig('ENCRYPT_SEPERATOR') . getConfig('DATE_KEY') . getConfig('ENCRYPT_SEPERATOR') . $a, substr(sha1(getConfig('SITE_KEY')), 0, getConfig('salt_length'))); + $saltedHash = generateHash(($a % getPrime()) . getEncryptSeperator() . $server . getEncryptSeperator() . $keys . getEncryptSeperator() . $data . getEncryptSeperator() . getConfig('DATE_KEY') . getEncryptSeperator() . $a, substr(sha1(getConfig('SITE_KEY')), 0, getSaltLength())); // Create number from hash $rcode = hexdec(substr($saltedHash, 8, 9)) / abs(getConfig('rand_no') - $a + sqrt(getConfig('_ADD'))) / pi(); @@ -759,7 +770,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 @@ -780,7 +791,7 @@ function createFancyTime ($stamp) { // Extract host from script name function extractHostnameFromUrl (&$script) { // Use default SERVER_URL by default... ;) So? - $url = getConfig('SERVER_URL'); + $url = getServerUrl(); // Is this URL valid? if (substr($script, 0, 7) == 'http://') { @@ -820,29 +831,32 @@ 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'); $request .= 'Host: ' . $host . getConfig('HTTP_EOL'); - $request .= 'Referer: ' . getConfig('URL') . '/admin.php' . getConfig('HTTP_EOL'); + $request .= 'Referer: ' . getUrl() . '/admin.php' . getConfig('HTTP_EOL'); if (isConfigEntrySet('FULL_VERSION')) { - $request .= 'User-Agent: ' . getConfig('TITLE') . '/' . getConfig('FULL_VERSION') . getConfig('HTTP_EOL'); + $request .= 'User-Agent: ' . getTitle() . '/' . getFullVersion() . getConfig('HTTP_EOL'); } else { - $request .= 'User-Agent: ' . getConfig('TITLE') . '/' . getConfig('VERSION') . getConfig('HTTP_EOL'); + $request .= 'User-Agent: ' . getTitle() . '/' . getConfig('VERSION') . getConfig('HTTP_EOL'); } $request .= 'Accept: image/png,image/*;q=0.8,text/plain,text/html,*/*;q=0.5' . getConfig('HTTP_EOL'); $request .= 'Accept-Charset: UTF-8,*' . getConfig('HTTP_EOL'); @@ -875,8 +889,8 @@ function sendPostRequest ($script, $postData) { // Generate POST request header $request = 'POST /' . trim($script) . ' HTTP/1.0' . getConfig('HTTP_EOL'); $request .= 'Host: ' . $host . getConfig('HTTP_EOL'); - $request .= 'Referer: ' . getConfig('URL') . '/admin.php' . getConfig('HTTP_EOL'); - $request .= 'User-Agent: ' . getConfig('TITLE') . '/' . getConfig('FULL_VERSION') . getConfig('HTTP_EOL'); + $request .= 'Referer: ' . getUrl() . '/admin.php' . getConfig('HTTP_EOL'); + $request .= 'User-Agent: ' . getTitle() . '/' . getFullVersion() . getConfig('HTTP_EOL'); $request .= 'Accept: text/plain;q=0.8' . getConfig('HTTP_EOL'); $request .= 'Accept-Charset: UTF-8,*' . getConfig('HTTP_EOL'); $request .= 'Cache-Control: no-cache' . getConfig('HTTP_EOL'); @@ -907,7 +921,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 @@ -1148,19 +1162,19 @@ function generateHash ($plainText, $salt = '', $hash = true) { // When the salt is empty build a new one, else use the first x configured characters as the salt if (empty($salt)) { // Build server string for more entropy - $server = $_SERVER['PHP_SELF'] . getConfig('ENCRYPT_SEPERATOR') . detectUserAgent() . getConfig('ENCRYPT_SEPERATOR') . getenv('SERVER_SOFTWARE') . getConfig('ENCRYPT_SEPERATOR') . detectRemoteAddr(); + $server = $_SERVER['PHP_SELF'] . getEncryptSeperator() . detectUserAgent() . getEncryptSeperator() . getenv('SERVER_SOFTWARE') . getEncryptSeperator() . detectRemoteAddr(); // Build key string - $keys = getConfig('SITE_KEY') . getConfig('ENCRYPT_SEPERATOR') . getConfig('DATE_KEY') . getConfig('ENCRYPT_SEPERATOR') . getConfig('secret_key') . getConfig('ENCRYPT_SEPERATOR') . getConfig('file_hash') . getConfig('ENCRYPT_SEPERATOR') . getDateFromPatchTime() . getConfig('ENCRYPT_SEPERATOR') . getConfig('master_salt'); + $keys = getConfig('SITE_KEY') . getEncryptSeperator() . getConfig('DATE_KEY') . getEncryptSeperator() . getSecretKey() . getEncryptSeperator() . getFileHash() . getEncryptSeperator() . getDateFromPatchTime() . getEncryptSeperator() . getMasterSalt(); // Additional data - $data = $plainText . getConfig('ENCRYPT_SEPERATOR') . uniqid(mt_rand(), true) . getConfig('ENCRYPT_SEPERATOR') . time(); + $data = $plainText . getEncryptSeperator() . uniqid(mt_rand(), true) . getEncryptSeperator() . time(); // Calculate number for generating the code $a = time() + getConfig('_ADD') - 1; // Generate SHA1 sum from modula of number and the prime number - $sha1 = sha1(($a % getConfig('_PRIME')) . $server . getConfig('ENCRYPT_SEPERATOR') . $keys . getConfig('ENCRYPT_SEPERATOR') . $data . getConfig('ENCRYPT_SEPERATOR') . getConfig('DATE_KEY') . getConfig('ENCRYPT_SEPERATOR') . $a); + $sha1 = sha1(($a % getPrime()) . $server . getEncryptSeperator() . $keys . getEncryptSeperator() . $data . getEncryptSeperator() . getConfig('DATE_KEY') . getEncryptSeperator() . $a); //* DEBUG: */ debugOutput('SHA1=' . $sha1.' ('.strlen($sha1).')
'); $sha1 = scrambleString($sha1); //* DEBUG: */ debugOutput('Scrambled=' . $sha1.' ('.strlen($sha1).')
'); @@ -1168,18 +1182,18 @@ function generateHash ($plainText, $salt = '', $hash = true) { //* DEBUG: */ debugOutput('Descrambled=' . $sha1b.' ('.strlen($sha1b).')
'); // Generate the password salt string - $salt = substr($sha1, 0, getConfig('salt_length')); + $salt = substr($sha1, 0, getSaltLength()); //* DEBUG: */ debugOutput($salt.' ('.strlen($salt).')
'); } else { // Use given salt //* DEBUG: */ debugOutput('salt=' . $salt); - $salt = substr($salt, 0, getConfig('salt_length')); - //* DEBUG: */ debugOutput('salt=' . $salt . '(' . strlen($salt) . '/' . getConfig('salt_length') . ')
'); + $salt = substr($salt, 0, getSaltLength()); + //* DEBUG: */ debugOutput('salt=' . $salt . '(' . strlen($salt) . '/' . getSaltLength() . ')
'); // Sanity check on salt - if (strlen($salt) != getConfig('salt_length')) { + if (strlen($salt) != getSaltLength()) { // Not the same! - debug_report_bug(__FUNCTION__.': salt length mismatch! ('.strlen($salt).'/'.getConfig('salt_length').')'); + debug_report_bug(__FUNCTION__, __LINE__, 'salt length mismatch! ('.strlen($salt).'/'.getSaltLength().')'); } // END - if } @@ -1194,7 +1208,7 @@ function generateHash ($plainText, $salt = '', $hash = true) { } // Scramble a string -function scrambleString($str) { +function scrambleString ($str) { // Init $scrambled = ''; @@ -1204,7 +1218,7 @@ function scrambleString($str) { return $str; } elseif (strlen($str) == 40) { // From database - $scrambleNums = explode(':', getConfig('pass_scramble')); + $scrambleNums = explode(':', getPassScramble()); } else { // Generate new numbers $scrambleNums = explode(':', genScrambleString(strlen($str))); @@ -1229,12 +1243,12 @@ 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; // Load numbers from config - $scrambleNums = explode(':', getConfig('pass_scramble')); + $scrambleNums = explode(':', getPassScramble()); // Validate numbers if (count($scrambleNums) != 40) return $str; @@ -1285,24 +1299,24 @@ function encodeHashForCookie ($passHash) { //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, intval(isExtensionInstalled('sql_patches')) . '/' . intval(isConfigEntrySet('_PRIME')) . '/' . intval(isConfigEntrySet('secret_key')) . '/' . intval(isConfigEntrySet('master_salt'))); if ((isExtensionInstalled('sql_patches')) && (isConfigEntrySet('_PRIME')) && (isConfigEntrySet('secret_key')) && (isConfigEntrySet('master_salt'))) { // Only calculate when the secret key is generated - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, strlen($passHash) . '/' . strlen(getConfig('secret_key'))); - if ((strlen($passHash) != 49) || (strlen(getConfig('secret_key')) != 40)) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, strlen($passHash) . '/' . strlen(getSecretKey())); + if ((strlen($passHash) != 49) || (strlen(getSecretKey()) != 40)) { // Both keys must have same length so return unencrypted - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, strlen($passHash) . '!=49/' . strlen(getConfig('secret_key')) . '!=40'); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, strlen($passHash) . '!=49/' . strlen(getSecretKey()) . '!=40'); return $ret; } // END - if $newHash = ''; $start = 9; //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'passHash=' . $passHash . '(' . strlen($passHash) . ')'); for ($idx = 0; $idx < 20; $idx++) { - $part1 = hexdec(substr($passHash, ($idx * 2) + (strlen($passHash) - strlen(getConfig('secret_key'))), 2)); - $part2 = hexdec(substr(getConfig('secret_key'), $start, 2)); + $part1 = hexdec(substr($passHash, ($idx * 2) + (strlen($passHash) - strlen(getSecretKey())), 2)); + $part2 = hexdec(substr(getSecretKey(), $start, 2)); //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'part1=' . $part1 . '/part2=' . $part2); $mod = dechex($idx); if ($part1 > $part2) { - $mod = dechex(sqrt(($part1 - $part2) * getConfig('_PRIME') / pi())); + $mod = dechex(sqrt(($part1 - $part2) * getPrime() / pi())); } elseif ($part2 > $part1) { - $mod = dechex(sqrt(($part2 - $part1) * getConfig('_PRIME') / pi())); + $mod = dechex(sqrt(($part2 - $part1) * getPrime() / pi())); } $mod = substr($mod, 0, 2); //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'part1=' . $part1 . '/part2=' . $part2 . '/mod=' . $mod . '(' . strlen($mod) . ')'); @@ -1313,7 +1327,7 @@ function encodeHashForCookie ($passHash) { } // END - for //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $passHash . ',' . $newHash . ' (' . strlen($newHash) . ')'); - $ret = generateHash($newHash, getConfig('master_salt')); + $ret = generateHash($newHash, getMasterSalt()); } // END - if // Return result @@ -1357,7 +1371,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 +1379,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 +1408,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 .= '
  • ' . basename($trace['file']) . ':' . $trace['line'].", " . $trace['function'] . '(' . count($trace['args']) . ')
    • '; + $backtrace .= '
  • ' . basename($trace['file']) . ':' . $trace['line'] . ', ' . $trace['function'] . '(' . count($trace['args']) . ')
    • '; } // END - foreach // Close it @@ -1445,7 +1459,7 @@ function getMessageFromErrorCode ($code) { case getCode('ACCOUNT_UNCONFIRMED'): $message = '{--LOGIN_STATUS_UNCONFIRMED--}'; break; case getCode('COOKIES_DISABLED') : $message = '{--LOGIN_COOKIES_DISABLED--}'; break; case getCode('BEG_SAME_AS_OWN') : $message = '{--BEG_SAME_UID_AS_OWN--}'; break; - case getCode('LOGIN_FAILED') : $message = '{--LOGIN_FAILED_GENERAL--}'; break; + case getCode('LOGIN_FAILED') : $message = '{--GUEST_LOGIN_FAILED_GENERAL--}'; break; case getCode('MODULE_MEMBER_ONLY') : $message = getMaskedMessage('MODULE_MEMBER_ONLY', getRequestParameter('mod')); break; case getCode('OVERLENGTH') : $message = '{--MEMBER_TEXT_OVERLENGTH--}'; break; case getCode('URL_FOUND') : $message = '{--MEMBER_TEXT_CONTAINS_URL--}'; break; @@ -1461,12 +1475,13 @@ function getMessageFromErrorCode ($code) { case getCode('NO_MAIL_TYPE') : $message = '{--MEMBER_NO_MAIL_TYPE_SELECTED--}'; break; case getCode('UNKNOWN_ERROR') : $message = '{--LOGIN_UNKNOWN_ERROR--}'; break; case getCode('UNKNOWN_STATUS') : $message = '{--LOGIN_UNKNOWN_STATUS--}'; break; + case getCode('PROFILE_UPDATED') : $message = '{--MEMBER_PROFILE_UPDATED--}'; break; case getCode('ERROR_MAILID'): if (isExtensionActive('mailid', true)) { $message = '{--ERROR_CONFIRMING_MAIL--}'; } else { - $message = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'mailid'); + $message = generateExtensionInactiveNotInstalledMessage('mailid'); } break; @@ -1478,34 +1493,31 @@ function getMessageFromErrorCode ($code) { } break; - case getCode('URL_TLOCK'): + case getCode('URL_TIME_LOCK'): // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ? $result = SQL_QUERY_ESC("SELECT `timestamp` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1", array(bigintval(getRequestParameter('id'))), __FUNCTION__, __LINE__); // Load timestamp from last order - list($timestamp) = SQL_FETCHROW($result); + $content = SQL_FETCHARRAY($result); // Free memory SQL_FREERESULT($result); // Translate it for templates - $timestamp = generateDateTime($timestamp, 1); + $content['timestamp'] = generateDateTime($content['timestamp'], 1); // Calculate hours... - $STD = round(getConfig('url_tlock') / 60 / 60); + $content['hours'] = round(getConfig('url_tlock') / 60 / 60); // Minutes... - $MIN = round((getConfig('url_tlock') - $STD * 60 * 60) / 60); + $content['minutes'] = round((getConfig('url_tlock') - $content['hours'] * 60 * 60) / 60); // And seconds - $SEC = getConfig('url_tlock') - $STD * 60 * 60 - $MIN * 60; + $content['seconds'] = round(getConfig('url_tlock') - $content['hours'] * 60 * 60 - $content['minutes'] * 60); // Finally contruct the message - // @TODO Rewrite this old lost code to a template - $message = "{--MEMBER_URL_TIME_LOCK--}
    {--CONFIG_URL_TLOCK--} ".$STD." - {--_HOURS--}, ".$MIN." {--_MINUTES--} {--_AND--} ".$SEC." {--_SECONDS--}
    - {--MEMBER_LAST_TLOCK--}: ".$timestamp; + $message = loadTemplate('tlock_message', true, $content); break; default: @@ -1571,9 +1583,9 @@ function isUrlValidSimple ($url) { // Debug regex? if (isDebugRegularExpressionEnabled()) { // @TODO Are these convertions still required? - $pat = str_replace('.', "\.", $pat); - $pat = str_replace('@', "\@", $pat); - //* DEBUG: */ debugOutput($key."= " . $pat); + $pat = str_replace('.', '\.', $pat); + $pat = str_replace('@', '\@', $pat); + //* DEBUG: */ debugOutput($key . '= ' . $pat); } // END - if // Check if expression matches @@ -1619,7 +1631,10 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) { // Read from source file $line = fgets ($fp, 1024); - if (strpos($line, $search) > -1) { $next = '0'; $found = true; } + if (strpos($line, $search) > -1) { + $next = '0'; + $found = true; + } // END - if if ($next > -1) { if ($next === $seek) { @@ -1682,7 +1697,7 @@ function logDebugMessage ($funcFile, $line, $message, $force=true) { $message = str_replace("\r", '', str_replace("\n", '', $message)); // Log this message away - $fp = fopen(getConfig('CACHE_PATH') . 'debug.log', 'a') or debug_report_bug(__FUNCTION__, __LINE__, 'Cannot write logfile debug.log!'); + $fp = fopen(getCachePath() . 'debug.log', 'a') or debug_report_bug(__FUNCTION__, __LINE__, 'Cannot write logfile debug.log!'); fwrite($fp, generateDateTime(time(), '4') . '|' . getModule(false) . '|' . basename($funcFile) . '|' . $line . '|' . $message . "\n"); fclose($fp); } // END - if @@ -1788,7 +1803,7 @@ function handleLoginFailures ($accessLevel) { // Ignore zero values if (getSession('mailer_' . $accessLevel . '_failures') > 0) { // Non-guest has login failures found, get both data and prepare it for template - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "accessLevel={$accessLevel}
    "); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'accessLevel=' . $accessLevel . '
    '); $content = array( 'login_failures' => 'mailer_' . $accessLevel . '_failures', 'last_failure' => generateDateTime(getSession('mailer_' . $accessLevel . '_last_failure'), 2) @@ -1832,7 +1847,7 @@ function rebuildCache ($cache, $inc = '', $force = false) { loadInclude($inc); } else { // Include not found! - logDebugMessage(__FUNCTION__, __LINE__, "Include {$inc} not found. cache={$cache}"); + logDebugMessage(__FUNCTION__, __LINE__, 'Include ' . $inc . ' not found. cache=' . $cache); } } // END - if } // END - if @@ -1902,7 +1917,7 @@ function addNewBonusMail ($data, $mode = '', $output=true) { // Determines referal id and sets it function determineReferalId () { // Skip this in non-html-mode and outside ref.php - if ((getOutputMode() != 0) && (basename($_SERVER['PHP_SELF']) != 'ref.php')) return false; + if ((!isHtmlOutputMode()) && (basename($_SERVER['PHP_SELF']) != 'ref.php')) return false; // Check if refid is set if ((isset($GLOBALS['refid'])) && ($GLOBALS['refid'] > 0)) { @@ -1919,13 +1934,13 @@ function determineReferalId () { } elseif (isGetRequestParameterSet('ref')) { // Set refid=ref (the referal link uses such variable) $GLOBALS['refid'] = secureString(getRequestParameter('ref')); - } elseif ((isSessionVariableSet('refid')) && (getSession('refid') != 0)) { + } elseif ((isSessionVariableSet('refid')) && (isValidUserId(getSession('refid')))) { // Set session refid als global $GLOBALS['refid'] = bigintval(getSession('refid')); - } elseif ((isExtensionInstalledAndNewer('user', '0.3.4')) && (getConfig('select_user_zero_refid') == 'Y')) { + } elseif ((isExtensionInstalledAndNewer('user', '0.3.4')) && (isRandomReferalIdEnabled())) { // Select a random user which has confirmed enougth mails $GLOBALS['refid'] = determineRandomReferalId(); - } elseif ((isExtensionInstalledAndNewer('sql_patches', '0.1.2')) && (getConfig('def_refid') > 0)) { + } elseif ((isExtensionInstalledAndNewer('sql_patches', '0.1.2')) && (isValidUserId(getConfig('def_refid')))) { // Set default refid as refid in URL $GLOBALS['refid'] = getConfig('def_refid'); } else { @@ -1934,7 +1949,7 @@ function determineReferalId () { } // Set cookie when default refid > 0 - if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((getSession('refid') == '0') && (isConfigEntrySet('def_refid')) && (getConfig('def_refid') > 0))) { + if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((!isValidUserId(getSession('refid'))) && (isConfigEntrySet('def_refid')) && (isValidUserId(getConfig('def_refid'))))) { // Default is not found $found = false; @@ -1996,7 +2011,9 @@ function initMemberId () { // Setter for member id function setMemberId ($memberid) { // We should not set member id to zero - if ($memberid == '0') debug_report_bug(__FUNCTION__, __LINE__, 'Userid should not be set zero.'); + if ($memberid == '0') { + debug_report_bug(__FUNCTION__, __LINE__, 'Userid should not be set zero.'); + } // END - if // Set it secured $GLOBALS['member_id'] = bigintval($memberid); @@ -2054,12 +2071,12 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad $excludeArray[] = '.svn'; $excludeArray[] = '.htaccess'; - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "baseDir={$baseDir},prefix={$prefix} - Entered!"); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'baseDir=' . $baseDir . ',prefix=' . $prefix . ' - Entered!'); // Init includes $files = array(); // Open directory - $dirPointer = opendir(getConfig('PATH') . $baseDir) or debug_report_bug(__FUNCTION__, __LINE__, 'Cannot read directory ' . basename($baseDir) . '.'); + $dirPointer = opendir(getPath() . $baseDir) or debug_report_bug(__FUNCTION__, __LINE__, 'Cannot read directory ' . basename($baseDir) . '.'); // Read all entries while ($baseFile = readdir($dirPointer)) { @@ -2072,7 +2089,7 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad // Construct include filename and FQFN $fileName = $baseDir . $baseFile; - $FQFN = getConfig('PATH') . $fileName; + $FQFN = getPath() . $fileName; // Remove double slashes $FQFN = str_replace('//', '/', $FQFN); @@ -2097,20 +2114,20 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad continue; } elseif (substr($baseFile, 0, strlen($prefix)) != $prefix) { // Skip this file - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Invalid prefix in file " . $baseFile . ", prefix=" . $prefix); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Invalid prefix in file ' . $baseFile . ', prefix=' . $prefix); continue; } elseif ((!empty($suffix)) && (substr($baseFile, -(strlen($suffix . $extension)), (strlen($suffix . $extension))) != $suffix . $extension)) { // Skip wrong suffix as well - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Invalid suffix in file " . $baseFile . ", suffix=" . $suffix); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Invalid suffix in file ' . $baseFile . ', suffix=' . $suffix); continue; } elseif (!isFileReadable($FQFN)) { // Not readable so skip it - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "File " . $FQFN . " is not readable!"); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'File ' . $FQFN . ' is not readable!'); continue; } // Is the file a PHP script or other? - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "baseDir={$baseDir},prefix={$prefix},baseFile={$baseFile}"); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'baseDir=' . $baseDir . ',prefix=' . $prefix . ',baseFile=' . $baseFile); if ((substr($baseFile, -4, 4) == '.php') || (($fileIncludeDirs === true) && (isDirectory($FQFN)))) { // Is this a valid include file? if ($extension == '.php') { @@ -2169,19 +2186,10 @@ function mapModuleToTable ($moduleName) { // Add SQL debug data to array for later output function addSqlToDebug ($result, $sqlString, $timing, $F, $L) { - // Already executed? - if (isset($GLOBALS['debug_sqls'][$F][$L][$sqlString])) { - // Then abort here, we don't need to profile a query twice - return; - } // END - if - - // Remeber this as profiled (or not, but we don't care here) - $GLOBALS['debug_sqls'][$F][$L][$sqlString] = true; - // Do we have cache? if (!isset($GLOBALS['debug_sql_available'])) { // Check it and cache it in $GLOBALS - $GLOBALS['debug_sql_available'] = ((isConfigurationLoaded()) && (isExtensionInstalledAndNewer('other', '0.2.2')) && (getConfig('display_debug_sqls') == 'Y')); + $GLOBALS['debug_sql_available'] = ((isConfigurationLoaded()) && (isDisplayDebugSqlEnabled())); } // END - if // Don't execute anything here if we don't need or ext-other is missing @@ -2189,6 +2197,15 @@ function addSqlToDebug ($result, $sqlString, $timing, $F, $L) { return; } // END - if + // Already executed? + if (isset($GLOBALS['debug_sqls'][$F][$L][$sqlString])) { + // Then abort here, we don't need to profile a query twice + return; + } // END - if + + // Remeber this as profiled (or not, but we don't care here) + $GLOBALS['debug_sqls'][$F][$L][$sqlString] = true; + // Generate record $record = array( 'num_rows' => SQL_NUMROWS($result), @@ -2265,7 +2282,7 @@ function getModuleFromFileName ($file, $accessLevel) { // Encodes an URL for adding session id, etc. function encodeUrl ($url, $outputMode = '0') { // Do we have already have a PHPSESSID inside or view.php is called? Then abort here - if ((strpos($url, session_name()) !== false) || (getOutputMode() == -3)) return $url; + if ((strpos($url, session_name()) !== false) || (isRawOutputMode())) return $url; // Do we have a valid session? if (((!isset($GLOBALS['valid_session'])) || ($GLOBALS['valid_session'] === false) || (!isset($_COOKIE[session_name()]))) && (isSpider() === false)) { @@ -2275,7 +2292,7 @@ function encodeUrl ($url, $outputMode = '0') { if (strpos($url, '?') === false) { // No question mark $seperator = '?'; - } elseif ((getOutputMode() != '0') || ($outputMode != '0')) { + } elseif ((!isHtmlOutputMode()) || ($outputMode != '0')) { // Non-HTML mode $seperator = '&'; } @@ -2287,7 +2304,7 @@ function encodeUrl ($url, $outputMode = '0') { } // END - if // Add {?URL?} ? - if ((substr($url, 0, strlen(getConfig('URL'))) != getConfig('URL')) && (substr($url, 0, 7) != '{?URL?}') && (substr($url, 0, 7) != 'http://') && (substr($url, 0, 8) != 'https://')) { + if ((substr($url, 0, strlen(getUrl())) != getUrl()) && (substr($url, 0, 7) != '{?URL?}') && (substr($url, 0, 7) != 'http://') && (substr($url, 0, 8) != 'https://')) { // Add it $url = '{?URL?}/' . $url; } // END - if @@ -2298,8 +2315,8 @@ function encodeUrl ($url, $outputMode = '0') { // Simple check for spider function isSpider () { - // Get the UA - $userAgent = strtolower(detectUserAgent(true)); + // Get the UA and trim it down + $userAgent = trim(strtolower(detectUserAgent(true))); // It should not be empty, if so it is better a spider/bot if (empty($userAgent)) return true; @@ -2322,7 +2339,7 @@ function searchDirsRecursive ($dir, &$last_changed, $lookFor = 'Date') { // Walk through all entries foreach ($ds as $d) { // Generate proper FQFN - $FQFN = str_replace('//', '/', getConfig('PATH') . $dir . '/' . $d); + $FQFN = str_replace('//', '/', getPath() . $dir . '/' . $d); // Is it a file and readable? //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'dir=' . $dir . ',d=' . $d); @@ -2367,9 +2384,49 @@ function handleFieldWithBraces ($field) { return $field; } -////////////////////////////////////////////////// -// AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS // -////////////////////////////////////////////////// +// Converts a userid so it can be used in SQL queries +function makeDatabaseUserId ($userid) { + // Is it a valid username? + if (isValidUserId($userid)) { + // Always secure it + $userid = bigintval($userid); + } else { + // Is not valid or zero + $userid = 'NULL'; + } + + // Return it + return $userid; +} + +// Capitalizes a string with underscores, e.g.: some_foo_string will become SomeFooString +// Note: This function is cached +function capitalizeUnderscoreString ($str) { + // Do we have cache? + if (!isset($GLOBALS[__FUNCTION__][$str])) { + // Init target string + $capitalized = ''; + + // Explode it with the underscore, but rewrite dashes to underscore before + $strArray = explode('_', str_replace('-', '_', $str)); + + // "Walk" through all elements and make them lower-case but first upper-case + foreach ($strArray as $part) { + // Capitalize the string part + $capitalized .= ucfirst(strtolower($part)); + } // END - foreach + + // Store the converted string in cache array + $GLOBALS[__FUNCTION__][$str] = $capitalized; + } // END - if + + // Return cache + return $GLOBALS[__FUNCTION__][$str]; +} + +//----------------------------------------------------------------------------- +// Automatically re-created functions, all taken from user comments on www.php.net +//----------------------------------------------------------------------------- // if (!function_exists('html_entity_decode')) { // Taken from documentation on www.php.net