X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=ff063d75f75c854f946c209e55acaaada197f321;hb=2242e96edcd22361e94ed18d72f5667ab286f791;hp=5f62c273416bde14d01b56aa74fa8dd90ab813cf;hpb=4cd3aebe807c719e7867ef5aefe824c55033f72d;p=mailer.git
diff --git a/inc/functions.php b/inc/functions.php
index 5f62c27341..ff063d75f7 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); } } @@ -275,15 +285,22 @@ function generatePassword ($length = '0') { // Generates a human-readable timestamp from the Uni* stamp function generateDateTime ($time, $mode = '0') { - // Filter out numbers - $time = bigintval($time); - // If the stamp is zero it mostly didn't "happen" if ($time == '0') { // Never happend return '{--NEVER_HAPPENED--}'; } // END - if + // Filter out numbers + $time = bigintval($time); + + // Is it cached? + if (isset($GLOBALS[__FUNCTION__][$time][$mode])) { + // Then use it + return $GLOBALS[__FUNCTION__][$time][$mode]; + } // END - if + + // Detect language switch (getLanguage()) { case 'de': // German date / time format switch ($mode) { @@ -291,6 +308,9 @@ function generateDateTime ($time, $mode = '0') { case '1': $ret = strtolower(date('d.m.Y - H:i', $time)); break; case '2': $ret = date('d.m.Y|H:i', $time); break; case '3': $ret = date('d.m.Y', $time); break; + case '4': $ret = date('d.m.Y|H:i:s', $time); break; + case '5': $ret = date('d-m-Y (l-F-T)', $time); break; + case '6': $ret = date('Ymd', $time); break; default: logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode)); break; @@ -300,34 +320,43 @@ function generateDateTime ($time, $mode = '0') { default: // Default is the US date / time format! switch ($mode) { case '0': $ret = date('r', $time); break; - case '1': $ret = date('Y-m-d - g:i A', $time); break; + case '1': $ret = strtolower(date('Y-m-d - g:i A', $time)); break; case '2': $ret = date('y-m-d|H:i', $time); break; case '3': $ret = date('y-m-d', $time); break; + case '4': $ret = date('d.m.Y|H:i:s', $time); break; + case '5': $ret = date('d-m-Y (l-F-T)', $time); break; + case '6': $ret = date('Ymd', $time); break; default: logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode)); break; } // END - switch } // END - switch + // Store it in cache + $GLOBALS[__FUNCTION__][$time][$mode] = $ret; + // Return result return $ret; } // Translates Y/N to yes/no function translateYesNo ($yn) { - // Default - $translated = '??? (' . $yn . ')'; - switch ($yn) { - case 'Y': $translated = '{--YES--}'; break; - case 'N': $translated = '{--NO--}'; break; - default: - // Log unknown value - logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown value %s. Expected Y/N!", $yn)); - break; - } // END - switch + // Is it cached? + if (!isset($GLOBALS[__FUNCTION__][$yn])) { + // Default + $GLOBALS[__FUNCTION__][$yn] = '??? (' . $yn . ')'; + switch ($yn) { + case 'Y': $GLOBALS[__FUNCTION__][$yn] = '{--YES--}'; break; + case 'N': $GLOBALS[__FUNCTION__][$yn] = '{--NO--}'; break; + default: + // Log unknown value + logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown value %s. Expected Y/N!", $yn)); + break; + } // END - switch + } // END - if // Return it - return $translated; + return $GLOBALS[__FUNCTION__][$yn]; } // Translates the "pool type" into human-readable @@ -357,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 @@ -385,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)); @@ -405,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 @@ -454,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 @@ -479,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 @@ -498,9 +531,9 @@ function countSelection ($array) { // Generates a timestamp (some wrapper for mktime()) function makeTime ($hours, $minutes, $seconds, $stamp) { // Extract day, month and year from given timestamp - $days = date('d', $stamp); - $months = date('m', $stamp); - $years = date('Y', $stamp); + $days = getDay($stamp); + $months = getMonth($stamp); + $years = getYear($stamp); // Create timestamp for wished time which depends on extracted date return mktime( @@ -515,6 +548,9 @@ function makeTime ($hours, $minutes, $seconds, $stamp) { // Redirects to an URL and if neccessarry extends it with own base URL function redirectToUrl ($URL, $allowSpider = true) { + // Remove {%url= + if (substr($URL, 0, 6) == '{%url=') $URL = substr($URL, 6, -2); + // Compile out codes eval('$URL = "' . compileRawCode(encodeUrl($URL)) . '";'); @@ -522,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); @@ -549,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 { @@ -623,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') . date('d-m-Y (l-F-T)', getConfig('patch_ctime')); - 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(); @@ -698,8 +731,8 @@ function createTimestampFromSelections ($prefix, $postData) { // Do we have a leap year? $SWITCH = '0'; - $TEST = date('Y', time()) / 4; - $M1 = date('m', time()); + $TEST = getYear() / 4; + $M1 = getMonth(); // If so and if current time is before 02/29 and estimated time is after 02/29 then add 86400 seconds (one day) if ((floor($TEST) == $TEST) && ($M1 == '02') && ($postData[$prefix . '_mo'] > '02')) $SWITCH = getConfig('ONE_DAY'); @@ -737,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 @@ -758,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://') { @@ -798,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'); @@ -853,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'); @@ -885,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 @@ -1126,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') . date('d-m-Y (l-F-T)', getConfig('patch_ctime')) . 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).')