'.linenumberCode($code).'
'.linenumberCode($eval).'
'.lineNumberCode($code).'
'.lineNumberCode($eval).'
'.linenumberCode($newContent).'
'.lineNumberCode($newContent).'
'.encodeEntities($newContent).'
' . linenumberCode($eval) . '
' . lineNumberCode($eval) . '
' . print_r($content, TRUE) . '
'.htmlentities($GLOBALS['template_eval']['email'][$template]).'
'; + print '[' . $file . ':' . $line . ':] ' . __FUNCTION__ . ' has already died! Message:' . $message . 'Backtrace:'; debug_print_backtrace(); die(''); } // END - if @@ -1299,7 +1289,7 @@ function reportBug ($F, $L, $message = '', $sendEmail = TRUE) { ); // @TODO Add a little more infos here - logDebugMessage($F, $L, strip_tags($message)); + logDebugMessage($file, $line, strip_tags($message)); } // END - if // Add output @@ -1322,9 +1312,9 @@ function reportBug ($F, $L, $message = '', $sendEmail = TRUE) { } // END - if // Is there HTML/CSS/AJAX mode? - if ((isHtmlOutputMode()) || (isCssOutputMode()) || (isAjaxOutputMode())) { + if (((isHtmlOutputMode()) || (isCssOutputMode()) || (isAjaxOutputMode())) && (isDebugModeEnabled())) { // And abort here - app_exit($F, $L, $debug); + app_exit($file, $line, $debug); } else { // Raw/image output mode and all other modes doesn't work well with text ... die(); @@ -1495,7 +1485,7 @@ function generateExtensionInactiveNotInstalledMessage ($ext_name) { } // Print code with line numbers -function linenumberCode ($code) { +function lineNumberCode ($code) { // By default copy the code $codeE = $code; @@ -1529,7 +1519,7 @@ function determinePageTitle () { $pageTitle = ''; // Config and database connection valid? - if ((isConfigLocalLoaded()) && (isConfigurationLoaded()) && (SQL_IS_LINK_UP()) && (isExtensionInstalledAndNewer('sql_patches', '0.1.6'))) { + if ((isConfigLocalLoaded()) && (isConfigurationLoaded()) && (isSqlLinkUp()) && (isExtensionInstalledAndNewer('sql_patches', '0.1.6'))) { // Title decoration enabled? if ((isTitleDecorationEnabled()) && (getTitleLeft() != '')) { $pageTitle .= '{%config,trim=title_left%} '; @@ -1549,17 +1539,8 @@ function determinePageTitle () { $pageTitle .= ' {%config,trim=title_middle%} {DQUOTE} . getModuleTitle(getModule()) . {DQUOTE}'; } // END - if - // Add title from what file - $menuMode = ''; - if (getModule() == 'login') { - $menuMode = 'member'; - } elseif (getModule() == 'index') { - $menuMode = 'guest'; - } elseif (getModule() == 'admin') { - $menuMode = 'admin'; - } elseif (getModule() == 'sponsor') { - $menuMode = 'sponsor'; - } + // Get menu mode from module + $menuMode = getMenuModeFromModule(); // Add middle part (always in admin area!) if ((!empty($menuMode)) && ((isWhatTitleEnabled()) || ($menuMode == 'admin'))) { @@ -1612,10 +1593,13 @@ function isTemplateCached ($prefix, $template) { // Flushes non-flushed template cache to disk function flushTemplateCache ($prefix, $template, $eval) { // Is this cache flushed? - if ((isDebuggingTemplateCache() === FALSE) && (isTemplateCached($prefix, $template) === FALSE) && ($eval != '404')) { + if ((isDebugTemplateCacheEnabled() === FALSE) && (isTemplateCached($prefix, $template) === FALSE) && ($eval != '404')) { // Generate FQFN $FQFN = generateCacheFqfn($prefix, $template); + // Compile code another round for better performance and preserve $ signs + $eval = str_replace(array(chr(92), '{DOLLAR}', '{BACK}', '{CONTENT}'), array('', '$', chr(92), '$content'), compileCode(str_replace(array('$content', chr(92)), array('{CONTENT}', '{BACK}'), $eval))); + // Is this a XML template? if ($prefix == 'xml') { // Compact only XML templates as emails needs new-line characters and HTML may contain required "comments" @@ -1623,16 +1607,16 @@ function flushTemplateCache ($prefix, $template, $eval) { } // END - if // And flush it - writeToFile($FQFN, $eval, TRUE); + writeToFile($FQFN, '', TRUE); } // END - if } // Reads a template cache -function readTemplateCache ($prefix, $template) { +function readTemplateCache ($prefix, $template, $content) { // Check it again - if ((isDebuggingTemplateCache()) || (!isTemplateCached($prefix, $template))) { + if ((isDebugTemplateCacheEnabled()) || (!isTemplateCached($prefix, $template))) { // This should not happen - reportBug('Wether debugging of template cache is enabled or template ' . $template . ' is not cached while expected.'); + reportBug(__FUNCTION__, __LINE__, 'Wether debugging of template cache is enabled or template ' . $template . ' is not cached while expected.'); } // END - if // Is it cached? @@ -1640,12 +1624,24 @@ function readTemplateCache ($prefix, $template) { // Generate FQFN $FQFN = generateCacheFqfn($prefix, $template); - // And read from it - $GLOBALS['template_eval'][$prefix][$template] = readFromFile($FQFN); + /* + * And read from it. + * + * WARNING: Do not replace this include() call with loadInclude() as it + * would hide local variables away which is here required to make this + * work. + */ + include($FQFN); + + // Is the template cache valid? + if (!isset($templateContent)) { + // Please clear your cache! + reportBug(__FUNCTION__, __LINE__, 'Template ' . $template . ' uses old structure. Please delete all template cache files and reload.'); + } // END - if } // END - if // And return it - return $GLOBALS['template_eval'][$prefix][$template]; + return $templateContent; } // Escapes quotes (default is only double-quotes) @@ -1687,7 +1683,7 @@ function sendModeMails ($mod, $modes) { $hash = encodeHashForCookie(getUserData('password')); // Does the hash match or should we change it? - if (($hash == getSession('u_hash')) || (postRequestElement('pass1') == postRequestElement('pass2'))) { + if (($hash == getSession('u_hash')) || (postRequestElement('password1') == postRequestElement('password2'))) { // Load the data $content = getUserDataArray(); @@ -1910,7 +1906,7 @@ function generateCacheFqfn ($prefix, $template) { if (!isset($GLOBALS['template_cache_fqfn'][$prefix][$template])) { // Generate the FQFN $GLOBALS['template_cache_fqfn'][$prefix][$template] = sprintf( - "%s_compiled/%s/%s.tpl.cache", + '%s_compiled/%s/%s.tpl.cache', getCachePath(), $prefix, $template @@ -1939,7 +1935,7 @@ function fixNullEmptyToDashes ($str, $num) { // Translates the "pool type" into human-readable function translatePoolType ($type) { // Return "translation" - return sprintf("{--POOL_TYPE_%s--}", strtoupper($type)); + return sprintf('{--POOL_TYPE_%s--}', strtoupper($type)); } // "Translates" given time unit @@ -1966,6 +1962,12 @@ function displayMessage ($message, $return = FALSE) { return loadTemplate('admin_settings_saved', $return, $message); } +// Displays given error message in admin_settings_saved template +function displayErrorMessage ($message, $return = FALSE) { + // Load the template + return loadTemplate('admin_settings_unsaved', $return, $message); +} + // Generates a selection box for (maybe) given gender function generateGenderSelectionBox ($selectedGender = '', $fieldName = 'gender') { // Start the HTML code @@ -2049,6 +2051,71 @@ function addJavaScriptMenuContent ($menuMode, $mainAction, $action, $what) { return $OUT; } +// Tries to anonymize some sensitive data (e.g. IP address, user agent, referrer, etc.) +function anonymizeSensitiveData ($data) { + // Trim it + $data = trim($data); + + // Is it empty? + if (empty($data)) { + // Then add three dashes + $data = '---'; + } elseif (isUrlValid($data)) { + // Is a referrer, so is it black-listed? + if (isAdmin()) { + // Is admin, has always priority + $data = '[{--ADMIN_TEST_URL--}]'; + } elseif ((isExtensionActive('blacklist')) && (isUrlBlacklisted($data))) { + // Yes, so replace it with text + $data = '{--URL_IS_BLACKLISTED--}'; + } else { + // A member is viewing this referral URL + $data = '[{--MEMBER_TEST_URL--}]'; + } + } elseif (isIp4AddressValid($data)) { + // Is an IPv4 address + $ipArray = explode('.', $data); + + // Only display first 2 octets + $data = $ipArray[0] . '.' . $ipArray[1] . '.?.?'; + } else { + // Generic data + $data = '{--DATA_IS_HIDDEN--}'; + } + + // Return it (hopefully) anonymized + return $data; +} + +/** + * Removes all comments, tabs and new-line characters to compact the content + * + * @param $uncompactedContent The uncompacted content + * @return $compactedContent The compacted content + */ +function compactContent ($uncompactedContent) { + // First, remove all tab/new-line/revert characters + $compactedContent = str_replace(chr(9), '', str_replace(PHP_EOL, '', str_replace(chr(13), '', $uncompactedContent))); + + // Make a space after > + $compactedContent = str_replace(array('>', ' '), array('> ', ' '), $compactedContent); + + // Then regex all comments like away + preg_match_all('//', $compactedContent, $matches); + + // Do we have entries? + if (isset($matches[0][0])) { + // Remove all + foreach ($matches[0] as $match) { + // Remove the match + $compactedContent = str_replace($match, '', $compactedContent); + } // END - foreach + } // END - if + + // Return compacted content + return $compactedContent; +} + //----------------------------------------------------------------------------- // Template helper functions for EL code //----------------------------------------------------------------------------- @@ -2093,13 +2160,13 @@ function doTemplateExtensionRegistrationLink ($templateName, $clear, $ext_name) // Helper function to create bonus mail admin links function doTemplateAdminBonusMailLinks ($templateName, $clear, $bonusId) { // Call the inner function - return generateAdminMailLinks('bid', $bonusId); + return generateAdminMailLinks('bonus', $bonusId); } // Helper function to create member mail admin links function doTemplateAdminMemberMailLinks ($templateName, $clear, $mailId) { // Call the inner function - return generateAdminMailLinks('mid', $mailId); + return generateAdminMailLinks('normal', $mailId); } // Helper function to create a selection box for YES/NO configuration entries @@ -2141,6 +2208,25 @@ function doTemplateNoYesSelectionBox ($templateName, $clear, $formField) { return $OUT; } +// Helper function to add extra content for guest area (module=index and others) +function doTemplateGuestFooterExtras ($templateName, $clear) { + // Init filter data + $filterData = array( + // Name of used template + 'template' => $templateName, + // Target array for gathered data + '__data' => array(), + // Where the HTML output will go + '__output' => '', + ); + + // Run the filter chain + $filterData = runFilterChain('guest_footer_extras', $filterData); + + // Return output + return $filterData['__output']; +} + // Helper function to add extra content for member area (module=login) function doTemplateMemberFooterExtras ($templateName, $clear) { // Is a member logged in? @@ -2251,69 +2337,29 @@ function doTemplateDereferrerUrl ($templateName, $clear = FALSE, $url = NULL) { return fixEmptyContentToDashes($url); } -// Tries to anonymize some sensitive data (e.g. IP address, user agent, referrer, etc.) -function anonymizeSensitiveData ($data) { - // Trim it - $data = trim($data); - - // Is it empty? - if (empty($data)) { - // Then add three dashes - $data = '---'; - } elseif (isUrlValid($data)) { - // Is a referrer, so is it black-listed? - if (isAdmin()) { - // Is admin, has always priority - $data = '[{--ADMIN_TEST_URL--}]'; - } elseif (isUrlBlacklisted($data)) { - // Yes, so replace it with text - $data = '{--URL_IS_BLACKLISTED--}'; - } else { - // A member is viewing this referral URL - $data = '[{--MEMBER_TEST_URL--}]'; - } - } elseif (isIp4AddressValid($data)) { - // Is an IPv4 address - $ipArray = explode('.', $data); - - // Only display first 2 octets - $data = $ipArray[0] . '.' . $ipArray[1] . '.?.?'; - } else { - // Generic data - $data = '{--DATA_IS_HIDDEN--}'; - } - - // Return it (hopefully) anonymized - return $data; +// Load another template and return its content +function doTemplateLoadTemplate ($templateName, $clear = FALSE, $theTemplate, $content = array()) { + // Load "the" template + return loadTemplate($theTemplate, TRUE, $content); } -/** - * Removes all commentd, tabs and new-line characters to compact the content - * - * @param $uncompactedContent The uncompacted content - * @return $compactedContent The compacted content - */ -function compactContent ($uncompactedContent) { - // First, remove all tab/new-line/revert characters - $compactedContent = str_replace(chr(9), '', str_replace(PHP_EOL, '', str_replace(chr(13), '', $uncompactedContent))); - - // Then regex all comments like away - preg_match_all('//', $compactedContent, $matches); +// Output HTML code for favicon.ico, if found +function doTemplateMetaFavIcon ($templateName, $clear = FALSE) { + // Default is not found + $out = ''; - // Do we have entries? - if (isset($matches[0][0])) { - // Remove all - foreach ($matches[0] as $match) { - // Remove the match - $compactedContent = str_replace($match, '', $compactedContent); - } // END - foreach - } // END - if - - // Set the content again - // @TODO Is this needed for e.g. $GLOBALS['template_content'] ? $this->setRawTemplateData($compactedContent); + // Check all common extensions + foreach (array('ico', 'gif', 'png') as $extension) { + // Is the file there? + if (isFileReadable(getPath() . 'favicon.' . $extension)) { + // Then use this and abort + $out = ''; + break; + } // END - if + } // END - while - // Return compacted content - return $compactedContent; + // Return code + return $out; } // [EOF]
'; debug_print_backtrace(); die('
';
+ return '
';
}
// Compiles the given HTML/mail code
-function compileCode ($code, $simple = FALSE, $constants = TRUE, $full = TRUE, $compileCode = TRUE) {
+function compileCode ($code, $full = TRUE, $compileCode = TRUE) {
// Is the code a string or should we not compile?
if ((!is_string($code)) || ($compileCode === FALSE)) {
// Silently return it
@@ -606,7 +631,7 @@ function compileCode ($code, $simple = FALSE, $constants = TRUE, $full = TRUE, $
$startCompile = microtime(TRUE);
// Comile the code
- $code = compileRawCode($code, $simple, $constants, $full);
+ $code = compileRawCode($code, $full, $compileCode);
// Get timing
$compilationTime = $startCompile - microtime(TRUE);
@@ -622,8 +647,7 @@ function compileCode ($code, $simple = FALSE, $constants = TRUE, $full = TRUE, $
}
// Compiles the code
-// @TODO $simple/$constants are deprecated
-function compileRawCode ($code, $simple = FALSE, $constants = TRUE, $full = TRUE, $compileCode = TRUE) {
+function compileRawCode ($code, $full = TRUE, $compileCode = TRUE) {
// Is the code a string or shall we not compile?
if ((!is_string($code)) || ($compileCode === FALSE)) {
// Silently return it
@@ -740,46 +764,30 @@ function compileRawCode ($code, $simple = FALSE, $constants = TRUE, $full = TRUE
}
//
-function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'form_select') {
+function addSelectionBox ($type, $default, $prefix = '', $id = NULL, $class = 'form_select') {
$OUT = '';
if ($type == 'yn') {
// This is a yes/no selection only!
- if ($id > 0) $prefix .= '[' . $id . ']';
+ if (isValidId($id)) $prefix .= '[' . $id . ']';
$OUT .= '