X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=6848f87e4f82bebf81ecbb52f3f89f2376592436;hb=3e429bc72276003273046a3d903261b97ac51307;hp=e50b598ef3d220c6d14fcbba8174b886635ce4cc;hpb=086762b9606889fbda59d946b7b557d764ec2c0e;p=mailer.git diff --git a/inc/functions.php b/inc/functions.php index e50b598ef3..6848f87e4f 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -226,7 +226,10 @@ function loadTemplate ($template, $return=false, $content=array()) { global $DATA; // Do we have cache? - if (!isset($GLOBALS['template_eval'][$template])) { + if (isTemplateCached($template)) { + // Evaluate the cache + eval(readTemplateCache($template)); + } elseif (!isset($GLOBALS['template_eval'][$template])) { // Add more variables which you want to use in your template files $username = getUsername(); @@ -240,40 +243,6 @@ function loadTemplate ($template, $return=false, $content=array()) { $ret = ''; if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = 0; - // Generate date/time string - $date_time = generateDateTime(time(), 1); - - // Is content an array - if (is_array($content)) $content['date_time'] = $date_time; - - // @DEPRECATED Try to rewrite the if() condition - if ($template == 'member_support_form') { - // Support request of a member - $result = SQL_QUERY_ESC("SELECT `userid`, `gender`, `surname`, `family`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1", - array(getUserId()), __FUNCTION__, __LINE__); - - // Is content an array? - if (is_array($content)) { - // Merge data - $content = merge_array($content, SQL_FETCHARRAY($result)); - - // Translate gender - $content['gender'] = translateGender($content['gender']); - } else { - // @DEPRECATED - // @TODO Find all templates which are using these direct variables and rewrite them. - // @TODO After this step is done, this else-block is history - list($gender, $surname, $family, $email) = SQL_FETCHROW($result); - - // Translate gender - $gender = translateGender($gender); - logDebugMessage(__FUNCTION__, __LINE__, sprintf("DEPRECATION-WARNING: content is not array [%s], template=%s.", gettype($content), $template)); - } - - // Free result - SQL_FREERESULT($result); - } // END - if - // Base directory $basePath = sprintf("%stemplates/%s/html/", getConfig('PATH'), getLanguage()); $mode = ''; @@ -353,12 +322,12 @@ function loadTemplate ($template, $return=false, $content=array()) { $ret = ''; if ((strpos($GLOBALS['tpl_content'], '$') !== false) || (strpos($GLOBALS['tpl_content'], '{--') !== false) || (strpos($GLOBALS['tpl_content'], '{!') !== false) || (strpos($GLOBALS['tpl_content'], '{?') !== false)) { // Normal HTML output? - if ($GLOBALS['output_mode'] == 0) { + if (getOutputMode() == 0) { // Add surrounding HTML comments to help finding bugs faster $ret = "\n" . $GLOBALS['tpl_content'] . "\n"; // Prepare eval() command - $eval = '$ret = "' . compileCode(smartAddSlashes($GLOBALS['tpl_content'])) . '";'; + $eval = '$ret = "' . compileCode(smartAddSlashes($ret)) . '";'; } else { // Prepare eval() command $eval = '$ret = "' . compileCode(smartAddSlashes($GLOBALS['tpl_content'])) . '";'; @@ -413,9 +382,6 @@ function loadTemplate ($template, $return=false, $content=array()) { function loadEmailTemplate ($template, $content = array(), $UID = 0) { global $DATA; - // Our configuration is kept non-global here - $_CONFIG = getConfigArray(); - // Make sure all template names are lowercase! $template = strtolower($template); @@ -458,28 +424,25 @@ function loadEmailTemplate ($template, $content = array(), $UID = 0) { } // END - if // Load user's data - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):UID={$UID},template={$template},content[]=".gettype($content)."
"); + //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):UID={$UID},template={$template},content[]=".gettype($content).'
'); if (($UID > 0) && (is_array($content))) { // If nickname extension is installed, fetch nickname as well - if (isExtensionActive('nickname')) { + if (isNicknameUsed($UID)) { //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):NICKNAME!
"); - // Load nickname - $result = SQL_QUERY_ESC("SELECT `surname`, `family`, `gender`, `email`, `nickname` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1", - array(bigintval($UID)), __FUNCTION__, __LINE__); + // Load by nickname + fetchUserData($UID, 'nickname'); } else { //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):NO-NICK!
"); - /// Load normal data - $result = SQL_QUERY_ESC("SELECT `surname`, `family`, `gender`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1", - array(bigintval($UID)), __FUNCTION__, __LINE__); + /// Load by userid + fetchUserData($UID); } - // Fetch and merge data + // Merge data if valid //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):content()=".count($content)." - PRE
"); - $content = merge_array($content, SQL_FETCHARRAY($result)); + if (isUserDataValid()) { + $content = merge_array($content, getUserDataArray()); + } // END - if //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):content()=".count($content)." - AFTER
"); - - // Free result - SQL_FREERESULT($result); } // END - if // Translate M to male or F to female if present @@ -527,10 +490,9 @@ function loadEmailTemplate ($template, $content = array(), $UID = 0) { if (isFileReadable($FQFN)) { // The local file does exists so we load it. :) $GLOBALS['tpl_content'] = readFromFile($FQFN); - $GLOBALS['tpl_content'] = SQL_ESCAPE($GLOBALS['tpl_content']); // Run code - $GLOBALS['tpl_content'] = "\$newContent = decodeEntities(\"".compileCode($GLOBALS['tpl_content'])."\");"; + $GLOBALS['tpl_content'] = "\$newContent = decodeEntities(\"".compileCode(smartAddSlashes($GLOBALS['tpl_content']))."\");"; eval($GLOBALS['tpl_content']); } elseif (!empty($template)) { // Template file not found! @@ -561,7 +523,7 @@ function loadEmailTemplate ($template, $content = array(), $UID = 0) { unset($DATA); // Compile the code and eval it - $eval = '$newContent = "' . compileCode(smartAddSlashes($newContent)) . '";'; + $eval = '$newContent = "' . compileRawCode(smartAddSlashes($newContent)) . '";'; eval($eval); // Return content @@ -573,7 +535,7 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = ' //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):TO={$toEmail},SUBJECT={$subject}
"); // Compile subject line (for POINTS constant etc.) - eval("\$subject = decodeEntities(\"".compileCode(smartAddSlashes($subject))."\");"); + eval("\$subject = decodeEntities(\"".compileRawCode(smartAddSlashes($subject))."\");"); // Set from header if ((!eregi('@', $toEmail)) && ($toEmail > 0)) { @@ -583,24 +545,16 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = ' ADD_MESSAGE_TO_BOX($toEmail, $subject, $message, $isHtml); return; } else { - // Load email address - $result_email = SQL_QUERY_ESC("SELECT `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1", - array(bigintval($toEmail)), __FUNCTION__, __LINE__); - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):numRows=".SQL_NUMROWS($result_email)."
"); - // Does the user exist? - if (SQL_NUMROWS($result_email)) { - // Load email address - list($toEmail) = SQL_FETCHROW($result_email); + if (fetchUserData($toEmail)) { + // Get the email + $toEmail = getUserData('email'); } else { // Set webmaster $toEmail = getConfig('WEBMASTER'); } - - // Free result - SQL_FREERESULT($result_email); } - } elseif ($toEmail == 0) { + } elseif ($toEmail == '0') { // Is the webmaster! $toEmail = getConfig('WEBMASTER'); } @@ -627,21 +581,21 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = ' } // Compile "TO" - eval("\$toEmail = \"".compileCode(smartAddSlashes($toEmail))."\";"); + eval("\$toEmail = \"".compileRawCode(smartAddSlashes($toEmail))."\";"); // Compile "MSG" - eval("\$message = \"".compileCode(smartAddSlashes($message))."\";"); + eval("\$message = \"".compileRawCode(smartAddSlashes($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("
-".htmlentities(trim($mailHeader))."
-To      : " . $toEmail."
-Subject : " . $subject."
-Message : " . $message."
-
\n"); + outputHtml('
+Headers : ' . str_replace('<', '<', str_replace('>', '>', htmlentities(trim($mailHeader)))) . '
+To      : ' . $toEmail . '
+Subject : ' . $subject . '
+Message : ' . $message . '
+
'); } elseif (($isHtml == 'Y') && (isExtensionActive('html_mail'))) { // Send mail as HTML away sendHtmlEmail($toEmail, $subject, $message, $mailHeader); @@ -671,6 +625,11 @@ function sendRawEmail ($toEmail, $subject, $message, $from) { // get new instance $mail = new PHPMailer(); + + // Set charset to UTF-8 + $mail->CharSet('UTF-8'); + + // Path for PHPMailer $mail->PluginDir = sprintf("%sinc/phpmailer/", getConfig('PATH')); $mail->IsSMTP(); @@ -958,8 +917,8 @@ function makeTime ($hours, $minutes, $seconds, $stamp) { // Redirects to an URL and if neccessarry extends it with own base URL function redirectToUrl ($URL) { - // Compile out URI codes - $URL = compileUriCode($URL); + // Compile out codes + eval('$URL = "' . compileRawCode($URL) . '";'); // Check if http(s):// is there if ((substr($URL, 0, 7) != 'http://') && (substr($URL, 0, 8) != 'https://')) { @@ -969,7 +928,7 @@ function redirectToUrl ($URL) { // Three different debug ways... //* DEBUG: */ debug_report_bug(sprintf("%s[%s:] URL=%s", __FUNCTION__, __LINE__, $URL)); - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $URL); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'URL=' . $URL); //* DEBUG: */ die($URL); // Default 'rel' value is external, nofollow is evil from Google and hurts the Internet @@ -1034,6 +993,30 @@ function compileCode ($code, $simple = false, $constants = true, $full = true) { return $code; } // END - if + // Start couting + $startCompile = explode(' ', microtime()); + + // Comile the code + $code = compileRawCode($code, $simple, $constants, $full); + + // Get timing + $compiled = explode(' ', microtime()); + + // Add timing + $code .= ''; + + // Return compiled code + return $code; +} + +// Compiles the code (use compileCode() only for HTML because of the comments) +function compileRawCode ($code, $simple = false, $constants = true, $full = true) { + // Is the code a string? + if (!is_string($code)) { + // Silently return it + return $code; + } // END - if + // Init replacement-array with full security characters $secChars = $GLOBALS['security_chars']; @@ -1109,7 +1092,7 @@ function compileCode ($code, $simple = false, $constants = true, $full = true) { } // END - foreach } // END - if - // Return compiled code + // Return it return $code; } @@ -1303,12 +1286,12 @@ function generateRandomCode ($length, $code, $userid, $DATA = '') { $data .= getConfig('ENCRYPT_SEPERATOR') . determineReferalId(); $data .= getConfig('ENCRYPT_SEPERATOR') . getLanguage(); $data .= getConfig('ENCRYPT_SEPERATOR') . getCurrentTheme(); - $data .= getConfig('ENCRYPT_SEPERATOR') . getUserId(); + $data .= getConfig('ENCRYPT_SEPERATOR') . getMemberId(); // Calculate number for generating the code $a = $code + getConfig('_ADD') - 1; - if (isConfigEntrySet('master_hash')) { + if (isConfigEntrySet('master_salt')) { // Generate hash with master salt from modula of number with the prime number and other data $saltedHash = generateHash(($a % getConfig('_PRIME')) . getConfig('ENCRYPT_SEPERATOR') . $server . getConfig('ENCRYPT_SEPERATOR') . $keys . getConfig('ENCRYPT_SEPERATOR') . $data . getConfig('ENCRYPT_SEPERATOR') . getConfig('DATE_KEY') . getConfig('ENCRYPT_SEPERATOR') . $a, getConfig('master_salt')); @@ -1316,7 +1299,7 @@ function generateRandomCode ($length, $code, $userid, $DATA = '') { $rcode = hexdec(substr($saltedHash, strlen(getConfig('master_salt')), 9)) / abs(getConfig('rand_no') - $a + sqrt(getConfig('_ADD'))) / pi(); } else { // Generate hash with "hash of site key" from modula of number with the prime number and other data - $saltedHash = generateHash(($a % getConfig('_PRIME')) . getConfig('ENCRYPT_SEPERATOR') . $server . getConfig('ENCRYPT_SEPERATOR') . $keys . getConfig('ENCRYPT_SEPERATOR') . $data . getConfig('ENCRYPT_SEPERATOR') . getConfig('DATE_KEY') . getConfig('ENCRYPT_SEPERATOR') . $a, substr(sha1(getConfig('SITE_KEY')), 0, 8)); + $saltedHash = generateHash(($a % getConfig('_PRIME')) . getConfig('ENCRYPT_SEPERATOR') . $server . getConfig('ENCRYPT_SEPERATOR') . $keys . getConfig('ENCRYPT_SEPERATOR') . $data . getConfig('ENCRYPT_SEPERATOR') . getConfig('DATE_KEY') . getConfig('ENCRYPT_SEPERATOR') . $a, substr(sha1(getConfig('SITE_KEY')), 0, getConfig('salt_length'))); // Create number from hash $rcode = hexdec(substr($saltedHash, 8, 9)) / abs(getConfig('rand_no') - $a + sqrt(getConfig('_ADD'))) / pi(); @@ -1725,7 +1708,7 @@ function extractHostnameFromUrl (&$script) { if (ereg('/', $host)) $host = substr($host, 0, strpos($host, '/')); // Generate relative URL - //* DEBUG: */ print("SCRIPT=" . $script."
"); + //* DEBUG: */ print("SCRIPT=" . $script.'
'); if (substr(strtolower($script), 0, 7) == 'http://') { // But only if http:// is in front! $script = substr($script, (strlen($url) + 7)); @@ -1734,7 +1717,7 @@ function extractHostnameFromUrl (&$script) { $script = substr($script, (strlen($url) + 8)); } - //* DEBUG: */ print("SCRIPT=" . $script."
"); + //* DEBUG: */ print("SCRIPT=" . $script.'
'); if (substr($script, 0, 1) == '/') $script = substr($script, 1); // Return host name @@ -1742,10 +1725,25 @@ function extractHostnameFromUrl (&$script) { } // Send a GET request -function sendGetRequest ($script) { +function sendGetRequest ($script, $data = array()) { // Extract host name from script $host = extractHostnameFromUrl($script); + // Add data + $scriptData = 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; + } else { + // Ok, add & + $scriptData = '&' . $scriptData; + } + + // Add script data + $script .= $scriptData; + // Generate GET request header $request = 'GET /' . trim($script) . ' HTTP/1.1' . getConfig('HTTP_EOL'); $request .= 'Host: ' . $host . getConfig('HTTP_EOL'); @@ -1775,14 +1773,11 @@ function sendPostRequest ($script, $postData) { return array('', '', ''); } // END - if - // Compile the script name - $script = compileCode($script); - // Extract host name from script $host = extractHostnameFromUrl($script); // Construct request - $data = http_build_query($postData, '','&'); + $data = http_build_query($postData, '', '&'); // Generate POST request header $request = 'POST /' . trim($script) . ' HTTP/1.1' . getConfig('HTTP_EOL'); @@ -1820,10 +1815,10 @@ function sendRawRequest ($host, $request) { } // END - if // Open connection - //* DEBUG: */ die("SCRIPT=" . $script."
"); + //* DEBUG: */ die("SCRIPT=" . $script.'
'); if ($useProxy === true) { // Connect to host through proxy connection - $fp = @fsockopen(compileCode(getConfig('proxy_host')), bigintval(getConfig('proxy_port')), $errno, $errdesc, 30); + $fp = @fsockopen(compileRawCode(getConfig('proxy_host')), bigintval(getConfig('proxy_port')), $errno, $errdesc, 30); } else { // Connect to host directly $fp = @fsockopen($host, 80, $errno, $errdesc, 30); @@ -1844,7 +1839,7 @@ function sendRawRequest ($host, $request) { // Use login data to proxy? (username at least!) if (getConfig('proxy_username') != '') { // Add it as well - $encodedAuth = base64_encode(compileCode(getConfig('proxy_username')) . getConfig('ENCRYPT_SEPERATOR') . compileCode(getConfig('proxy_password'))); + $encodedAuth = base64_encode(compileRawCode(getConfig('proxy_username')) . getConfig('ENCRYPT_SEPERATOR') . compileRawCode(getConfig('proxy_password'))); $proxyTunnel .= "Proxy-Authorization: Basic " . $encodedAuth . getConfig('HTTP_EOL'); } // END - if @@ -1918,9 +1913,6 @@ function sendRawRequest ($host, $request) { // Taken from www.php.net eregi() user comments function isEmailValid ($email) { - // Compile email - $email = compileCode($email); - // Check first part of email address $first = '[-a-z0-9!#$%&\'*+/=?^_<{|}~]+(\.[-a-zA-Z0-9!#$%&\'*+/=?^_<{|}~]+)*'; @@ -1938,11 +1930,11 @@ function isEmailValid ($email) { function isUrlValid ($URL, $compile=true) { // Trim URL a little $URL = trim(urldecode($URL)); - //* DEBUG: */ outputHtml($URL."
"); + //* DEBUG: */ outputHtml($URL.'
'); // Compile some chars out... if ($compile === true) $URL = compileUriCode($URL, false, false, false); - //* DEBUG: */ outputHtml($URL."
"); + //* DEBUG: */ outputHtml($URL.'
'); // Check for the extension filter if (isExtensionActive('filter')) { @@ -2021,7 +2013,7 @@ function generateEmailLink ($email, $table = 'admins') { // Generate a hash for extra-security for all passwords function generateHash ($plainText, $salt = '') { // Is the required extension 'sql_patches' there and a salt is not given? - if (((isExtensionInstalledAndOlder('sql_patches', '0.3.6')) || (!isExtensionActive('sql_patches'))) && (empty($salt))) { + if (((isExtensionInstalledAndOlder('sql_patches', '0.3.6')) || (!isExtensionActive('sql_patches')) || (!isExtensionInstalledAndNewer('other', '0.2.5'))) && (empty($salt))) { // Extension sql_patches is missing/outdated so we hash the plain text with MD5 return md5($plainText); } // END - if @@ -2059,8 +2051,15 @@ function generateHash ($plainText, $salt = '') { //* DEBUG: */ outputHtml($salt." (".strlen($salt).")
"); } else { // Use given salt + //* DEBUG: */ print 'salt=' . $salt . '
'; $salt = substr($salt, 0, getConfig('salt_length')); - //* DEBUG: */ outputHtml("GIVEN={$salt}
"); + //* DEBUG: */ print 'salt=' . $salt . '(' . strlen($salt) . '/' . getConfig('salt_length') . ')
'; + + // Sanity check on salt + if (strlen($salt) != getConfig('salt_length')) { + // Not the same! + debug_report_bug(__FUNCTION__.': salt length mismatch! ('.strlen($salt).'/'.getConfig('salt_length').')'); + } // END - if } // Return hash @@ -2153,7 +2152,7 @@ function generatePassString ($passHash) { $ret = $passHash; // Is a secret key and master salt already initialized? - if ((isExtensionInstalled('sql_patches')) && (isConfigEntrySet('secret_key')) && (isConfigEntrySet('master_salt'))) { + if ((isExtensionInstalled('sql_patches')) && (isExtensionInstalledAndNewer('other', '0.2.5')) && (isConfigEntrySet('_PRIME')) && (isConfigEntrySet('secret_key')) && (isConfigEntrySet('master_salt'))) { // Only calculate when the secret key is generated $newHash = ''; $start = 9; for ($idx = 0; $idx < 10; $idx++) { @@ -2165,16 +2164,17 @@ function generatePassString ($passHash) { } elseif ($part2 > $part1) { $mod = dechex(sqrt(($part2 - $part1) * getConfig('_PRIME') / pi())); } - $mod = substr(round($mod), 0, 4); - $mod = str_repeat(0, 4-strlen($mod)) . $mod; - //* DEBUG: */ outputHtml("*" . $start.'=' . $mod."*
"); + $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; $newHash .= $mod; } // END - for - //* DEBUG: */ print($passHash."
" . $newHash." (".strlen($newHash).')'); + //* DEBUG: */ print($passHash.'
' . $newHash." (".strlen($newHash).')
'); $ret = generateHash($newHash, getConfig('master_salt')); - //* DEBUG: */ print($ret."
"); + //* DEBUG: */ print('ret='.$ret.'
'); } else { // Hash it simple //* DEBUG: */ outputHtml("--" . $passHash."--
"); @@ -2295,7 +2295,7 @@ function getCurrentTheme () { $ret = 'default'; // Load default theme if not empty from configuration - if (getConfig('default_theme') != '') $ret = getConfig('default_theme'); + if ((isConfigEntrySet('default_theme')) && (getConfig('default_theme') != '')) $ret = getConfig('default_theme'); if (!isSessionVariableSet('mxchange_theme')) { // Set default theme @@ -2378,11 +2378,11 @@ function getThemeId ($name) { } // Generates an error code from given account status -function generateErrorCodeFromUserStatus ($status) { - // @TODO The status should never be empty - if (empty($status)) { - // Something really bad happend here - debug_report_bug(__FUNCTION__ . ': status is empty.'); +function generateErrorCodeFromUserStatus ($status='') { + // If no status is provided, use the default, cached + if ((empty($status)) && (isMember())) { + // Get user status + $status = getUserData('status'); } // END - if // Default error code if unknown account status @@ -2407,12 +2407,12 @@ function generateErrorCodeFromUserStatus ($status) { // Function to search for the last modifified file function searchDirsRecursive ($dir, &$last_changed) { // Get dir as array - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):dir=" . $dir."
"); + //* 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)."
"); + //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):ds[]=".count($ds).'
'); // Walk through all entries foreach ($ds as $d) { @@ -2425,7 +2425,7 @@ function searchDirsRecursive ($dir, &$last_changed) { // $FQFN is a directory so also crawl into this directory $newDir = $d; if (!empty($dir)) $newDir = $dir . '/'. $d; - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):DESCENT: " . $newDir."
"); + //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):DESCENT: " . $newDir.'
'); searchDirsRecursive($newDir, $last_changed); } elseif (isFileReadable($FQFN)) { // $FQFN is a filename and no directory @@ -2604,6 +2604,17 @@ function debug_get_printable_backtrace () { // Output a debug backtrace to the user function debug_report_bug ($message = '') { + // Is this already called? + if (isset($GLOBALS[__FUNCTION__])) { + // Other backtrace + print 'Message:'.$message.'
Backtrace:
';
+		debug_print_backtrace();
+		die('
'); + } // END - if + + // Set this function as called + $GLOBALS[__FUNCTION__] = true; + // Init message $debug = ''; @@ -2781,7 +2792,7 @@ function compileUriCode ($code, $simple = true) { // Function taken from user comments on www.php.net / function eregi() function isUrlValidSimple ($url) { // Prepare URL - $url = secureString(str_replace("\\", '', compileCode(urldecode($url)))); + $url = secureString(str_replace("\\", '', compileRawCode(urldecode($url)))); // Allows http and https $http = "(http|https)+(:\/\/)"; @@ -2829,7 +2840,7 @@ function isUrlValidSimple ($url) { // @TODO Are these convertions still required? $pat = str_replace('.', "\.", $pat); $pat = str_replace('@', "\@", $pat); - //* DEBUG: */ outputHtml($key."= " . $pat . "
"); + //* DEBUG: */ outputHtml($key."= " . $pat . '
'); } // END - if // Check if expression matches @@ -2920,7 +2931,7 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) { } // Send notification to admin function sendAdminNotification ($subject, $templateName, $content=array(), $userid = 0) { - if (getExtensionVersion('admins') >= '0.4.1') { + if (isExtensionInstalledAndNewer('admins', '0.4.1')) { // Send new way sendAdminsEmails($subject, $templateName, $content, $userid); } else { @@ -2939,7 +2950,7 @@ function logDebugMessage ($funcFile, $line, $message, $force=true) { // Log this message away, we better don't call app_die() here to prevent an endless loop $fp = fopen(getConfig('CACHE_PATH') . 'debug.log', 'a') or die(__FUNCTION__.'['.__LINE__.']: Cannot write logfile debug.log!'); - fwrite($fp, date('d.m.Y|H:i:s', time()) . '|' . getModule() . '|' . basename($funcFile) . '|' . $line . '|' . $message . "\n"); + fwrite($fp, date('d.m.Y|H:i:s', time()) . '|' . getModule(false) . '|' . basename($funcFile) . '|' . $line . '|' . $message . "\n"); fclose($fp); } // END - if } @@ -2980,6 +2991,7 @@ function handleExtraValues ($filterFunction, $value, $extraValue) { // Converts timestamp selections into a timestamp function convertSelectionsToTimestamp (&$postData, &$DATA, &$id, &$skip) { // Init test variable + $skip = false; $test2 = ''; // Get last three chars @@ -2992,21 +3004,20 @@ function convertSelectionsToTimestamp (&$postData, &$DATA, &$id, &$skip) { if ((isset($postData[$test.'_ye'])) && (isset($postData[$test.'_mo'])) && (isset($postData[$test.'_we'])) && (isset($postData[$test.'_da'])) && (isset($postData[$test.'_ho'])) && (isset($postData[$test.'_mi'])) && (isset($postData[$test.'_se'])) && ($test != $test2)) { // Generate timestamp $postData[$test] = createTimestampFromSelections($test, $postData); - $DATA[] = sprintf("%s='%s'", $test, $postData[$test]); + $DATA[] = sprintf("`%s`='%s'", $test, $postData[$test]); + $GLOBALS['skip_config'][$test] = true; // Remove data from array foreach (array('ye', 'mo', 'we', 'da', 'ho', 'mi', 'se') as $rem) { - unset($postData[$test.'_' . $rem]); + unset($postData[$test . '_' . $rem]); } // END - foreach // Skip adding - unset($id); $skip = true; $test2 = $test; + unset($id); + $skip = true; + $test2 = $test; } // END - if - } else { - // Process this entry - $skip = false; - $test2 = ''; - } + } // END - if } // Reverts the german decimal comma into Computer decimal dot @@ -3155,8 +3166,8 @@ function addNewBonusMail ($data, $mode = '', $output=true) { // Determines referal id and sets it function determineReferalId () { - // Skip this in non-html-mode - if (getOutputMode() != 0) return false; + // Skip this in non-html-mode and outside ref.php + if ((getOutputMode() != 0) && (basename($_SERVER['PHP_SELF']) != 'ref.php')) return false; // Check if refid is set if ((isset($GLOBALS['refid'])) && ($GLOBALS['refid'] > 0)) { @@ -3183,12 +3194,30 @@ function determineReferalId () { // Set default refid as refid in URL $GLOBALS['refid'] = getConfig('def_refid'); } else { - // No default ID when sql_patches is not installed or none set + // No default id when sql_patches is not installed or none set $GLOBALS['refid'] = 0; } // Set cookie when default refid > 0 - if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((getSession('refid') == 0) && (getConfig('def_refid') > 0))) { + if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((getSession('refid') == 0) && (isConfigEntrySet('def_refid')) && (getConfig('def_refid') > 0))) { + // Default is not found + $found = false; + + // Do we have nickname or userid set? + if (isNicknameUsed($GLOBALS['refid'])) { + // Nickname in URL, so load the id + $found = fetchUserData($GLOBALS['refid'], 'nickname'); + } elseif ($GLOBALS['refid'] > 0) { + // Direct userid entered + $found = fetchUserData($GLOBALS['refid']); + } + + // Is the record valid? + if (($found === false) || (!isUserDataValid())) { + // No, then reset referal id + $GLOBALS['refid'] = getConfig('def_refid'); + } // END - if + // Set cookie setSession('refid', $GLOBALS['refid']); } // END - if @@ -3223,29 +3252,38 @@ function shutdown () { exit; } -// Setter for userid -function setUserId ($userid) { - $GLOBALS['userid'] = bigintval($userid); +// Init member id +function initMemberId () { + $GLOBALS['member_id'] = 0; } -// Getter for userid or returns zero -function getUserId () { - // Default userid - $userid = 0; +// Setter for member id +function setMemberId ($memberid) { + // We should not set member id to zero + if ($memberid == 0) debug_report_bug('Userid should not be set zero.'); + + // Set it secured + $GLOBALS['member_id'] = bigintval($memberid); +} - // Is the userid set? - if (isUserIdSet()) { +// Getter for member id or returns zero +function getMemberId () { + // Default member id + $memberid = 0; + + // Is the member id set? + if (isMemberIdSet()) { // Then use it - $userid = $GLOBALS['userid']; + $memberid = $GLOBALS['member_id']; } // END - if // Return it - return $userid; + return $memberid; } -// Checks ether the userid is set -function isUserIdSet () { - return (isset($GLOBALS['userid'])); +// Checks ether the member id is set +function isMemberIdSet () { + return (isset($GLOBALS['member_id'])); } // Handle message codes from URL @@ -3377,7 +3415,7 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad // Exclude '.', '..' and entries in $excludeArray automatically if (in_array($baseFile, $excludeArray, true)) { // Exclude them - //* DEBUG: */ outputHtml('excluded=' . $baseFile . "
"); + //* DEBUG: */ outputHtml('excluded=' . $baseFile . '
'); continue; } // END - if @@ -3391,9 +3429,9 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad // Check if the base filename 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 . "
"); - //* DEBUG: */ outputHtml('baseFile:' . $baseFile . "
"); - //* DEBUG: */ outputHtml('FQFN:' . $FQFN . "
"); + //* DEBUG: */ outputHtml('baseDir:' . $baseDir . '
'); + //* DEBUG: */ outputHtml('baseFile:' . $baseFile . '
'); + //* DEBUG: */ outputHtml('FQFN:' . $FQFN . '
'); // Exclude this one continue; @@ -3476,8 +3514,25 @@ function mapModuleToTable ($moduleName) { // Add SQL debug data to array for later output function addSqlToDebug ($result, $sqlString, $timing, $F, $L) { - // Don't execute anything here if we don't need - if (getConfig('display_debug_sqls') != 'Y') return; + // Already executed? + if (isset($GLOBALS['debug_sqls'][$F][$L][$sqlString])) { + // Then abort here, we don't need to profile a query twice + return; + } // END - if + + // Remeber this as profiled (or not, but we don't care here) + $GLOBALS['debug_sqls'][$F][$L][$sqlString] = true; + + // Do we have cache? + if (!isset($GLOBALS['debug_sql_available'])) { + // Check it and cache it in $GLOBALS + $GLOBALS['debug_sql_available'] = ((isConfigurationLoaded()) && (isExtensionInstalledAndNewer('other', '0.2.2')) && (getConfig('display_debug_sqls') == 'Y')); + } // END - if + + // Don't execute anything here if we don't need or ext-other is missing + if ($GLOBALS['debug_sql_available'] === false) { + return; + } // END - if // Generate record $record = array( @@ -3502,7 +3557,7 @@ function initCacheInstance () { $GLOBALS['cache_instance'] = new CacheSystem(); if ($GLOBALS['cache_instance']->getStatus() != 'done') { // Failed to initialize cache sustem - addFatalMessage(__FILE__, __LINE__, "(".__LINE__."): ".getMessage('CACHE_CANNOT_INITIALIZE')); + addFatalMessage(__FILE__, __LINE__, '(' . __LINE__ . '): ' . getMessage('CACHE_CANNOT_INITIALIZE')); } // END - if } @@ -3548,6 +3603,107 @@ function convertReceivers ($old) { return str_replace(';', ', ', $old); } +// Determines the right page title +function determinePageTitle () { + // Config and database connection valid? + if ((isConfigLocalLoaded()) && (isConfigurationLoaded()) && (SQL_IS_LINK_UP()) && (isExtensionInstalledAndNewer('sql_patches', '0.1.6'))) { + // Init title + $TITLE = ''; + + // Title decoration enabled? + if ((getConfig('enable_title_deco') == 'Y') && (getConfig('title_left') != '')) $TITLE .= trim(getConfig('title_left'))." "; + + // Do we have some extra title? + if (isExtraTitleSet()) { + // Then prepent it + $TITLE .= getExtraTitle() . ' by '; + } // END - if + + // Add main title + $TITLE .= getConfig('MAIN_TITLE'); + + // Add title of module? (middle decoration will also be added!) + if ((getConfig('enable_mod_title') == 'Y') || ((!isWhatSet()) && (!isActionSet())) || (getModule() == 'admin')) { + $TITLE .= ' ' . trim(getConfig('title_middle')) . ' ' . getModuleTitle(getModule()); + } // END - if + + // Add title from what file + $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()); + + // Add title decorations? (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()) . ' --]'; + } elseif ((isInstalled()) && (!isAdminRegistered())) { + // Installed but no admin registered + $pageTitle = sprintf(getMessage('SETUP_OF_MXCHANGE'), getConfig('MAIN_TITLE')); + } elseif ((!isInstalled()) || (!isAdminRegistered())) { + // Installation mode + $pageTitle = getMessage('INSTALLATION_OF_MXCHANGE'); + } else { + // Configuration not found! + $pageTitle = getMessage('NO_CONFIG_FOUND_TITLE'); + + // Do not add the fatal message in installation mode + if ((!isInstalling()) && (!isConfigurationLoaded())) addFatalMessage(__FILE__, __LINE__, getMessage('NO_CONFIG_FOUND')); + } + + // Return title + return $pageTitle; +} + +// Checks wethere there is a cache file there. This function is cached. +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); + + // Is it there? + $GLOBALS['template_cache'][$template] = isFileReadable($FQFN); + } // END - if + + // Return it + return $GLOBALS['template_cache'][$template]; +} + +// Flushes non-flushed template cache to disk +function flushTemplateCache ($template, $eval) { + // Is this cache flushed? + if ((!isTemplateCached($template)) && ($eval != '404')) { + // Generate FQFN + $FQFN = sprintf("%s_compiled/templates/%s.tpl.cache", getConfig('CACHE_PATH'), $template); + + // Replace username with a call + $eval = str_replace('$username', '".getUsername()."', $eval); + + // And flush it + writeToFile($FQFN, $eval, true); + } // END - if +} + +// Reads a template cache +function readTemplateCache ($template) { + // Check it again + if (isTemplateCached($template)) { + // Generate FQFN + $FQFN = sprintf("%s_compiled/templates/%s.tpl.cache", getConfig('CACHE_PATH'), $template); + + // And read from it + $GLOBALS['template_eval'][$template] = readFromFile($FQFN); + } // END - if + + // And return it + return $GLOBALS['template_eval'][$template]; +} + ////////////////////////////////////////////////// // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS // ////////////////////////////////////////////////// @@ -3561,5 +3717,29 @@ 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) + function http_build_query($data, $prefix='', $sep='', $key='') { + $ret = array(); + foreach ((array)$data as $k => $v) { + if (is_int($k) && $prefix != null) { + $k = urlencode($prefix . $k); + } // END - if + + 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)); + } else { + array_push($ret, $k.'='.urlencode($v)); + } + } // END - foreach + + if (empty($sep)) $sep = ini_get('arg_separator.output'); + + return implode($sep, $ret); + } +}// // END - if + // [EOF] ?>