X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=5ebcaebce1fc5211496031264048ccf9a9deb519;hb=b1cf96c4a5a63a1d334119a0681e5fbf68edf527;hp=508112789ff98c0d85f315728fd3e445c60a5aea;hpb=36c3c8b749a88ce05ad0fda81e00047f9cb5433f;p=mailer.git
diff --git a/inc/functions.php b/inc/functions.php
index 508112789f..5ebcaebce1 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1,7 +1,7 @@
{--FATAL_ERROR--}: {--LANG_NO_RENDER_DIRECT--}");
+ app_die(__FUNCTION__, __LINE__, '{--FATAL_ERROR--}: {--LANG_NO_RENDER_DIRECT--}');
break;
- }
- } elseif ((constant('_OB_CACHING') == 'on') && (isset($GLOBALS['footer_sent'])) && ($GLOBALS['footer_sent'] == 1)) {
+ } // END - switch
+ } elseif ((getPhpCaching() == 'on') && (isset($GLOBALS['footer_sent'])) && ($GLOBALS['footer_sent'] == 1)) {
// Headers already sent?
if (headers_sent()) {
// Log this error
- DEBUG_LOG(__FUNCTION__, __LINE__, "Headers already sent! We need debug backtrace here.");
+ logDebugMessage(__FUNCTION__, __LINE__, 'Headers already sent! We need debug backtrace here.');
// Trigger an user error
- debug_report_bug("Headers are already sent!");
+ debug_report_bug('Headers are already sent!');
} // END - if
// Output cached HTML code
- $OUTPUT = ob_get_contents();
+ $GLOBALS['output'] = ob_get_contents();
// Clear output buffer for later output if output is found
- if (!empty($OUTPUT)) {
+ if (!empty($GLOBALS['output'])) {
clearOutputBuffer();
} // END - if
- // Send HTTP header
- sendHeader('HTTP/1.1 200');
-
- // Used later
- $now = gmdate('D, d M Y H:i:s') . ' GMT';
-
- // General headers for no caching
- sendHeader('Expired: ' . $now); // RFC2616 - Section 14.21
- sendHeader('Last-Modified: ' . $now);
- sendHeader('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
- sendHeader('Pragma: no-cache'); // HTTP/1.0
- sendHeader('Connection: Close');
-
// Extension 'rewrite' installed?
- if ((EXT_IS_ACTIVE('rewrite')) && (getOutputMode() != '1') && (getOutputMode() != '-1')) {
- $OUTPUT = rewriteLinksInCode($OUTPUT);
+ if ((isExtensionActive('rewrite')) && (getOutputMode() != 1)) {
+ $GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
} // END - if
// Compile and run finished rendered HTML code
- while (strpos($OUTPUT, '{!') > 0) {
- // Replace _MYSQL_PREFIX
- $OUTPUT = str_replace("{!_MYSQL_PREFIX!}", getConfig('_MYSQL_PREFIX'), $OUTPUT);
-
- // Prepare the content and eval() it...
- $newContent = '';
- $eval = "\$newContent = \"".COMPILE_CODE(smartAddSlashes($OUTPUT))."\";";
- eval($eval);
-
- // Was that eval okay?
- if (empty($newContent)) {
- // Something went wrong!
- app_die(__FUNCTION__, __LINE__, 'Evaluation error:
' . htmlentities($eval) . '
');
- } // END - if
- $OUTPUT = $newContent;
- } // END - while
+ compileFinalOutput();
+
+ // Send all HTTP headers
+ sendHttpHeaders();
// Output code here, DO NOT REMOVE! ;-)
- outputRawCode($OUTPUT);
- } elseif ((getConfig('OUTPUT_MODE') == 'render') && (!empty($OUTPUT))) {
+ outputRawCode($GLOBALS['output']);
+ } elseif ((getConfig('OUTPUT_MODE') == 'render') && (!empty($GLOBALS['output']))) {
// Rewrite links when rewrite extension is active
- if ((EXT_IS_ACTIVE('rewrite')) && (getOutputMode() != '1') && (getOutputMode() != '-1')) {
- $OUTPUT = rewriteLinksInCode($OUTPUT);
+ if ((isExtensionActive('rewrite')) && (getOutputMode() != 1)) {
+ $GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
} // END - if
// Compile and run finished rendered HTML code
- while (strpos($OUTPUT, '{!') > 0) {
- $eval = "\$OUTPUT = \"".COMPILE_CODE(smartAddSlashes($OUTPUT))."\";";
- eval($eval);
- } // END - while
+ compileFinalOutput();
+
+ // Send all HTTP headers
+ sendHttpHeaders();
// Output code here, DO NOT REMOVE! ;-)
- outputRawCode($OUTPUT);
+ outputRawCode($GLOBALS['output']);
}
}
+// Sends out all headers required for HTTP/1.1 reply
+function sendHttpHeaders () {
+ // Used later
+ $now = gmdate('D, d M Y H:i:s') . ' GMT';
+
+ // Send HTTP header
+ sendHeader('HTTP/1.1 200');
+
+ // General headers for no caching
+ sendHeader('Expired: ' . $now); // RFC2616 - Section 14.21
+ sendHeader('Last-Modified: ' . $now);
+ sendHeader('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
+ sendHeader('Pragma: no-cache'); // HTTP/1.0
+ sendHeader('Connection: Close');
+ sendHeader('Content-Type: ' . getContentType() . '; charset=UTF-8');
+ sendHeader('Content-Language: ' . getLanguage());
+}
+
+// Compiles the final output
+function compileFinalOutput () {
+ // Init counter
+ $cnt = '0';
+
+ // 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) . '
');
+ } // END - if
+ $GLOBALS['output'] = $newContent;
+
+ // Count round
+ $cnt++;
+ } // END - while
+
+ // Add final length
+ sendHeader('Content-Length: ' . strlen($GLOBALS['output']));
+}
+
// Output the raw HTML code
-function outputRawCode ($HTML) {
+function outputRawCode ($htmlCode) {
// Output stripped HTML code to avoid broken JavaScript code, etc.
- print(stripslashes(stripslashes($HTML)));
+ print(str_replace('{BACK}', "\\", $htmlCode));
- // Flush the output if only constant('_OB_CACHING') is not 'on'
- if (constant('_OB_CACHING') != 'on') {
+ // Flush the output if only getPhpCaching() is not 'on'
+ if (getPhpCaching() != 'on') {
// Flush it
flush();
} // END - if
@@ -178,7 +204,7 @@ function getFatalArray () {
}
// Add a fatal error message to the queue array
-function addFatalMessage ($F, $L, $message, $extra='') {
+function addFatalMessage ($F, $L, $message, $extra = '') {
if (is_array($extra)) {
// Multiple extras for a message with masks
$message = call_user_func_array('sprintf', $extra);
@@ -191,13 +217,14 @@ function addFatalMessage ($F, $L, $message, $extra='') {
$GLOBALS['fatal_messages'][] = $message;
// Log fatal messages away
- DEBUG_LOG($F, $L, " message={$message}");
+ debug_report_bug($message);
+ logDebugMessage($F, $L, 'Fatal error message: ' . $message);
}
// Getter for total fatal message count
function getTotalFatalErrors () {
// Init coun
- $count = 0;
+ $count = '0';
// Do we have at least the first entry?
if (!empty($GLOBALS['fatal_messages'][0])) {
@@ -210,118 +237,245 @@ function getTotalFatalErrors () {
}
// Load a template file and return it's content (only it's name; do not use ' or ")
-function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
+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) . ')');
- // Add more variables which you want to use in your template files
- global $DATA, $username;
+ // @TODO Try to rewrite all $DATA to $content
+ global $DATA;
- // Get whole config array
- $_CONFIG = getConfigArray();
+ // 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);
+ // Make all template names lowercase
+ $template = strtolower($template);
- // Count the template load
- incrementConfigEntry('num_templates');
+ // Init some data
+ $ret = '';
+ if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = '0';
- // Prepare IP number and User Agent
- $REMOTE_ADDR = detectRemoteAddr();
- if (!defined('REMOTE_ADDR')) define('REMOTE_ADDR', $REMOTE_ADDR);
- $HTTP_USER_AGENT = detectUserAgent();
+ // Base directory
+ $basePath = sprintf("%stemplates/%s/html/", getConfig('PATH'), getLanguage());
+ $extraPath = detectExtraTemplatePath($template);;
- // Init some data
- $ret = '';
- if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = 0;
+ ////////////////////////
+ // Generate file name //
+ ////////////////////////
+ $FQFN = $basePath . $extraPath . $template . '.tpl';
- // @DEPRECATED Try to rewrite the if() condition
- if ($template == 'member_support_form') {
- // Support request of a member
- $result = SQL_QUERY_ESC("SELECT `userid`, `gender`, `surname`, `family`, `email` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1",
- array(getUserId()), __FUNCTION__, __LINE__);
+ // Does the special template exists?
+ if (!isFileReadable($FQFN)) {
+ // Reset to default template
+ $FQFN = $basePath . $template . '.tpl';
+ } // END - if
- // Is content an array?
- if (is_array($content)) {
- // Merge data
- $content = merge_array($content, SQL_FETCHARRAY($result));
+ // 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)) {
+ // 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 = "' . escapeQuotes($ret) . '";';
+ } // END - if
- // Translate gender
- $content['gender'] = translateGender($content['gender']);
- } else {
- // @DEPRECATED
- // @TODO Find all templates which are using these direct variables and rewrite them.
- // @TODO After this step is done, this else-block is history
- list($gender, $surname, $family, $email) = SQL_FETCHROW($result);
+ // Cache the eval() command here
+ $GLOBALS['template_eval'][$template] = $eval;
- // Translate gender
- $gender = translateGender($gender);
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("DEPRECATION-WARNING: content is not array [%s], template=%s.", gettype($content), $template));
+ // 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) . '
+
';
+ } else {
+ // No file!
+ $GLOBALS['template_eval'][$template] = '404';
}
+ } else {
+ // Eval the code
+ eval($GLOBALS['template_eval'][$template]);
+ }
- // Free result
- SQL_FREERESULT($result);
- } // END - if
-
- // Generate date/time string
- $date_time = generateDateTime(time(), '1');
+ // 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) . '
';
+ }
+}
- // Base directory
- $basePath = sprintf("%stemplates/%s/html/", constant('PATH'), getLanguage());
- $mode = '';
+// Detects the extra template path from given template name
+function detectExtraTemplatePath ($template) {
+ // Default is empty
+ $extraPath = '';
// Check for admin/guest/member templates
- if (strpos($template, 'admin_') > -1) {
+ if (substr($template, 0, 6) == 'admin_') {
// Admin template found
- $mode = 'admin/';
- } elseif (strpos($template, 'guest_') > -1) {
+ $extraPath = 'admin/';
+ } elseif (substr($template, 0, 6) == 'guest_') {
// Guest template found
- $mode = 'guest/';
- } elseif (strpos($template, 'member_') > -1) {
+ $extraPath = 'guest/';
+ } elseif (substr($template, 0, 7) == 'member_') {
// Member template found
- $mode = 'member/';
- } elseif (strpos($template, 'install_') > -1) {
+ $extraPath = 'member/';
+ } elseif (substr($template, 0, 8) == 'install_') {
// Installation template found
- $mode = 'install/';
- } elseif (strpos($template, 'ext_') > -1) {
+ $extraPath = 'install/';
+ } elseif (substr($template, 0, 4) == 'ext_') {
// Extension template found
- $mode = 'ext/';
- } elseif (strpos($template, 'la_') > -1) {
+ $extraPath = 'ext/';
+ } elseif (substr($template, 0, 3) == 'la_') {
// 'Logical-area' template found
- $mode = 'la/';
- } elseif (strpos($template, 'js_') > -1) {
+ $extraPath = 'la/';
+ } elseif (substr($template, 0, 3) == 'js_') {
// JavaScript template found
- $mode = 'js/';
+ $extraPath = 'js/';
+ } elseif (substr($template, 0, 5) == 'menu_') {
+ // Menu template found
+ $extraPath = 'menu/';
} else {
// Test for extension
$test = substr($template, 0, strpos($template, '_'));
- if (EXT_IS_ACTIVE($test)) {
+
+ // Probe for valid extension name
+ if (isExtensionNameValid($test)) {
// Set extra path to extension's name
- $mode = $test . '/';
+ $extraPath = $test . '/';
} // END - if
}
- ////////////////////////
- // Generate file name //
- ////////////////////////
- $FQFN = $basePath . $mode . $template . '.tpl';
-
- if ((isWhatSet()) && ((strpos($template, '_header') > 0) || (strpos($template, '_footer') > 0)) && (($mode == 'guest/') || ($mode == 'member/') || ($mode == 'admin/'))) {
- // Select what depended header/footer template file for admin/guest/member area
- $file2 = sprintf("%s%s%s_%s.tpl",
- $basePath,
- $mode,
- $template,
- getWhat()
- );
+ // Return result
+ return $extraPath;
+}
- // Probe for it...
- if (isFileReadable($file2)) $FQFN = $file2;
+// Loads an email template and compiles it
+function loadEmailTemplate ($template, $content = array(), $UID = '0') {
+ global $DATA;
- // Remove variable from memory
- unset($file2);
+ // Make sure all template names are lowercase!
+ $template = strtolower($template);
+
+ // Default 'nickname' if extension is not installed
+ $nick = '---';
+
+ // Prepare IP number and User Agent
+ $REMOTE_ADDR = detectRemoteAddr();
+ $HTTP_USER_AGENT = detectUserAgent();
+
+ // Default admin
+ $ADMIN = getConfig('MAIN_TITLE');
+
+ // Is the admin logged in?
+ if (isAdmin()) {
+ // Get admin id
+ $adminId = getCurrentAdminId();
+
+ // Load Admin data
+ $ADMIN = getAdminEmail($adminId);
+ } // END - if
+
+ // Neutral email address is default
+ $email = getConfig('WEBMASTER');
+
+ // Expiration in a nice output format
+ // NOTE: Use $content[expiration] in your templates instead of $EXPIRATION
+ if (getConfig('auto_purge') == '0') {
+ // Will never expire!
+ $EXPIRATION = getMessage('MAIL_WILL_NEVER_EXPIRE');
+ } else {
+ // Create nice date string
+ $EXPIRATION = createFancyTime(getConfig('auto_purge'));
+ }
+
+ // Is content an array?
+ if (is_array($content)) {
+ // Add expiration to array, $EXPIRATION is now deprecated!
+ $content['expiration'] = $EXPIRATION;
} // END - if
+ // Load user's data
+ //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):UID={$UID},template={$template},content[]=".gettype($content).'
');
+ if (($UID > 0) && (is_array($content))) {
+ // If nickname extension is installed, fetch nickname as well
+ if (isNicknameUsed($UID)) {
+ //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):NICKNAME!
");
+ // Load by nickname
+ fetchUserData($UID, 'nickname');
+ } else {
+ //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):NO-NICK!
");
+ /// Load by userid
+ fetchUserData($UID);
+ }
+
+ // Merge data if valid
+ //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):content()=".count($content)." - PRE
");
+ if (isUserDataValid()) {
+ $content = merge_array($content, getUserDataArray());
+ } // END - if
+ //* DEBUG: */ outputHtml(__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 $contentn, 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
@@ -329,151 +483,126 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
} // END - if
// Now does the final template exists?
+ $newContent = '';
if (isFileReadable($FQFN)) {
// The local file does exists so we load it. :)
- $tmpl_file = readFromFile($FQFN);
+ $GLOBALS['tpl_content'] = readFromFile($FQFN);
- // Replace ' to our own chars to preventing them being quoted
- while (strpos($tmpl_file, "'") !== false) { $tmpl_file = str_replace("'", '{QUOT}', $tmpl_file); }
-
- // Do we have to compile the code?
- $ret = '';
- if ((strpos($tmpl_file, "\$") !== false) || (strpos($tmpl_file, '{--') !== false) || (strpos($tmpl_file, '--}') > 0)) {
- // Okay, compile it!
- $tmpl_file = "\$ret=\"".COMPILE_CODE(smartAddSlashes($tmpl_file))."\";";
- eval($tmpl_file);
- } else {
- // Simply return loaded code
- $ret = $tmpl_file;
- }
-
- // Normal HTML output?
- if ($GLOBALS['output_mode'] == 0) {
- // Add surrounding HTML comments to help finding bugs faster
- $ret = "\n" . $ret . "\n";
- } // END - if
- } elseif ((IS_ADMIN()) || ((isInstalling()) && (!isInstalled()))) {
- // Only admins shall see this warning or when installation mode is active
- $ret = "
{--TEMPLATE_404--}
-(".basename($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)."
+' . print_r($content, true) . '
{--TEMPLATE_DATA--}
-".print_r($DATA, true)."
-
";
+' . 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);
- // 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 direct
- OUTPUT_HTML($ret);
- }
- } elseif (isDebugModeEnabled()) {
- // Warning, empty output!
- return "E:" . $template."
\n";
- }
+ // Return content
+ return $newContent;
}
// Send mail out to an email address
-function sendEmail ($toEmail, $subject, $message, $HTML = 'N', $mailHeader = '') {
- //* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(".__LINE__."):TO={$toEmail},SUBJECT={$subject}
");
+function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '') {
+ //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):TO={$toEmail},SUBJECT={$subject}
");
// Compile subject line (for POINTS constant etc.)
- $eval = "\$subject = decodeEntities(\"".COMPILE_CODE(smartAddSlashes($subject))."\");";
- eval($eval);
+ eval("\$subject = decodeEntities(\"".compileRawCode(escapeQuotes($subject))."\");");
// Set from header
if ((!eregi('@', $toEmail)) && ($toEmail > 0)) {
// Value detected, is the message extension installed?
// @TODO Extension 'msg' does not exist
- if (EXT_IS_ACTIVE('msg')) {
- ADD_MESSAGE_TO_BOX($toEmail, $subject, $message, $HTML);
+ if (isExtensionActive('msg')) {
+ ADD_MESSAGE_TO_BOX($toEmail, $subject, $message, $isHtml);
return;
} else {
- // Load email address
- $result_email = SQL_QUERY_ESC("SELECT `email` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1",
- array(bigintval($toEmail)), __FUNCTION__, __LINE__);
- //* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(".__LINE__."):numRows=".SQL_NUMROWS($result_email)."
");
-
// Does the user exist?
- if (SQL_NUMROWS($result_email)) {
- // Load email address
- list($toEmail) = SQL_FETCHROW($result_email);
+ if (fetchUserData($toEmail)) {
+ // Get the email
+ $toEmail = getUserData('email');
} else {
// Set webmaster
- $toEmail = constant('WEBMASTER');
+ $toEmail = getConfig('WEBMASTER');
}
-
- // Free result
- SQL_FREERESULT($result_email);
}
} elseif ($toEmail == '0') {
// Is the webmaster!
- $toEmail = constant('WEBMASTER');
+ $toEmail = getConfig('WEBMASTER');
}
- //* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(".__LINE__."):TO={$toEmail}
");
+ //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):TO={$toEmail}
");
// Check for PHPMailer or debug-mode
if (!checkPhpMailerUsage()) {
// Not in PHPMailer-Mode
if (empty($mailHeader)) {
// Load email header template
- $mailHeader = LOAD_EMAIL_TEMPLATE('header');
+ $mailHeader = loadEmailTemplate('header');
} else {
// Append header
- $mailHeader .= LOAD_EMAIL_TEMPLATE('header');
+ $mailHeader .= loadEmailTemplate('header');
}
} elseif (isDebugModeEnabled()) {
if (empty($mailHeader)) {
// Load email header template
- $mailHeader = LOAD_EMAIL_TEMPLATE('header');
+ $mailHeader = loadEmailTemplate('header');
} else {
// Append header
- $mailHeader .= LOAD_EMAIL_TEMPLATE('header');
+ $mailHeader .= loadEmailTemplate('header');
}
}
// Compile "TO"
- $eval = "\$toEmail = \"".COMPILE_CODE(smartAddSlashes($toEmail))."\";";
- eval($eval);
+ eval("\$toEmail = \"".compileRawCode(escapeQuotes($toEmail))."\";");
// Compile "MSG"
- $eval = "\$message = \"".COMPILE_CODE(smartAddSlashes($message))."\";";
- eval($eval);
+ eval("\$message = \"".compileRawCode(escapeQuotes($message))."\";");
// Fix HTML parameter (default is no!)
- if (empty($HTML)) $HTML = 'N';
+ if (empty($isHtml)) $isHtml = 'N';
if (isDebugModeEnabled()) {
// In debug mode we want to display the mail instead of sending it away so we can debug this part
- OUTPUT_HTML("
-".htmlentities(trim($mailHeader))."
-To : " . $toEmail."
-Subject : " . $subject."
-Message : " . $message."
-
\n");
- } elseif (($HTML == 'Y') && (EXT_IS_ACTIVE('html_mail'))) {
+ outputHtml('
+Headers : ' . str_replace('<', '<', str_replace('>', '>', secureString(trim($mailHeader)))) . '
+To : ' . $toEmail . '
+Subject : ' . $subject . '
+Message : ' . $message . '
+
');
+ } elseif (($isHtml == 'Y') && (isExtensionActive('html_mail'))) {
// Send mail as HTML away
sendHtmlEmail($toEmail, $subject, $message, $mailHeader);
} elseif (!empty($toEmail)) {
// Send Mail away
sendRawEmail($toEmail, $subject, $message, $mailHeader);
- } elseif ($HTML == 'N') {
+ } elseif ($isHtml != 'Y') {
// Problem found!
- sendRawEmail(constant('WEBMASTER'), '[PROBLEM:]' . $subject, $message, $mailHeader);
+ sendRawEmail(getConfig('WEBMASTER'), '[PROBLEM:]' . $subject, $message, $mailHeader);
}
}
-// Check if legacy or PHPMailer command
+// Check to use wether legacy mail() command or PHPMailer class
// @TODO Rewrite this to an extension 'smtp'
// @private
function checkPhpMailerUsage() {
@@ -482,6 +611,12 @@ 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)) . '");');
+
// Shall we use PHPMailer class or legacy mode?
if (checkPhpMailerUsage()) {
// Use PHPMailer class with SMTP enabled
@@ -490,7 +625,12 @@ function sendRawEmail ($toEmail, $subject, $message, $from) {
// get new instance
$mail = new PHPMailer();
- $mail->PluginDir = sprintf("%sinc/phpmailer/", constant('PATH'));
+
+ // Set charset to UTF-8
+ $mail->CharSet('UTF-8');
+
+ // Path for PHPMailer
+ $mail->PluginDir = sprintf("%sinc/phpmailer/", getConfig('PATH'));
$mail->IsSMTP();
$mail->SMTPAuth = true;
@@ -499,13 +639,13 @@ function sendRawEmail ($toEmail, $subject, $message, $from) {
$mail->Username = getConfig('SMTP_USER');
$mail->Password = getConfig('SMTP_PASSWORD');
if (empty($from)) {
- $mail->From = constant('WEBMASTER');
+ $mail->From = getConfig('WEBMASTER');
} else {
$mail->From = $from;
}
- $mail->FromName = constant('MAIN_TITLE');
+ $mail->FromName = getConfig('MAIN_TITLE');
$mail->Subject = $subject;
- if ((EXT_IS_ACTIVE('html_mail')) && (strip_tags($message) != $message)) {
+ if ((isExtensionActive('html_mail')) && (secureString($message) != $message)) {
$mail->Body = $message;
$mail->AltBody = 'Your mail program required HTML support to read this mail!';
$mail->WordWrap = 70;
@@ -514,9 +654,9 @@ function sendRawEmail ($toEmail, $subject, $message, $from) {
$mail->Body = decodeEntities($message);
}
$mail->AddAddress($toEmail, '');
- $mail->AddReplyTo(constant('WEBMASTER'), constant('MAIN_TITLE'));
- $mail->AddCustomHeader('Errors-To:' . constant('WEBMASTER'));
- $mail->AddCustomHeader('X-Loop:' . constant('WEBMASTER'));
+ $mail->AddReplyTo(getConfig('WEBMASTER'), getConfig('MAIN_TITLE'));
+ $mail->AddCustomHeader('Errors-To:' . getConfig('WEBMASTER'));
+ $mail->AddCustomHeader('X-Loop:' . getConfig('WEBMASTER'));
$mail->Send();
} else {
// Use legacy mail() command
@@ -525,16 +665,16 @@ function sendRawEmail ($toEmail, $subject, $message, $from) {
}
// Generate a password in a specified length or use default password length
-function generatePassword ($length = 0) {
+function generatePassword ($length = '0') {
// Auto-fix invalid length of zero
- if ($length == 0) $length = getConfig('pass_len');
+ if ($length == '0') $length = getConfig('pass_len');
// Initialize array with all allowed chars
$ABC = explode(',', 'a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,0,1,2,3,4,5,6,7,8,9,-,+,_,/,.');
// Start creating password
$PASS = '';
- for ($i = 0; $i < $length; $i++) {
+ for ($i = '0'; $i < $length; $i++) {
$PASS .= $ABC[mt_rand(0, count($ABC) -1)];
} // END - for
@@ -555,49 +695,50 @@ function generateDateTime ($time, $mode = '0') {
$time = bigintval($time);
// If the stamp is zero it mostly didn't "happen"
- if ($time == 0) {
+ if ($time == '0') {
// Never happend
return getMessage('NEVER_HAPPENED');
} // END - if
- switch (getLanguage())
- {
+ switch (getLanguage()) {
case 'de': // German date / time format
switch ($mode) {
case '0': $ret = date("d.m.Y \u\m H:i \U\h\\r", $time); break;
- case '1': $ret = strtolower(date("d.m.Y - H:i", $time)); break;
- case '2': $ret = date("d.m.Y|H:i", $time); break;
- case '3': $ret = date("d.m.Y", $time); break;
+ case '1': $ret = strtolower(date('d.m.Y - H:i', $time)); break;
+ case '2': $ret = date('d.m.Y|H:i', $time); break;
+ case '3': $ret = date('d.m.Y', $time); break;
default:
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
+ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
break;
}
break;
- default: // Default is the US date / time format!
- switch ($mode) {
- case '0': $ret = date("r", $time); break;
- case '1': $ret = date("Y-m-d - g:i A", $time); break;
- case '2': $ret = date("y-m-d|H:i", $time); break;
- case '3': $ret = date("y-m-d", $time); break;
- default:
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
- break;
- }
- }
+ default: // Default is the US date / time format!
+ switch ($mode) {
+ case '0': $ret = date('r', $time); break;
+ case '1': $ret = date('Y-m-d - g:i A', $time); break;
+ case '2': $ret = date('y-m-d|H:i', $time); break;
+ case '3': $ret = date('y-m-d', $time); break;
+ default:
+ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
+ break;
+ } // END - switch
+ } // END - switch
+
+ // Return result
return $ret;
}
// Translates Y/N to yes/no
function translateYesNo ($yn) {
// Default
- $translated = "??? (" . $yn.')';
+ $translated = '??? (' . $yn . ')';
switch ($yn) {
case 'Y': $translated = getMessage('YES'); break;
case 'N': $translated = getMessage('NO'); break;
default:
// Log unknown value
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown value %s. Expected Y/N!", $yn));
+ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown value %s. Expected Y/N!", $yn));
break;
}
@@ -614,7 +755,7 @@ function translatePoolType ($type) {
$constName = sprintf("POOL_TYPE_%s", $type);
// Does it exist?
- if (defined($constName)) {
+ if (isMessageIdValid($constName)) {
// Then use it
$translated = getMessage($constName);
} // END - if
@@ -624,9 +765,9 @@ function translatePoolType ($type) {
}
// Translates the american decimal dot into a german comma
-function translateComma ($dotted, $cut = true, $max = 0) {
+function translateComma ($dotted, $cut = true, $max = '0') {
// Default is 3 you can change this in admin area "Misc -> Misc Options"
- if (!isConfigEntrySet('max_comma')) setConfigEntry('max_comma', '3');
+ if (!isConfigEntrySet('max_comma')) setConfigEntry('max_comma', 3);
// Use from config is default
$maxComma = getConfig('max_comma');
@@ -635,25 +776,25 @@ function translateComma ($dotted, $cut = true, $max = 0) {
if ($max > 0) $maxComma = $max;
// Cut zeros off?
- if (($cut) && ($max == 0)) {
+ if (($cut === true) && ($max == '0')) {
// Test for commata if in cut-mode
$com = explode('.', $dotted);
if (count($com) < 2) {
// Don't display commatas even if there are none... ;-)
- $maxComma = 0;
+ $maxComma = '0';
}
} // END - if
// Debug log
- //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "dotted={$dotted},maxComma={$maxComma}");
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "dotted={$dotted},maxComma={$maxComma}");
// Translate it now
switch (getLanguage()) {
- case 'de':
+ case 'de': // German language
$dotted = number_format($dotted, $maxComma, ',', '.');
break;
- default:
+ default: // All others
$dotted = number_format($dotted, $maxComma, '.', ',');
break;
}
@@ -674,7 +815,7 @@ function translateGender ($gender) {
case 'C': $ret = getMessage('GENDER_C'); break;
default:
// Log unknown gender
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown gender %s detected.", $gender));
+ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown gender %s detected.", $gender));
break;
}
@@ -684,8 +825,8 @@ function translateGender ($gender) {
// "Translates" the user status
function translateUserStatus ($status) {
- switch ($status)
- {
+ // Generate message depending on status
+ switch ($status) {
case 'UNCONFIRMED':
case 'CONFIRMED':
case 'LOCKED':
@@ -698,21 +839,21 @@ function translateUserStatus ($status) {
break;
default:
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
+ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
$ret = sprintf(getMessage('UNKNOWN_STATUS'), $status);
break;
- }
+ } // END - switch
// Return it
return $ret;
}
// Generates an URL for the dereferer
-function DEREFERER ($URL) {
+function generateDerefererUrl ($URL) {
// Don't de-refer our own links!
- if (substr($URL, 0, strlen(constant('URL'))) != constant('URL')) {
+ if (substr($URL, 0, strlen(getConfig('URL'))) != getConfig('URL')) {
// De-refer this link
- $URL = 'modules.php?module=loader&url=' . encodeString(compileUriCode($URL));
+ $URL = '{?URL?}/modules.php?module=loader&url=' . encodeString(compileUriCode($URL));
} // END - if
// Return link
@@ -720,244 +861,111 @@ function DEREFERER ($URL) {
}
// Generates an URL for the frametester
-function FRAMETESTER ($URL) {
+function generateFrametesterUrl ($URL) {
// Prepare frametester URL
- $frametesterUrl = sprintf("{!URL!}/modules.php?module=frametester&url=%s",
- encodeString(compileUriCode($URL))
+ $frametesterUrl = sprintf("{?URL?}/modules.php?module=frametester&url=%s",
+ encodeString(compileUriCode($URL))
);
+
+ // Return the new URL
return $frametesterUrl;
}
// Count entries from e.g. a selection box
function countSelection ($array) {
- $ret = 0;
- if (is_array($array)) {
- foreach ($array as $key => $selected) {
- if (!empty($selected)) $ret++;
- }
- }
- return $ret;
-}
-
-// Generate XHTML code for the CAPTCHA
-function generateCaptchaCode ($code, $type, $DATA, $uid) {
- return '';
-}
-
-// Loads an email template and compiles it
-function LOAD_EMAIL_TEMPLATE ($template, $content = array(), $UID = '0') {
- global $DATA;
-
- // Our configuration is kept non-global here
- $_CONFIG = getConfigArray();
-
- // Make sure all template names are lowercase!
- $template = strtolower($template);
-
- // Default 'nickname' if extension is not installed
- $nick = '---';
-
- // Prepare IP number and User Agent
- $REMOTE_ADDR = detectRemoteAddr();
- $HTTP_USER_AGENT = detectUserAgent();
-
- // Default admin
- $ADMIN = constant('MAIN_TITLE');
-
- // Is the admin logged in?
- if (IS_ADMIN()) {
- // Get admin id
- $aid = getCurrentAdminId();
-
- // Load Admin data
- $ADMIN = getAdminEmail($aid);
+ // Integrity check
+ if (!is_array($array)) {
+ // Not an array!
+ debug_report_bug(__FUNCTION__.': No array provided.');
} // END - if
- // Neutral email address is default
- $email = constant('WEBMASTER');
-
- // Expiration in a nice output format
- // NOTE: Use $content[expiration] in your templates instead of $EXPIRATION
- if (getConfig('auto_purge') == 0) {
- // Will never expire!
- $EXPIRATION = getMessage('MAIL_WILL_NEVER_EXPIRE');
- } else {
- // Create nice date string
- $EXPIRATION = createFancyTime(getConfig('auto_purge'));
- }
+ // Init count
+ $ret = '0';
- // Is content an array?
- if (is_array($content)) {
- // Add expiration to array, $EXPIRATION is now deprecated!
- $content['expiration'] = $EXPIRATION;
- } // END - if
-
- // Load user's data
- //* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(".__LINE__."):UID={$UID},template={$template},content[]=".gettype($content)."
");
- if (($UID > 0) && (is_array($content))) {
- // If nickname extension is installed, fetch nickname as well
- if (EXT_IS_ACTIVE('nickname')) {
- //* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(".__LINE__."):NICKNAME!
");
- // Load nickname
- $result = SQL_QUERY_ESC("SELECT `surname`, `family`, `gender`, `email`, `nickname` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1",
- array(bigintval($UID)), __FUNCTION__, __LINE__);
- } else {
- //* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(".__LINE__."):NO-NICK!
");
- /// Load normal data
- $result = SQL_QUERY_ESC("SELECT `surname`, `family`, `gender`, `email` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1",
- array(bigintval($UID)), __FUNCTION__, __LINE__);
- }
-
- // Fetch and merge data
- //* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(".__LINE__."):content()=".count($content)." - PRE
");
- $content = merge_array($content, SQL_FETCHARRAY($result));
- //* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(".__LINE__."):content()=".count($content)." - AFTER
");
-
- // Free result
- SQL_FREERESULT($result);
- } // 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
- $DATA['email'] = $email;
-
- // Base directory
- $basePath = sprintf("%stemplates/%s/emails/", constant('PATH'), getLanguage());
-
- // Check for admin/guest/member templates
- if (strpos($template, 'admin_') > -1) {
- // Admin template found
- $FQFN = $basePath.'admin/' . $template.'.tpl';
- } elseif (strpos($template, 'guest_') > -1) {
- // Guest template found
- $FQFN = $basePath.'guest/' . $template.'.tpl';
- } elseif (strpos($template, 'member_') > -1) {
- // Member template found
- $FQFN = $basePath.'member/' . $template.'.tpl';
- } else {
- // Test for extension
- $test = substr($template, 0, strpos($template, '_'));
- if (EXT_IS_ACTIVE($test)) {
- // Set extra path to extension's name
- $FQFN = $basePath . $test.'/' . $template.'.tpl';
- } else {
- // No special filename
- $FQFN = $basePath . $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. :)
- $tmpl_file = readFromFile($FQFN);
- $tmpl_file = SQL_ESCAPE($tmpl_file);
-
- // Run code
- $tmpl_file = "\$newContent = decodeEntities(\"".COMPILE_CODE($tmpl_file)."\");";
- eval($tmpl_file);
- } 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 = strip_tags($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" . $tmpl_file;
- // 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
+ // Count all entries
+ foreach ($array as $key => $selected) {
+ // Is it checked?
+ if (!empty($selected)) $ret++;
+ } // END - foreach
- // Remove content and data
- unset($content);
- unset($DATA);
+ // Return counted selections
+ return $ret;
+}
- // Return compiled content
- return COMPILE_CODE($newContent);
+// Generate XHTML code for the CAPTCHA
+function generateCaptchaCode ($code, $type, $DATA, $userid) {
+ return '';
}
// Generates a timestamp (some wrapper for mktime())
-function makeTime ($H, $M, $S, $stamp) {
+function makeTime ($hours, $minutes, $seconds, $stamp) {
// Extract day, month and year from given timestamp
- $day = date('d', $stamp);
- $month = date('m', $stamp);
- $year = date('Y', $stamp);
+ $days = date('d', $stamp);
+ $months = date('m', $stamp);
+ $years = date('Y', $stamp);
// Create timestamp for wished time which depends on extracted date
- return mktime($H, $M, $S, $month, $day, $year);
+ return mktime(
+ $hours,
+ $minutes,
+ $seconds,
+ $months,
+ $days,
+ $years
+ );
}
// Redirects to an URL and if neccessarry extends it with own base URL
function redirectToUrl ($URL) {
- // Compile out URI codes
- $URL = compileUriCode($URL);
+ // Compile out codes
+ eval('$URL = "' . compileRawCode($URL) . '";');
// Check if http(s):// is there
if ((substr($URL, 0, 7) != 'http://') && (substr($URL, 0, 8) != 'https://')) {
// Make all URLs full-qualified
- $URL = constant('URL') . '/' . $URL;
+ $URL = getConfig('URL') . '/' . $URL;
} // END - if
// Three different debug ways...
//* DEBUG: */ debug_report_bug(sprintf("%s[%s:] URL=%s", __FUNCTION__, __LINE__, $URL));
- //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, $URL);
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'URL=' . $URL);
//* DEBUG: */ die($URL);
// Default 'rel' value is external, nofollow is evil from Google and hurts the Internet
$rel = ' rel="external"';
// Do we have internal or external URL?
- if (substr($URL, 0, strlen(constant('URL'))) == constant('URL')) {
+ if (substr($URL, 0, strlen(getConfig('URL'))) == getConfig('URL')) {
// Own (=internal) URL
$rel = '';
} // END - if
// Get output buffer
- $OUTPUT = ob_get_contents();
+ $GLOBALS['output'] = ob_get_contents();
// Clear it only if there is content
- if (!empty($OUTPUT)) {
+ if (!empty($GLOBALS['output'])) {
clearOutputBuffer();
} // END - if
// Simple probe for bots/spiders from search engines
if ((strpos(detectUserAgent(), 'spider') !== false) || (strpos(detectUserAgent(), 'bot') !== false)) {
// Secure the URL against bad things such als HTML insertions and so on...
- $URL = htmlentities(strip_tags($URL), ENT_QUOTES);
+ $URL = secureString($URL);
// Output new location link as anchor
- OUTPUT_HTML('' . $URL . '');
+ outputHtml('' . $URL . '');
} elseif (!headers_sent()) {
- // Load URL when headers are not sent
//* DEBUG: */ debug_report_bug("URL={$URL}");
+ // Clear own output buffer
+ $GLOBALS['output'] = '';
+
+ // Load URL when headers are not sent
sendHeader('Location: '.str_replace('&', '&', $URL));
} else {
// Output error message
loadInclude('inc/header.php');
- LOAD_TEMPLATE('redirect_url', false, str_replace('&', '&', $URL));
+ loadTemplate('redirect_url', false, str_replace('&', '&', $URL));
loadInclude('inc/footer.php');
}
@@ -973,36 +981,64 @@ function redirectToConfiguredUrl ($configEntry) {
// Is this URL set?
if (is_null($URL)) {
// Then abort here
- trigger_error(sprintf("Configuration entry %s is not set!", $configEntry));
+ debug_report_bug(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
- // Load the URL
- redirectToUrl($URL);
+ // 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;
}
-//
-function COMPILE_CODE ($code, $simple = false, $constants = true, $full = true) {
+// 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 full security characters
- $secChars = $GLOBALS['security_chars'];
+ // 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'];
- // Select smaller set of chars to replace when we e.g. want to compile URLs
- if (!$full) $secChars = $GLOBALS['url_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('{--','".', str_replace('--}','."', $code));
+ $code = str_replace('{--', "\".getMessage('", str_replace('--}', "').\"", $code));
// BEFORE 0.2.1 : Not used
// WITH 0.2.1+ : Data constants
- $code = str_replace('{!','".', str_replace("!}", '."', $code));
+ $code = str_replace('{!', "\".constant('", str_replace("!}", "').\"", $code));
} // END - if
// Compile QUOT and other non-HTML codes
@@ -1011,11 +1047,9 @@ function COMPILE_CODE ($code, $simple = false, $constants = true, $full = true)
$code = str_replace($to, $secChars['from'][$k], $code);
} // END - foreach
- // But shall I keep simple quotes for later use?
- if ($simple) $code = str_replace("'", '{QUOT}', $code);
-
// Find $content[bla][blub] entries
- preg_match_all('/\$(content|DATA)((\[([a-zA-Z0-9-_]+)\])*)/', $code, $matches);
+ // @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)) {
@@ -1031,36 +1065,36 @@ function COMPILE_CODE ($code, $simple = false, $constants = true, $full = true)
$test = substr($found, 0, strlen($match));
// Does this entry exist?
- //* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(".__LINE__."):found={$found},match={$match},set={$set}
");
+ //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):found={$found},match={$match},set={$set}
");
if ($test == $match) {
// Match found!
- //* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(".__LINE__."):fuzzyFound!
");
+ //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):fuzzyFound!
");
$fuzzyFound = true;
break;
} // END - if
} // END - foreach
// Skip this entry?
- if ($fuzzyFound) continue;
+ 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: */ OUTPUT_HTML(__FUNCTION__."(".__LINE__."):key={$key},match={$match}
");
- $newMatch = str_replace("[" . $matches[4][$key]."]", "['" . $matches[4][$key]."']", $match);
- $code = str_replace($match, "\"." . $newMatch.".\"", $code);
- $matchesFound[$key."_" . $matches[4][$key]] = 1;
+ //* DEBUG: */ outputHtml(__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: */ OUTPUT_HTML(__FUNCTION__."(".__LINE__."):match={$match}
");
- $code = str_replace($match, "\"." . $match.".\"", $code);
+ //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):match={$match}
");
+ $code = str_replace($match, '".' . $match . '."', $code);
$matchesFound[$match] = 1;
}
} // END - foreach
} // END - if
- // Return compiled code
+ // Return it
return $code;
}
@@ -1080,13 +1114,13 @@ function COMPILE_CODE ($code, $simple = false, $constants = true, $full = true)
* Sie, dass es doch nicht so schwer ist! :-) *
* *
************************************************************************/
-function array_pk_sort (&$array, $a_sort, $primary_key = 0, $order = -1, $nums = false) {
+function array_pk_sort (&$array, $a_sort, $primary_key = '0', $order = -1, $nums = false) {
$dummy = $array;
while ($primary_key < count($a_sort)) {
foreach ($dummy[$a_sort[$primary_key]] as $key => $value) {
foreach ($dummy[$a_sort[$primary_key]] as $key2 => $value2) {
$match = false;
- if (!$nums) {
+ if ($nums === false) {
// Sort byte-by-byte (also numbers will be interpreted as chars! E.g.: "9" > "10")
if (($key != $key2) && (strcmp(strtolower($dummy[$a_sort[$primary_key]][$key]), strtolower($dummy[$a_sort[$primary_key]][$key2])) == $order)) $match = true;
} elseif ($key != $key2) {
@@ -1116,23 +1150,23 @@ function array_pk_sort (&$array, $a_sort, $primary_key = 0, $order = -1, $nums =
}
//
-function ADD_SELECTION ($type, $default, $prefix = '', $id = '0') {
+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 .= "