X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Ffunctions.php;h=6f82e177899d66bd008f5f943499ff3ee40c48cd;hb=cf3765c38cf0a76f396aca291f71858936e92956;hp=2edf08a02c0c6f72f466af45dc1048472f4f64b0;hpb=a82b69abcd219f6772f4e6e89654e345b816abab;p=mailer.git
diff --git a/inc/functions.php b/inc/functions.php
index 2edf08a02c..6f82e17789 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -42,84 +42,6 @@ if (!defined('__SECURITY')) {
die();
} // END - if
-// Output HTML code directly or 'render' it. You addionally switch the new-line character off
-function outputHtml ($htmlCode, $newLine = true) {
- // Init output
- if (!isset($GLOBALS['output'])) {
- $GLOBALS['output'] = '';
- } // END - if
-
- // Transfer username
- $username = getMessage('USERNAME_UNKNOWN');
- if (isset($GLOBALS['username'])) $username = getUsername();
-
- // Do we have HTML-Code here?
- if (!empty($htmlCode)) {
- // Yes, so we handle it as you have configured
- switch (getConfig('OUTPUT_MODE')) {
- case 'render':
- // That's why you don't need any \n at the end of your HTML code... :-)
- if (getPhpCaching() == 'on') {
- // Output into PHP's internal buffer
- outputRawCode($htmlCode);
-
- // That's why you don't need any \n at the end of your HTML code... :-)
- if ($newLine === true) print("\n");
- } else {
- // Render mode for old or lame servers...
- $GLOBALS['output'] .= $htmlCode;
-
- // That's why you don't need any \n at the end of your HTML code... :-)
- if ($newLine === true) $GLOBALS['output'] .= "\n";
- }
- break;
-
- case 'direct':
- // If we are switching from render to direct output rendered code
- if ((!empty($GLOBALS['output'])) && (getPhpCaching() != 'on')) { outputRawCode($GLOBALS['output']); $GLOBALS['output'] = ''; }
-
- // The same as above... ^
- outputRawCode($htmlCode);
- if ($newLine === true) print("\n");
- break;
-
- default:
- // Huh, something goes wrong or maybe you have edited config.php ???
- debug_report_bug(__FUNCTION__, __LINE__, '{--FATAL_ERROR--}: {--LANG_NO_RENDER_DIRECT--}');
- break;
- } // END - switch
- } elseif ((getPhpCaching() == 'on') && ((!isset($GLOBALS['header'])) || (count($GLOBALS['header']) == 0))) {
- // Output cached HTML code
- $GLOBALS['output'] = ob_get_contents();
-
- // Clear output buffer for later output if output is found
- if (!empty($GLOBALS['output'])) {
- clearOutputBuffer();
- } // END - if
-
- // 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']))) {
- // 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();
- }
-}
-
// Sends out all headers required for HTTP/1.1 reply
function sendHttpHeaders () {
// Used later
@@ -138,79 +60,6 @@ function sendHttpHeaders () {
sendHeader('Content-Language: ' . getLanguage());
}
-// Compiles the final output
-function compileFinalOutput () {
- // Init counter
- $cnt = 0;
-
- // Add page header and footer
- addPageHeaderFooter();
-
- // Compile all out
- while (((strpos($GLOBALS['output'], '{--') !== false) || (strpos($GLOBALS['output'], '{DQUOTE}') !== false) || (strpos($GLOBALS['output'], '{!') !== false) || (strpos($GLOBALS['output'], '{?') !== false) || (strpos($GLOBALS['output'], '{%') !== false)) && ($cnt < 3)) {
- // Init common variables
- $content = array();
- $newContent = '';
-
- // Compile it
- //* DEBUG: */ print '
'.htmlentities($GLOBALS['output']).' ';
- $eval = '$newContent = "' . str_replace('{DQUOTE}', '"', compileCode(escapeQuotes($GLOBALS['output']))) . '";';
- //* DEBUG: */ die(''.htmlentities($eval).' ');
- eval($eval);
- //* DEBUG: */ die(''.htmlentities($newContent).' ');
-
- // Was that eval okay?
- if (empty($newContent)) {
- // Something went wrong!
- debug_report_bug(__FUNCTION__, __LINE__, 'Evaluation error:' . linenumberCode($eval) . ' ', false);
- } // END - if
-
- // Use it again
- $GLOBALS['output'] = $newContent;
-
- // Count round
- $cnt++;
- } // END - while
-
- // Extension 'rewrite' installed?
- if ((isExtensionActive('rewrite')) && (getOutputMode() != 1)) {
- $GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
- } // END - if
-
- // 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
-function outputRawCode ($htmlCode) {
- // Output stripped HTML code to avoid broken JavaScript code, etc.
- print(str_replace('{BACK}', "\\", $htmlCode));
-
- // Flush the output if only getPhpCaching() is not 'on'
- if (getPhpCaching() != 'on') {
- // Flush it
- flush();
- } // END - if
-}
-
// Init fatal message array
function initFatalMessages () {
$GLOBALS['fatal_messages'] = array();
@@ -253,286 +102,6 @@ function getTotalFatalErrors () {
return $count;
}
-// Load a template file and return it's content (only it's name; do not use ' or ")
-function loadTemplate ($template, $return = false, $content = array()) {
- // @TODO Remove this sanity-check if all is fine
- if (!is_bool($return)) debug_report_bug(__FUNCTION__, __LINE__, 'return is not bool (' . gettype($return) . ')');
-
- // @TODO Try to rewrite all $DATA to $content
- global $DATA;
-
- // Do we have cache?
- 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();
-
- // Make all template names lowercase
- $template = strtolower($template);
-
- // Init some data
- $ret = '';
- if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = '0';
-
- // Base directory
- $basePath = sprintf("%stemplates/%s/html/", getConfig('PATH'), getLanguage());
- $extraPath = detectExtraTemplatePath($template);;
-
- ////////////////////////
- // Generate file name //
- ////////////////////////
- $FQFN = $basePath . $extraPath . $template . '.tpl';
-
- // Does the special template exists?
- if (!isFileReadable($FQFN)) {
- // Reset to default template
- $FQFN = $basePath . $template . '.tpl';
- } // END - if
-
- // Now does the final template exists?
- if (isFileReadable($FQFN)) {
- // Count the template load
- incrementConfigEntry('num_templates');
-
- // The local file does exists so we load it. :)
- $GLOBALS['tpl_content'] = readFromFile($FQFN);
-
- // 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) || (strpos($GLOBALS['tpl_content'], '{%') !== false)) {
- // Normal HTML output?
- if (getOutputMode() == '0') {
- // Add surrounding HTML comments to help finding bugs faster
- $ret = '\n" . $GLOBALS['tpl_content'] . '\n";
-
- // Prepare eval() command
- $eval = '$ret = "' . compileCode(escapeQuotes($ret)) . '";';
- } elseif (substr($template, 0, 3) == 'js_') {
- // JavaScripts don't like entities and timings
- $eval = '$ret = decodeEntities("' . compileRawCode(escapeJavaScriptQuotes($GLOBALS['tpl_content'])) . '");';
- } else {
- // Prepare eval() command, other output doesn't like entities, maybe
- $eval = '$ret = decodeEntities("' . compileRawCode(escapeQuotes($GLOBALS['tpl_content'])) . '");';
- }
- } else {
- // Add surrounding HTML comments to help finding bugs faster
- $ret = '\n" . $GLOBALS['tpl_content'] . '\n";
- $eval = '$ret = "' . compileRawCode(escapeQuotes($ret)) . '";';
- } // END - if
-
- // Cache the eval() command here
- $GLOBALS['template_eval'][$template] = $eval;
- } elseif ((isAdmin()) || ((isInstalling()) && (!isInstalled()))) {
- // Only admins shall see this warning or when installation mode is active
- $ret = '{--TEMPLATE_404--}
-(' . $template . ')
-
-{--TEMPLATE_CONTENT--}
-' . print_r($content, true) . '
-{--TEMPLATE_DATA--}
-' . print_r($DATA, true) . '
- ';
- } else {
- // No file!
- $GLOBALS['template_eval'][$template] = '404';
- }
- }
-
- // Code set?
- if ((isset($GLOBALS['template_eval'][$template])) && ($GLOBALS['template_eval'][$template] != '404')) {
- // Eval the code
- eval($GLOBALS['template_eval'][$template]);
- } // END - if
-
- // Do we have some content to output or return?
- if (!empty($ret)) {
- // Not empty so let's put it out! ;)
- if ($return === true) {
- // Return the HTML code
- return $ret;
- } else {
- // Output directly
- outputHtml($ret);
- }
- } elseif (isDebugModeEnabled()) {
- // Warning, empty output!
- return 'E:' . $template . ',content=' . print_r($content, true) . ' ';
- }
-}
-
-// Detects the extra template path from given template name
-function detectExtraTemplatePath ($template) {
- // Default is empty
- $extraPath = '';
-
- // 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
- }
-
- // Store it in cache
- $GLOBALS['extra_path'][$template] = $extraPath;
- } // END - if
-
- // Return result
- return $GLOBALS['extra_path'][$template];
-}
-
-// Loads an email template and compiles it
-function loadEmailTemplate ($template, $content = array(), $userid = '0') {
- global $DATA;
-
- // Make sure all template names are lowercase!
- $template = strtolower($template);
-
- // Default 'nickname' if extension is not installed
- $nick = '---';
-
- // Neutral email address is default
- $email = getConfig('WEBMASTER');
-
- // Is content an array?
- if (is_array($content)) {
- // 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: */ 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 ((isExtensionActive('nickname')) && (isNicknameUsed($userid))) {
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "NICKNAME! ");
- // Load by nickname
- fetchUserData($userid, 'nickname');
- } else {
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "NO-NICK! ");
- /// Load by userid
- fetchUserData($userid);
- }
-
- // Merge data if valid
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "content()=".count($content)." - PRE ");
- if (isUserDataValid()) {
- $content = merge_array($content, getUserDataArray());
- } // END - if
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "content()=".count($content)." - AFTER ");
- } // END - if
-
- // Translate M to male or F to female if present
- if (isset($content['gender'])) $content['gender'] = translateGender($content['gender']);
-
- // 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 $content, not $DATA or raw variables
- $DATA['email'] = $email;
-
- // Base directory
- $basePath = sprintf("%stemplates/%s/emails/", getConfig('PATH'), getLanguage());
-
- // Detect extra path
- $extraPath = detectExtraTemplatePath($template);
-
- // Generate full FQFN
- $FQFN = $basePath . $extraPath . $template . '.tpl';
-
- // Does the special template exists?
- if (!isFileReadable($FQFN)) {
- // Reset to default template
- $FQFN = $basePath . $template . '.tpl';
- } // END - if
-
- // Now does the final template exists?
- $newContent = '';
- if (isFileReadable($FQFN)) {
- // The local file does exists so we load it. :)
- $GLOBALS['tpl_content'] = readFromFile($FQFN);
-
- // Run code
- $GLOBALS['tpl_content'] = '$newContent = decodeEntities("' . compileRawCode(escapeQuotes($GLOBALS['tpl_content'])) . '");';
- eval($GLOBALS['tpl_content']);
- } elseif (!empty($template)) {
- // Template file not found!
- $newContent = '{--TEMPLATE_404--}: ' . $template . '
-{--TEMPLATE_CONTENT--}
-' . print_r($content, true) . '
-{--TEMPLATE_DATA--}
-' . print_r($DATA, true) . '
- ';
-
- // Debug mode not active? Then remove the HTML tags
- if (!isDebugModeEnabled()) $newContent = secureString($newContent);
- } else {
- // No template name supplied!
- $newContent = getMessage('NO_TEMPLATE_SUPPLIED');
- }
-
- // Is there some content?
- if (empty($newContent)) {
- // Compiling failed
- $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.";
- } // END - if
-
- // Remove content and data
- unset($content);
- unset($DATA);
-
- // Return content
- return $newContent;
-}
-
// Send mail out to an email address
function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '') {
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "TO={$toEmail},SUBJECT={$subject} ");
@@ -564,7 +133,7 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "TO={$toEmail} ");
// Check for PHPMailer or debug-mode
- if (!checkPhpMailerUsage()) {
+ if ((!checkPhpMailerUsage()) || (isDebugModeEnabled())) {
// Not in PHPMailer-Mode
if (empty($mailHeader)) {
// Load email header template
@@ -573,32 +142,23 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
// Append header
$mailHeader .= loadEmailTemplate('header');
}
- } elseif (isDebugModeEnabled()) {
- if (empty($mailHeader)) {
- // Load email header template
- $mailHeader = loadEmailTemplate('header');
- } else {
- // Append header
- $mailHeader .= loadEmailTemplate('header');
- }
- }
-
- // Compile "TO"
- eval('$toEmail = "' . compileRawCode(escapeQuotes($toEmail)) . '";');
-
- // Compile "MSG"
- eval('$message = "' . str_replace('$', '$', compileRawCode(escapeQuotes($message))) . '";');
+ } // END - if
// Fix HTML parameter (default is no!)
if (empty($isHtml)) $isHtml = 'N';
+
+ // Debug mode enabled?
if (isDebugModeEnabled()) {
// In debug mode we want to display the mail instead of sending it away so we can debug this part
outputHtml('
-Headers : ' . htmlentities(utf8_decode(trim($mailHeader))) . '
-To : ' . htmlentities(utf8_decode($toEmail)) . '
-Subject : ' . htmlentities(utf8_decode($subject)) . '
-Message : ' . htmlentities(utf8_decode($message)) . '
+Headers : ' . encodeEntities(utf8_decode(trim($mailHeader))) . '
+To : ' . encodeEntities(utf8_decode($toEmail)) . '
+Subject : ' . encodeEntities(utf8_decode($subject)) . '
+Message : ' . encodeEntities(utf8_decode($message)) . '
');
+
+ // This is always fine
+ return true;
} elseif (($isHtml == 'Y') && (isExtensionActive('html_mail'))) {
// Send mail as HTML away
return sendHtmlEmail($toEmail, $subject, $message, $mailHeader);
@@ -609,6 +169,9 @@ Message : ' . htmlentities(utf8_decode($message)) . '
// Problem found!
return sendRawEmail(getConfig('WEBMASTER'), '[PROBLEM:]' . $subject, $message, $mailHeader);
}
+
+ // Why did we end up here? This should not happen
+ debug_report_bug(__FUNCTION__, __LINE__, 'Ending up: template=' . $template);
}
// Check to use wether legacy mail() command or PHPMailer class
@@ -621,10 +184,10 @@ function checkPhpMailerUsage() {
// Send out a raw email with PHPMailer class or legacy mail() command
function sendRawEmail ($toEmail, $subject, $message, $from) {
// Just compile all again, to put out all configs, etc.
- eval('$toEmail = decodeEntities("' . compileRawCode(escapeQuotes($toEmail)) . '");');
- eval('$subject = decodeEntities("' . compileRawCode(escapeQuotes($subject)) . '");');
- eval('$message = decodeEntities("' . compileRawCode(escapeQuotes($message)) . '");');
- eval('$from = decodeEntities("' . compileRawCode(escapeQuotes($from)) . '");');
+ eval('$toEmail = decodeEntities("' . doFinalCompilation(compileRawCode(escapeQuotes($toEmail)), false) . '");');
+ eval('$subject = decodeEntities("' . doFinalCompilation(compileRawCode(escapeQuotes($subject)), false) . '");');
+ eval('$message = decodeEntities("' . doFinalCompilation(compileRawCode(escapeQuotes($message)), false) . '");');
+ eval('$from = decodeEntities("' . doFinalCompilation(compileRawCode(escapeQuotes($from)) , false) . '");');
// Shall we use PHPMailer class or legacy mode?
if (checkPhpMailerUsage()) {
@@ -755,13 +318,13 @@ function translateYesNo ($yn) {
// Default
$translated = '??? (' . $yn . ')';
switch ($yn) {
- case 'Y': $translated = getMessage('YES'); break;
- case 'N': $translated = getMessage('NO'); break;
+ case 'Y': $translated = '{--YES--}'; break;
+ case 'N': $translated = '{--NO--}'; break;
default:
// Log unknown value
logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown value %s. Expected Y/N!", $yn));
break;
- }
+ } // END - switch
// Return it
return $translated;
@@ -821,7 +384,7 @@ function translateComma ($dotted, $cut = true, $max = '0') {
default: // All others
$dotted = number_format($dotted, $maxComma, '.', ',');
break;
- }
+ } // END - switch
// Return translated value
return $dotted;
@@ -834,9 +397,9 @@ function translateGender ($gender) {
// Male/female or company?
switch ($gender) {
- case 'M': $ret = getMessage('GENDER_M'); break;
- case 'F': $ret = getMessage('GENDER_F'); break;
- case 'C': $ret = getMessage('GENDER_C'); break;
+ case 'M': $ret = '{--GENDER_M--}'; break;
+ case 'F': $ret = '{--GENDER_F--}'; break;
+ case 'C': $ret = '{--GENDER_C--}'; break;
default:
// Please report bugs on unknown genders
debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown gender %s detected.", $gender));
@@ -859,7 +422,7 @@ function translateUserStatus ($status) {
case '':
case null:
- $ret = getMessage('ACCOUNT_DELETED');
+ $ret = '{--ACCOUNT_DELETED--}';
break;
default:
@@ -875,24 +438,24 @@ function translateUserStatus ($status) {
// "Translates" 'visible' and 'locked' to a CSS class
function translateMenuVisibleLocked ($content, $prefix = '') {
// Translate 'visible' and keep an eye on the prefix
- switch ($content[$prefix . 'visible']) {
+ switch ($content['visible']) {
// Should be visible
- case 'Y': $content[$prefix . 'visible_css'] = $prefix . 'menu_visible' ; break;
- case 'N': $content[$prefix . 'visible_css'] = $prefix . 'menu_invisible'; break;
+ case 'Y': $content['visible_css'] = $prefix . 'menu_visible' ; break;
+ case 'N': $content['visible_css'] = $prefix . 'menu_invisible'; break;
default:
// Please report this
- debug_report_bug('Unsupported visible value detected. content='.print_r($content, true).' ');
+ debug_report_bug(__FUNCTION__, __LINE__, 'Unsupported visible value detected. content=' . print_r($content, true) . ' ');
break;
} // END - switch
// Translate 'locked' and keep an eye on the prefix
- switch ($content[$prefix . 'locked']) {
+ switch ($content['locked']) {
// Should be locked
- case 'Y': $content[$prefix . 'locked_css'] = $prefix . 'menu_locked' ; break;
- case 'N': $content[$prefix . 'locked_css'] = $prefix . 'menu_unlocked'; break;
+ case 'Y': $content['locked_css'] = $prefix . 'menu_locked' ; break;
+ case 'N': $content['locked_css'] = $prefix . 'menu_unlocked'; break;
default:
// Please report this
- debug_report_bug('Unsupported locked value detected. content='.print_r($content, true).' ');
+ debug_report_bug(__FUNCTION__, __LINE__, 'Unsupported locked value detected. content=' . print_r($content, true) . ' ');
break;
} // END - switch
@@ -944,11 +507,6 @@ function countSelection ($array) {
return $ret;
}
-// Generate XHTML code for the CAPTCHA
-function generateCaptchaCode ($code, $type, $DATA, $userid) {
- return ' ';
-}
-
// Generates a timestamp (some wrapper for mktime())
function makeTime ($hours, $minutes, $seconds, $stamp) {
// Extract day, month and year from given timestamp
@@ -988,15 +546,18 @@ function redirectToUrl ($URL, $allowSpider = true) {
// Simple probe for bots/spiders from search engines
if ((isSpider()) && ($allowSpider === true)) {
- // Secure the URL against bad things such als HTML insertions and so on...
- $URL = secureString($URL);
+ // Set HTTP-Status
+ setHttpStatus('200 OK');
// Set content-type here to fix a missing array element
setContentType('text/html');
// Output new location link as anchor
- outputHtml('' . $URL . ' ');
+ outputHtml('' . secureString($URL) . ' ');
} elseif (!headers_sent()) {
+ // Clear output buffer
+ clearOutputBuffer();
+
// Clear own output buffer
$GLOBALS['output'] = '';
@@ -1004,7 +565,7 @@ function redirectToUrl ($URL, $allowSpider = true) {
setHttpStatus('302 Found');
// Load URL when headers are not sent
- sendHeader('Location: '.str_replace('&', '&', $URL));
+ sendRawRedirect(doFinalCompilation(str_replace('&', '&', $URL), false));
} else {
// Output error message
loadInclude('inc/header.php');
@@ -1016,131 +577,6 @@ function redirectToUrl ($URL, $allowSpider = true) {
shutdown();
}
-// Wrapper for redirectToUrl but URL comes from a configuration entry
-function redirectToConfiguredUrl ($configEntry) {
- // Get the URL
- $URL = getConfig($configEntry);
-
- // Is this URL set?
- if (is_null($URL)) {
- // Then abort here
- debug_report_bug(__FUNCTION__, __LINE__, sprintf("Configuration entry %s is not set!", $configEntry));
- } // END - if
-
- // Load the URL
- redirectToUrl($URL);
-}
-
-// Compiles the given HTML/mail code
-function compileCode ($code, $simple = false, $constants = true, $full = true) {
- // Is the code a string?
- if (!is_string($code)) {
- // Silently return it
- return $code;
- } // END - if
-
- // Start couting
- $startCompile = microtime(true);
-
- // Comile the code
- $code = compileRawCode($code, $simple, $constants, $full);
-
- // Get timing
- $compiled = microtime(true);
-
- // Add timing
- $code .= '';
-
- // Return compiled code
- return $code;
-}
-
-// Compiles the code (use compileCode() only for HTML because of the comments)
-// @TODO $simple is deprecated
-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 smaller set of security characters
- $secChars = $GLOBALS['url_chars'];
-
- // Select full set of chars to replace when we e.g. want to compile URLs
- if ($full === true) $secChars = $GLOBALS['security_chars'];
-
- // Compile more through a filter
- $code = runFilterChain('compile_code', $code);
-
- // Compile constants
- 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));
-
- // BEFORE 0.2.1 : Not used
- // WITH 0.2.1+ : Data constants
- $code = str_replace('{!', "\" . constant('", str_replace('!}', "') . \"", $code));
- } // END - if
-
- // Compile QUOT and other non-HTML codes
- foreach ($secChars['to'] as $k => $to) {
- // Do the reversed thing as in inc/libs/security_functions.php
- $code = str_replace($to, $secChars['from'][$k], $code);
- } // END - foreach
-
- // Find $content[bla][blub] entries
- // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
- preg_match_all('/\$(content|GLOBALS|DATA)((\[([a-zA-Z0-9-_]+)\])*)/', $code, $matches);
-
- // Are some matches found?
- if ((count($matches) > 0) && (count($matches[0]) > 0)) {
- // Replace all matches
- $matchesFound = array();
- foreach ($matches[0] as $key => $match) {
- // Fuzzy look has failed by default
- $fuzzyFound = false;
-
- // Fuzzy look on match if already found
- foreach ($matchesFound as $found => $set) {
- // Get test part
- $test = substr($found, 0, strlen($match));
-
- // Does this entry exist?
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "found={$found},match={$match},set={$set} ");
- if ($test == $match) {
- // Match found!
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "fuzzyFound! ");
- $fuzzyFound = true;
- break;
- } // END - if
- } // END - foreach
-
- // Skip this entry?
- if ($fuzzyFound === true) continue;
-
- // 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: */ 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: */ logDebugMessage(__FUNCTION__, __LINE__, "match={$match} ");
- $code = str_replace($match, '".' . $match . '."', $code);
- $matchesFound[$match] = 1;
- }
- } // END - foreach
- } // END - if
-
- // Return it
- return $code;
-}
-
/************************************************************************
* *
* Gaenderter Sortier-Algorythmus, $array wird nach dem Array (!) *
@@ -1192,118 +628,6 @@ function array_pk_sort (&$array, $a_sort, $primary_key = '0', $order = -1, $nums
$array = $dummy;
}
-//
-function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'register_select') {
- $OUT = '';
-
- if ($type == 'yn') {
- // This is a yes/no selection only!
- if ($id > 0) $prefix .= '[' . $id . ']';
- $OUT .= '';
- } else {
- // Begin with regular selection box here
- if (!empty($prefix)) $prefix .= "_";
- $type2 = $type;
- if ($id > 0) $type2 .= '[' . $id . ']';
- $OUT .= '';
- }
-
- switch ($type) {
- case 'day': // Day
- for ($idx = 1; $idx < 32; $idx++) {
- $OUT .= '';
- } // END - for
- break;
-
- case 'month': // Month
- foreach ($GLOBALS['month_descr'] as $idx => $descr) {
- $OUT .= ' ';
- } // END - for
- break;
-
- case 'year': // Year
- // Get current year
- $year = date('Y', time());
-
- // Use configured min age or fixed?
- if (isExtensionInstalledAndNewer('order', '0.2.1')) {
- // Configured
- $startYear = $year - getConfig('min_age');
- } else {
- // Fixed 16 years
- $startYear = $year - 16;
- }
-
- // Calculate earliest year (100 years old people can still enter Internet???)
- $minYear = $year - 100;
-
- // Check if the default value is larger than minimum and bigger than actual year
- if (($default > $minYear) && ($default >= $year)) {
- for ($idx = $year; $idx < ($year + 11); $idx++) {
- $OUT .= ' ';
- } // END - for
- } elseif ($default == -1) {
- // Current year minus 1
- for ($idx = $startYear; $idx <= ($year + 1); $idx++) {
- $OUT .= ' ' . $idx . ' ';
- } // END - for
- } else {
- // Get current year and subtract the configured minimum age
- $OUT .= '<' . $minYear . ' ';
- // Calculate earliest year depending on extension version
- if (isExtensionInstalledAndNewer('order', '0.2.1')) {
- // Use configured minimum age
- $year = date('Y', time()) - getConfig('min_age');
- } else {
- // Use fixed 16 years age
- $year = date('Y', time()) - 16;
- }
-
- // Construct year selection list
- for ($idx = $minYear; $idx <= $year; $idx++) {
- $OUT .= '';
- } // END - for
- }
- break;
-
- case 'sec':
- case 'min':
- for ($idx = 0; $idx < 60; $idx+=5) {
- if (strlen($idx) == 1) $idx = '0' . $idx;
- $OUT .= ' ';
- } // END - for
- break;
-
- case 'hour':
- for ($idx = 0; $idx < 24; $idx++) {
- if (strlen($idx) == 1) $idx = '0' . $idx;
- $OUT .= ' ';
- } // END - for
- break;
-
- case 'yn':
- $OUT .= ' 6) || (empty($img_code)) || (getConfig('code_length') == '0')) {
- // Stop execution of function here because of over-sized code length
- debug_report_bug(__FUNCTION__, __LINE__, '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 ' ';
- }
-
- // Load image
- $img = sprintf("%s/theme/%s/images/code_bg.%s",
- getConfig('PATH'),
- getCurrentTheme(),
- getConfig('img_type')
- );
-
- // Is it readable?
- if (isFileReadable($img)) {
- // Switch image type
- switch (getConfig('img_type')) {
- case 'jpg':
- // Okay, load image and hide all errors
- $image = imagecreatefromjpeg($img);
- break;
-
- case 'png':
- // Okay, load image and hide all errors
- $image = imagecreatefrompng($img);
- break;
- } // END - switch
- } else {
- // Exit function here
- logDebugMessage(__FUNCTION__, __LINE__, sprintf("File for image type %s not found.", getConfig('img_type')));
- return;
- }
-
- // Generate text color (red/green/blue; 0 = dark, 255 = bright)
- $text_color = imagecolorallocate($image, 0, 0, 0);
-
- // Insert code into image
- imagestring($image, 5, 14, 2, $img_code, $text_color);
-
- // Return to browser
- sendHeader('Content-Type: image/' . getConfig('img_type'));
-
- // Output image with matching image factory
- switch (getConfig('img_type')) {
- case 'jpg': imagejpeg($image); break;
- case 'png': imagepng($image); break;
- } // END - switch
-
- // Remove image from memory
- imagedestroy($image);
-}
-// 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."* ");
-
- // Do we have a leap year?
- $SWITCH = '0';
- $TEST = date('Y', time()) / 4;
- $M1 = date('m', time());
- $M2 = date('m', (time() + $timestamp));
-
- // 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") && ($M2 > "02")) $SWITCH = getConfig('ONE_DAY');
-
- // First of all years...
- $Y = abs(floor($timestamp / (31536000 + $SWITCH)));
- //* DEBUG: */ print("Y={$Y} ");
- // Next months...
- $M = abs(floor($timestamp / 2628000 - $Y * 12));
- //* DEBUG: */ print("M={$M} ");
- // Next weeks
- $W = abs(floor($timestamp / 604800 - $Y * ((365 + $SWITCH / getConfig('ONE_DAY')) / 7) - ($M / 12 * (365 + $SWITCH / getConfig('ONE_DAY')) / 7)));
- //* DEBUG: */ print("W={$W} ");
- // Next days...
- $D = abs(floor($timestamp / 86400 - $Y * (365 + $SWITCH / getConfig('ONE_DAY')) - ($M / 12 * (365 + $SWITCH / getConfig('ONE_DAY'))) - $W * 7));
- //* DEBUG: */ print("D={$D} ");
- // Next hours...
- $h = abs(floor($timestamp / 3600 - $Y * (365 + $SWITCH / getConfig('ONE_DAY')) * 24 - ($M / 12 * (365 + $SWITCH / getConfig('ONE_DAY')) * 24) - $W * 7 * 24 - $D * 24));
- //* DEBUG: */ print("h={$h} ");
- // Next minutes..
- $m = abs(floor($timestamp / 60 - $Y * (365 + $SWITCH / getConfig('ONE_DAY')) * 24 * 60 - ($M / 12 * (365 + $SWITCH / getConfig('ONE_DAY')) * 24 * 60) - $W * 7 * 24 * 60 - $D * 24 * 60 - $h * 60));
- //* DEBUG: */ print("m={$m} ");
- // And at last seconds...
- $s = abs(floor($timestamp - $Y * (365 + $SWITCH / getConfig('ONE_DAY')) * 24 * 3600 - ($M / 12 * (365 + $SWITCH / getConfig('ONE_DAY')) * 24 * 3600) - $W * 7 * 24 * 3600 - $D * 24 * 3600 - $h * 3600 - $m * 60));
- //* DEBUG: */ print("s={$s} ");
-
- // Is seconds zero and time is < 60 seconds?
- if (($s == '0') && ($timestamp < 60)) {
- // Fix seconds
- $s = round($timestamp);
- } // END - if
-
- //
- // Now we convert them in seconds...
- //
- if ($return_array) {
- // Just put all data in an array for later use
- $OUT = array(
- 'YEARS' => $Y,
- 'MONTHS' => $M,
- 'WEEKS' => $W,
- 'DAYS' => $D,
- 'HOURS' => $h,
- 'MINUTES' => $m,
- 'SECONDS' => $s
- );
- } else {
- // Generate table
- $OUT = '';
- $OUT .= '
';
- $OUT .= '';
-
- if (isInString('Y', $display) || (empty($display))) {
- $OUT .= '{--_YEARS--}
';
- } // END - if
-
- if (isInString('M', $display) || (empty($display))) {
- $OUT .= '{--_MONTHS--}
';
- } // END - if
-
- if (isInString('W', $display) || (empty($display))) {
- $OUT .= '{--_WEEKS--}
';
- } // END - if
-
- if (isInString('D', $display) || (empty($display))) {
- $OUT .= '{--_DAYS--}
';
- } // END - if
-
- if (isInString('h', $display) || (empty($display))) {
- $OUT .= '{--_HOURS--}
';
- } // END - if
-
- if (isInString('m', $display) || (empty($display))) {
- $OUT .= '{--_MINUTES--}
';
- } // END - if
-
- if (isInString('s', $display) || (empty($display))) {
- $OUT .= '{--_SECONDS--}
';
- } // END - if
-
- $OUT .= ' ';
- $OUT .= '';
-
- if (isInString('Y', $display) || (empty($display))) {
- // Generate year selection
- $OUT .= '';
- for ($idx = 0; $idx <= 10; $idx++) {
- $OUT .= '';
- } // END - for
- $OUT .= ' ';
- } else {
- $OUT .= ' ';
- }
-
- if (isInString('M', $display) || (empty($display))) {
- // Generate month selection
- $OUT .= '';
- for ($idx = 0; $idx <= 11; $idx++) {
- $OUT .= ' ';
- } // END - for
- $OUT .= ' ';
- } else {
- $OUT .= ' ';
- }
-
- if (isInString('W', $display) || (empty($display))) {
- // Generate week selection
- $OUT .= '';
- for ($idx = 0; $idx <= 4; $idx++) {
- $OUT .= ' ';
- } // END - for
- $OUT .= ' ';
- } else {
- $OUT .= ' ';
- }
-
- if (isInString('D', $display) || (empty($display))) {
- // Generate day selection
- $OUT .= '';
- for ($idx = 0; $idx <= 31; $idx++) {
- $OUT .= ' ';
- } // END - for
- $OUT .= ' ';
- } else {
- $OUT .= ' ';
- }
-
- if (isInString('h', $display) || (empty($display))) {
- // Generate hour selection
- $OUT .= '';
- for ($idx = 0; $idx <= 23; $idx++) {
- $OUT .= ' ';
- } // END - for
- $OUT .= ' ';
- } else {
- $OUT .= ' ';
- }
-
- if (isInString('m', $display) || (empty($display))) {
- // Generate minute selection
- $OUT .= '';
- for ($idx = 0; $idx <= 59; $idx++) {
- $OUT .= ' ';
- } // END - for
- $OUT .= ' ';
- } else {
- $OUT .= ' ';
- }
-
- if (isInString('s', $display) || (empty($display))) {
- // Generate second selection
- $OUT .= '';
- for ($idx = 0; $idx <= 59; $idx++) {
- $OUT .= ' ';
- } // END - for
- $OUT .= ' ';
- } else {
- $OUT .= ' ';
- }
- $OUT .= ' ';
- $OUT .= '
';
- $OUT .= '
';
- }
-
- // Return generated HTML code
- return $OUT;
-}
-
-//
+// Creates a Uni* timestamp from given selection data and prefix
function createTimestampFromSelections ($prefix, $postData) {
// Initial return value
$ret = '0';
@@ -1702,62 +767,6 @@ function createFancyTime ($stamp) {
return $ret;
}
-// Generates a navigation row for listing emails
-function addEmailNavigation ($PAGES, $offset, $show_form, $colspan, $return=false) {
- $TOP = '';
- if ($show_form === false) {
- $TOP = ' top';
- } // END - if
-
- $NAV = '';
- for ($page = 1; $page <= $PAGES; $page++) {
- // Is the page currently selected or shall we generate a link to it?
- 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 .= '';
- }
- $NAV .= $page;
- if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
- // Is currently selected, so only highlight it
- $NAV .= '- ';
- } else {
- // Close anchor tag
- $NAV .= '';
- }
-
- // Add seperator if we have not yet reached total pages
- if ($page < $PAGES) {
- // Add it
- $NAV .= '|';
- } // END - if
- } // END - for
-
- // Define constants only once
- $content['nav'] = $NAV;
- $content['span'] = $colspan;
- $content['top'] = $TOP;
-
- // Load navigation template
- $OUT = loadTemplate('admin_email_nav_row', true, $content);
-
- if ($return === true) {
- // Return generated HTML-Code
- return $OUT;
- } else {
- // Output HTML-Code
- outputHtml($OUT);
- }
-}
-
// Extract host from script name
function extractHostnameFromUrl (&$script) {
// Use default SERVER_URL by default... ;) So?
@@ -1777,7 +786,7 @@ function extractHostnameFromUrl (&$script) {
if (isInString('/', $host)) $host = substr($host, 0, strpos($host, '/'));
// Generate relative URL
- //* DEBUG: */ print('SCRIPT=' . $script.' ');
+ //* DEBUG: */ debugOutput('SCRIPT=' . $script);
if (substr(strtolower($script), 0, 7) == 'http://') {
// But only if http:// is in front!
$script = substr($script, (strlen($url) + 7));
@@ -1786,7 +795,7 @@ function extractHostnameFromUrl (&$script) {
$script = substr($script, (strlen($url) + 8));
}
- //* DEBUG: */ print('SCRIPT=' . $script.' ');
+ //* DEBUG: */ debugOutput('SCRIPT=' . $script);
if (substr($script, 0, 1) == '/') $script = substr($script, 1);
// Return host name
@@ -1900,7 +909,7 @@ function sendRawRequest ($host, $request) {
$resolver = new HostnameResolver();
// Open connection
- //* DEBUG: */ die('SCRIPT=' . $script.' ');
+ //* DEBUG: */ die('SCRIPT=' . $script);
if ($useProxy === true) {
// Resolve hostname into IP address
$ip = $resolver->resolveHostname(compileRawCode(getConfig('proxy_host')));
@@ -2000,8 +1009,8 @@ function sendRawRequest ($host, $request) {
}
} // END - foreach
- //* DEBUG: */ print('Request: '.print_r($request, true).' ');
- //* DEBUG: */ print('Response: '.print_r($response, true).' ');
+ //* DEBUG: */ debugOutput('Request: '.print_r($request, true).' ');
+ //* DEBUG: */ debugOutput('Response: '.print_r($response, true).' ');
// Proxy agent found or something went wrong?
if (!isset($response[0])) {
@@ -2043,7 +1052,7 @@ function setupProxyTunnel ($host, $resource) {
// Add last new-line
$proxyTunnel .= getConfig('HTTP_EOL');
- //* DEBUG: */ print('proxyTunnel= ' . $proxyTunnel.' ');
+ //* DEBUG: */ debugOutput('proxyTunnel= ' . $proxyTunnel.' ');
// Write request
fwrite($fp, $proxyTunnel);
@@ -2085,11 +1094,11 @@ function isEmailValid ($email) {
function isUrlValid ($URL, $compile=true) {
// Trim URL a little
$URL = trim(urldecode($URL));
- //* DEBUG: */ outputHtml($URL.' ');
+ //* DEBUG: */ debugOutput($URL);
// Compile some chars out...
if ($compile === true) $URL = compileUriCode($URL, false, false, false);
- //* DEBUG: */ outputHtml($URL.' ');
+ //* DEBUG: */ debugOutput($URL);
// Check for the extension filter
if (isExtensionActive('filter')) {
@@ -2102,77 +1111,14 @@ function isUrlValid ($URL, $compile=true) {
return isUrlValidSimple($URL);
}
-// Generate a list of administrative links to a given userid
-function generateMemberAdminActionLinks ($userid, $status = '') {
- // Make sure userid is a number
- if ($userid != bigintval($userid)) debug_report_bug(__FUNCTION__, __LINE__, 'userid is not a number!');
-
- // Define all main targets
- $targetArray = array('del_user', 'edit_user', 'lock_user', 'add_points', 'sub_points');
-
- // Begin of navigation links
- $OUT = '[';
-
- foreach ($targetArray as $tar) {
- $OUT .= '{--ADMIN_';
- if (($tar == 'lock_user') && ($status == 'LOCKED')) {
- // Locked accounts shall be unlocked
- $OUT .= 'UNLOCK_USER';
- } else {
- // All other status is fine
- $OUT .= strtoupper($tar);
- }
- $OUT .= '--} |';
- }
-
- // Finish navigation link
- $OUT = substr($OUT, 0, -7) . ']';
-
- // Return string
- return $OUT;
-}
-
-// Generate an email link
-function generateEmailLink ($email, $table = 'admins') {
- // Default email link (INSECURE! Spammer can read this by harvester programs)
- $EMAIL = 'mailto:' . $email;
-
- // Check for several extensions
- if ((isExtensionActive('admins')) && ($table == 'admins')) {
- // Create email link for contacting admin in guest area
- $EMAIL = generateAdminEmailLink($email);
- } elseif ((isExtensionInstalledAndNewer('user', '0.3.3')) && ($table == 'user_data')) {
- // Create email link for contacting a member within admin area (or later in other areas, too?)
- $EMAIL = generateUserEmailLink($email, 'admin');
- } elseif ((isExtensionActive('sponsor')) && ($table == 'sponsor_data')) {
- // Create email link to contact sponsor within admin area (or like the link above?)
- $EMAIL = generateSponsorEmailLink($email, 'sponsor_data');
- }
-
- // Shall I close the link when there is no admin?
- if ((!isAdmin()) && ($EMAIL == $email)) $EMAIL = '#'; // Closed!
-
- // Return email link
- return $EMAIL;
-}
-
// Generate a hash for extra-security for all passwords
function generateHash ($plainText, $salt = '', $hash = true) {
// Debug output
- //* DEBUG: */ outputHtml('plainText=' . $plainText . ',salt=' . $salt . ',hash='.intval($hash).' ');
+ //* DEBUG: */ debugOutput('plainText('.strlen($plainText).')=' . $plainText . ',salt('.strlen($salt).')=' . $salt . ',hash=' . intval($hash));
// Is the required extension 'sql_patches' there and a salt is not given?
- // 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')))) {
+ // 123 4 43 3 4 432 2 3 32 2 3 32 2 3 3 21
+ if (((isExtensionInstalledAndOlder('sql_patches', '0.3.6')) && (empty($salt))) || (!isExtensionActive('sql_patches')) || (!isExtensionInstalledAndNewer('other', '0.2.5')) || (strlen($salt) == 32)) {
// Extension sql_patches is missing/outdated so we hash the plain text with MD5
if ($hash === true) {
// Is plain password
@@ -2205,20 +1151,20 @@ function generateHash ($plainText, $salt = '', $hash = true) {
// 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: */ debugOutput('SHA1=' . $sha1.' ('.strlen($sha1).') ');
$sha1 = scrambleString($sha1);
- //* DEBUG: */ outputHtml('Scrambled=' . $sha1.' ('.strlen($sha1).') ');
+ //* DEBUG: */ debugOutput('Scrambled=' . $sha1.' ('.strlen($sha1).') ');
//* DEBUG: */ $sha1b = descrambleString($sha1);
- //* DEBUG: */ outputHtml('Descrambled=' . $sha1b.' ('.strlen($sha1b).') ');
+ //* DEBUG: */ debugOutput('Descrambled=' . $sha1b.' ('.strlen($sha1b).') ');
// Generate the password salt string
$salt = substr($sha1, 0, getConfig('salt_length'));
- //* DEBUG: */ outputHtml($salt.' ('.strlen($salt).') ');
+ //* DEBUG: */ debugOutput($salt.' ('.strlen($salt).') ');
} else {
// Use given salt
- //* DEBUG: */ outputHtml('salt=' . $salt . ' ');
+ //* DEBUG: */ debugOutput('salt=' . $salt);
$salt = substr($salt, 0, getConfig('salt_length'));
- //* DEBUG: */ outputHtml('salt=' . $salt . '(' . strlen($salt) . '/' . getConfig('salt_length') . ') ');
+ //* DEBUG: */ debugOutput('salt=' . $salt . '(' . strlen($salt) . '/' . getConfig('salt_length') . ') ');
// Sanity check on salt
if (strlen($salt) != getConfig('salt_length')) {
@@ -2231,7 +1177,7 @@ function generateHash ($plainText, $salt = '', $hash = true) {
$finalHash = $salt . sha1($salt . $plainText);
// Debug output
- //* DEBUG: */ outputHtml('finalHash=' . $finalHash);
+ //* DEBUG: */ debugOutput('finalHash('.strlen($finalHash).')=' . $finalHash);
// Return hash
return $finalHash;
@@ -2258,7 +1204,7 @@ function scrambleString($str) {
if (strlen($str) != count($scrambleNums)) return $str;
// Scramble string here
- //* DEBUG: */ outputHtml('***Original=' . $str.'*** ');
+ //* DEBUG: */ debugOutput('***Original=' . $str.'*** ');
for ($idx = 0; $idx < strlen($str); $idx++) {
// Get char on scrambled position
$char = substr($str, $scrambleNums[$idx], 1);
@@ -2268,7 +1214,7 @@ function scrambleString($str) {
} // END - for
// Return scrambled string
- //* DEBUG: */ outputHtml('***Scrambled=' . $scrambled.'*** ');
+ //* DEBUG: */ debugOutput('***Scrambled=' . $scrambled.'*** ');
return $scrambled;
}
@@ -2285,14 +1231,14 @@ function descrambleString($str) {
// Begin descrambling
$orig = str_repeat(' ', 40);
- //* DEBUG: */ outputHtml('+++Scrambled=' . $str.'+++ ');
+ //* DEBUG: */ debugOutput('+++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: */ debugOutput('+++Original=' . $orig.'+++ ');
return $orig;
}
@@ -2379,90 +1325,6 @@ function fixDeletedCookies ($cookies) {
} // END - if
}
-// Output error messages in a fasioned way and die...
-function app_die ($F, $L, $message) {
- // Check if Script is already dieing and not let it kill itself another 1000 times
- if (!isset($GLOBALS['app_died'])) {
- // 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');
-
- // Rewrite message for output
- $message = sprintf(getMessage('MAILER_HAS_DIED'), basename($F), $L, $message);
-
- // Load the message template
- loadTemplate('app_die_message', false, $message);
-
- // Load footer
- loadIncludeOnce('inc/footer.php');
- } else {
- // Script tried to kill itself twice
- die('['.__FUNCTION__.':'.__LINE__.']: Script wanted to kill itself more than once! Raw message=' . $message . ', file/function=' . $F . ', line=' . $L);
- }
-}
-
-// Display parsing time and number of SQL queries in footer
-function displayParsingTime () {
- // Is the timer started?
- if (!isset($GLOBALS['startTime'])) {
- // Abort here
- return false;
- } // END - if
-
- // Get end time
- $endTime = microtime(true);
-
- // "Explode" both times
- $start = explode(' ', $GLOBALS['startTime']);
- $end = explode(' ', $endTime);
- $runTime = $end[0] - $start[0];
- if ($runTime < 0) $runTime = '0';
-
- // Prepare output
- // @TODO This can be easily moved out after the merge from EL branch to this is complete
- $content = array(
- 'run_time' => translateComma($runTime),
- 'sql_time' => translateComma(getConfig('sql_time') * 1000),
- );
-
- // Load the template
- $GLOBALS['page_footer'] .= loadTemplate('show_timings', true, $content);
-}
-
-// Check wether a boolean constant is set
-// Taken from user comments in PHP documentation for function constant()
-function isBooleanConstantAndTrue ($constName) { // : Boolean
- // Failed by default
- $res = false;
-
- // In cache?
- if (isset($GLOBALS['cache_array']['const'][$constName])) {
- // Use cache
- //* DEBUG: */ outputHtml(__FUNCTION__ . '(' . __LINE__ . ' ): ' . $constName."-CACHE! ");
- $res = ($GLOBALS['cache_array']['const'][$constName] === true);
- } else {
- // Check constant
- //* DEBUG: */ outputHtml(__FUNCTION__ . '(' . __LINE__ . ' ): ' . $constName."-RESOLVE! ");
- if (defined($constName)) {
- // Found!
- //* DEBUG: */ outputHtml(__FUNCTION__ . '(' . __LINE__ . ' ): ' . $constName."-FOUND! ");
- $res = (constant($constName) === true);
- } // END - if
-
- // Set cache
- $GLOBALS['cache_array']['const'][$constName] = $res;
- }
- //* DEBUG: */ var_dump($res);
-
- // Return value
- return $res;
-}
-
// Checks if a given apache module is loaded
function isApacheModuleLoaded ($apacheModule) {
// Check it and return result
@@ -2514,7 +1376,7 @@ function generateErrorCodeFromUserStatus ($status='') {
// Back-ported from the new ship-simu engine. :-)
function debug_get_printable_backtrace () {
// Init variable
- $backtrace = "\n";
+ $backtrace = '';
// Get and prepare backtrace for output
$backtraceArray = debug_backtrace();
@@ -2522,11 +1384,11 @@ function debug_get_printable_backtrace () {
if (!isset($trace['file'])) $trace['file'] = __FUNCTION__;
if (!isset($trace['line'])) $trace['line'] = __LINE__;
if (!isset($trace['args'])) $trace['args'] = array();
- $backtrace .= "".basename($trace['file'])." :" . $trace['line'].", " . $trace['function'].'('.count($trace['args']).") \n";
+ $backtrace .= '' . basename($trace['file']) . ' :' . $trace['line'].", " . $trace['function'] . '(' . count($trace['args']) . ') ';
} // END - foreach
// Close it
- $backtrace .= " \n";
+ $backtrace .= ' ';
// Return the backtrace
return $backtrace;
@@ -2550,55 +1412,6 @@ function debug_get_mailable_backtrace () {
return $backtrace;
}
-// Output a debug backtrace to the user
-function debug_report_bug ($F, $L, $message = '', $sendEmail = true) {
- // 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 = '';
-
- // Is the optional message set?
- if (!empty($message)) {
- // Use and log it
- $debug = sprintf("Note: %s \n",
- $message
- );
-
- // @TODO Add a little more infos here
- logDebugMessage($F, $L, strip_tags($message));
- } // END - if
-
- // Add output
- $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
- app_die($F, $L, $debug);
-}
-
// Generates a ***weak*** seed
function generateSeed () {
return microtime(true) * 100000;
@@ -2609,39 +1422,39 @@ function getMessageFromErrorCode ($code) {
$message = '';
switch ($code) {
case '': break;
- case getCode('LOGOUT_DONE') : $message = getMessage('LOGOUT_DONE'); break;
+ case getCode('LOGOUT_DONE') : $message = '{--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('DATA_INVALID') : $message = '{--MAIL_DATA_INVALID--}'; break;
+ case getCode('POSSIBLE_INVALID') : $message = '{--MAIL_POSSIBLE_INVALID--}'; break;
+ case getCode('USER_404') : $message = '{--USER_404--}'; break;
+ case getCode('STATS_404') : $message = '{--MAIL_STATS_404--}'; break;
+ case getCode('ALREADY_CONFIRMED') : $message = '{--MAIL_ALREADY_CONFIRMED--}'; break;
+ case getCode('WRONG_PASS') : $message = '{--LOGIN_WRONG_PASS--}'; break;
+ case getCode('WRONG_ID') : $message = '{--LOGIN_WRONG_ID--}'; break;
+ case getCode('ACCOUNT_LOCKED') : $message = '{--LOGIN_STATUS_LOCKED--}'; break;
+ case getCode('ACCOUNT_UNCONFIRMED'): $message = '{--LOGIN_STATUS_UNCONFIRMED--}'; break;
+ case getCode('COOKIES_DISABLED') : $message = '{--LOGIN_COOKIES_DISABLED--}'; break;
+ case getCode('BEG_SAME_AS_OWN') : $message = '{--BEG_SAME_UID_AS_OWN--}'; break;
+ case getCode('LOGIN_FAILED') : $message = '{--LOGIN_FAILED_GENERAL--}'; break;
+ case getCode('MODULE_MEMBER_ONLY') : $message = getMaskedMessage('MODULE_MEMBER_ONLY', getRequestParameter('mod')); break;
+ case getCode('OVERLENGTH') : $message = '{--MEMBER_TEXT_OVERLENGTH--}'; break;
+ case getCode('URL_FOUND') : $message = '{--MEMBER_TEXT_CONTAINS_URL--}'; break;
+ case getCode('SUBJECT_URL') : $message = '{--MEMBER_SUBJECT_CONTAINS_URL--}'; break;
+ case getCode('BLIST_URL') : $message = '{--MEMBER_URL_BLACK_LISTED--} {--MEMBER_BLIST_TIME--}: ' . generateDateTime(getRequestParameter('blist'), 0); break;
+ case getCode('NO_RECS_LEFT') : $message = '{--MEMBER_SELECTED_MORE_RECS--}'; break;
+ case getCode('INVALID_TAGS') : $message = '{--MEMBER_HTML_INVALID_TAGS--}'; break;
+ case getCode('MORE_POINTS') : $message = '{--MEMBER_MORE_POINTS_NEEDED--}'; break;
+ case getCode('MORE_RECEIVERS1') : $message = '{--MEMBER_ENTER_MORE_RECEIVERS--}'; break;
+ case getCode('MORE_RECEIVERS2') : $message = '{--MEMBER_NO_MORE_RECEIVERS_FOUND--}'; break;
+ case getCode('MORE_RECEIVERS3') : $message = '{--MEMBER_ENTER_MORE_MIN_RECEIVERS--}'; break;
+ case getCode('INVALID_URL') : $message = '{--MEMBER_ENTER_INVALID_URL--}'; break;
+ case getCode('NO_MAIL_TYPE') : $message = '{--MEMBER_NO_MAIL_TYPE_SELECTED--}'; break;
+ case getCode('UNKNOWN_ERROR') : $message = '{--LOGIN_UNKNOWN_ERROR--}'; break;
+ case getCode('UNKNOWN_STATUS') : $message = '{--LOGIN_UNKNOWN_STATUS--}'; break;
case getCode('ERROR_MAILID'):
if (isExtensionActive('mailid', true)) {
- $message = getMessage('ERROR_CONFIRMING_MAIL');
+ $message = '{--ERROR_CONFIRMING_MAIL--}';
} else {
$message = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'mailid');
}
@@ -2651,7 +1464,7 @@ function getMessageFromErrorCode ($code) {
if (isGetRequestParameterSet('ext')) {
$message = generateExtensionInactiveNotInstalledMessage(getRequestParameter('ext'));
} else {
- $message = getMessage('EXTENSION_PROBLEM_UNSET_EXT');
+ $message = '{--EXTENSION_PROBLEM_UNSET_EXT--}';
}
break;
@@ -2698,28 +1511,6 @@ function getMessageFromErrorCode ($code) {
return $message;
}
-// Compile characters which are allowed in URLs
-function compileUriCode ($code, $simple = true) {
- // Compile constants
- if ($simple === false) $code = str_replace('{--', '".', str_replace('--}', '."', $code));
-
- // Compile QUOT and other non-HTML codes
- $code = str_replace('{DOT}', '.',
- str_replace('{SLASH}', '/',
- str_replace('{QUOT}', "'",
- str_replace('{DOLLAR}', '$',
- str_replace('{OPEN_ANCHOR}', '(',
- str_replace('{CLOSE_ANCHOR}', ')',
- str_replace('{OPEN_SQR}', '[',
- str_replace('{CLOSE_SQR}', ']',
- str_replace('{PER}', '%',
- $code
- )))))))));
-
- // Return compiled code
- return $code;
-}
-
// Function taken from user comments on www.php.net / function isInStringIgnoreCase()
function isUrlValidSimple ($url) {
// Prepare URL
@@ -2772,7 +1563,7 @@ function isUrlValidSimple ($url) {
// @TODO Are these convertions still required?
$pat = str_replace('.', "\.", $pat);
$pat = str_replace('@', "\@", $pat);
- //* DEBUG: */ outputHtml($key."= " . $pat . ' ');
+ //* DEBUG: */ debugOutput($key."= " . $pat);
} // END - if
// Check if expression matches
@@ -2801,12 +1592,12 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) {
$tmp = $FQFN . '.tmp';
// Open the source file
- $fp = fopen($FQFN, 'r') or outputHtml('READ: ' . $FQFN . ' ');
+ $fp = fopen($FQFN, 'r') or debug_report_bug(__FUNCTION__, __LINE__, 'Cannot read. file=' . basename($FQFN));
// Is the resource valid?
if (is_resource($fp)) {
// Open temporary file
- $fp_tmp = fopen($tmp, 'w') or outputHtml('WRITE: ' . $tmp . ' ');
+ $fp_tmp = fopen($tmp, 'w') or debug_report_bug(__FUNCTION__, __LINE__, 'Cannot write. tmp=' . basename($tmp) . ',file=' . $FQFN);
// Is the resource again valid?
if (is_resource($fp_tmp)) {
@@ -2855,7 +1646,7 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) {
}
} else {
// File not found, not readable or writeable
- outputHtml('404: ' . $FQFN . ' ');
+ debug_report_bug(__FUNCTION__, __LINE__, 'File not readable/writeable. file=' . basename($FQFN));
}
// An error was detected!
@@ -3074,25 +1865,27 @@ function addNewBonusMail ($data, $mode = '', $output=true) {
if (!empty($receiver)) {
// Add bonus mail to queue
addBonusMailToQueue(
- $data['subject'],
- $data['text'],
- $receiver,
- $data['points'],
- $data['seconds'],
- $data['url'],
- $data['cat'],
- $mode,
- $data['receiver']
+ $data['subject'],
+ $data['text'],
+ $receiver,
+ $data['points'],
+ $data['seconds'],
+ $data['url'],
+ $data['cat'],
+ $mode,
+ $data['receiver']
);
// Mail inserted into bonus pool
- if ($output) loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BONUS_SEND'));
- } elseif ($output) {
+ if ($output === true) {
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_BONUS_SEND--}');
+ } // END - if
+ } elseif ($output === true) {
// More entered than can be reached!
- loadTemplate('admin_settings_saved', false, getMessage('ADMIN_MORE_SELECTED'));
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_MORE_SELECTED--}');
} else {
// Debug log
- logDebugMessage(__FUNCTION__, __LINE__, "cat={$data['cat']},receiver={$data['receiver']},data=".base64_encode(serialize($data))." More selected, than available!");
+ logDebugMessage(__FUNCTION__, __LINE__, 'cat=' . $data['cat'] . ',receiver=' . $data['receiver'] . ',data=' . base64_encode(serialize($data)) . ' More selected, than available!');
}
}
@@ -3178,7 +1971,7 @@ function shutdown () {
SQL_CLOSE(__FUNCTION__, __LINE__);
} elseif (!isInstallationPhase()) {
// No database link
- addFatalMessage(__FUNCTION__, __LINE__, getMessage('NO_DB_LINK_SHUTDOWN'));
+ addFatalMessage(__FUNCTION__, __LINE__, '{--NO_DB_LINK_SHUTDOWN--}');
}
// Stop executing here
@@ -3219,23 +2012,6 @@ function isMemberIdSet () {
return (isset($GLOBALS['member_id']));
}
-// Handle message codes from URL
-function handleCodeMessage () {
- if (isGetRequestParameterSet('code')) {
- // Default extension is 'unknown'
- $ext = 'unknown';
-
- // Is extension given?
- if (isGetRequestParameterSet('ext')) $ext = getRequestParameter('ext');
-
- // Convert the 'code' parameter from URL to a human-readable message
- $message = getMessageFromErrorCode(getRequestParameter('code'));
-
- // Load message template
- loadTemplate('message', false, $message);
- } // END - if
-}
-
// Setter for extra title
function setExtraTitle ($extraTitle) {
$GLOBALS['extra_title'] = $extraTitle;
@@ -3258,74 +2034,6 @@ function isExtraTitleSet () {
return ((isset($GLOBALS['extra_title'])) && (!empty($GLOBALS['extra_title'])));
}
-// Generates a 'extension foo inactive' message
-function generateExtensionInactiveMessage ($ext_name) {
- // Is the extension empty?
- if (empty($ext_name)) {
- // This should not happen
- debug_report_bug(__FUNCTION__ . ': Parameter ext is empty. This should not happen.');
- } // END - if
-
- // Default message
- $message = getMaskedMessage('EXTENSION_PROBLEM_EXT_INACTIVE', $ext_name);
-
- // Is an admin logged in?
- if (isAdmin()) {
- // Then output admin message
- $message = getMaskedMessage('ADMIN_EXTENSION_PROBLEM_EXT_INACTIVE', $ext_name);
- } // END - if
-
- // Return prepared message
- return $message;
-}
-
-// Generates a 'extension foo not installed' message
-function generateExtensionNotInstalledMessage ($ext_name) {
- // Is the extension empty?
- if (empty($ext_name)) {
- // This should not happen
- debug_report_bug(__FUNCTION__ . ': Parameter ext is empty. This should not happen.');
- } // END - if
-
- // Default message
- $message = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', $ext_name);
-
- // Is an admin logged in?
- if (isAdmin()) {
- // Then output admin message
- $message = getMaskedMessage('ADMIN_EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', $ext_name);
- } // END - if
-
- // Return prepared message
- return $message;
-}
-
-// Generates a message depending on if the extension is not installed or not
-// just activated
-function generateExtensionInactiveNotInstalledMessage ($ext_name) {
- // Init message
- $message = '';
-
- // Is the extension not installed or just deactivated?
- switch (isExtensionInstalled($ext_name)) {
- case true; // Deactivated!
- $message = generateExtensionInactiveMessage($ext_name);
- break;
-
- case false; // Not installed!
- $message = generateExtensionNotInstalledMessage($ext_name);
- break;
-
- default: // Should not happen!
- logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid state of extension %s detected.", $ext_name));
- $message = sprintf("Invalid state of extension %s detected.", $ext_name);
- break;
- } // END - switch
-
- // Return the message
- return $message;
-}
-
// 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.
@@ -3348,7 +2056,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: */ debugOutput('excluded=' . $baseFile);
continue;
} // END - if
@@ -3362,9 +2070,9 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
// 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 . ' ');
- //* DEBUG: */ outputHtml('baseFile:' . $baseFile . ' ');
- //* DEBUG: */ outputHtml('FQFN:' . $FQFN . ' ');
+ //* DEBUG: */ debugOutput('baseDir:' . $baseDir);
+ //* DEBUG: */ debugOutput('baseFile:' . $baseFile);
+ //* DEBUG: */ debugOutput('FQFN:' . $FQFN);
// Exclude this one
continue;
@@ -3494,7 +2202,7 @@ function initCacheInstance () {
$GLOBALS['cache_instance'] = new CacheSystem();
if ($GLOBALS['cache_instance']->getStatus() != 'done') {
// Failed to initialize cache sustem
- addFatalMessage(__FUNCTION__, __LINE__, '(' . __LINE__ . ' ): ' . getMessage('CACHE_CANNOT_INITIALIZE'));
+ addFatalMessage(__FUNCTION__, __LINE__, '(' . __LINE__ . ' ): {--CACHE_CANNOT_INITIALIZE--}');
} // END - if
}
@@ -3513,300 +2221,11 @@ function getMessageFromIndexedArray ($message, $pos, $array) {
return $ret;
}
-// Print code with line numbers
-function linenumberCode ($code) {
- if (!is_array($code)) $codeE = explode("\n", $code); else $codeE = $code;
- $count_lines = count($codeE);
-
- $r = 'Line | Code: ';
- foreach($codeE as $line => $c) {
- $r .= '';
- if ($count_lines == 1) {
- $r .= 1;
- } else {
- $r .= ($line == ($count_lines - 1)) ? '' : ($line+1);
- }
- $r .= ' |';
-
- // Add code
- $r .= '' . htmlentities($c) . '
';
- }
-
- return '' . $r . '
';
-}
-
// Convert ';' to ', ' for e.g. receiver list
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')) . ' ' . getTitleFromMenu($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 = getMessage('SETUP_OF_MAILER');
- } elseif ((!isInstalled()) || (!isAdminRegistered())) {
- // Installation mode
- $pageTitle = getMessage('INSTALLATION_OF_MAILER');
- } else {
- // Configuration not found!
- $pageTitle = getMessage('NO_CONFIG_FOUND_TITLE');
-
- // Do not add the fatal message in installation mode
- if ((!isInstalling()) && (!isConfigurationLoaded())) addFatalMessage(__FUNCTION__, __LINE__, getMessage('NO_CONFIG_FOUND'));
- }
-
- // Return title
- return decodeEntities($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 = generateCacheFqfn($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 ((isDebuggingTemplateCache() === false) && (isTemplateCached($template) === false) && ($eval != '404')) {
- // Generate FQFN
- $FQFN = generateCacheFqfn($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 ((isDebuggingTemplateCache() === false) && (isTemplateCached($template))) {
- // Generate FQFN
- $FQFN = generateCacheFqfn($template);
-
- // And read from it
- $GLOBALS['template_eval'][$template] = readFromFile($FQFN);
- } // END - if
-
- // And return it
- return $GLOBALS['template_eval'][$template];
-}
-
-// Escapes quotes (default is only double-quotes)
-function escapeQuotes ($str, $single = false) {
- // Should we escape all?
- if ($single === true) {
- // Escape all (including null)
- $str = addslashes($str);
- } else {
- // Escape only double-quotes but prevent double-quoting
- $str = str_replace("\\\\", "\\", str_replace('"', "\\\"", $str));
- }
-
- // Return the escaped string
- return $str;
-}
-
-// Escapes the JavaScript code, prevents \r and \n becoming char 10/13
-function escapeJavaScriptQuotes ($str) {
- // Replace all double-quotes and secure back-ticks
- $str = str_replace('"', '\"', str_replace("\\", '{BACK}', $str));
-
- // Return it
- 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 = '', $extraName = '') {
- // Start the output
- $OUT = '
-{--PLEASE_SELECT--} ';
-
- // Walk through all options
- foreach ($options as $option) {
- // Add the entry
- if (empty($optionContent)) {
- // ... from template
- $OUT .= loadTemplate('select_' . $name . $extraName . '_option', true, $option);
- } else {
- // Direct HTML code
- $OUT .= ' ' . $option[$optionContent] . ' ';
- }
- } // END - foreach
-
- // Finish selection box
- $OUT .= ' ';
-
- // Prepare output
- $content = array(
- 'selection_box' => $OUT,
- 'module' => getModule(),
- 'what' => getWhat()
- );
-
- // Load template and return it
- return loadTemplate('select_' . $name . $extraName . '_box', true, $content);
-}
-
// Get a module from filename and access level
function getModuleFromFileName ($file, $accessLevel) {
// Default is 'invalid';
@@ -3879,64 +2298,6 @@ function isSpider () {
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 and if sql_patches has correct version
- if ((getModule() == 'index') && (isExtensionInstalledAndNewer('sql_patches', '0.1.6'))) {
- // 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
@@ -3974,21 +2335,6 @@ function searchDirsRecursive ($dir, &$last_changed, $lookFor = 'Date') {
} // 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;
-}
-
// Handles the braces [] of a field (e.g. value of 'name' attribute)
function handleFieldWithBraces ($field) {
// Are there braces [] at the end?