X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=b21b98e90a754a042def35c4ba88311c7c1348e9;hp=c727a3bf64ffe0cd73f0e22fb022a5db79922761;hb=154687dcd45c5b53e323eaba010eabab5950f876;hpb=258bb8c82f21617f7f90bff8023602a11b986f7e diff --git a/inc/functions.php b/inc/functions.php index c727a3bf64..b21b98e90a 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -1,7 +1,7 @@ {--FATAL_ERROR--}: {--LANG_NO_RENDER_DIRECT--}'); break; } // END - switch - } elseif ((getPhpCaching() == 'on') && (isset($GLOBALS['footer_sent'])) && ($GLOBALS['footer_sent'] == 1)) { - // Headers already sent? - if (headers_sent()) { - // Log this error - logDebugMessage(__FUNCTION__, __LINE__, 'Headers already sent! We need debug backtrace here.'); - - // Trigger an user error - debug_report_bug('Headers are already sent!'); - } // END - if - + } elseif ((getPhpCaching() == 'on') && ((!isset($GLOBALS['header'])) || (count($GLOBALS['header']) == 0))) { // Output cached HTML code $GLOBALS['output'] = ob_get_contents(); @@ -108,12 +100,12 @@ function outputHtml ($htmlCode, $newLine = true) { $GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']); } // END - if - // Compile and run finished rendered HTML code - compileFinalOutput(); - // Send all HTTP headers sendHttpHeaders(); + // Compile and run finished rendered HTML code + compileFinalOutput(); + // Output code here, DO NOT REMOVE! ;-) outputRawCode($GLOBALS['output']); } elseif ((getConfig('OUTPUT_MODE') == 'render') && (!empty($GLOBALS['output']))) { @@ -122,14 +114,17 @@ function outputHtml ($htmlCode, $newLine = true) { $GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']); } // END - if - // Compile and run finished rendered HTML code - compileFinalOutput(); - // Send all HTTP headers sendHttpHeaders(); + // Compile and run finished rendered HTML code + compileFinalOutput(); + // Output code here, DO NOT REMOVE! ;-) outputRawCode($GLOBALS['output']); + } else { + // And flush all headers + flushHeaders(); } } @@ -139,10 +134,10 @@ function sendHttpHeaders () { $now = gmdate('D, d M Y H:i:s') . ' GMT'; // Send HTTP header - sendHeader('HTTP/1.1 200'); + sendHeader('HTTP/1.1 200 OK'); // General headers for no caching - sendHeader('Expired: ' . $now); // RFC2616 - Section 14.21 + sendHeader('Expires: ' . $now); // RFC2616 - Section 14.21 sendHeader('Last-Modified: ' . $now); sendHeader('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1 sendHeader('Pragma: no-cache'); // HTTP/1.0 @@ -156,6 +151,9 @@ function compileFinalOutput () { // Init counter $cnt = '0'; + // Add page header and footer + addPageHeaderFooter(); + // Compile all out while (((strpos($GLOBALS['output'], '{--') > 0) || (strpos($GLOBALS['output'], '{!') > 0) || (strpos($GLOBALS['output'], '{?') > 0)) && ($cnt < 3)) { // Init common variables @@ -169,7 +167,7 @@ function compileFinalOutput () { // Was that eval okay? if (empty($newContent)) { // Something went wrong! - debug_report_bug('Evaluation error:
' . linenumberCode($eval) . '
'); + debug_report_bug('Evaluation error:
' . linenumberCode($eval) . '
', false); } // END - if $GLOBALS['output'] = $newContent; @@ -177,8 +175,26 @@ function compileFinalOutput () { $cnt++; } // END - while + // Compress it? + if (!empty($_SERVER['HTTP_ACCEPT_ENCODING']) && (strpos('gzip', $_SERVER['HTTP_ACCEPT_ENCODING']) !== null)) { + // Compress it for HTTP gzip + $GLOBALS['output'] = gzencode($GLOBALS['output'], 9, true); + + // Add header + sendHeader('Content-Encoding: gzip'); + } elseif (!empty($_SERVER['HTTP_ACCEPT_ENCODING']) && (strpos('deflate', $_SERVER['HTTP_ACCEPT_ENCODING']) !== null)) { + // Compress it for HTTP deflate + $GLOBALS['output'] = gzcompress($GLOBALS['output'], 9); + + // Add header + sendHeader('Content-Encoding: deflate'); + } + // Add final length sendHeader('Content-Length: ' . strlen($GLOBALS['output'])); + + // Flush all headers + flushHeaders(); } // Output the raw HTML code @@ -217,7 +233,6 @@ function addFatalMessage ($F, $L, $message, $extra = '') { $GLOBALS['fatal_messages'][] = $message; // Log fatal messages away - debug_report_bug($message); logDebugMessage($F, $L, 'Fatal error message: ' . $message); } @@ -284,7 +299,7 @@ function loadTemplate ($template, $return = false, $content = array()) { // Do we have to compile the code? $ret = ''; - if ((strpos($GLOBALS['tpl_content'], '$') !== false) || (strpos($GLOBALS['tpl_content'], '{--') !== false) || (strpos($GLOBALS['tpl_content'], '{!') !== false) || (strpos($GLOBALS['tpl_content'], '{?') !== false)) { + if ((strpos($GLOBALS['tpl_content'], '$') !== false) || (strpos($GLOBALS['tpl_content'], '{--') !== false) || (strpos($GLOBALS['tpl_content'], '{!') !== false) || (strpos($GLOBALS['tpl_content'], '{?') !== false) || (strpos($GLOBALS['tpl_content'], '{%') !== false)) { // Normal HTML output? if (getOutputMode() == '0') { // Add surrounding HTML comments to help finding bugs faster @@ -302,7 +317,7 @@ function loadTemplate ($template, $return = false, $content = array()) { } else { // Add surrounding HTML comments to help finding bugs faster $ret = '\n" . $GLOBALS['tpl_content'] . '\n"; - $eval = '$ret = "' . escapeQuotes($ret) . '";'; + $eval = '$ret = "' . compileRawCode(escapeQuotes($ret)) . '";'; } // END - if // Cache the eval() command here @@ -312,7 +327,7 @@ function loadTemplate ($template, $return = false, $content = array()) { eval($GLOBALS['template_eval'][$template]); } elseif ((isAdmin()) || ((isInstalling()) && (!isInstalled()))) { // Only admins shall see this warning or when installation mode is active - $ret = '
{--TEMPLATE_404--}
+ $ret = '
{--TEMPLATE_404--}
(' . $template . ')

{--TEMPLATE_CONTENT--} @@ -350,48 +365,57 @@ function detectExtraTemplatePath ($template) { // Default is empty $extraPath = ''; - // Check for admin/guest/member templates - if (substr($template, 0, 6) == 'admin_') { - // Admin template found - $extraPath = 'admin/'; - } elseif (substr($template, 0, 6) == 'guest_') { - // Guest template found - $extraPath = 'guest/'; - } elseif (substr($template, 0, 7) == 'member_') { - // Member template found - $extraPath = 'member/'; - } elseif (substr($template, 0, 8) == 'install_') { - // Installation template found - $extraPath = 'install/'; - } elseif (substr($template, 0, 4) == 'ext_') { - // Extension template found - $extraPath = 'ext/'; - } elseif (substr($template, 0, 3) == 'la_') { - // 'Logical-area' template found - $extraPath = 'la/'; - } elseif (substr($template, 0, 3) == 'js_') { - // JavaScript template found - $extraPath = 'js/'; - } elseif (substr($template, 0, 5) == 'menu_') { - // Menu template found - $extraPath = 'menu/'; - } else { - // Test for extension - $test = substr($template, 0, strpos($template, '_')); + // Do we have cache? + if (!isset($GLOBALS['extra_path'][$template])) { + // Check for admin/guest/member/etc. templates + if (substr($template, 0, 6) == 'admin_') { + // Admin template found + $extraPath = 'admin/'; + } elseif (substr($template, 0, 6) == 'guest_') { + // Guest template found + $extraPath = 'guest/'; + } elseif (substr($template, 0, 7) == 'member_') { + // Member template found + $extraPath = 'member/'; + } elseif (substr($template, 0, 7) == 'select_') { + // Selection template found + $extraPath = 'select/'; + } elseif (substr($template, 0, 8) == 'install_') { + // Installation template found + $extraPath = 'install/'; + } elseif (substr($template, 0, 4) == 'ext_') { + // Extension template found + $extraPath = 'ext/'; + } elseif (substr($template, 0, 3) == 'la_') { + // 'Logical-area' template found + $extraPath = 'la/'; + } elseif (substr($template, 0, 3) == 'js_') { + // JavaScript template found + $extraPath = 'js/'; + } elseif (substr($template, 0, 5) == 'menu_') { + // Menu template found + $extraPath = 'menu/'; + } else { + // Test for extension + $test = substr($template, 0, strpos($template, '_')); - // Probe for valid extension name - if (isExtensionNameValid($test)) { - // Set extra path to extension's name - $extraPath = $test . '/'; - } // END - if - } + // Probe for valid extension name + if (isExtensionNameValid($test)) { + // Set extra path to extension's name + $extraPath = $test . '/'; + } // END - if + } + + // Store it in cache + $GLOBALS['extra_path'][$template] = $extraPath; + } // END - if // Return result - return $extraPath; + return $GLOBALS['extra_path'][$template]; } // Loads an email template and compiles it -function loadEmailTemplate ($template, $content = array(), $UID = '0') { +function loadEmailTemplate ($template, $content = array(), $userid = '0') { global $DATA; // Make sure all template names are lowercase! @@ -400,61 +424,44 @@ function loadEmailTemplate ($template, $content = array(), $UID = '0') { // Default 'nickname' if extension is not installed $nick = '---'; - // Prepare IP number and User Agent - $REMOTE_ADDR = detectRemoteAddr(); - $HTTP_USER_AGENT = detectUserAgent(); - - // Default admin - $ADMIN = getConfig('MAIN_TITLE'); - - // Is the admin logged in? - if (isAdmin()) { - // Get admin id - $adminId = getCurrentAdminId(); - - // Load Admin data - $ADMIN = getAdminEmail($adminId); - } // END - if - // Neutral email address is default $email = getConfig('WEBMASTER'); - // Expiration in a nice output format - // NOTE: Use $content[expiration] in your templates instead of $EXPIRATION - if (getConfig('auto_purge') == '0') { - // Will never expire! - $EXPIRATION = getMessage('MAIL_WILL_NEVER_EXPIRE'); - } else { - // Create nice date string - $EXPIRATION = createFancyTime(getConfig('auto_purge')); - } - // Is content an array? if (is_array($content)) { - // Add expiration to array, $EXPIRATION is now deprecated! - $content['expiration'] = $EXPIRATION; + // Add expiration to array + if ((isConfigEntrySet('auto_purge')) && (getConfig('auto_purge') == '0')) { + // Will never expire! + $content['expiration'] = getMessage('MAIL_WILL_NEVER_EXPIRE'); + } elseif (isConfigEntrySet('auto_purge')) { + // Create nice date string + $content['expiration'] = createFancyTime(getConfig('auto_purge')); + } else { + // Missing entry + $content['expiration'] = getMessage('MAIL_NO_CONFIG_AUTO_PURGE'); + } } // END - if // Load user's data - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):UID={$UID},template={$template},content[]=".gettype($content).'
'); - if (($UID > 0) && (is_array($content))) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "UID={$userid},template={$template},content[]=".gettype($content).'
'); + if (($userid > 0) && (is_array($content))) { // If nickname extension is installed, fetch nickname as well - if (isNicknameUsed($UID)) { - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):NICKNAME!
"); + if ((isExtensionActive('nickname')) && (isNicknameUsed($userid))) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "NICKNAME!
"); // Load by nickname - fetchUserData($UID, 'nickname'); + fetchUserData($userid, 'nickname'); } else { - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):NO-NICK!
"); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "NO-NICK!
"); /// Load by userid - fetchUserData($UID); + fetchUserData($userid); } // Merge data if valid - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):content()=".count($content)." - PRE
"); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "content()=".count($content)." - PRE
"); if (isUserDataValid()) { $content = merge_array($content, getUserDataArray()); } // END - if - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):content()=".count($content)." - AFTER
"); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "content()=".count($content)." - AFTER
"); } // END - if // Translate M to male or F to female if present @@ -463,8 +470,8 @@ function loadEmailTemplate ($template, $content = array(), $UID = '0') { // Overwrite email from data if present if (isset($content['email'])) $email = $content['email']; - // Store email for some functions in global data array - // @TODO Do only use $contentn, not $DATA or raw variables + // Store email for some functions in global $DATA array + // @TODO Do only use $content, not $DATA or raw variables $DATA['email'] = $email; // Base directory @@ -489,7 +496,7 @@ function loadEmailTemplate ($template, $content = array(), $UID = '0') { $GLOBALS['tpl_content'] = readFromFile($FQFN); // Run code - $GLOBALS['tpl_content'] = "\$newContent = decodeEntities(\"".compileRawCode(escapeQuotes($GLOBALS['tpl_content']))."\");"; + $GLOBALS['tpl_content'] = '$newContent = decodeEntities("' . compileRawCode(escapeQuotes($GLOBALS['tpl_content'])) . '");'; eval($GLOBALS['tpl_content']); } elseif (!empty($template)) { // Template file not found! @@ -510,7 +517,7 @@ function loadEmailTemplate ($template, $content = array(), $UID = '0') { // Is there some content? if (empty($newContent)) { // Compiling failed - $newContent = "Compiler error for template {$template}!\nUncompiled content:\n" . $GLOBALS['tpl_content']; + $newContent = "Compiler error for template " . $template . " !\nUncompiled content:\n" . $GLOBALS['tpl_content']; // Add last error if the required function exists if (function_exists('error_get_last')) $newContent .= "\n--------------------------------------\nDebug:\n".print_r(error_get_last(), true)."--------------------------------------\nPlease don't alter these informations!\nThanx."; @@ -526,13 +533,13 @@ function loadEmailTemplate ($template, $content = array(), $UID = '0') { // Send mail out to an email address function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '') { - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):TO={$toEmail},SUBJECT={$subject}
"); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "TO={$toEmail},SUBJECT={$subject}
"); // Compile subject line (for POINTS constant etc.) - eval("\$subject = decodeEntities(\"".compileRawCode(escapeQuotes($subject))."\");"); + eval('$subject = decodeEntities("' . compileRawCode(escapeQuotes($subject)) . '");'); // Set from header - if ((!eregi('@', $toEmail)) && ($toEmail > 0)) { + if ((!isInStringIgnoreCase('@', $toEmail)) && ($toEmail > 0)) { // Value detected, is the message extension installed? // @TODO Extension 'msg' does not exist if (isExtensionActive('msg')) { @@ -552,7 +559,7 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = ' // Is the webmaster! $toEmail = getConfig('WEBMASTER'); } - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):TO={$toEmail}
"); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "TO={$toEmail}
"); // Check for PHPMailer or debug-mode if (!checkPhpMailerUsage()) { @@ -575,30 +582,30 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = ' } // Compile "TO" - eval("\$toEmail = \"".compileRawCode(escapeQuotes($toEmail))."\";"); + eval('$toEmail = "' . compileRawCode(escapeQuotes($toEmail)) . '";'); // Compile "MSG" - eval("\$message = \"".compileRawCode(escapeQuotes($message))."\";"); + eval('$message = "' . str_replace('$', '$', compileRawCode(escapeQuotes($message))) . '";'); // Fix HTML parameter (default is no!) if (empty($isHtml)) $isHtml = 'N'; if (isDebugModeEnabled()) { // In debug mode we want to display the mail instead of sending it away so we can debug this part outputHtml('
-Headers : ' . str_replace('<', '<', str_replace('>', '>', secureString(trim($mailHeader)))) . '
-To      : ' . $toEmail . '
-Subject : ' . $subject . '
-Message : ' . $message . '
+Headers : ' . htmlentities(utf8_decode(trim($mailHeader))) . '
+To      : ' . htmlentities(utf8_decode($toEmail)) . '
+Subject : ' . htmlentities(utf8_decode($subject)) . '
+Message : ' . htmlentities(utf8_decode($message)) . '
'); } elseif (($isHtml == 'Y') && (isExtensionActive('html_mail'))) { // Send mail as HTML away - sendHtmlEmail($toEmail, $subject, $message, $mailHeader); + return sendHtmlEmail($toEmail, $subject, $message, $mailHeader); } elseif (!empty($toEmail)) { // Send Mail away - sendRawEmail($toEmail, $subject, $message, $mailHeader); + return sendRawEmail($toEmail, $subject, $message, $mailHeader); } elseif ($isHtml != 'Y') { // Problem found! - sendRawEmail(getConfig('WEBMASTER'), '[PROBLEM:]' . $subject, $message, $mailHeader); + return sendRawEmail(getConfig('WEBMASTER'), '[PROBLEM:]' . $subject, $message, $mailHeader); } } @@ -627,7 +634,7 @@ function sendRawEmail ($toEmail, $subject, $message, $from) { $mail = new PHPMailer(); // Set charset to UTF-8 - $mail->CharSet('UTF-8'); + $mail->CharSet = 'UTF-8'; // Path for PHPMailer $mail->PluginDir = sprintf("%sinc/phpmailer/", getConfig('PATH')); @@ -658,9 +665,21 @@ function sendRawEmail ($toEmail, $subject, $message, $from) { $mail->AddCustomHeader('Errors-To:' . getConfig('WEBMASTER')); $mail->AddCustomHeader('X-Loop:' . getConfig('WEBMASTER')); $mail->Send(); + + // Has an error occured? + if (!empty($mail->ErrorInfo)) { + // Log message + logDebugMessage(__FUNCTION__, __LINE__, 'Error while sending mail: ' . $mail->ErrorInfo); + + // Raise an error + return false; + } else { + // All fine! + return true; + } } else { // Use legacy mail() command - mail($toEmail, $subject, decodeEntities($message), $from); + return mail($toEmail, $subject, decodeEntities($message), $from); } } @@ -749,7 +768,7 @@ function translateYesNo ($yn) { // Translates the "pool type" into human-readable function translatePoolType ($type) { // Default?type is unknown - $translated = sprintf(getMessage('POOL_TYPE_UNKNOWN'), $type); + $translated = getMaskedMessage('POOL_TYPE_UNKNOWN', $type); // Generate constant $constName = sprintf("POOL_TYPE_%s", $type); @@ -766,6 +785,9 @@ function translatePoolType ($type) { // Translates the american decimal dot into a german comma function translateComma ($dotted, $cut = true, $max = '0') { + // First, cast all to double, due to PHP changes + $dotted = (double) $dotted; + // Default is 3 you can change this in admin area "Misc -> Misc Options" if (!isConfigEntrySet('max_comma')) setConfigEntry('max_comma', 3); @@ -814,10 +836,10 @@ function translateGender ($gender) { case 'F': $ret = getMessage('GENDER_F'); break; case 'C': $ret = getMessage('GENDER_C'); break; default: - // Log unknown gender - logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown gender %s detected.", $gender)); + // Please report bugs on unknown genders + debug_report_bug(sprintf("Unknown gender %s detected.", $gender)); break; - } + } // END - switch // Return translated gender return $ret; @@ -839,8 +861,8 @@ function translateUserStatus ($status) { break; default: - logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status)); - $ret = sprintf(getMessage('UNKNOWN_STATUS'), $status); + // Please report all unknown status + debug_report_bug(sprintf("Unknown status %s detected.", $status)); break; } // END - switch @@ -853,7 +875,7 @@ function generateDerefererUrl ($URL) { // Don't de-refer our own links! if (substr($URL, 0, strlen(getConfig('URL'))) != getConfig('URL')) { // De-refer this link - $URL = '{?URL?}/modules.php?module=loader&url=' . encodeString(compileUriCode($URL)); + $URL = '{%url=modules.php?module=loader&url=' . encodeString(compileUriCode($URL)) . '%}'; } // END - if // Return link @@ -863,7 +885,7 @@ function generateDerefererUrl ($URL) { // Generates an URL for the frametester function generateFrametesterUrl ($URL) { // Prepare frametester URL - $frametesterUrl = sprintf("{?URL?}/modules.php?module=frametester&url=%s", + $frametesterUrl = sprintf("{%%url=modules.php?module=frametester&url=%s%%}", encodeString(compileUriCode($URL)) ); @@ -894,7 +916,7 @@ function countSelection ($array) { // Generate XHTML code for the CAPTCHA function generateCaptchaCode ($code, $type, $DATA, $userid) { - return 'Code ' . $code . ''; + return 'Code ' . $code . ''; } // Generates a timestamp (some wrapper for mktime()) @@ -916,20 +938,9 @@ function makeTime ($hours, $minutes, $seconds, $stamp) { } // Redirects to an URL and if neccessarry extends it with own base URL -function redirectToUrl ($URL) { +function redirectToUrl ($URL, $allowSpider = true) { // Compile out codes - eval('$URL = "' . compileRawCode($URL) . '";'); - - // Check if http(s):// is there - if ((substr($URL, 0, 7) != 'http://') && (substr($URL, 0, 8) != 'https://')) { - // Make all URLs full-qualified - $URL = getConfig('URL') . '/' . $URL; - } // END - if - - // Three different debug ways... - //* DEBUG: */ debug_report_bug(sprintf("%s[%s:] URL=%s", __FUNCTION__, __LINE__, $URL)); - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'URL=' . $URL); - //* DEBUG: */ die($URL); + eval('$URL = "' . compileRawCode(encodeUrl($URL)) . '";'); // Default 'rel' value is external, nofollow is evil from Google and hurts the Internet $rel = ' rel="external"'; @@ -940,23 +951,22 @@ function redirectToUrl ($URL) { $rel = ''; } // END - if - // Get output buffer - $GLOBALS['output'] = ob_get_contents(); - - // Clear it only if there is content - if (!empty($GLOBALS['output'])) { - clearOutputBuffer(); - } // END - if + // Three different ways to debug... + //* DEBUG: */ debug_report_bug(sprintf("%s[%s:] URL=%s", __FUNCTION__, __LINE__, $URL)); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'URL=' . $URL); + //* DEBUG: */ die($URL); // Simple probe for bots/spiders from search engines - if ((strpos(detectUserAgent(), 'spider') !== false) || (strpos(detectUserAgent(), 'bot') !== false)) { + if ((isSpider()) && ($allowSpider === true)) { // Secure the URL against bad things such als HTML insertions and so on... $URL = secureString($URL); + // Set content-type here to fix a missing array element + setContentType('text/html'); + // Output new location link as anchor outputHtml('' . $URL . ''); } elseif (!headers_sent()) { - //* DEBUG: */ debug_report_bug("URL={$URL}"); // Clear own output buffer $GLOBALS['output'] = ''; @@ -997,16 +1007,16 @@ function compileCode ($code, $simple = false, $constants = true, $full = true) { } // END - if // Start couting - $startCompile = explode(' ', microtime()); + $startCompile = microtime(true); // Comile the code $code = compileRawCode($code, $simple, $constants, $full); // Get timing - $compiled = explode(' ', microtime()); + $compiled = microtime(true); // Add timing - $code .= ''; + $code .= ''; // Return compiled code return $code; @@ -1034,11 +1044,11 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true if ($constants === true) { // BEFORE 0.2.1 : Language and data constants // WITH 0.2.1+ : Only language constants - $code = str_replace('{--', "\".getMessage('", str_replace('--}', "').\"", $code)); + $code = str_replace('{--', "\" . getMessage('", str_replace('--}', "') . \"", $code)); // BEFORE 0.2.1 : Not used // WITH 0.2.1+ : Data constants - $code = str_replace('{!', "\".constant('", str_replace("!}", "').\"", $code)); + $code = str_replace('{!', "\" . constant('", str_replace('!}', "') . \"", $code)); } // END - if // Compile QUOT and other non-HTML codes @@ -1065,10 +1075,10 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true $test = substr($found, 0, strlen($match)); // Does this entry exist? - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):found={$found},match={$match},set={$set}
"); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "found={$found},match={$match},set={$set}
"); if ($test == $match) { // Match found! - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):fuzzyFound!
"); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "fuzzyFound!
"); $fuzzyFound = true; break; } // END - if @@ -1080,14 +1090,14 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true // Take all string elements if ((is_string($matches[4][$key])) && (!isset($matchesFound[$match])) && (!isset($matchesFound[$key."_" . $matches[4][$key]]))) { // Replace it in the code - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):key={$key},match={$match}
"); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "key={$key},match={$match}
"); $newMatch = str_replace('[', "['", str_replace(']', "']", $match)); $code = str_replace($match, '".' . $newMatch . '."', $code); $matchesFound[$key . '_' . $matches[4][$key]] = 1; $matchesFound[$match] = 1; } elseif (!isset($matchesFound[$match])) { // Not yet replaced! - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):match={$match}
"); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "match={$match}
"); $code = str_replace($match, '".' . $match . '."', $code); $matchesFound[$match] = 1; } @@ -1269,7 +1279,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 're // 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().":'.':".filemtime(getConfig('PATH').'inc/databases.php'); + $server = $_SERVER['PHP_SELF'] . getConfig('ENCRYPT_SEPERATOR') . detectUserAgent() . getConfig('ENCRYPT_SEPERATOR') . getenv('SERVER_SOFTWARE') . getConfig('ENCRYPT_SEPERATOR') . detectRemoteAddr(); // Build key string $keys = getConfig('SITE_KEY') . getConfig('ENCRYPT_SEPERATOR') . getConfig('DATE_KEY'); @@ -1320,7 +1330,7 @@ function generateRandomCode ($length, $code, $userid, $DATA = '') { } // Does only allow numbers -function bigintval ($num, $castValue = true) { +function bigintval ($num, $castValue = true, $abortOnMismatch = true) { // Filter all numbers out $ret = preg_replace('/[^0123456789]/', '', $num); @@ -1328,7 +1338,7 @@ function bigintval ($num, $castValue = true) { if ($castValue === true) $ret = (double)$ret; // Has the whole value changed? - if ('' . $ret . '' != '' . $num . '') { + if (('' . $ret . '' != '' . $num . '') && ($abortOnMismatch === true)) { // Log the values debug_report_bug('Problem with number found. ret=' . $ret . ', num='. $num); } // END - if @@ -1341,11 +1351,11 @@ function bigintval ($num, $castValue = true) { function generateImageOrCode ($img_code, $headerSent = true) { // Is the code size oversized or shouldn't we display it? if ((strlen($img_code) > 6) || (empty($img_code)) || (getConfig('code_length') == '0')) { - // Stop2 execution of function here because of over-sized code length + // Stop execution of function here because of over-sized code length debug_report_bug('img_code ' . $img_code .' has invalid length. img_code()=' . strlen($img_code) . ' code_length=' . getConfig('code_length')); } elseif ($headerSent === false) { // Return an HTML code here - return "\"Image\"\n"; + return "\"Image\"\n"; } // Load image @@ -1396,6 +1406,16 @@ function generateImageOrCode ($img_code, $headerSent = true) { } // Create selection box or array of splitted timestamp function createTimeSelections ($timestamp, $prefix = '', $display = '', $align = 'center', $return_array=false) { + // Do not continue if ONE_DAY is absend + if (!isConfigEntrySet('ONE_DAY')) { + // And return the timestamp itself or empty array + if ($return_array === true) { + return array(); + } else { + return $timestamp; + } + } // END - if + // Calculate 2-seconds timestamp $stamp = round($timestamp); //* DEBUG: */ print("*" . $stamp.'/' . $timestamp."*
"); @@ -1457,40 +1477,40 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align = $OUT .= "\n"; $OUT .= "\n"; - if (ereg('Y', $display) || (empty($display))) { - $OUT .= " \n"; + if (isInString('Y', $display) || (empty($display))) { + $OUT .= " \n"; } - if (ereg('M', $display) || (empty($display))) { - $OUT .= " \n"; + if (isInString('M', $display) || (empty($display))) { + $OUT .= " \n"; } - if (ereg('W', $display) || (empty($display))) { - $OUT .= " \n"; + if (isInString('W', $display) || (empty($display))) { + $OUT .= " \n"; } - if (ereg('D', $display) || (empty($display))) { - $OUT .= " \n"; + if (isInString('D', $display) || (empty($display))) { + $OUT .= " \n"; } - if (ereg('h', $display) || (empty($display))) { - $OUT .= " \n"; + if (isInString('h', $display) || (empty($display))) { + $OUT .= " \n"; } - if (ereg('m', $display) || (empty($display))) { - $OUT .= " \n"; + if (isInString('m', $display) || (empty($display))) { + $OUT .= " \n"; } - if (ereg('s', $display) || (empty($display))) { - $OUT .= " \n"; + if (isInString('s', $display) || (empty($display))) { + $OUT .= " \n"; } $OUT .= "\n"; $OUT .= "\n"; - if (ereg('Y', $display) || (empty($display))) { + if (isInString('Y', $display) || (empty($display))) { // Generate year selection - $OUT .= " \n"; $OUT .= "
{--_YEARS--}
{--_YEARS--}
{--_MONTHS--}
{--_MONTHS--}
{--_WEEKS--}
{--_WEEKS--}
{--_DAYS--}
{--_DAYS--}
{--_HOURS--}
{--_HOURS--}
{--_MINUTES--}
{--_MINUTES--}
{--_SECONDS--}
{--_SECONDS--}
'; } - if (ereg('M', $display) || (empty($display))) { + if (isInString('M', $display) || (empty($display))) { // Generate month selection - $OUT .= " '; } - if (ereg('W', $display) || (empty($display))) { + if (isInString('W', $display) || (empty($display))) { // Generate week selection - $OUT .= " '; } - if (ereg('D', $display) || (empty($display))) { + if (isInString('D', $display) || (empty($display))) { // Generate day selection - $OUT .= " '; } - if (ereg('h', $display) || (empty($display))) { + if (isInString('h', $display) || (empty($display))) { // Generate hour selection - $OUT .= " '; } - if (ereg('m', $display) || (empty($display))) { + if (isInString('m', $display) || (empty($display))) { // Generate minute selection - $OUT .= " '; } - if (ereg('s', $display) || (empty($display))) { + if (isInString('s', $display) || (empty($display))) { // Generate second selection - $OUT .= " '; } $OUT .= "
\n"; @@ -1597,21 +1617,21 @@ function createTimestampFromSelections ($prefix, $postData) { $TEST = date('Y', time()) / 4; $M1 = date('m', time()); // 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'); + if ((floor($TEST) == $TEST) && ($M1 == '02') && ($postData[$prefix . '_mo'] > '02')) $SWITCH = getConfig('ONE_DAY'); // First add years... - $ret += $postData[$prefix."_ye"] * (31536000 + $SWITCH); + $ret += $postData[$prefix . '_ye'] * (31536000 + $SWITCH); // Next months... - $ret += $postData[$prefix."_mo"] * 2628000; + $ret += $postData[$prefix . '_mo'] * 2628000; // Next weeks - $ret += $postData[$prefix."_we"] * 604800; + $ret += $postData[$prefix . '_we'] * 604800; // Next days... - $ret += $postData[$prefix."_da"] * 86400; + $ret += $postData[$prefix . '_da'] * 86400; // Next hours... - $ret += $postData[$prefix."_ho"] * 3600; + $ret += $postData[$prefix . '_ho'] * 3600; // Next minutes.. - $ret += $postData[$prefix."_mi"] * 60; + $ret += $postData[$prefix . '_mi'] * 60; // And at last seconds... - $ret += $postData[$prefix."_se"]; + $ret += $postData[$prefix . '_se']; // Return calculated value return $ret; } @@ -1644,30 +1664,29 @@ function createFancyTime ($stamp) { // Generates a navigation row for listing emails function addEmailNavigation ($PAGES, $offset, $show_form, $colspan, $return=false) { - $SEP = ''; $TOP = ''; + $TOP = ''; if ($show_form === false) { - $TOP = " top2"; - $SEP = " "; + $TOP = " top"; } $NAV = ''; for ($page = 1; $page <= $PAGES; $page++) { // Is the page currently selected or shall we generate a link to it? - if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) { + if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) { // Is currently selected, so only highlight it $NAV .= '-'; } else { // Open anchor tag and add base URL - $NAV .= ' 0)) $NAV .= '&userid=' . bigintval(getRequestElement('userid')); + if ((isGetRequestParameterSet('userid')) && (bigintval(getRequestParameter('userid')) > 0)) $NAV .= '&userid=' . bigintval(getRequestParameter('userid')); // Close open anchor tag - $NAV .= '">'; + $NAV .= '%}">'; } $NAV .= $page; - if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) { + if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) { // Is currently selected, so only highlight it $NAV .= '-'; } else { @@ -1683,7 +1702,6 @@ function addEmailNavigation ($PAGES, $offset, $show_form, $colspan, $return=fals $content['nav'] = $NAV; $content['span'] = $colspan; $content['top'] = $TOP; - $content['sep'] = $SEP; // Load navigation template $OUT = loadTemplate('admin_email_nav_row', true, $content); @@ -1713,14 +1731,14 @@ function extractHostnameFromUrl (&$script) { // Extract host name $host = str_replace('http://', '', $url); - if (ereg('/', $host)) $host = substr($host, 0, strpos($host, '/')); + if (isInString('/', $host)) $host = substr($host, 0, strpos($host, '/')); // Generate relative URL //* DEBUG: */ print("SCRIPT=" . $script.'
'); if (substr(strtolower($script), 0, 7) == 'http://') { // But only if http:// is in front! $script = substr($script, (strlen($url) + 7)); - } elseif (substr(strtolower($script), 0, 8) == "https://") { + } elseif (substr(strtolower($script), 0, 8) == 'https://') { // Does this work?! $script = substr($script, (strlen($url) + 8)); } @@ -1738,19 +1756,22 @@ function sendGetRequest ($script, $data = array()) { $host = extractHostnameFromUrl($script); // Add data - $scriptData = http_build_query($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 - $scriptData = '?' . $scriptData; + $body = '?' . $body; } else { // Ok, add & - $scriptData = '&' . $scriptData; + $body = '&' . $body; } // Add script data - $script .= $scriptData; + $script .= $body; + + // Remove trailed & to make it more conform + if (substr($script, -1, 1) == '&') $script = substr($script, 0, -1); // Generate GET request header $request = 'GET /' . trim($script) . ' HTTP/1.1' . getConfig('HTTP_EOL'); @@ -1761,9 +1782,13 @@ function sendGetRequest ($script, $data = array()) { } else { $request .= 'User-Agent: ' . getConfig('TITLE') . '/' . getConfig('VERSION') . getConfig('HTTP_EOL'); } - $request .= 'Content-Type: text/plain' . 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'); - $request .= 'Connection: Close' . getConfig('HTTP_EOL') . getConfig('HTTP_EOL'); + $request .= 'Content-Type: text/plain' . getConfig('HTTP_EOL'); + $request .= 'Content-Length: 0' . getConfig('HTTP_EOL'); + $request .= 'Connection: close' . getConfig('HTTP_EOL'); + $request .= getConfig('HTTP_EOL'); // Send the raw request $response = sendRawRequest($host, $request); @@ -1784,19 +1809,24 @@ function sendPostRequest ($script, $postData) { // Extract host name from script $host = extractHostnameFromUrl($script); - // Construct request - $data = http_build_query($postData, '', '&'); + // Construct request body + $body = http_build_query($postData, '', '&'); // Generate POST request header $request = 'POST /' . trim($script) . ' HTTP/1.1' . 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 .= 'Content-Type: application/x-www-form-urlencoded' . getConfig('HTTP_EOL'); - $request .= 'Content-length: ' . strlen($data) . 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'); - $request .= 'Connection: Close' . getConfig('HTTP_EOL') . getConfig('HTTP_EOL'); - $request .= $data; + $request .= 'Content-Type: application/x-www-form-urlencoded' . getConfig('HTTP_EOL'); + $request .= 'Content-Length: ' . strlen($body) . getConfig('HTTP_EOL'); + $request .= 'Connection: close' . getConfig('HTTP_EOL'); + $request .= getConfig('HTTP_EOL'); + + // Add body + $request .= $body; // Send the raw request $response = sendRawRequest($host, $request); @@ -1822,68 +1852,97 @@ function sendRawRequest ($host, $request) { $useProxy = true; } // END - if + // Load include + loadIncludeOnce('inc/classes/resolver.class.php'); + + // Get resolver instance + $resolver = new HostnameResolver(); + // Open connection //* DEBUG: */ die("SCRIPT=" . $script.'
'); if ($useProxy === true) { + // Resolve hostname into IP address + $ip = $resolver->resolveHostname(compileRawCode(getConfig('proxy_host'))); + // Connect to host through proxy connection - $fp = @fsockopen(compileRawCode(getConfig('proxy_host')), bigintval(getConfig('proxy_port')), $errno, $errdesc, 30); + $fp = fsockopen($ip, bigintval(getConfig('proxy_port')), $errno, $errdesc, 30); } else { + // Resolve hostname into IP address + $ip = $resolver->resolveHostname($host); + // Connect to host directly - $fp = @fsockopen($host, 80, $errno, $errdesc, 30); + $fp = fsockopen($ip, 80, $errno, $errdesc, 30); } // Is there a link? if (!is_resource($fp)) { // Failed! + logDebugMessage(__FUNCTION__, __LINE__, $errdesc . ' (' . $errno . ')'); return $response; - } // END - if + } elseif ((!stream_set_blocking($fp, 0)) || (!stream_set_timeout($fp, 1))) { + // Cannot set non-blocking mode or timeout + logDebugMessage(__FUNCTION__, __LINE__, socket_strerror(socket_last_error())); + return $response; + } // Do we use proxy? if ($useProxy === true) { - // Generate CONNECT request header - $proxyTunnel = "CONNECT " . $host . ":80 HTTP/1.1" . getConfig('HTTP_EOL'); - $proxyTunnel .= "Host: " . $host . getConfig('HTTP_EOL'); - - // Use login data to proxy? (username at least!) - if (getConfig('proxy_username') != '') { - // Add it as well - $encodedAuth = base64_encode(compileRawCode(getConfig('proxy_username')) . getConfig('ENCRYPT_SEPERATOR') . compileRawCode(getConfig('proxy_password'))); - $proxyTunnel .= "Proxy-Authorization: Basic " . $encodedAuth . getConfig('HTTP_EOL'); - } // END - if - - // Add last new-line - $proxyTunnel .= getConfig('HTTP_EOL'); - //* DEBUG: */ print("proxyTunnel=
" . $proxyTunnel."
"); - - // Write request - fputs($fp, $proxyTunnel); + // Setup proxy tunnel + $response = setupProxyTunnel($host, $fp); - // Got response? - if (feof($fp)) { - // No response received - return $response; - } // END - if - - // Read the first line - $resp = trim(fgets($fp, 10240)); - $respArray = explode(' ', $resp); - if ((strtolower($respArray[0]) !== 'http/1.0') || ($respArray[1] != '200')) { + // If the response is invalid, abort + if ((count($response) == 3) && (empty($response[0])) && (empty($response[1])) && (empty($response[2]))) { // Invalid response! + logDebugMessage(__FUNCTION__, __LINE__, 'Proxy tunnel not working?'); return $response; } // END - if } // END - if // Write request - fputs($fp, $request); + fwrite($fp, $request); + + // Start counting + $start = microtime(true); // Read response while (!feof($fp)) { - $response[] = trim(fgets($fp, 1024)); + // Get info from stream + $info = stream_get_meta_data($fp); + + // Is it timed out? 15 seconds is a really patient... + if (($info['timed_out'] == true) || (microtime(true) - $start) > 15) { + // Timeout + logDebugMessage(__FUNCTION__, __LINE__, 'Timed out to get data from host ' . $host); + + // Abort here + break; + } // END - if + + // Get line from stream + $line = fgets($fp, 128); + + // Ignore empty lines because of non-blocking mode + if (empty($line)) { + // uslepp a little to avoid 100% CPU load + usleep(10); + + // Skip this + continue; + } // END - if + + // Add it to response + $response[] = trim($line); } // END - while // Close socket fclose($fp); + // Time request if debug-mode is enabled + if (isDebugModeEnabled()) { + // Add debug message... + logDebugMessage(__FUNCTION__, __LINE__, 'Request took ' . (microtime(true) - $start) . ' seconds and returned ' . count($response) . ' line(s).'); + } // END - if + // Skip first empty lines $resp = $response; foreach ($resp as $idx => $line) { @@ -1900,18 +1959,24 @@ function sendRawRequest ($host, $request) { } } // END - foreach - //* DEBUG: */ print("Response:
".print_r($response, true)."
"); + //* DEBUG: */ print('Request:
'.print_r($request, true).'
'); + //* DEBUG: */ print('Response:
'.print_r($response, true).'
'); - // Proxy agent found? - if ((substr(strtolower($response[0]), 0, 11) == 'proxy-agent') && ($useProxy === true)) { + // Proxy agent found or something went wrong? + if (!isset($response[0])) { + // No response, maybe timeout + $response = array('', '', ''); + logDebugMessage(__FUNCTION__, __LINE__, 'Invalid empty response array, maybe timed out?'); + } elseif ((substr(strtolower($response[0]), 0, 11) == 'proxy-agent') && ($useProxy === true)) { // Proxy header detected, so remove two lines array_shift($response); array_shift($response); } // END - if // Was the request successfull? - if ((!eregi('200 OK', $response[0])) || (empty($response[0]))) { + if ((!isInStringIgnoreCase('200 OK', $response[0])) || (empty($response[0]))) { // Not found / access forbidden + logDebugMessage(__FUNCTION__, __LINE__, 'Unexpected status code ' . $response[0] . ' detected. "200 OK" was expected.'); $response = array('', '', ''); } // END - if @@ -1919,7 +1984,48 @@ function sendRawRequest ($host, $request) { return $response; } -// Taken from www.php.net eregi() user comments +// Sets up a proxy tunnel for given hostname and through resource +function setupProxyTunnel ($host, $resource) { + // Initialize array + $response = array('', '', ''); + + // Generate CONNECT request header + $proxyTunnel = 'CONNECT ' . $host . ':80 HTTP/1.1' . getConfig('HTTP_EOL'); + $proxyTunnel .= 'Host: ' . $host . getConfig('HTTP_EOL'); + + // Use login data to proxy? (username at least!) + if (getConfig('proxy_username') != '') { + // Add it as well + $encodedAuth = base64_encode(compileRawCode(getConfig('proxy_username')) . ':' . compileRawCode(getConfig('proxy_password'))); + $proxyTunnel .= 'Proxy-Authorization: Basic ' . $encodedAuth . getConfig('HTTP_EOL'); + } // END - if + + // Add last new-line + $proxyTunnel .= getConfig('HTTP_EOL'); + //* DEBUG: */ print('proxyTunnel=
' . $proxyTunnel.'
'); + + // Write request + fwrite($fp, $proxyTunnel); + + // Got response? + if (feof($fp)) { + // No response received + return $response; + } // END - if + + // Read the first line + $resp = trim(fgets($fp, 10240)); + $respArray = explode(' ', $resp); + if ((strtolower($respArray[0]) !== 'http/1.0') || ($respArray[1] != '200')) { + // Invalid response! + return $response; + } // END - if + + // All fine! + return $respArray; +} + +// Taken from www.php.net isInStringIgnoreCase() user comments function isEmailValid ($email) { // Check first part of email address $first = '[-a-z0-9!#$%&\'*+/=?^_<{|}~]+(\.[-a-zA-Z0-9!#$%&\'*+/=?^_<{|}~]+)*'; @@ -1934,7 +2040,7 @@ function isEmailValid ($email) { return preg_match($regex, $email); } -// Function taken from user comments on www.php.net / function eregi() +// Function taken from user comments on www.php.net / function isInStringIgnoreCase() function isUrlValid ($URL, $compile=true) { // Trim URL a little $URL = trim(urldecode($URL)); @@ -1964,11 +2070,11 @@ function generateMemberAdminActionLinks ($userid, $status = '') { $targetArray = array('del_user', 'edit_user', 'lock_user', 'add_points', 'sub_points'); // Begin of navigation links - $OUT = "[ "; + $OUT = '[ '; foreach ($targetArray as $tar) { - $OUT .= ""); + $OUT .= '{--ADMIN_"; + $OUT .= '_TITLE--}">{--ADMIN_'; if (($tar == 'lock_user') && ($status == 'LOCKED')) { // Locked accounts shall be unlocked $OUT .= 'UNLOCK_USER'; @@ -1984,7 +2090,7 @@ function generateMemberAdminActionLinks ($userid, $status = '') { // All other status is fine $OUT .= strtoupper($tar); } - $OUT .= "--} | "; + $OUT .= '--} | '; } // Finish navigation link @@ -2019,22 +2125,32 @@ function generateEmailLink ($email, $table = 'admins') { } // Generate a hash for extra-security for all passwords -function generateHash ($plainText, $salt = '') { +function generateHash ($plainText, $salt = '', $hash = true) { + // Debug output + //* DEBUG: */ outputHtml('plainText=' . $plainText . ',salt=' . $salt . ',hash='.intval($hash).'
'); + // Is the required extension 'sql_patches' there and a salt is not given? - if (((isExtensionInstalledAndOlder('sql_patches', '0.3.6')) || (!isExtensionActive('sql_patches')) || (!isExtensionInstalledAndNewer('other', '0.2.5'))) && (empty($salt))) { + // 0123 4 43 3 4 432 2 3 32 2 3 3210 + if ((((isExtensionInstalledAndOlder('sql_patches', '0.3.6')) && (empty($salt))) || (!isExtensionActive('sql_patches')) || (!isExtensionInstalledAndNewer('other', '0.2.5')))) { // Extension sql_patches is missing/outdated so we hash the plain text with MD5 - return md5($plainText); + if ($hash === true) { + // Is plain password + return md5($plainText); + } else { + // Is already a hash + return $plainText; + } } // END - if // Do we miss an arry element here? if (!isConfigEntrySet('file_hash')) { - // Stop2 here + // Stop here debug_report_bug('Missing file_hash in ' . __FUNCTION__ . '.'); } // END - if // 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 (inc/databases.php is no longer updated with every commit) + // Build server string for more entropy $server = $_SERVER['PHP_SELF'] . getConfig('ENCRYPT_SEPERATOR') . detectUserAgent() . getConfig('ENCRYPT_SEPERATOR') . getenv('SERVER_SOFTWARE') . getConfig('ENCRYPT_SEPERATOR') . detectRemoteAddr(); // Build key string @@ -2048,20 +2164,20 @@ function generateHash ($plainText, $salt = '') { // 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); - //* DEBUG: */ outputHtml("SHA1=" . $sha1." (".strlen($sha1).")
"); + //* DEBUG: */ outputHtml('SHA1=' . $sha1.' ('.strlen($sha1).')
'); $sha1 = scrambleString($sha1); - //* DEBUG: */ outputHtml("Scrambled=" . $sha1." (".strlen($sha1).")
"); + //* DEBUG: */ outputHtml('Scrambled=' . $sha1.' ('.strlen($sha1).')
'); //* DEBUG: */ $sha1b = descrambleString($sha1); - //* DEBUG: */ outputHtml("Descrambled=" . $sha1b." (".strlen($sha1b).")
"); + //* DEBUG: */ outputHtml('Descrambled=' . $sha1b.' ('.strlen($sha1b).')
'); // Generate the password salt string $salt = substr($sha1, 0, getConfig('salt_length')); - //* DEBUG: */ outputHtml($salt." (".strlen($salt).")
"); + //* DEBUG: */ outputHtml($salt.' ('.strlen($salt).')
'); } else { // Use given salt - //* DEBUG: */ print 'salt=' . $salt . '
'; + //* DEBUG: */ outputHtml('salt=' . $salt . '
'); $salt = substr($salt, 0, getConfig('salt_length')); - //* DEBUG: */ print 'salt=' . $salt . '(' . strlen($salt) . '/' . getConfig('salt_length') . ')
'; + //* DEBUG: */ outputHtml('salt=' . $salt . '(' . strlen($salt) . '/' . getConfig('salt_length') . ')
'); // Sanity check on salt if (strlen($salt) != getConfig('salt_length')) { @@ -2070,8 +2186,14 @@ function generateHash ($plainText, $salt = '') { } // END - if } + // Generate final hash (for debug output) + $finalHash = $salt . sha1($salt . $plainText); + + // Debug output + //* DEBUG: */ outputHtml('finalHash=' . $finalHash); + // Return hash - return $salt.sha1($salt . $plainText); + return $finalHash; } // Scramble a string @@ -2091,8 +2213,11 @@ function scrambleString($str) { $scrambleNums = explode(':', genScrambleString(strlen($str))); } + // Compare both lengths and abort if different + if (strlen($str) != count($scrambleNums)) return $str; + // Scramble string here - //* DEBUG: */ outputHtml("***Original=" . $str."***
"); + //* DEBUG: */ outputHtml('***Original=' . $str.'***
'); for ($idx = '0'; $idx < strlen($str); $idx++) { // Get char on scrambled position $char = substr($str, $scrambleNums[$idx], 1); @@ -2102,7 +2227,7 @@ function scrambleString($str) { } // END - for // Return scrambled string - //* DEBUG: */ outputHtml("***Scrambled=" . $scrambled."***
"); + //* DEBUG: */ outputHtml('***Scrambled=' . $scrambled.'***
'); return $scrambled; } @@ -2119,14 +2244,14 @@ function descrambleString($str) { // Begin descrambling $orig = str_repeat(' ', 40); - //* DEBUG: */ outputHtml("+++Scrambled=" . $str."+++
"); + //* DEBUG: */ outputHtml('+++Scrambled=' . $str.'+++
'); for ($idx = '0'; $idx < 40; $idx++) { $char = substr($str, $idx, 1); $orig = substr_replace($orig, $char, $scrambleNums[$idx], 1); } // END - for // Return scrambled string - //* DEBUG: */ outputHtml("+++Original=" . $orig."+++
"); + //* DEBUG: */ outputHtml('+++Original=' . $orig.'+++
'); return $orig; } @@ -2155,42 +2280,47 @@ function genScrambleString ($len) { } // Generate an PGP-like encrypted hash of given hash for e.g. cookies -function generatePassString ($passHash) { +function encodeHashForCookie ($passHash) { // Return vanilla password hash $ret = $passHash; // Is a secret key and master salt already initialized? - if ((isExtensionInstalled('sql_patches')) && (isExtensionInstalledAndNewer('other', '0.2.5')) && (isConfigEntrySet('_PRIME')) && (isConfigEntrySet('secret_key')) && (isConfigEntrySet('master_salt'))) { + //* 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)) { + // Both keys must have same length so return unencrypted + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, strlen($passHash) . '!=49/' . strlen(getConfig('secret_key')) . '!=40'); + return $ret; + } // END - if + $newHash = ''; $start = 9; - for ($idx = '0'; $idx < 10; $idx++) { - $part1 = hexdec(substr($passHash, $start, 4)); - $part2 = hexdec(substr(getConfig('secret_key'), $start, 4)); + //* 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)); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'part1=' . $part1 . '/part2=' . $part2); $mod = dechex($idx); if ($part1 > $part2) { $mod = dechex(sqrt(($part1 - $part2) * getConfig('_PRIME') / pi())); } elseif ($part2 > $part1) { $mod = dechex(sqrt(($part2 - $part1) * getConfig('_PRIME') / pi())); } - $mod = substr($mod, 0, 4); - //* DEBUG: */ outputHtml('part1='.$part1.'/part2='.$part2.'/mod=' . $mod . '('.strlen($mod).')
'); - $mod = str_repeat(0, (4 - strlen($mod))) . $mod; - //* DEBUG: */ outputHtml('*' . $start . '=' . $mod . '*
'); - $start += 4; + $mod = substr($mod, 0, 2); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'part1=' . $part1 . '/part2=' . $part2 . '/mod=' . $mod . '(' . strlen($mod) . ')'); + $mod = str_repeat(0, (2 - strlen($mod))) . $mod; + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'mod(' . ($idx * 2) . ')=' . $mod . '*'); + $start += 2; $newHash .= $mod; } // END - for - //* DEBUG: */ print($passHash.'
' . $newHash." (".strlen($newHash).')
'); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $passHash . ',' . $newHash . ' (' . strlen($newHash) . ')'); $ret = generateHash($newHash, getConfig('master_salt')); - //* DEBUG: */ print('ret='.$ret.'
'); - } else { - // Hash it simple - //* DEBUG: */ outputHtml("--" . $passHash."--
"); - $ret = md5($passHash); - //* DEBUG: */ outputHtml("++" . $ret."++
"); - } + } // END - if // Return result + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret=' . $ret . ''); return $ret; } @@ -2215,6 +2345,9 @@ function app_die ($F, $L, $message) { // Make sure, that the script realy realy diese here and now $GLOBALS['app_died'] = true; + // Set content type as text/html + setContentType('text/html'); + // Load header loadIncludeOnce('inc/header.php'); @@ -2222,10 +2355,10 @@ function app_die ($F, $L, $message) { $message = sprintf(getMessage('MXCHANGE_HAS_DIED'), basename($F), $L, $message); // Better log this message away - logDebugMessage($F, $L, $message); + if ($F != 'debug_report_bug') logDebugMessage($F, $L, $message); // Load the message template - loadTemplate('admin_settings_saved', false, $message); + loadTemplate('app_die_message', false, $message); // Load footer loadIncludeOnce('inc/footer.php'); @@ -2259,7 +2392,7 @@ function displayParsingTime() { ); // Load the template - loadTemplate('show_timings', false, $content); + $GLOBALS['page_footer'] .= loadTemplate('show_timings', true, $content); } // Check wether a boolean constant is set @@ -2271,14 +2404,14 @@ function isBooleanConstantAndTrue ($constName) { // : Boolean // In cache? if (isset($GLOBALS['cache_array']['const'][$constName])) { // Use cache - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."): " . $constName."-CACHE!
"); + //* DEBUG: */ outputHtml(__FUNCTION__ . '(' . __LINE__ . '): ' . $constName."-CACHE!
"); $res = ($GLOBALS['cache_array']['const'][$constName] === true); } else { // Check constant - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."): " . $constName."-RESOLVE!
"); + //* DEBUG: */ outputHtml(__FUNCTION__ . '(' . __LINE__ . '): ' . $constName."-RESOLVE!
"); if (defined($constName)) { // Found! - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."): " . $constName."-FOUND!
"); + //* DEBUG: */ outputHtml(__FUNCTION__ . '(' . __LINE__ . '): ' . $constName."-FOUND!
"); $res = (constant($constName) === true); } // END - if @@ -2302,89 +2435,16 @@ function getCurrentTheme () { // The default theme is 'default'... ;-) $ret = 'default'; - // Load default theme if not empty from configuration - if ((isConfigEntrySet('default_theme')) && (getConfig('default_theme') != '')) $ret = getConfig('default_theme'); - - if (!isSessionVariableSet('mxchange_theme')) { - // Set default theme - setTheme($ret); - } elseif ((isSessionVariableSet('mxchange_theme')) && (isExtensionInstalledAndNewer('sql_patches', '0.1.4'))) { - //die("
".print_r($GLOBALS['cache_array']['themes'], true)."
"); - // Get theme from cookie - $ret = getSession('mxchange_theme'); - - // Is it valid? - if (getThemeId($ret) == '0') { - // Fix it to default - $ret = 'default'; - } // END - if - } elseif ((!isInstalled()) && ((isInstalling()) || (getOutputMode() == true)) && ((isGetRequestElementSet('theme')) || (isPostRequestElementSet('theme')))) { - // Prepare FQFN for checking - $theme = sprintf("%stheme/%s/theme.php", getConfig('PATH'), getRequestElement('theme')); - - // Installation mode active - if ((isGetRequestElementSet('theme')) && (isFileReadable($theme))) { - // Set cookie from URL data - setTheme(getRequestElement('theme')); - } elseif (isFileReadable(sprintf("%stheme/%s/theme.php", getConfig('PATH'), secureString(postRequestElement('theme'))))) { - // Set cookie from posted data - setTheme(secureString(postRequestElement('theme'))); - } - - // Set return value - $ret = getSession('mxchange_theme'); - } else { - // Invalid design, reset cookie - setTheme($ret); - } + // Do we have ext-theme installed and active? + if (isExtensionActive('theme')) { + // Call inner method + $ret = getActualTheme(); + } // END - if // Return theme value return $ret; } -// Setter for theme in session -function setTheme ($newTheme) { - setSession('mxchange_theme', $newTheme); -} - -// Get id from theme -// @TODO Try to move this to inc/libs/theme_functions.php -function getThemeId ($name) { - // Is the extension 'theme' installed? - if (!isExtensionActive('theme')) { - // Then abort here - return 0; - } // END - if - - // Default id - $id = '0'; - - // Is the cache entry there? - if (isset($GLOBALS['cache_array']['themes']['id'][$name])) { - // Get the version from cache - $id = $GLOBALS['cache_array']['themes']['id'][$name]; - - // Count up - incrementStatsEntry('cache_hits'); - } elseif (isExtensionInstalledAndNewer('cache', '0.1.8')) { - // Check if current theme is already imported or not - $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_themes` WHERE `theme_path`='%s' LIMIT 1", - array($name), __FUNCTION__, __LINE__); - - // Entry found? - if (SQL_NUMROWS($result) == 1) { - // Fetch data - list($id) = SQL_FETCHROW($result); - } // END - if - - // Free result - SQL_FREERESULT($result); - } - - // Return id - return $id; -} - // Generates an error code from given account status function generateErrorCodeFromUserStatus ($status='') { // If no status is provided, use the default, cached @@ -2397,7 +2457,7 @@ function generateErrorCodeFromUserStatus ($status='') { $errorCode = getCode('UNKNOWN_STATUS'); // Generate constant name - $codeName = sprintf("ID_%s", $status); + $codeName = sprintf("ACCOUNT_%s", strtoupper($status)); // Is the constant there? if (isCodeSet($codeName)) { @@ -2412,183 +2472,6 @@ function generateErrorCodeFromUserStatus ($status='') { return $errorCode; } -// Function to search for the last modifified file -function searchDirsRecursive ($dir, &$last_changed) { - // Get dir as array - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):dir=" . $dir.'
'); - // Does it match what we are looking for? (We skip a lot files already!) - // RegexPattern to exclude ., .., .revision, .svn, debug.log or .cache in the filenames - $excludePattern = '@(\.revision|debug\.log|\.cache|config\.php)$@'; - $ds = getArrayFromDirectory($dir, '', true, false, array(), '.php', $excludePattern); - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):ds[]=".count($ds).'
'); - - // Walk through all entries - foreach ($ds as $d) { - // Generate proper FQFN - $FQFN = str_replace('//', '/', getConfig('PATH') . $dir. '/'. $d); - - // Is it a file and readable? - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):FQFN={$FQFN}
"); - if (isDirectory($FQFN)) { - // $FQFN is a directory so also crawl into this directory - $newDir = $d; - if (!empty($dir)) $newDir = $dir . '/'. $d; - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):DESCENT: " . $newDir.'
'); - searchDirsRecursive($newDir, $last_changed); - } elseif (isFileReadable($FQFN)) { - // $FQFN is a filename and no directory - $time = filemtime($FQFN); - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):File: " . $d." found. (".($last_changed['time'] - $time).")
"); - if ($last_changed['time'] < $time) { - // This file is newer as the file before - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__.") - NEWER!
"); - $last_changed['path_name'] = $FQFN; - $last_changed['time'] = $time; - } // END - if - } - } // END - foreach -} - -// "Getter" for revision/version data -function getActualVersion ($type = 'Revision') { - // By default nothing is new... ;-) - $new = false; - - // Is the cache entry there? - if (isset($GLOBALS['cache_array']['revision'][$type])) { - // Found so increase cache hit - incrementStatsEntry('cache_hits'); - - // Return it - return $GLOBALS['cache_array']['revision'][$type][0]; - } else { - // FQFN of revision file - $FQFN = sprintf("%s/.revision", getConfig('CACHE_PATH')); - - // Check if 'check_revision_data' is setted (switch for manually rewrite the .revision-File) - if ((isGetRequestElementSet('check_revision_data')) && (getRequestElement('check_revision_data') == 'yes')) { - // Forced rebuild of .revision file - $new = true; - } else { - // Check for revision file - if (!isFileReadable($FQFN)) { - // Not found, so we need to create it - $new = true; - } else { - // Revision file found - $ins_vers = explode("\n", readFromFile($FQFN)); - - // Get array for mapping information - $mapper = array_flip(getSearchFor()); - //* DEBUG: */ print('
mapper='.print_r($mapper, true).'
ins_vers=
'.print_r($ins_vers, true).'
'); - - // Is the content valid? - if ((!is_array($ins_vers)) || (count($ins_vers) <= 0) || (!isset($ins_vers[$mapper[$type]])) || (trim($ins_vers[$mapper[$type]]) == '') || ($ins_vers[0]) == 'new') { - // File needs update! - $new = true; - } else { - // Generate fake cache entry - foreach ($mapper as $map=>$idx) { - $GLOBALS['cache_array']['revision'][$map][0] = $ins_vers[$idx]; - } // END - foreach - - // Return found value - return trim($ins_vers[$mapper[$type]]); - } - } - } - - // Has it been updated? - if ($new === true) { - // Write it - writeToFile($FQFN, implode("\n", getArrayFromActualVersion())); - - // ... and call recursive - return getActualVersion($type); - } // END - if - } -} - -// Repares an array we are looking for -// The returned Array is needed twice (in getArrayFromActualVersion() and in getActualVersion() in the old .revision-fallback) so I puted it in an extra function to not polute the global namespace -function getSearchFor () { - // Add Revision, Date, Tag and Author - $searchFor = array('Revision', 'Date', 'Tag', 'Author', 'File'); - - // Return the created array - return $searchFor; -} - -// @TODO Please describe this function -function getArrayFromActualVersion () { - // Init variables - $next_dir = ''; - - // Directory to start with search - $last_changed = array( - 'path_name' => '', - 'time' => 0 - ); - - // Init return array - $akt_vers = array(); - - // Init value for counting the founded keywords - $res = '0'; - - // Searches all Files and there date of the last modifikation and puts the newest File in $last_changed. - searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time); - - // Get file - $last_file = readFromFile($last_changed['path_name']); - - // Get all the keywords to search for - $searchFor = getSearchFor(); - - // This foreach loops the $searchFor-Tags (array('Revision', 'Date', 'Tag', 'Author') --> could easaly extended in the future) - foreach ($searchFor as $search) { - // Searches for "$search-tag:VALUE$" or "$search-tag::VALUE$"(the stylish keywordversion ;-)) in the lates modified file - $res += preg_match('@\$' . $search.'(:|::) (.*) \$@U', $last_file, $t); - // This trimms the search-result and puts it in the $GLOBALS['cache_array']['revision']-return array - if (isset($t[2])) $GLOBALS['cache_array']['revision'][$search] = trim($t[2]); - } // END - foreach - - // Save the last-changed filename for debugging - $GLOBALS['cache_array']['revision']['File'] = $last_changed['path_name']; - - // at least 3 keyword-Tags are needed for propper values - if ($res && $res >= 3 - && isset($GLOBALS['cache_array']['revision']['Revision']) && $GLOBALS['cache_array']['revision']['Revision'] != '' - && isset($GLOBALS['cache_array']['revision']['Date']) && $GLOBALS['cache_array']['revision']['Date'] != '' - && isset($GLOBALS['cache_array']['revision']['Tag']) && $GLOBALS['cache_array']['revision']['Tag'] != '') { - // Prepare content witch need special treadment - - // Prepare timestamp for date - preg_match('@(....)-(..)-(..) (..):(..):(..)@', $GLOBALS['cache_array']['revision']['Date'], $match_d); - $GLOBALS['cache_array']['revision']['Date'] = mktime($match_d[4], $match_d[5], $match_d[6], $match_d[2], $match_d[3], $match_d[1]); - - // Add author to the Tag if the author is set and is not quix0r (lead coder) - if ((isset($GLOBALS['cache_array']['revision']['Author'])) && ($GLOBALS['cache_array']['revision']['Author'] != 'quix0r')) { - $GLOBALS['cache_array']['revision']['Tag'] .= '-'.strtoupper($GLOBALS['cache_array']['revision']['Author']); - } // END - if - - } else { - // No valid Data from the last modificated file so read the Revision from the Server. Fallback-solution!! Should not be removed I think. - $version = sendGetRequest('check-updates3.php'); - - // Prepare content - // Only sets not setted or not proper values to the Online-Server-Fallback-Solution - if (!isset($GLOBALS['cache_array']['revision']['Revision']) || $GLOBALS['cache_array']['revision']['Revision'] == '') $GLOBALS['cache_array']['revision']['Revision'] = trim($version[10]); - if (!isset($GLOBALS['cache_array']['revision']['Date']) || $GLOBALS['cache_array']['revision']['Date'] == '') $GLOBALS['cache_array']['revision']['Date'] = trim($version[9]); - if (!isset($GLOBALS['cache_array']['revision']['Tag']) || $GLOBALS['cache_array']['revision']['Tag'] == '') $GLOBALS['cache_array']['revision']['Tag'] = trim($version[8]); - if (!isset($GLOBALS['cache_array']['revision']['Author']) || $GLOBALS['cache_array']['revision']['Author'] == '') $GLOBALS['cache_array']['revision']['Author'] = 'quix0r'; - if (!isset($GLOBALS['cache_array']['revision']['File']) || $GLOBALS['cache_array']['revision']['File'] == '') $GLOBALS['cache_array']['revision']['File'] = trim($version[11]); - } - - // Return prepared array - return $GLOBALS['cache_array']['revision']; -} - // Back-ported from the new ship-simu engine. :-) function debug_get_printable_backtrace () { // Init variable @@ -2610,8 +2493,26 @@ function debug_get_printable_backtrace () { return $backtrace; } +// A mail-able backtrace +function debug_get_mailable_backtrace () { + // Init variable + $backtrace = ''; + + // Get and prepare backtrace for output + $backtraceArray = debug_backtrace(); + foreach ($backtraceArray as $key => $trace) { + if (!isset($trace['file'])) $trace['file'] = __FUNCTION__; + if (!isset($trace['line'])) $trace['line'] = __LINE__; + if (!isset($trace['args'])) $trace['args'] = array(); + $backtrace .= ($key+1) . '.:' . basename($trace['file']) . ':' . $trace['line'] . ', ' . $trace['function'] . '(' . count($trace['args']) . ")\n"; + } // END - foreach + + // Return the backtrace + return $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 @@ -2638,21 +2539,30 @@ function debug_report_bug ($message = '') { } // END - if // Add output - $debug .= "Please report this bug at bugs.mxchange.org and include the logfile from " . getConfig('CACHE_PATH') . "debug.log in your report (you can now attach files):
";
+	$debug .= "Please report this bug at http://bugs.mxchange.org and include the logfile from " . str_replace(getConfig('PATH'), '', getConfig('CACHE_PATH')) . "debug.log in your report (you can now attach files):
";
 	$debug .= debug_get_printable_backtrace();
 	$debug .= "
\nRequest-URI: " . getRequestUri()."
\n";
 	$debug .= "Thank you for finding bugs.";
 
+	// Send an email? (e.g. not wanted for evaluation errors)
+	if (($sendEmail === true) && (!isInstallationPhase())) {
+		// Prepare content
+		$content = array(
+			'message'     => trim($message),
+			'backtrace'   => trim(debug_get_mailable_backtrace())
+		);
+
+		// 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.
-	die($debug);
+	app_die(__FUNCTION__, __LINE__, $debug);
 }
 
-// Generates a ***weak*** seed (taken from de.php.net/mt_srand)
+// Generates a ***weak*** seed
 function generateSeed () {
-	list($usec, $sec) = explode(' ', microtime());
-	$microTime = (((float)$sec + (float)$usec)) * 100000;
-	return $microTime;
+	return microtime(true) * 100000;
 }
 
 // Converts a message code to a human-readable message
@@ -2660,63 +2570,66 @@ function getMessageFromErrorCode ($code) {
 	$message = '';
 	switch ($code) {
 		case '': break;
-		case getCode('LOGOUT_DONE')      : $message = getMessage('LOGOUT_DONE'); break;
-		case getCode('LOGOUT_FAILED')    : $message = "{--LOGOUT_FAILED--}"; break;
-		case getCode('DATA_INVALID')     : $message = getMessage('MAIL_DATA_INVALID'); break;
-		case getCode('POSSIBLE_INVALID') : $message = getMessage('MAIL_POSSIBLE_INVALID'); break;
-		case getCode('ACCOUNT_LOCKED')   : $message = getMessage('MEMBER_ACCOUNT_LOCKED_UNC'); break;
-		case getCode('USER_404')         : $message = getMessage('USER_404'); break;
-		case getCode('STATS_404')        : $message = getMessage('MAIL_STATS_404'); break;
-		case getCode('ALREADY_CONFIRMED'): $message = getMessage('MAIL_ALREADY_CONFIRMED'); break;
-		case getCode('WRONG_PASS')       : $message = getMessage('LOGIN_WRONG_PASS'); break;
-		case getCode('WRONG_ID')         : $message = getMessage('LOGIN_WRONG_ID'); break;
-		case getCode('ID_LOCKED')        : $message = getMessage('LOGIN_ID_LOCKED'); break;
-		case getCode('ID_UNCONFIRMED')   : $message = getMessage('LOGIN_ID_UNCONFIRMED'); break;
-		case getCode('ID_GUEST')         : $message = getMessage('LOGIN_ID_GUEST'); break;
-		case getCode('NO_COOKIES')       : $message = getMessage('LOGIN_NO_COOKIES'); break;
-		case getCode('COOKIES_DISABLED') : $message = getMessage('LOGIN_NO_COOKIES'); break;
-		case getCode('BEG_SAME_AS_OWN')  : $message = getMessage('BEG_SAME_UID_AS_OWN'); break;
-		case getCode('LOGIN_FAILED')     : $message = getMessage('LOGIN_FAILED_GENERAL'); break;
-		case getCode('MODULE_MEM_ONLY')  : $message = sprintf(getMessage('MODULE_MEM_ONLY'), getRequestElement('mod')); break;
-		case getCode('OVERLENGTH')       : $message = getMessage('MEMBER_TEXT_OVERLENGTH'); break;
-		case getCode('URL_FOUND')        : $message = getMessage('MEMBER_TEXT_CONTAINS_URL'); break;
-		case getCode('SUBJ_URL')         : $message = getMessage('MEMBER_SUBJ_CONTAINS_URL'); break;
-		case getCode('BLIST_URL')        : $message = "{--MEMBER_URL_BLACK_LISTED--}
\n{--MEMBER_BLIST_TIME--}: ".generateDateTime(getRequestElement('blist'), 0); break;
-		case getCode('NO_RECS_LEFT')     : $message = getMessage('MEMBER_SELECTED_MORE_RECS'); break;
-		case getCode('INVALID_TAGS')     : $message = getMessage('MEMBER_HTML_INVALID_TAGS'); break;
-		case getCode('MORE_POINTS')      : $message = getMessage('MEMBER_MORE_POINTS_NEEDED'); break;
-		case getCode('MORE_RECEIVERS1')  : $message = getMessage('MEMBER_ENTER_MORE_RECEIVERS'); break;
-		case getCode('MORE_RECEIVERS2')  : $message = getMessage('MEMBER_NO_MORE_RECEIVERS_FOUND'); break;
-		case getCode('MORE_RECEIVERS3')  : $message = sprintf(getMessage('MEMBER_ENTER_MORE_MIN_RECEIVERS'), getConfig('order_min')); break;
-		case getCode('INVALID_URL')      : $message = getMessage('MEMBER_ENTER_INVALID_URL'); break;
+		case getCode('LOGOUT_DONE')        : $message = getMessage('LOGOUT_DONE'); break;
+		case getCode('LOGOUT_FAILED')      : $message = '{--LOGOUT_FAILED--}'; break;
+		case getCode('DATA_INVALID')       : $message = getMessage('MAIL_DATA_INVALID'); break;
+		case getCode('POSSIBLE_INVALID')   : $message = getMessage('MAIL_POSSIBLE_INVALID'); break;
+		case getCode('USER_404')           : $message = getMessage('USER_404'); break;
+		case getCode('STATS_404')          : $message = getMessage('MAIL_STATS_404'); break;
+		case getCode('ALREADY_CONFIRMED')  : $message = getMessage('MAIL_ALREADY_CONFIRMED'); break;
+		case getCode('WRONG_PASS')         : $message = getMessage('LOGIN_WRONG_PASS'); break;
+		case getCode('WRONG_ID')           : $message = getMessage('LOGIN_WRONG_ID'); break;
+		case getCode('ACCOUNT_LOCKED')     : $message = getMessage('LOGIN_STATUS_LOCKED'); break;
+		case getCode('ACCOUNT_UNCONFIRMED'): $message = getMessage('LOGIN_STATUS_UNCONFIRMED'); break;
+		case getCode('COOKIES_DISABLED')   : $message = getMessage('LOGIN_COOKIES_DISABLED'); break;
+		case getCode('BEG_SAME_AS_OWN')    : $message = getMessage('BEG_SAME_UID_AS_OWN'); break;
+		case getCode('LOGIN_FAILED')       : $message = getMessage('LOGIN_FAILED_GENERAL'); break;
+		case getCode('MODULE_MEM_ONLY')    : $message = getMaskedMessage('MODULE_MEM_ONLY', getRequestParameter('mod')); break;
+		case getCode('OVERLENGTH')         : $message = getMessage('MEMBER_TEXT_OVERLENGTH'); break;
+		case getCode('URL_FOUND')          : $message = getMessage('MEMBER_TEXT_CONTAINS_URL'); break;
+		case getCode('SUBJ_URL')           : $message = getMessage('MEMBER_SUBJ_CONTAINS_URL'); break;
+		case getCode('BLIST_URL')          : $message = "{--MEMBER_URL_BLACK_LISTED--}
\n{--MEMBER_BLIST_TIME--}: ".generateDateTime(getRequestParameter('blist'), 0); break;
+		case getCode('NO_RECS_LEFT')       : $message = getMessage('MEMBER_SELECTED_MORE_RECS'); break;
+		case getCode('INVALID_TAGS')       : $message = getMessage('MEMBER_HTML_INVALID_TAGS'); break;
+		case getCode('MORE_POINTS')        : $message = getMessage('MEMBER_MORE_POINTS_NEEDED'); break;
+		case getCode('MORE_RECEIVERS1')    : $message = getMessage('MEMBER_ENTER_MORE_RECEIVERS'); break;
+		case getCode('MORE_RECEIVERS2')    : $message = getMessage('MEMBER_NO_MORE_RECEIVERS_FOUND'); break;
+		case getCode('MORE_RECEIVERS3')    : $message = getMessage('MEMBER_ENTER_MORE_MIN_RECEIVERS'); break;
+		case getCode('INVALID_URL')        : $message = getMessage('MEMBER_ENTER_INVALID_URL'); break;
+		case getCode('NO_MAIL_TYPE')       : $message = getMessage('MEMBER_NO_MAIL_TYPE_SELECTED'); break;
+		case getCode('UNKNOWN_ERROR')      : $message = getMessage('LOGIN_UNKNOWN_ERROR'); break;
+		case getCode('UNKNOWN_STATUS')     : $message = getMessage('LOGIN_UNKNOWN_STATUS'); break;
 
 		case getCode('ERROR_MAILID'):
 			if (isExtensionActive('mailid', true)) {
 				$message = getMessage('ERROR_CONFIRMING_MAIL');
 			} else {
-				$message = sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'mailid');
+				$message = getMaskedMessage('EXTENSION_PROBLEM_NOT_INSTALLED', 'mailid');
 			}
 			break;
 
 		case getCode('EXTENSION_PROBLEM'):
-			if (isGetRequestElementSet('ext')) {
-				$message = generateExtensionInactiveNotInstalledMessage(getRequestElement('ext'));
+			if (isGetRequestParameterSet('ext')) {
+				$message = generateExtensionInactiveNotInstalledMessage(getRequestParameter('ext'));
 			} else {
 				$message = getMessage('EXTENSION_PROBLEM_UNSET_EXT');
 			}
 			break;
 
 		case getCode('URL_TLOCK'):
+			// @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(getRequestElement('id'))), __FILE__, __LINE__);
+				array(bigintval(getRequestParameter('id'))), __FILE__, __LINE__);
 
 			// Load timestamp from last order
 			list($timestamp) = SQL_FETCHROW($result);
-			$timestamp = generateDateTime($timestamp, 1);
 
 			// Free memory
 			SQL_FREERESULT($result);
 
+			// Translate it for templates
+			$timestamp = generateDateTime($timestamp, 1);
+
 			// Calculate hours...
 			$STD = round(getConfig('url_tlock') / 60 / 60);
 
@@ -2735,7 +2648,7 @@ function getMessageFromErrorCode ($code) {
 
 		default:
 			// Missing/invalid code
-			$message = sprintf(getMessage('UNKNOWN_MAILID_CODE'), $code);
+			$message = getMaskedMessage('UNKNOWN_MAILID_CODE', $code);
 
 			// Log it
 			logDebugMessage(__FUNCTION__, __LINE__, $message);
@@ -2768,7 +2681,7 @@ function compileUriCode ($code, $simple = true) {
 	return $code;
 }
 
-// Function taken from user comments on www.php.net / function eregi()
+// Function taken from user comments on www.php.net / function isInStringIgnoreCase()
 function isUrlValidSimple ($url) {
 	// Prepare URL
 	$url = secureString(str_replace("\\", '', compileRawCode(urldecode($url))));
@@ -2811,11 +2724,12 @@ function isUrlValidSimple ($url) {
 	$pattern['d1g12']  = $http . $domain1 . $getstring1;
 	$pattern['d2g12']  = $http . $domain2 . $getstring1;
 	$pattern['ipg12']  = $http . $ip . $getstring1;
+
 	// Test all patterns
 	$reg = false;
 	foreach ($pattern as $key => $pat) {
 		// Debug regex?
-		if (isDebugRegExpressionEnabled()) {
+		if (isDebugRegularExpressionEnabled()) {
 			// @TODO Are these convertions still required?
 			$pat = str_replace('.', "\.", $pat);
 			$pat = str_replace('@', "\@", $pat);
@@ -2823,7 +2737,7 @@ function isUrlValidSimple ($url) {
 		} // END - if
 
 		// Check if expression matches
-		$reg = ($reg || preg_match(('^' . $pat.'^'), $url));
+		$reg = ($reg || preg_match(('^' . $pat . '^'), $url));
 
 		// Does it match?
 		if ($reg === true) break;
@@ -2877,7 +2791,7 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) {
 					} // END - if
 
 					// Write to temp file
-					fputs($fp_tmp, $line);
+					fwrite($fp_tmp, $line);
 				} // END - while
 
 				// Close temp file
@@ -2910,7 +2824,7 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) {
 }
 // Send notification to admin
 function sendAdminNotification ($subject, $templateName, $content=array(), $userid = '0') {
-	if (isExtensionInstalledAndNewer('admins', '0.4.1')) {
+	if ((isExtensionInstalledAndNewer('admins', '0.4.1')) && (function_exists('sendAdminsEmails'))) {
 		// Send new way
 		sendAdminsEmails($subject, $templateName, $content, $userid);
 	} else {
@@ -3025,19 +2939,19 @@ function convertCommaToDot ($str) {
 }
 
 // Handle menu-depending failed logins and return the rendered content
-function handleLoginFailtures ($accessLevel) {
+function handleLoginFailures ($accessLevel) {
 	// Default output is empty ;-)
 	$OUT = '';
 
 	// Is the session data set?
-	if ((isSessionVariableSet('mxchange_' . $accessLevel.'_failures')) && (isSessionVariableSet('mxchange_' . $accessLevel.'_last_fail'))) {
+	if ((isSessionVariableSet('mailer_' . $accessLevel . '_failures')) && (isSessionVariableSet('mailer_' . $accessLevel . '_last_failure'))) {
 		// Ignore zero values
-		if (getSession('mxchange_' . $accessLevel.'_failures') > 0) {
+		if (getSession('mailer_' . $accessLevel . '_failures') > 0) {
 			// Non-guest has login failures found, get both data and prepare it for template
-			//* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):accessLevel={$accessLevel}
");
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "accessLevel={$accessLevel}
");
 			$content = array(
-				'login_failures' => getSession('mxchange_' . $accessLevel.'_failures'),
-				'last_failure'   => generateDateTime(getSession('mxchange_' . $accessLevel.'_last_fail'), 2)
+				'login_failures' => getSession('mailer_' . $accessLevel . '_failures'),
+				'last_failure'   => generateDateTime(getSession('mailer_' . $accessLevel . '_last_failure'), 2)
 			);
 
 			// Load template
@@ -3045,8 +2959,8 @@ function handleLoginFailtures ($accessLevel) {
 		} // END - if
 
 		// Reset session data
-		setSession('mxchange_' . $accessLevel.'_failures', '');
-		setSession('mxchange_' . $accessLevel.'_last_fail', '');
+		setSession('mailer_' . $accessLevel . '_failures', '');
+		setSession('mailer_' . $accessLevel . '_last_failure', '');
 	} // END - if
 
 	// Return rendered content
@@ -3054,7 +2968,7 @@ function handleLoginFailtures ($accessLevel) {
 }
 
 // Rebuild cache
-function rebuildCacheFile ($cache, $inc = '', $force = false) {
+function rebuildCache ($cache, $inc = '', $force = false) {
 	// Debug message
 	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("cache=%s, inc=%s, force=%s", $cache, $inc, intval($force)));
 
@@ -3074,7 +2988,7 @@ function rebuildCacheFile ($cache, $inc = '', $force = false) {
 			// Is the include there?
 			if (isIncludeReadable($inc)) {
 				// And rebuild it from scratch
-				//* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."): inc={$inc} - LOADED!
");
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "inc={$inc} - LOADED!
");
 				loadInclude($inc);
 			} else {
 				// Include not found!
@@ -3115,15 +3029,15 @@ function addNewBonusMail ($data, $mode = '', $output=true) {
 	if ((empty($mode)) && (isset($data['mode']))) $mode = $data['mode'];
 
 	// Generate receiver list
-	$RECEIVER = generateReceiverList($data['cat'], $data['receiver'], $mode);
+	$receiver = generateReceiverList($data['cat'], $data['receiver'], $mode);
 
 	// Receivers added?
-	if (!empty($RECEIVER)) {
+	if (!empty($receiver)) {
 		// Add bonus mail to queue
 		addBonusMailToQueue(
 		$data['subject'],
 		$data['text'],
-		$RECEIVER,
+		$receiver,
 		$data['points'],
 		$data['seconds'],
 		$data['url'],
@@ -3151,22 +3065,22 @@ function determineReferalId () {
 	// Check if refid is set
 	if ((isset($GLOBALS['refid'])) && ($GLOBALS['refid'] > 0)) {
 		// This is fine...
-	} elseif ((isGetRequestElementSet('user')) && (basename($_SERVER['PHP_SELF']) == 'click.php')) {
+	} elseif ((isGetRequestParameterSet('user')) && (basename($_SERVER['PHP_SELF']) == 'click.php')) {
 		// The variable user comes from the click-counter script click.php and we only accept this here
-		$GLOBALS['refid'] = bigintval(getRequestElement('user'));
-	} elseif (isPostRequestElementSet('refid')) {
+		$GLOBALS['refid'] = bigintval(getRequestParameter('user'));
+	} elseif (isPostRequestParameterSet('refid')) {
 		// Get referal id from variable refid (so I hope this makes my script more compatible to other scripts)
-		$GLOBALS['refid'] = secureString(postRequestElement('refid'));
-	} elseif (isGetRequestElementSet('refid')) {
+		$GLOBALS['refid'] = secureString(postRequestParameter('refid'));
+	} elseif (isGetRequestParameterSet('refid')) {
 		// Get referal id from variable refid (so I hope this makes my script more compatible to other scripts)
-		$GLOBALS['refid'] = secureString(getRequestElement('refid'));
-	} elseif (isGetRequestElementSet('ref')) {
+		$GLOBALS['refid'] = secureString(getRequestParameter('refid'));
+	} elseif (isGetRequestParameterSet('ref')) {
 		// Set refid=ref (the referal link uses such variable)
-		$GLOBALS['refid'] = secureString(getRequestElement('ref'));
+		$GLOBALS['refid'] = secureString(getRequestParameter('ref'));
 	} elseif ((isSessionVariableSet('refid')) && (getSession('refid') != 0)) {
 		// 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')) && (getConfig('select_user_zero_refid') == 'Y')) {
 		// Select a random user which has confirmed enougth mails
 		$GLOBALS['refid'] = determineRandomReferalId();
 	} elseif ((isExtensionInstalled('sql_patches')) && (getConfig('def_refid') > 0)) {
@@ -3183,7 +3097,7 @@ function determineReferalId () {
 		$found = false;
 
 		// Do we have nickname or userid set?
-		if (isNicknameUsed($GLOBALS['refid'])) {
+		if ((isExtensionActive('nickname')) && (isNicknameUsed($GLOBALS['refid']))) {
 			// Nickname in URL, so load the id
 			$found = fetchUserData($GLOBALS['refid'], 'nickname');
 		} elseif ($GLOBALS['refid'] > 0) {
@@ -3192,7 +3106,7 @@ function determineReferalId () {
 		}
 
 		// Is the record valid?
-		if (($found === false) || (!isUserDataValid())) {
+		if ((($found === false) || (!isUserDataValid())) && (isConfigEntrySet('def_refid'))) {
 			// No, then reset referal id
 			$GLOBALS['refid'] = getConfig('def_refid');
 		} // END - if
@@ -3219,7 +3133,8 @@ function shutdown () {
 	// Call the filter chain 'shutdown'
 	runFilterChain('shutdown', null);
 
-	if (SQL_IS_LINK_UP()) {
+	// Check if not in installation phase and the link is up
+	if ((!isInstallationPhase()) && (SQL_IS_LINK_UP())) {
 		// Close link
 		SQL_CLOSE(__FILE__, __LINE__);
 	} elseif (!isInstallationPhase()) {
@@ -3227,7 +3142,7 @@ function shutdown () {
 		addFatalMessage(__FILE__, __LINE__, getMessage('NO_DB_LINK_SHUTDOWN'));
 	}
 
-	// Stop2 executing here
+	// Stop executing here
 	exit;
 }
 
@@ -3267,15 +3182,15 @@ function isMemberIdSet () {
 
 // Handle message codes from URL
 function handleCodeMessage () {
-	if (isGetRequestElementSet('code')) {
+	if (isGetRequestParameterSet('code')) {
 		// Default extension is 'unknown'
 		$ext = 'unknown';
 
 		// Is extension given?
-		if (isGetRequestElementSet('ext')) $ext = getRequestElement('ext');
+		if (isGetRequestParameterSet('ext')) $ext = getRequestParameter('ext');
 
 		// Convert the 'code' parameter from URL to a human-readable message
-		$message = getMessageFromErrorCode(getRequestElement('code'));
+		$message = getMessageFromErrorCode(getRequestParameter('code'));
 
 		// Load message template
 		loadTemplate('message', false, $message);
@@ -3313,12 +3228,12 @@ function generateExtensionInactiveMessage ($ext_name) {
 	} // END - if
 
 	// Default message
-	$message = sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), $ext_name);
+	$message = getMaskedMessage('EXTENSION_PROBLEM_EXT_INACTIVE', $ext_name);
 
 	// Is an admin logged in?
 	if (isAdmin()) {
 		// Then output admin message
-		$message = sprintf(getMessage('ADMIN_EXTENSION_PROBLEM_EXT_INACTIVE'), $ext_name);
+		$message = getMaskedMessage('ADMIN_EXTENSION_PROBLEM_EXT_INACTIVE', $ext_name);
 	} // END - if
 
 	// Return prepared message
@@ -3334,12 +3249,12 @@ function generateExtensionNotInstalledMessage ($ext_name) {
 	} // END - if
 
 	// Default message
-	$message = sprintf(getMessage('EXTENSION_PROBLEM_EXT_NOT_INSTALLED'), $ext_name);
+	$message = getMaskedMessage('EXTENSION_PROBLEM_EXT_NOT_INSTALLED', $ext_name);
 
 	// Is an admin logged in?
 	if (isAdmin()) {
 		// Then output admin message
-		$message = sprintf(getMessage('ADMIN_EXTENSION_PROBLEM_EXT_NOT_INSTALLED'), $ext_name);
+		$message = getMaskedMessage('ADMIN_EXTENSION_PROBLEM_EXT_NOT_INSTALLED', $ext_name);
 	} // END - if
 
 	// Return prepared message
@@ -3375,7 +3290,7 @@ function generateExtensionInactiveNotInstalledMessage ($ext_name) {
 // Reads a directory recursively by default and searches for files not matching
 // an exclusion pattern. You can now keep the exclusion pattern empty for reading
 // a whole directory.
-function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $addBaseDir = true, $excludeArray = array(), $extension = '.php', $excludePattern = '@(\.|\.\.)$@', $recursive = true) {
+function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $addBaseDir = true, $excludeArray = array(), $extension = '.php', $excludePattern = '@(\.|\.\.)$@', $recursive = true, $suffix = '') {
 	// Add default entries we should exclude
 	$excludeArray[] = '.';
 	$excludeArray[] = '..';
@@ -3405,7 +3320,7 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
 		// Remove double slashes
 		$FQFN = str_replace('//', '/', $FQFN);
 
-		// Check if the base filename matches an exclusion pattern and if the pattern is not empty
+		// Check if the base filenname matches an exclusion pattern and if the pattern is not empty
 		if ((!empty($excludePattern)) && (preg_match($excludePattern, $baseFile, $match))) {
 			// These Lines are only for debugging!!
 			//* DEBUG: */ outputHtml('baseDir:' . $baseDir . '
');
@@ -3427,6 +3342,10 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
 			// Skip this file
 			//* 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);
+			continue;
 		} elseif (!isFileReadable($FQFN)) {
 			// Not readable so skip it
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "File " . $FQFN . " is not readable!");
@@ -3469,7 +3388,7 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
 	closedir($dirPointer);
 
 	// Sort array
-	asort($files);
+	sort($files);
 
 	// Return array with include files
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Left!');
@@ -3590,7 +3509,7 @@ function determinePageTitle () {
 		$TITLE = '';
 
 		// Title decoration enabled?
-		if ((getConfig('enable_title_deco') == 'Y') && (getConfig('title_left') != '')) $TITLE .= trim(getConfig('title_left'))." ";
+		if ((getConfig('enable_title_deco') == 'Y') && (getConfig('title_left') != '')) $TITLE .= trim(getConfig('title_left')) . ' ';
 
 		// Do we have some extra title?
 		if (isExtraTitleSet()) {
@@ -3610,19 +3529,19 @@ function determinePageTitle () {
 		$mode = '';
 		if (getModule() == 'login') $mode = 'member';
 		elseif (getModule() == 'index') $mode = 'guest';
-		if ((!empty($mode)) && (getConfig('enable_what_title') == 'Y')) $TITLE .= " ".trim(getConfig('title_middle'))." ".getModuleDescription($mode, getWhat());
+		if ((!empty($mode)) && (getConfig('enable_what_title') == 'Y')) $TITLE .= ' ' . trim(getConfig('title_middle')) . ' ' . getTitleFromMenu($mode, getWhat());
 
 		// Add title decorations? (right)
-		if ((getConfig('enable_title_deco') == 'Y') && (getConfig('title_right') != '')) $TITLE .= " ".trim(getConfig('title_right'));
+		if ((getConfig('enable_title_deco') == 'Y') && (getConfig('title_right') != '')) $TITLE .= ' ' . trim(getConfig('title_right'));
 
 		// Remember title in constant for the template
 		$pageTitle = $TITLE;
 	} elseif ((isInstalled()) && (isAdminRegistered())) {
 		// Installed, admin registered but no ext-sql_patches
-		$pageTitle = '[-- ' . getConfig('MAIN_TITLE').' - '.getModuleTitle(getModule()) . ' --]';
+		$pageTitle = '[-- ' . getConfig('MAIN_TITLE') . ' - ' . getModuleTitle(getModule()) . ' --]';
 	} elseif ((isInstalled()) && (!isAdminRegistered())) {
 		// Installed but no admin registered
-		$pageTitle = sprintf(getMessage('SETUP_OF_MXCHANGE'), getConfig('MAIN_TITLE'));
+		$pageTitle = getMessage('SETUP_OF_MXCHANGE');
 	} elseif ((!isInstalled()) || (!isAdminRegistered())) {
 		// Installation mode
 		$pageTitle = getMessage('INSTALLATION_OF_MXCHANGE');
@@ -3635,7 +3554,7 @@ function determinePageTitle () {
 	}
 
 	// Return title
-	return $pageTitle;
+	return decodeEntities($pageTitle);
 }
 
 // Checks wethere there is a cache file there. This function is cached.
@@ -3643,7 +3562,7 @@ function isTemplateCached ($template) {
 	// Do we have cached this result?
 	if (!isset($GLOBALS['template_cache'][$template])) {
 		// Generate FQFN
-		$FQFN = sprintf("%s_compiled/templates/%s.tpl.cache", getConfig('CACHE_PATH'), $template);
+		$FQFN = generateCacheFqfn($template);
 
 		// Is it there?
 		$GLOBALS['template_cache'][$template] = isFileReadable($FQFN);
@@ -3656,9 +3575,9 @@ function isTemplateCached ($template) {
 // Flushes non-flushed template cache to disk
 function flushTemplateCache ($template, $eval) {
 	// Is this cache flushed?
-	if ((!isTemplateCached($template)) && ($eval != '404')) {
+	if ((isDebuggingTemplateCache() === false) && (isTemplateCached($template) === false) && ($eval != '404')) {
 		// Generate FQFN
-		$FQFN = sprintf("%s_compiled/templates/%s.tpl.cache", getConfig('CACHE_PATH'), $template);
+		$FQFN = generateCacheFqfn($template);
 
 		// Replace username with a call
 		$eval = str_replace('$username', '".getUsername()."', $eval);
@@ -3671,9 +3590,9 @@ function flushTemplateCache ($template, $eval) {
 // Reads a template cache
 function readTemplateCache ($template) {
 	// Check it again
-	if (isTemplateCached($template)) {
+	if ((isDebuggingTemplateCache() === false) && (isTemplateCached($template))) {
 		// Generate FQFN
-		$FQFN = sprintf("%s_compiled/templates/%s.tpl.cache", getConfig('CACHE_PATH'), $template);
+		$FQFN = generateCacheFqfn($template);
 
 		// And read from it
 		$GLOBALS['template_eval'][$template] = readFromFile($FQFN);
@@ -3707,6 +3626,330 @@ function escapeJavaScriptQuotes ($str) {
 	return $str;
 }
 
+// Send out mails depending on the 'mod/modes' combination
+// @TODO Lame description for this function
+function sendModeMails ($mod, $modes) {
+	// Load hash
+	if (fetchUserData(getMemberId())) {
+		// Extract salt from cookie
+		$salt = substr(getSession('u_hash'), 0, -40);
+
+		// Now let's compare passwords
+		$hash = encodeHashForCookie(getUserData('password'));
+
+		// Does the hash match or should we change it?
+		if (($hash == getSession('u_hash')) || (postRequestParameter('pass1') == postRequestParameter('pass2'))) {
+			// Load the data
+			$content = getUserDataArray();
+
+			// Translate gender
+			$content['gender'] = translateGender($content['gender']);
+
+			// Clear/init the content variable
+			$content['message'] = '';
+
+			// Which mail?
+			// @TODO Move this in a filter
+			switch ($mod) {
+				case 'mydata':
+					foreach ($modes as $mode) {
+						switch ($mode) {
+							case 'normal': break; // Do not add any special lines
+							case 'email': // Email was changed!
+								$content['message'] = getMessage('MEMBER_CHANGED_EMAIL').": ".postRequestParameter('old_email')."\n";
+								break;
+
+							case 'pass': // Password was changed
+								$content['message'] = getMessage('MEMBER_CHANGED_PASS')."\n";
+								break;
+
+							default:
+								logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown mode %s detected.", $mode));
+								$content['message'] = getMessage('MEMBER_UNKNOWN_MODE') . ': ' . $mode . "\n\n";
+								break;
+						} // END - switch
+					} // END - foreach
+
+					if (isExtensionActive('country')) {
+						// Replace code with description
+						$content['country'] = generateCountryInfo(postRequestParameter('country_code'));
+					} // END - if
+
+					// Merge content with data from POST
+					$content = merge_array($content, postRequestArray());
+
+					// Load template
+					$message = loadEmailTemplate('member_mydata_notify', $content, getMemberId());
+
+					if (getConfig('admin_notify') == 'Y') {
+						// The admin needs to be notified about a profile change
+						$message_admin = 'admin_mydata_notify';
+						$sub_adm   = getMessage('ADMIN_CHANGED_DATA');
+					} else {
+						// No mail to admin
+						$message_admin = '';
+						$sub_adm   = '';
+					}
+
+					// Set subject lines
+					$sub_mem = getMessage('MEMBER_CHANGED_DATA');
+
+					// Output success message
+					$content = '{--MYDATA_MAIL_SENT--}';
+					break;
+
+				default: // Unsupported module!
+					logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unsupported module %s detected.", $mod));
+					$content = '{--UNKNOWN_MODULE--}';
+					break;
+			} // END - switch
+		} else {
+			// Passwords mismatch
+			$content = '{--MEMBER_PASSWORD_ERROR--}';
+		}
+	} else {
+		// Could not load profile
+		$content = '{--MEMBER_CANNOT_LOAD_PROFILE--}';
+	}
+
+	// Send email to user if required
+	if ((!empty($sub_mem)) && (!empty($message))) {
+		// Send member mail
+		sendEmail($content['email'], $sub_mem, $message);
+	} // END - if
+
+	// Send only if no other error has occured
+	if (empty($content)) {
+		if ((!empty($sub_adm)) && (!empty($message_admin))) {
+			// Send admin mail
+			sendAdminNotification($sub_adm, $message_admin, $content, getMemberId());
+		} elseif (getConfig('admin_notify') == 'Y') {
+			// Cannot send mails to admin!
+			$content = getMessage('CANNOT_SEND_ADMIN_MAILS');
+		} else {
+			// No mail to admin
+			$content = '{--MYDATA_MAIL_SENT--}';
+		}
+	} // END - if
+
+	// Load template
+	loadTemplate('admin_settings_saved', false, $content);
+}
+
+// Generates a 'selection box' from given array
+function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionContent='') {
+	// Start the output
+	$OUT = '';
+
+	// Prepare output
+	$content = array(
+		'selection_box' => $OUT,
+		'module'        => getModule(),
+		'what'          => getWhat()
+	);
+
+	// Load template and return it
+	return loadTemplate('select_' . $name . '_box', true, $content);
+}
+
+// Get a module from filename and access level
+function getModuleFromFileName ($file, $accessLevel) {
+	// Default is 'invalid';
+	$modCheck = 'invalid';
+
+	// @TODO This is still very static, rewrite it somehow
+	switch ($accessLevel) {
+		case 'admin':
+			$modCheck = 'admin';
+			break;
+
+		case 'sponsor':
+		case 'guest':
+		case 'member':
+			$modCheck = getModule();
+			break;
+
+		default: // Unsupported file name / access level
+			debug_report_bug('Unsupported file name=' . basename($file) . '/access level=' . $accessLevel);
+			break;
+	}
+
+	// Return result
+	return $modCheck;
+}
+
+// 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;
+
+	// Do we have a valid session?
+	if (((!isset($GLOBALS['valid_session'])) || ($GLOBALS['valid_session'] === false) || (!isset($_COOKIE[session_name()]))) && (isSpider() === false)) {
+		// Invalid session
+		// Determine right seperator
+		$seperator = '&';
+		if (strpos($url, '?') === false) {
+			// No question mark
+			$seperator = '?';
+		} elseif ((getOutputMode() != '0') || ($outputMode != '0')) {
+			// Non-HTML mode
+			$seperator = '&';
+		}
+
+		// Add it to URL
+		if (session_id() != '') {
+			$url .= $seperator . session_name() . '=' . session_id();
+		} // END - if
+	} // 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://')) {
+		// Add it
+		$url = '{?URL?}/' . $url;
+	} // END - if
+
+	// Return the URL
+	return $url;
+}
+
+// Simple check for spider
+function isSpider () {
+	// Get the UA
+	$userAgent = strtolower(detectUserAgent(true));
+
+	// It should not be empty, if so it is better a spider/bot
+	if (empty($userAgent)) return true;
+
+	// Is it a spider?
+	return ((strpos($userAgent, 'spider') !== false) || (strpos($userAgent, 'slurp') !== false) || (strpos($userAgent, 'bot') !== false) || (strpos($userAgent, 'archiver') !== false));
+}
+
+// Prepares the header for HTML output
+function loadHtmlHeader () {
+	// Run two filters:
+	// 1.) pre_page_header (mainly loads the page_header template and includes
+	//     meta description)
+	runFilterChain('pre_page_header');
+
+	// Here can be something be added, but normally one of the two filters
+	// around this line should do the job for you.
+
+	// 2.) post_page_header (mainly to load stylesheet, extra JavaScripts and
+	//     to close the head-tag)
+	// Include more header data here
+	runFilterChain('post_page_header');
+}
+
+// Adds page header and footer to output array element
+function addPageHeaderFooter () {
+	// Init output
+	$OUT = '';
+
+	// Add them all together. This is maybe to simple
+	foreach (array('page_header', 'output', 'page_footer') as $pagePart) {
+		// Add page part if set
+		if (isset($GLOBALS[$pagePart])) $OUT .= $GLOBALS[$pagePart];
+	} // END - foreach
+
+	// Transfer $OUT to 'output'
+	$GLOBALS['output'] = $OUT;
+}
+
+// Generates meta description for current module and 'what' value
+function generateMetaDescriptionCode () {
+	// Only include from guest area
+	if (getModule() == 'index') {
+		// Construct dynamic description
+		$DESCR = '{?MAIN_TITLE?} '.trim(getConfig('title_middle')) . ' ' . getTitleFromMenu('guest', getWhat());
+
+		// Output it directly
+		$GLOBALS['page_header'] .= '';
+	} // END - if
+
+	// Remove depth
+	unset($GLOBALS['ref_level']);
+}
+
+// Generates an FQFN for template cache from the given template name
+function generateCacheFqfn ($template) {
+	// Is this cached?
+	if (!isset($GLOBALS['template_cache_fqfn'][$template])) {
+		// Generate the FQFN
+		$GLOBALS['template_cache_fqfn'][$template] = sprintf("%s_compiled/html/%s.tpl.cache", getConfig('CACHE_PATH'), $template);
+	} // END - if
+
+	// Return it
+	return $GLOBALS['template_cache_fqfn'][$template];
+}
+
+// Function to search for the last modified file
+function searchDirsRecursive ($dir, &$last_changed, $lookFor = 'Date') {
+	// Get dir as array
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'dir=' . $dir);
+	// Does it match what we are looking for? (We skip a lot files already!)
+	// RegexPattern to exclude  ., .., .revision,  .svn, debug.log or .cache in the filenames
+	$excludePattern = '@(\.revision|\.svn|debug\.log|\.cache|config\.php)$@';
+
+	$ds = getArrayFromDirectory($dir, '', false, true, array(), '.php', $excludePattern);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'count(ds)='.count($ds));
+
+	// Walk through all entries
+	foreach ($ds as $d) {
+		// Generate proper FQFN
+		$FQFN = str_replace('//', '/', getConfig('PATH') . $dir . '/' . $d);
+
+		// Is it a file and readable?
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'dir=' . $dir . ',d=' . $d);
+		if (isFileReadable($FQFN)) {
+			// $FQFN is a readable file so extract the requested data from it
+			$check = extractRevisionInfoFromFile($FQFN, $lookFor);
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'File: ' . $d . ' found. check=' . $check);
+
+			// Is the file more recent?
+			if ((!isset($last_changed[$lookFor])) || ($last_changed[$lookFor] < $check)) {
+				// This file is newer as the file before
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'NEWER!');
+				$last_changed['path_name'] = $FQFN;
+				$last_changed[$lookFor] = $check;
+			} // END - if
+		} else {
+			// Not readable
+			/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'File: ' . $d . ' not readable or directory.');
+		}
+	} // END - foreach
+}
+
+// "Fixes" null or empty string to count of dashes
+function fixNullEmptyToDashes ($str, $num) {
+	// Use str as default
+	$return = $str;
+
+	// Is it empty?
+	if ((is_null($str)) || (trim($str) == '')) {
+		// Set it
+		$return = str_repeat('-', $num);
+	} // END - if
+
+	// Return final string
+	return $return;
+}
+
 //////////////////////////////////////////////////
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
 //////////////////////////////////////////////////
@@ -3721,7 +3964,7 @@ if (!function_exists('html_entity_decode')) {
 } // END - if
 
 if (!function_exists('http_build_query')) {
-	// Taken from documentation on www.php.net, credits to Marco K. (Germany)
+	// Taken from documentation on www.php.net, credits to Marco K. (Germany) and some light mods by R.Haeder
 	function http_build_query($data, $prefix = '', $sep = '', $key = '') {
 		$ret = array();
 		foreach ((array)$data as $k => $v) {
@@ -3729,7 +3972,7 @@ if (!function_exists('http_build_query')) {
 				$k = urlencode($prefix . $k);
 			} // END - if
 
-			if ((!empty($key)) || ($key === 0))  $k = $key.'['.urlencode($k).']';
+			if ((!empty($key)) || ($key === 0))  $k = $key . '[' . urlencode($k) . ']';
 
 			if (is_array($v) || is_object($v)) {
 				array_push($ret, http_build_query($v, '', $sep, $k));