X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=107542e91f55811176def121dbff5a08e4c21e8f;hp=0187e2c818180a0a5fbffee9a8e7182a6e3d7b47;hb=fc162164725588cf75969f707faead9c9cd8e68b;hpb=b5f0a54eacb6a7208c3e5e4146f1c3396ec4ba3f
diff --git a/inc/functions.php b/inc/functions.php
index 0187e2c818..107542e91f 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -45,11 +45,9 @@ if (!defined('__SECURITY')) {
// 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'] = '';
-
- // Transfer username
- $username = getMessage('USERNAME_UNKNOWN');
- if (isset($GLOBALS['username'])) $username = getUsername();
+ if (!isset($GLOBALS['output'])) {
+ $GLOBALS['output'] = '';
+ } // END - if
// Do we have HTML-Code here?
if (!empty($htmlCode)) {
@@ -83,7 +81,7 @@ function outputHtml ($htmlCode, $newLine = true) {
default:
// Huh, something goes wrong or maybe you have edited config.php ???
- app_die(__FUNCTION__, __LINE__, '{--FATAL_ERROR--}: {--LANG_NO_RENDER_DIRECT--}');
+ debug_report_bug(__FUNCTION__, __LINE__, '{--FATAL_ERROR--}: {--LANG_NO_RENDER_DIRECT--}');
break;
} // END - switch
} elseif ((getPhpCaching() == 'on') && ((!isset($GLOBALS['header'])) || (count($GLOBALS['header']) == 0))) {
@@ -95,11 +93,6 @@ function outputHtml ($htmlCode, $newLine = true) {
clearOutputBuffer();
} // END - if
- // Extension 'rewrite' installed?
- if ((isExtensionActive('rewrite')) && (getOutputMode() != 1)) {
- $GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
- } // END - if
-
// Send all HTTP headers
sendHttpHeaders();
@@ -109,11 +102,6 @@ function outputHtml ($htmlCode, $newLine = true) {
// Output code here, DO NOT REMOVE! ;-)
outputRawCode($GLOBALS['output']);
} elseif ((getConfig('OUTPUT_MODE') == 'render') && (!empty($GLOBALS['output']))) {
- // Rewrite links when rewrite extension is active
- if ((isExtensionActive('rewrite')) && (getOutputMode() != 1)) {
- $GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
- } // END - if
-
// Send all HTTP headers
sendHttpHeaders();
@@ -134,7 +122,7 @@ function sendHttpHeaders () {
$now = gmdate('D, d M Y H:i:s') . ' GMT';
// Send HTTP header
- sendHeader('HTTP/1.1 200 OK');
+ sendHeader('HTTP/1.1 ' . getHttpStatus());
// General headers for no caching
sendHeader('Expires: ' . $now); // RFC2616 - Section 14.21
@@ -148,32 +136,16 @@ function sendHttpHeaders () {
// Compiles the final output
function compileFinalOutput () {
- // Init counter
- $cnt = '0';
-
// Add page header and footer
addPageHeaderFooter();
- // Compile all out
- while (((strpos($GLOBALS['output'], '{--') > 0) || (strpos($GLOBALS['output'], '{!') > 0) || (strpos($GLOBALS['output'], '{?') > 0)) && ($cnt < 3)) {
- // Init common variables
- $content = array();
- $newContent = '';
-
- // Compile it
- $eval = "\$newContent = \"".compileCode(escapeQuotes($GLOBALS['output']))."\";";
- eval($eval);
-
- // Was that eval okay?
- if (empty($newContent)) {
- // Something went wrong!
- debug_report_bug('Evaluation error:
' . linenumberCode($eval) . ' ', false);
- } // END - if
- $GLOBALS['output'] = $newContent;
+ // Do the final compilation
+ $GLOBALS['output'] = doFinalCompilation($GLOBALS['output']);
- // 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)) {
@@ -197,6 +169,44 @@ function compileFinalOutput () {
flushHeaders();
}
+// Main compilation loop
+function doFinalCompilation ($code, $insertComments = true) {
+ // Insert comments? (Only valid with HTML templates, of course)
+ enableTemplateHtml($insertComments);
+
+ // Init counter
+ $cnt = 0;
+
+ // Compile all out
+ while (((strpos($code, '{--') !== false) || (strpos($code, '{DQUOTE}') !== false) || (strpos($code, '{?') !== false) || (strpos($code, '{%') !== false)) && ($cnt < 4)) {
+ // Init common variables
+ $content = array();
+ $newContent = '';
+
+ // Compile it
+ //* DEBUG: */ debugOutput(''.htmlentities($code).' ');
+ $eval = '$newContent = "' . str_replace('{DQUOTE}', '"', compileCode(escapeQuotes($code))) . '";';
+ //* DEBUG: */ if ($insertComments) die(''.linenumberCode($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
+ $code = $newContent;
+
+ // Count round
+ $cnt++;
+ } // END - while
+
+ // Return the compiled code
+ return $code;
+}
+
// Output the raw HTML code
function outputRawCode ($htmlCode) {
// Output stripped HTML code to avoid broken JavaScript code, etc.
@@ -254,19 +264,16 @@ function getTotalFatalErrors () {
// 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('return is not bool (' . gettype($return) . ')');
+ 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)) {
+ if ((isDebuggingTemplateCache() === false) && (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);
@@ -299,7 +306,7 @@ function loadTemplate ($template, $return = false, $content = array()) {
// Do we have to compile the code?
$ret = '';
- if ((strpos($GLOBALS['tpl_content'], '$') !== false) || (strpos($GLOBALS['tpl_content'], '{--') !== false) || (strpos($GLOBALS['tpl_content'], '{!') !== false) || (strpos($GLOBALS['tpl_content'], '{?') !== false) || (strpos($GLOBALS['tpl_content'], '{%') !== false)) {
+ if ((strpos($GLOBALS['tpl_content'], '$') !== false) || (strpos($GLOBALS['tpl_content'], '{--') !== false) || (strpos($GLOBALS['tpl_content'], '{?') !== false) || (strpos($GLOBALS['tpl_content'], '{%') !== false)) {
// Normal HTML output?
if (getOutputMode() == '0') {
// Add surrounding HTML comments to help finding bugs faster
@@ -322,27 +329,31 @@ function loadTemplate ($template, $return = false, $content = array()) {
// Cache the eval() command here
$GLOBALS['template_eval'][$template] = $eval;
-
- // Eval the code
- eval($GLOBALS['template_eval'][$template]);
} 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) . '
- ';
+ $ret = '
+ {--TEMPLATE_404--}
+
+
+ (' . $template . ')
+
+
+ {--TEMPLATE_CONTENT--}
+
' . print_r($content, true) . '
+ {--TEMPLATE_DATA--}
+
' . print_r($DATA, true) . '
+
';
} else {
// No file!
$GLOBALS['template_eval'][$template] = '404';
}
- } else {
+ }
+
+ // 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)) {
@@ -421,29 +432,23 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') {
// 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');
+ $content['expiration'] = '{--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');
+ $content['expiration'] = '{--MAIL_NO_CONFIG_AUTO_PURGE--}';
}
} // END - if
// Load user's data
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "UID={$userid},template={$template},content[]=".gettype($content).' ');
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "UID={$userid},template={$template},content[]=".gettype($content));
if (($userid > 0) && (is_array($content))) {
// If nickname extension is installed, fetch nickname as well
if ((isExtensionActive('nickname')) && (isNicknameUsed($userid))) {
@@ -464,9 +469,6 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') {
//* 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'];
@@ -500,18 +502,21 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') {
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) . '
- ';
+ $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');
+ $newContent = '{--NO_TEMPLATE_SUPPLIED--}';
}
// Is there some content?
@@ -562,7 +567,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
@@ -571,24 +576,12 @@ 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('
@@ -597,6 +590,9 @@ To : ' . htmlentities(utf8_decode($toEmail)) . '
Subject : ' . htmlentities(utf8_decode($subject)) . '
Message : ' . htmlentities(utf8_decode($message)) . '
');
+
+ // This is always fine
+ return true;
} elseif (($isHtml == 'Y') && (isExtensionActive('html_mail'))) {
// Send mail as HTML away
return sendHtmlEmail($toEmail, $subject, $message, $mailHeader);
@@ -607,6 +603,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
@@ -619,10 +618,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()) {
@@ -753,13 +752,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;
@@ -819,7 +818,7 @@ function translateComma ($dotted, $cut = true, $max = '0') {
default: // All others
$dotted = number_format($dotted, $maxComma, '.', ',');
break;
- }
+ } // END - switch
// Return translated value
return $dotted;
@@ -832,12 +831,12 @@ 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(sprintf("Unknown gender %s detected.", $gender));
+ debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown gender %s detected.", $gender));
break;
} // END - switch
@@ -857,12 +856,12 @@ function translateUserStatus ($status) {
case '':
case null:
- $ret = getMessage('ACCOUNT_DELETED');
+ $ret = '{--ACCOUNT_DELETED--}';
break;
default:
// Please report all unknown status
- debug_report_bug(sprintf("Unknown status %s detected.", $status));
+ debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
break;
} // END - switch
@@ -870,6 +869,53 @@ function translateUserStatus ($status) {
return $ret;
}
+// "Translates" 'visible' and 'locked' to a CSS class
+function translateMenuVisibleLocked ($content, $prefix = '') {
+ // Translate 'visible' and keep an eye on the prefix
+ switch ($content['visible']) {
+ // Should be visible
+ 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(__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['locked']) {
+ // Should be locked
+ 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(__FUNCTION__, __LINE__, 'Unsupported locked value detected. content=' . print_r($content, true) . ' ');
+ break;
+ } // END - switch
+
+ // Return the resulting array
+ return $content;
+}
+
+// "Getter" for menu CSS classes, mainly used in templates
+function getMenuCssClasses ($data) {
+ // $data needs to be converted into an array
+ $content = explode('|', $data);
+
+ // Non-existent index 2 will happen in menu blocks
+ if (!isset($content[2])) $content[2] = '';
+
+ // Re-construct the array: 0=visible,1=locked,2=prefix
+ $content['visible'] = $content[0];
+ $content['locked'] = $content[1];
+
+ // Call our "translator" function
+ $content = translateMenuVisibleLocked($content, $content[2]);
+
+ // Return CSS classes
+ return ($content['visible_css'] . ' ' . $content['locked_css']);
+}
+
// Generates an URL for the dereferer
function generateDerefererUrl ($URL) {
// Don't de-refer our own links!
@@ -952,26 +998,32 @@ function redirectToUrl ($URL, $allowSpider = true) {
} // END - if
// Three different ways to debug...
- //* DEBUG: */ debug_report_bug(sprintf("%s[%s:] URL=%s", __FUNCTION__, __LINE__, $URL));
+ //* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, sprintf("%s[%s:] URL=%s", __FUNCTION__, __LINE__, $URL));
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'URL=' . $URL);
//* DEBUG: */ die($URL);
// Simple probe for bots/spiders from search engines
if ((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'] = '';
+ // Set header
+ 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');
@@ -985,17 +1037,8 @@ function redirectToUrl ($URL, $allowSpider = true) {
// 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(sprintf("Configuration entry %s is not set!", $configEntry));
- } // END - if
-
// Load the URL
- redirectToUrl($URL);
+ redirectToUrl(getConfig($configEntry));
}
// Compiles the given HTML/mail code
@@ -1015,15 +1058,18 @@ function compileCode ($code, $simple = false, $constants = true, $full = true) {
// Get timing
$compiled = microtime(true);
- // Add timing
- $code .= '';
+ // Add timing if enabled
+ if (isTemplateHtml()) {
+ // Add timing, this should be disabled in
+ $code .= '';
+ } // END - if
// Return compiled code
return $code;
}
// Compiles the code (use compileCode() only for HTML because of the comments)
-// @TODO $simple is deprecated
+// @TODO $simple/$constants are deprecated
function compileRawCode ($code, $simple = false, $constants = true, $full = true) {
// Is the code a string?
if (!is_string($code)) {
@@ -1040,16 +1086,8 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true
// 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 message strings
+ $code = str_replace('{--', '{%message,', str_replace('--}', '%}', $code));
// Compile QUOT and other non-HTML codes
foreach ($secChars['to'] as $k => $to) {
@@ -1088,7 +1126,7 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true
if ($fuzzyFound === true) continue;
// Take all string elements
- if ((is_string($matches[4][$key])) && (!isset($matchesFound[$match])) && (!isset($matchesFound[$key."_" . $matches[4][$key]]))) {
+ 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));
@@ -1165,30 +1203,30 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 're
if ($type == 'yn') {
// This is a yes/no selection only!
- if ($id > 0) $prefix .= "[" . $id."]";
- $OUT .= " \n";
+ if ($id > 0) $prefix .= '[' . $id . ']';
+ $OUT .= '';
} else {
// Begin with regular selection box here
- if (!empty($prefix)) $prefix .= "_";
+ if (!empty($prefix)) $prefix .= '_';
$type2 = $type;
- if ($id > 0) $type2 .= "[" . $id."]";
- $OUT .= " \n";
+ if ($id > 0) $type2 .= '[' . $id . ']';
+ $OUT .= '';
}
switch ($type) {
case 'day': // Day
for ($idx = 1; $idx < 32; $idx++) {
- $OUT .= "\n";
+ $OUT .= '>' . $idx . ' ';
} // END - for
break;
case 'month': // Month
- foreach ($GLOBALS['month_descr'] as $month => $descr) {
- $OUT .= "\n";
+ foreach ($GLOBALS['month_descr'] as $idx => $descr) {
+ $OUT .= ' ';
} // END - for
break;
@@ -1197,7 +1235,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 're
$year = date('Y', time());
// Use configured min age or fixed?
- if ((isExtensionActive('other')) && (getExtensionVersion('other') >= '0.2.1')) {
+ if (isExtensionInstalledAndNewer('order', '0.2.1')) {
// Configured
$startYear = $year - getConfig('min_age');
} else {
@@ -1211,21 +1249,20 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 're
// 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 .= " \n";
+ $OUT .= '>' . $idx . ' ';
} // END - for
} elseif ($default == -1) {
// Current year minus 1
- for ($idx = $startYear; $idx <= ($year + 1); $idx++)
- {
- $OUT .= "" . $idx." \n";
- }
+ for ($idx = $startYear; $idx <= ($year + 1); $idx++) {
+ $OUT .= '' . $idx . ' ';
+ } // END - for
} else {
// Get current year and subtract the configured minimum age
- $OUT .= "<" . $minYear." \n";
+ $OUT .= '<' . $minYear . ' ';
// Calculate earliest year depending on extension version
- if ((isExtensionActive('other')) && (getExtensionVersion('other') >= '0.2.1')) {
+ if (isExtensionInstalledAndNewer('order', '0.2.1')) {
// Use configured minimum age
$year = date('Y', time()) - getConfig('min_age');
} else {
@@ -1235,41 +1272,41 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 're
// Construct year selection list
for ($idx = $minYear; $idx <= $year; $idx++) {
- $OUT .= "\n";
+ $OUT .= '>' . $idx . ' ';
} // END - for
}
break;
case 'sec':
case 'min':
- for ($idx = '0'; $idx < 60; $idx+=5) {
+ for ($idx = 0; $idx < 60; $idx+=5) {
if (strlen($idx) == 1) $idx = '0' . $idx;
- $OUT .= "\n";
+ $OUT .= '>' . $idx . ' ';
} // END - for
break;
case 'hour':
- for ($idx = '0'; $idx < 24; $idx++) {
+ for ($idx = 0; $idx < 24; $idx++) {
if (strlen($idx) == 1) $idx = '0' . $idx;
- $OUT .= "\n";
+ $OUT .= '>' . $idx . ' ';
} // 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('img_code ' . $img_code .' has invalid length. img_code()=' . strlen($img_code) . ' code_length=' . getConfig('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 " \n";
+ return ' ';
}
// Load image
@@ -1368,8 +1405,7 @@ function generateImageOrCode ($img_code, $headerSent = true) {
// Is it readable?
if (isFileReadable($img)) {
// Switch image type
- switch (getConfig('img_type'))
- {
+ switch (getConfig('img_type')) {
case 'jpg':
// Okay, load image and hide all errors
$image = imagecreatefromjpeg($img);
@@ -1379,7 +1415,7 @@ function generateImageOrCode ($img_code, $headerSent = true) {
// 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')));
@@ -1399,7 +1435,7 @@ function generateImageOrCode ($img_code, $headerSent = true) {
switch (getConfig('img_type')) {
case 'jpg': imagejpeg($image); break;
case 'png': imagepng($image); break;
- }
+ } // END - switch
// Remove image from memory
imagedestroy($image);
@@ -1418,7 +1454,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
// Calculate 2-seconds timestamp
$stamp = round($timestamp);
- //* DEBUG: */ print("*" . $stamp.'/' . $timestamp."* ");
+ //* DEBUG: */ debugOutput('*' . $stamp .'/' . $timestamp . '*');
// Do we have a leap year?
$SWITCH = '0';
@@ -1427,29 +1463,29 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
$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');
+ 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} ");
+ //* DEBUG: */ debugOutput('Y=' . $Y);
// Next months...
$M = abs(floor($timestamp / 2628000 - $Y * 12));
- //* DEBUG: */ print("M={$M} ");
+ //* DEBUG: */ debugOutput('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} ");
+ //* DEBUG: */ debugOutput('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} ");
+ //* DEBUG: */ debugOutput('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} ");
+ //* DEBUG: */ debugOutput('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} ");
+ //* DEBUG: */ debugOutput('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} ");
+ //* DEBUG: */ debugOutput('s=' . $s);
// Is seconds zero and time is < 60 seconds?
if (($s == '0') && ($timestamp < 60)) {
@@ -1473,137 +1509,137 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
);
} else {
// Generate table
- $OUT = "\n";
- $OUT .= "
\n";
- $OUT .= "\n";
+ $OUT = '';
+ $OUT .= '
';
+ $OUT .= '';
if (isInString('Y', $display) || (empty($display))) {
- $OUT .= " {--_YEARS--}
\n";
- }
+ $OUT .= '{--_YEARS--}
';
+ } // END - if
if (isInString('M', $display) || (empty($display))) {
- $OUT .= " {--_MONTHS--}
\n";
- }
+ $OUT .= '{--_MONTHS--}
';
+ } // END - if
if (isInString('W', $display) || (empty($display))) {
- $OUT .= " {--_WEEKS--}
\n";
- }
+ $OUT .= '{--_WEEKS--}
';
+ } // END - if
if (isInString('D', $display) || (empty($display))) {
- $OUT .= " {--_DAYS--}
\n";
- }
+ $OUT .= '{--_DAYS--}
';
+ } // END - if
if (isInString('h', $display) || (empty($display))) {
- $OUT .= " {--_HOURS--}
\n";
- }
+ $OUT .= '{--_HOURS--}
';
+ } // END - if
if (isInString('m', $display) || (empty($display))) {
- $OUT .= " {--_MINUTES--}
\n";
- }
+ $OUT .= '{--_MINUTES--}
';
+ } // END - if
if (isInString('s', $display) || (empty($display))) {
- $OUT .= " {--_SECONDS--}
\n";
- }
+ $OUT .= '{--_SECONDS--}
';
+ } // END - if
- $OUT .= " \n";
- $OUT .= "\n";
+ $OUT .= ' ';
+ $OUT .= '';
if (isInString('Y', $display) || (empty($display))) {
// Generate year selection
- $OUT .= " \n";
- for ($idx = '0'; $idx <= 10; $idx++) {
- $OUT .= " ';
+ for ($idx = 0; $idx <= 10; $idx++) {
+ $OUT .= ' \n";
- }
- $OUT .= " \n";
+ $OUT .= '>' . $idx . '';
+ } // END - for
+ $OUT .= '';
} else {
$OUT .= ' ';
}
if (isInString('M', $display) || (empty($display))) {
// Generate month selection
- $OUT .= " \n";
- for ($idx = '0'; $idx <= 11; $idx++)
- {
- $OUT .= " ';
+ for ($idx = 0; $idx <= 11; $idx++) {
+ $OUT .= ' \n";
- }
- $OUT .= " \n";
+ $OUT .= '>' . $idx . '';
+ } // END - for
+ $OUT .= '';
} else {
$OUT .= ' ';
}
if (isInString('W', $display) || (empty($display))) {
// Generate week selection
- $OUT .= " \n";
- for ($idx = '0'; $idx <= 4; $idx++) {
- $OUT .= " ';
+ for ($idx = 0; $idx <= 4; $idx++) {
+ $OUT .= ' \n";
- }
- $OUT .= " \n";
+ $OUT .= '>' . $idx . '';
+ } // END - for
+ $OUT .= '';
} else {
$OUT .= ' ';
}
if (isInString('D', $display) || (empty($display))) {
// Generate day selection
- $OUT .= " \n";
- for ($idx = '0'; $idx <= 31; $idx++) {
- $OUT .= " ';
+ for ($idx = 0; $idx <= 31; $idx++) {
+ $OUT .= ' \n";
- }
- $OUT .= " \n";
+ $OUT .= '>' . $idx . '';
+ } // END - for
+ $OUT .= '';
} else {
$OUT .= ' ';
}
if (isInString('h', $display) || (empty($display))) {
// Generate hour selection
- $OUT .= " \n";
- for ($idx = '0'; $idx <= 23; $idx++) {
- $OUT .= " ';
+ for ($idx = 0; $idx <= 23; $idx++) {
+ $OUT .= ' \n";
- }
- $OUT .= " \n";
+ $OUT .= '>' . $idx . '';
+ } // END - for
+ $OUT .= '';
} else {
$OUT .= ' ';
}
if (isInString('m', $display) || (empty($display))) {
// Generate minute selection
- $OUT .= " \n";
- for ($idx = '0'; $idx <= 59; $idx++) {
- $OUT .= " ';
+ for ($idx = 0; $idx <= 59; $idx++) {
+ $OUT .= ' \n";
- }
- $OUT .= " \n";
+ $OUT .= '>' . $idx . '';
+ } // END - for
+ $OUT .= '';
} else {
$OUT .= ' ';
}
if (isInString('s', $display) || (empty($display))) {
// Generate second selection
- $OUT .= " \n";
- for ($idx = '0'; $idx <= 59; $idx++) {
- $OUT .= " ';
+ for ($idx = 0; $idx <= 59; $idx++) {
+ $OUT .= ' \n";
- }
- $OUT .= " \n";
+ $OUT .= '>' . $idx . '';
+ } // END - for
+ $OUT .= '';
} else {
$OUT .= ' ';
}
- $OUT .= " \n";
- $OUT .= "
\n";
- $OUT .= "
\n";
- // Return generated HTML code
+ $OUT .= ' ';
+ $OUT .= '
';
+ $OUT .= '
';
}
+
+ // Return generated HTML code
return $OUT;
}
@@ -1616,22 +1652,31 @@ function createTimestampFromSelections ($prefix, $postData) {
$SWITCH = '0';
$TEST = date('Y', time()) / 4;
$M1 = date('m', time());
+
// If so and if current time is before 02/29 and estimated time is after 02/29 then add 86400 seconds (one day)
if ((floor($TEST) == $TEST) && ($M1 == '02') && ($postData[$prefix . '_mo'] > '02')) $SWITCH = getConfig('ONE_DAY');
+
// First add years...
$ret += $postData[$prefix . '_ye'] * (31536000 + $SWITCH);
+
// Next months...
$ret += $postData[$prefix . '_mo'] * 2628000;
+
// Next weeks
$ret += $postData[$prefix . '_we'] * 604800;
+
// Next days...
$ret += $postData[$prefix . '_da'] * 86400;
+
// Next hours...
$ret += $postData[$prefix . '_ho'] * 3600;
+
// Next minutes..
$ret += $postData[$prefix . '_mi'] * 60;
+
// And at last seconds...
$ret += $postData[$prefix . '_se'];
+
// Return calculated value
return $ret;
}
@@ -1644,7 +1689,7 @@ function createFancyTime ($stamp) {
foreach($data as $k => $v) {
if ($v > 0) {
// Value is greater than 0 "eval" data to return string
- eval("\$ret .= \", \".\$v.\" {--_".strtoupper($k)."--}\";");
+ eval('$ret .= ", ".$v." {--_' . strtoupper($k) . '--}";');
break;
} // END - if
} // END - foreach
@@ -1655,66 +1700,13 @@ function createFancyTime ($stamp) {
$ret = substr($ret, 2);
} else {
// Zero seconds
- $ret = "0 {--_SECONDS--}";
+ $ret = '0 {--_SECONDS--}';
}
// Return fancy time string
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";
- }
-
- $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) $NAV .= ' | ';
- } // 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?
@@ -1734,7 +1726,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));
@@ -1743,7 +1735,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
@@ -1857,7 +1849,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')));
@@ -1957,8 +1949,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])) {
@@ -2000,7 +1992,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);
@@ -2042,11 +2034,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')) {
@@ -2060,19 +2052,22 @@ function isUrlValid ($URL, $compile=true) {
}
// Generate a list of administrative links to a given userid
-function generateMemberAdminActionLinks ($userid, $status = '') {
+function generateMemberAdminActionLinks ($userid) {
// Make sure userid is a number
- if ($userid != bigintval($userid)) debug_report_bug('userid is not 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');
+ // Get user status
+ $status = getFetchedUserData('userid', $userid, 'status');
+
// Begin of navigation links
- $OUT = '[ ';
+ $OUT = '[';
foreach ($targetArray as $tar) {
$OUT .= '' . __LINE__ . '): ' . $constName."-CACHE! ");
+ //* DEBUG: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . ' ): ' . $constName."-CACHE! ");
$res = ($GLOBALS['cache_array']['const'][$constName] === true);
} else {
// Check constant
- //* DEBUG: */ outputHtml(__FUNCTION__ . '(' . __LINE__ . ' ): ' . $constName."-RESOLVE! ");
+ //* DEBUG: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . ' ): ' . $constName."-RESOLVE! ");
if (defined($constName)) {
// Found!
- //* DEBUG: */ outputHtml(__FUNCTION__ . '(' . __LINE__ . ' ): ' . $constName."-FOUND! ");
+ //* DEBUG: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . ' ): ' . $constName."-FOUND! ");
$res = (constant($constName) === true);
} // END - if
@@ -2473,7 +2466,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();
@@ -2481,11 +2474,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;
@@ -2510,7 +2503,7 @@ function debug_get_mailable_backtrace () {
}
// Output a debug backtrace to the user
-function debug_report_bug ($message = '', $sendEmail = true) {
+function debug_report_bug ($F, $L, $message = '', $sendEmail = true) {
// Is this already called?
if (isset($GLOBALS[__FUNCTION__])) {
// Other backtrace
@@ -2533,21 +2526,22 @@ function debug_report_bug ($message = '', $sendEmail = true) {
);
// @TODO Add a little more infos here
- logDebugMessage(__FUNCTION__, __LINE__, strip_tags($message));
+ 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 .= '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.";
+ $debug .= ' ';
+ $debug .= 'Request-URI: ' . getRequestUri() . '
';
+ $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())
+ 'message' => trim($message),
+ 'backtrace' => trim(debug_get_mailable_backtrace())
);
// Send email to webmaster
@@ -2555,7 +2549,7 @@ function debug_report_bug ($message = '', $sendEmail = true) {
} // END - if
// And abort here
- app_die(__FUNCTION__, __LINE__, $debug);
+ app_die($F, $L, $debug);
}
// Generates a ***weak*** seed
@@ -2568,41 +2562,41 @@ 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('SUBJ_URL') : $message = '{--MEMBER_SUBJ_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_NOT_INSTALLED', 'mailid');
+ $message = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'mailid');
}
break;
@@ -2610,14 +2604,14 @@ function getMessageFromErrorCode ($code) {
if (isGetRequestParameterSet('ext')) {
$message = generateExtensionInactiveNotInstalledMessage(getRequestParameter('ext'));
} else {
- $message = getMessage('EXTENSION_PROBLEM_UNSET_EXT');
+ $message = '{--EXTENSION_PROBLEM_UNSET_EXT--}';
}
break;
case getCode('URL_TLOCK'):
// @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
$result = SQL_QUERY_ESC("SELECT `timestamp` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
- array(bigintval(getRequestParameter('id'))), __FILE__, __LINE__);
+ array(bigintval(getRequestParameter('id'))), __FUNCTION__, __LINE__);
// Load timestamp from last order
list($timestamp) = SQL_FETCHROW($result);
@@ -2731,7 +2725,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
@@ -2760,12 +2754,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)) {
@@ -2814,7 +2808,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!
@@ -2839,8 +2833,8 @@ function logDebugMessage ($funcFile, $line, $message, $force=true) {
// Remove CRLF
$message = str_replace("\r", '', str_replace("\n", '', $message));
- // Log this message away, we better don't call app_die() here to prevent an endless loop
- $fp = fopen(getConfig('CACHE_PATH') . 'debug.log', 'a') or die(__FUNCTION__.'['.__LINE__.']: Cannot write logfile debug.log!');
+ // Log this message away
+ $fp = fopen(getConfig('CACHE_PATH') . 'debug.log', 'a') or debug_report_bug(__FUNCTION__, __LINE__, 'Cannot write logfile debug.log!');
fwrite($fp, date('d.m.Y|H:i:s', time()) . '|' . getModule(false) . '|' . basename($funcFile) . '|' . $line . '|' . $message . "\n");
fclose($fp);
} // END - if
@@ -3033,25 +3027,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!');
}
}
@@ -3081,7 +3077,7 @@ function determineReferalId () {
} elseif ((isExtensionInstalledAndNewer('user', '0.3.4')) && (getConfig('select_user_zero_refid') == 'Y')) {
// Select a random user which has confirmed enougth mails
$GLOBALS['refid'] = determineRandomReferalId();
- } elseif ((isExtensionInstalled('sql_patches')) && (getConfig('def_refid') > 0)) {
+ } elseif ((isExtensionInstalledAndNewer('sql_patches', '0.1.2')) && (getConfig('def_refid') > 0)) {
// Set default refid as refid in URL
$GLOBALS['refid'] = getConfig('def_refid');
} else {
@@ -3134,10 +3130,10 @@ function shutdown () {
// Check if not in installation phase and the link is up
if ((!isInstallationPhase()) && (SQL_IS_LINK_UP())) {
// Close link
- SQL_CLOSE(__FILE__, __LINE__);
+ SQL_CLOSE(__FUNCTION__, __LINE__);
} elseif (!isInstallationPhase()) {
// No database link
- addFatalMessage(__FILE__, __LINE__, getMessage('NO_DB_LINK_SHUTDOWN'));
+ addFatalMessage(__FUNCTION__, __LINE__, '{--NO_DB_LINK_SHUTDOWN--}');
}
// Stop executing here
@@ -3152,7 +3148,7 @@ function initMemberId () {
// Setter for member id
function setMemberId ($memberid) {
// We should not set member id to zero
- if ($memberid == '0') debug_report_bug('Userid should not be set zero.');
+ if ($memberid == '0') debug_report_bug(__FUNCTION__, __LINE__, 'Userid should not be set zero.');
// Set it secured
$GLOBALS['member_id'] = bigintval($memberid);
@@ -3205,7 +3201,7 @@ function getExtraTitle () {
// Is the extra title set?
if (!isExtraTitleSet()) {
// No, then abort here
- debug_report_bug('extra_title is not set!');
+ debug_report_bug(__FUNCTION__, __LINE__, 'extra_title is not set!');
} // END - if
// Return it
@@ -3222,7 +3218,7 @@ 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.');
+ debug_report_bug(__FUNCTION__, __LINE__, 'Parameter ext is empty. This should not happen.');
} // END - if
// Default message
@@ -3243,16 +3239,16 @@ 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.');
+ debug_report_bug(__FUNCTION__, __LINE__, 'Parameter ext is empty. This should not happen.');
} // END - if
// Default message
- $message = getMaskedMessage('EXTENSION_PROBLEM_EXT_NOT_INSTALLED', $ext_name);
+ $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_EXT_NOT_INSTALLED', $ext_name);
+ $message = getMaskedMessage('ADMIN_EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', $ext_name);
} // END - if
// Return prepared message
@@ -3300,14 +3296,14 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
$files = array();
// Open directory
- $dirPointer = opendir(getConfig('PATH') . $baseDir) or app_die(__FUNCTION__, __LINE__, 'Cannot read directory ' . basename($baseDir) . '.');
+ $dirPointer = opendir(getConfig('PATH') . $baseDir) or debug_report_bug(__FUNCTION__, __LINE__, 'Cannot read directory ' . basename($baseDir) . '.');
// Read all entries
while ($baseFile = readdir($dirPointer)) {
// 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
@@ -3321,9 +3317,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;
@@ -3374,7 +3370,7 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
}
} else {
// We found .php file but should not search for them, why?
- debug_report_bug('We should find files with extension=' . $extension . ', but we found a PHP script.');
+ debug_report_bug(__FUNCTION__, __LINE__, 'We should find files with extension=' . $extension . ', but we found a PHP script.');
}
} elseif (substr($baseFile, -4, 4) == $extension) {
// Other, generic file found
@@ -3453,7 +3449,7 @@ function initCacheInstance () {
$GLOBALS['cache_instance'] = new CacheSystem();
if ($GLOBALS['cache_instance']->getStatus() != 'done') {
// Failed to initialize cache sustem
- addFatalMessage(__FILE__, __LINE__, '(' . __LINE__ . ' ): ' . getMessage('CACHE_CANNOT_INITIALIZE'));
+ addFatalMessage(__FUNCTION__, __LINE__, '(' . __LINE__ . ' ): {--CACHE_CANNOT_INITIALIZE--}');
} // END - if
}
@@ -3539,16 +3535,16 @@ function determinePageTitle () {
$pageTitle = '[-- ' . getConfig('MAIN_TITLE') . ' - ' . getModuleTitle(getModule()) . ' --]';
} elseif ((isInstalled()) && (!isAdminRegistered())) {
// Installed but no admin registered
- $pageTitle = getMessage('SETUP_OF_MXCHANGE');
+ $pageTitle = '{--SETUP_OF_MAILER--}';
} elseif ((!isInstalled()) || (!isAdminRegistered())) {
// Installation mode
- $pageTitle = getMessage('INSTALLATION_OF_MXCHANGE');
+ $pageTitle = '{--INSTALLATION_OF_MAILER--}';
} else {
// Configuration not found!
- $pageTitle = getMessage('NO_CONFIG_FOUND_TITLE');
+ $pageTitle = '{--NO_CONFIG_FOUND_TITLE--}';
// Do not add the fatal message in installation mode
- if ((!isInstalling()) && (!isConfigurationLoaded())) addFatalMessage(__FILE__, __LINE__, getMessage('NO_CONFIG_FOUND'));
+ if ((!isInstalling()) && (!isConfigurationLoaded())) addFatalMessage(__FUNCTION__, __LINE__, '{--NO_CONFIG_FOUND--}');
}
// Return title
@@ -3577,9 +3573,6 @@ function flushTemplateCache ($template, $eval) {
// 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
@@ -3588,7 +3581,13 @@ function flushTemplateCache ($template, $eval) {
// Reads a template cache
function readTemplateCache ($template) {
// Check it again
- if ((isDebuggingTemplateCache() === false) && (isTemplateCached($template))) {
+ if ((isDebuggingTemplateCache()) || (!isTemplateCached($template))) {
+ // This should not happen
+ debug_report_bug('Wether debugging of template cache is enabled or template ' . $template . ' is not cached while expected.');
+ } // END - if
+
+ // Is it cached?
+ if (!isset($GLOBALS['template_eval'][$template])) {
// Generate FQFN
$FQFN = generateCacheFqfn($template);
@@ -3640,9 +3639,6 @@ function sendModeMails ($mod, $modes) {
// Load the data
$content = getUserDataArray();
- // Translate gender
- $content['gender'] = translateGender($content['gender']);
-
// Clear/init the content variable
$content['message'] = '';
@@ -3654,16 +3650,16 @@ function sendModeMails ($mod, $modes) {
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";
+ $content['message'] = '{--MEMBER_CHANGED_EMAIL--}' . ': ' . postRequestParameter('old_email') . "\n";
break;
case 'pass': // Password was changed
- $content['message'] = getMessage('MEMBER_CHANGED_PASS')."\n";
+ $content['message'] = '{--MEMBER_CHANGED_PASS--}' . "\n";
break;
default:
logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown mode %s detected.", $mode));
- $content['message'] = getMessage('MEMBER_UNKNOWN_MODE') . ': ' . $mode . "\n\n";
+ $content['message'] = '{--MEMBER_UNKNOWN_MODE--}' . ': ' . $mode . "\n\n";
break;
} // END - switch
} // END - foreach
@@ -3682,7 +3678,7 @@ function sendModeMails ($mod, $modes) {
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');
+ $sub_adm = '{--ADMIN_CHANGED_DATA--}';
} else {
// No mail to admin
$message_admin = '';
@@ -3690,7 +3686,7 @@ function sendModeMails ($mod, $modes) {
}
// Set subject lines
- $sub_mem = getMessage('MEMBER_CHANGED_DATA');
+ $sub_mem = '{--MEMBER_CHANGED_DATA--}';
// Output success message
$content = '{--MYDATA_MAIL_SENT--} ';
@@ -3723,7 +3719,7 @@ function sendModeMails ($mod, $modes) {
sendAdminNotification($sub_adm, $message_admin, $content, getMemberId());
} elseif (getConfig('admin_notify') == 'Y') {
// Cannot send mails to admin!
- $content = getMessage('CANNOT_SEND_ADMIN_MAILS');
+ $content = '{--CANNOT_SEND_ADMIN_MAILS--}';
} else {
// No mail to admin
$content = '{--MYDATA_MAIL_SENT--} ';
@@ -3735,7 +3731,7 @@ function sendModeMails ($mod, $modes) {
}
// Generates a 'selection box' from given array
-function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionContent='') {
+function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionContent = '', $extraName = '') {
// Start the output
$OUT = '
{--PLEASE_SELECT--} ';
@@ -3745,7 +3741,7 @@ function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionCo
// Add the entry
if (empty($optionContent)) {
// ... from template
- $OUT .= loadTemplate('select_' . $name . '_option', true, $option);
+ $OUT .= loadTemplate('select_' . $name . $extraName . '_option', true, $option);
} else {
// Direct HTML code
$OUT .= ' ' . $option[$optionContent] . ' ';
@@ -3763,7 +3759,7 @@ function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionCo
);
// Load template and return it
- return loadTemplate('select_' . $name . '_box', true, $content);
+ return loadTemplate('select_' . $name . $extraName . '_box', true, $content);
}
// Get a module from filename and access level
@@ -3784,7 +3780,7 @@ function getModuleFromFileName ($file, $accessLevel) {
break;
default: // Unsupported file name / access level
- debug_report_bug('Unsupported file name=' . basename($file) . '/access level=' . $accessLevel);
+ debug_report_bug(__FUNCTION__, __LINE__, 'Unsupported file name=' . basename($file) . '/access level=' . $accessLevel);
break;
}
@@ -3871,10 +3867,10 @@ function addPageHeaderFooter () {
// Generates meta description for current module and 'what' value
function generateMetaDescriptionCode () {
- // Only include from guest area
- if (getModule() == 'index') {
+ // 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());
+ $DESCR = '{?MAIN_TITLE?} ' . trim(getConfig('title_middle')) . ' ' . getTitleFromMenu('guest', getWhat());
// Output it directly
$GLOBALS['page_header'] .= ' ';
@@ -3885,11 +3881,16 @@ function generateMetaDescriptionCode () {
}
// Generates an FQFN for template cache from the given template name
-function generateCacheFqfn ($template) {
+function generateCacheFqfn ($template, $mode = 'html') {
// 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);
+ $GLOBALS['template_cache_fqfn'][$template] = sprintf(
+ "%s_compiled/%s/%s.tpl.cache",
+ getConfig('CACHE_PATH'),
+ $mode,
+ $template
+ );
} // END - if
// Return it
@@ -3948,6 +3949,28 @@ function fixNullEmptyToDashes ($str, $num) {
return $return;
}
+// Handles the braces [] of a field (e.g. value of 'name' attribute)
+function handleFieldWithBraces ($field) {
+ // Are there braces [] at the end?
+ if (substr($field, -2, 2) == '[]') {
+ // Try to find one and replace it. I do it this way to allow easy
+ // extending of this code.
+ foreach (array('admin_list_builder_id_value') as $key) {
+ // Is the cache entry set?
+ if (isset($GLOBALS[$key])) {
+ // Insert it
+ $field = str_replace('[]', '[' . $GLOBALS[$key] . ']', $field);
+
+ // And abort
+ break;
+ } // END - if
+ } // END - foreach
+ } // END - if
+
+ // Return it
+ return $field;
+}
+
//////////////////////////////////////////////////
// AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
//////////////////////////////////////////////////