X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=c72f7eb7f65de7009edeb2cfd41a98b544e8eb43;hb=6bd47661d7ec406cd276f0835364b1e3f933d6c8;hp=473c494382dfc52f9e3d88e2e1781bc076e9099b;hpb=4836fdd88165b4d32f5b826a93467d2bb293e3ad;p=mailer.git
diff --git a/inc/functions.php b/inc/functions.php
index 473c494382..c72f7eb7f6 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -6,20 +6,18 @@
* -------------------------------------------------------------------- *
* File : functions.php *
* -------------------------------------------------------------------- *
- * Short description : Many non-MySQL functions (also file access) *
+ * Short description : Many non-database functions (also file access) *
* -------------------------------------------------------------------- *
- * Kurzbeschreibung : Viele Nicht-MySQL-Funktionen (auch Dateizugriff) *
+ * Kurzbeschreibung : Viele Nicht-Datenbank-Funktionen *
* -------------------------------------------------------------------- *
* $Revision:: $ *
* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009, 2010 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -42,173 +40,6 @@ if (!defined('__SECURITY')) {
die();
} // END - if
-// Output HTML code directly or 'render' it. You addionally switch the new-line character off
-function outputHtml ($htmlCode, $newLine = true) {
- // Init output
- if (!isset($GLOBALS['output'])) $GLOBALS['output'] = '';
-
- // Transfer username
- $username = getMessage('USERNAME_UNKNOWN');
- if (isset($GLOBALS['username'])) $username = getUsername();
-
- // Do we have HTML-Code here?
- if (!empty($htmlCode)) {
- // Yes, so we handle it as you have configured
- switch (getConfig('OUTPUT_MODE')) {
- case 'render':
- // That's why you don't need any \n at the end of your HTML code... :-)
- if (getPhpCaching() == 'on') {
- // Output into PHP's internal buffer
- outputRawCode($htmlCode);
-
- // That's why you don't need any \n at the end of your HTML code... :-)
- if ($newLine === true) print("\n");
- } else {
- // Render mode for old or lame servers...
- $GLOBALS['output'] .= $htmlCode;
-
- // That's why you don't need any \n at the end of your HTML code... :-)
- if ($newLine === true) $GLOBALS['output'] .= "\n";
- }
- break;
-
- case 'direct':
- // If we are switching from render to direct output rendered code
- if ((!empty($GLOBALS['output'])) && (getPhpCaching() != 'on')) { outputRawCode($GLOBALS['output']); $GLOBALS['output'] = ''; }
-
- // The same as above... ^
- outputRawCode($htmlCode);
- if ($newLine === true) print("\n");
- break;
-
- default:
- // Huh, something goes wrong or maybe you have edited config.php ???
- app_die(__FUNCTION__, __LINE__, '{--FATAL_ERROR--}: {--LANG_NO_RENDER_DIRECT--}');
- break;
- } // END - switch
- } elseif ((getPhpCaching() == 'on') && ((!isset($GLOBALS['header'])) || (count($GLOBALS['header']) == 0))) {
- // Output cached HTML code
- $GLOBALS['output'] = ob_get_contents();
-
- // Clear output buffer for later output if output is found
- if (!empty($GLOBALS['output'])) {
- clearOutputBuffer();
- } // END - if
-
- // Extension 'rewrite' installed?
- if ((isExtensionActive('rewrite')) && (getOutputMode() != 1)) {
- $GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
- } // END - if
-
- // Send all HTTP headers
- sendHttpHeaders();
-
- // Compile and run finished rendered HTML code
- compileFinalOutput();
-
- // Output code here, DO NOT REMOVE! ;-)
- outputRawCode($GLOBALS['output']);
- } elseif ((getConfig('OUTPUT_MODE') == 'render') && (!empty($GLOBALS['output']))) {
- // Rewrite links when rewrite extension is active
- if ((isExtensionActive('rewrite')) && (getOutputMode() != 1)) {
- $GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
- } // END - if
-
- // Send all HTTP headers
- sendHttpHeaders();
-
- // Compile and run finished rendered HTML code
- compileFinalOutput();
-
- // Output code here, DO NOT REMOVE! ;-)
- outputRawCode($GLOBALS['output']);
- } else {
- // And flush all headers
- flushHeaders();
- }
-}
-
-// Sends out all headers required for HTTP/1.1 reply
-function sendHttpHeaders () {
- // Used later
- $now = gmdate('D, d M Y H:i:s') . ' GMT';
-
- // Send HTTP header
- sendHeader('HTTP/1.1 200 OK');
-
- // General headers for no caching
- sendHeader('Expires: ' . $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';
-
- // 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;
-
- // Count round
- $cnt++;
- } // END - while
-
- // Compress it?
- if (!empty($_SERVER['HTTP_ACCEPT_ENCODING']) && (strpos('gzip', $_SERVER['HTTP_ACCEPT_ENCODING']) !== null)) {
- // Compress it for HTTP gzip
- $GLOBALS['output'] = gzencode($GLOBALS['output'], 9, true);
-
- // Add header
- sendHeader('Content-Encoding: gzip');
- } elseif (!empty($_SERVER['HTTP_ACCEPT_ENCODING']) && (strpos('deflate', $_SERVER['HTTP_ACCEPT_ENCODING']) !== null)) {
- // Compress it for HTTP deflate
- $GLOBALS['output'] = gzcompress($GLOBALS['output'], 9);
-
- // Add header
- sendHeader('Content-Encoding: deflate');
- }
-
- // Add final length
- sendHeader('Content-Length: ' . strlen($GLOBALS['output']));
-
- // Flush all headers
- flushHeaders();
-}
-
-// Output the raw HTML code
-function outputRawCode ($htmlCode) {
- // Output stripped HTML code to avoid broken JavaScript code, etc.
- print(str_replace('{BACK}', "\\", $htmlCode));
-
- // Flush the output if only getPhpCaching() is not 'on'
- if (getPhpCaching() != 'on') {
- // Flush it
- flush();
- } // END - if
-}
-
// Init fatal message array
function initFatalMessages () {
$GLOBALS['fatal_messages'] = array();
@@ -230,18 +61,18 @@ function addFatalMessage ($F, $L, $message, $extra = '') {
}
// Add message to $GLOBALS['fatal_messages']
- $GLOBALS['fatal_messages'][] = $message;
+ array_push($GLOBALS['fatal_messages'], $message);
// Log fatal messages away
- logDebugMessage($F, $L, 'Fatal error message: ' . $message);
+ logDebugMessage($F, $L, 'Fatal error message: ' . compileCode($message));
}
// Getter for total fatal message count
function getTotalFatalErrors () {
- // Init coun
+ // Init count
$count = '0';
- // Do we have at least the first entry?
+ // Is there at least the first entry?
if (!empty($GLOBALS['fatal_messages'][0])) {
// Get total count
$count = count($GLOBALS['fatal_messages']);
@@ -251,578 +82,162 @@ function getTotalFatalErrors () {
return $count;
}
-// Load a template file and return it's content (only it's name; do not use ' or ")
-function loadTemplate ($template, $return = false, $content = array()) {
- // @TODO Remove this sanity-check if all is fine
- if (!is_bool($return)) debug_report_bug('return is not bool (' . gettype($return) . ')');
-
- // @TODO Try to rewrite all $DATA to $content
- global $DATA;
-
- // Do we have cache?
- if (isTemplateCached($template)) {
- // Evaluate the cache
- eval(readTemplateCache($template));
- } elseif (!isset($GLOBALS['template_eval'][$template])) {
- // Add more variables which you want to use in your template files
- $username = getUsername();
-
- // Make all template names lowercase
- $template = strtolower($template);
-
- // Init some data
- $ret = '';
- if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = '0';
-
- // Base directory
- $basePath = sprintf("%stemplates/%s/html/", getConfig('PATH'), getLanguage());
- $extraPath = detectExtraTemplatePath($template);;
-
- ////////////////////////
- // Generate file name //
- ////////////////////////
- $FQFN = $basePath . $extraPath . $template . '.tpl';
-
- // Does the special template exists?
- if (!isFileReadable($FQFN)) {
- // Reset to default template
- $FQFN = $basePath . $template . '.tpl';
- } // END - if
-
- // Now does the final template exists?
- if (isFileReadable($FQFN)) {
- // Count the template load
- incrementConfigEntry('num_templates');
-
- // The local file does exists so we load it. :)
- $GLOBALS['tpl_content'] = readFromFile($FQFN);
-
- // Do we have to compile the code?
- $ret = '';
- if ((strpos($GLOBALS['tpl_content'], '$') !== false) || (strpos($GLOBALS['tpl_content'], '{--') !== false) || (strpos($GLOBALS['tpl_content'], '{!') !== false) || (strpos($GLOBALS['tpl_content'], '{?') !== false) || (strpos($GLOBALS['tpl_content'], '{%') !== false)) {
- // Normal HTML output?
- if (getOutputMode() == '0') {
- // Add surrounding HTML comments to help finding bugs faster
- $ret = '\n" . $GLOBALS['tpl_content'] . '\n";
-
- // Prepare eval() command
- $eval = '$ret = "' . compileCode(escapeQuotes($ret)) . '";';
- } elseif (substr($template, 0, 3) == 'js_') {
- // JavaScripts don't like entities and timings
- $eval = '$ret = decodeEntities("' . compileRawCode(escapeJavaScriptQuotes($GLOBALS['tpl_content'])) . '");';
- } else {
- // Prepare eval() command, other output doesn't like entities, maybe
- $eval = '$ret = decodeEntities("' . compileRawCode(escapeQuotes($GLOBALS['tpl_content'])) . '");';
- }
- } else {
- // Add surrounding HTML comments to help finding bugs faster
- $ret = '\n" . $GLOBALS['tpl_content'] . '\n";
- $eval = '$ret = "' . compileRawCode(escapeQuotes($ret)) . '";';
- } // END - if
-
- // Cache the eval() command here
- $GLOBALS['template_eval'][$template] = $eval;
-
- // 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]);
- }
-
- // Do we have some content to output or return?
- if (!empty($ret)) {
- // Not empty so let's put it out! ;)
- if ($return === true) {
- // Return the HTML code
- return $ret;
- } else {
- // Output directly
- outputHtml($ret);
- }
- } elseif (isDebugModeEnabled()) {
- // Warning, empty output!
- return 'E:' . $template . ',content=
' . print_r($content, true) . '
';
- }
-}
-
-// Detects the extra template path from given template name
-function detectExtraTemplatePath ($template) {
- // Default is empty
- $extraPath = '';
-
- // Do we have cache?
- if (!isset($GLOBALS['extra_path'][$template])) {
- // Check for admin/guest/member/etc. templates
- if (substr($template, 0, 6) == 'admin_') {
- // Admin template found
- $extraPath = 'admin/';
- } elseif (substr($template, 0, 6) == 'guest_') {
- // Guest template found
- $extraPath = 'guest/';
- } elseif (substr($template, 0, 7) == 'member_') {
- // Member template found
- $extraPath = 'member/';
- } elseif (substr($template, 0, 7) == 'select_') {
- // Selection template found
- $extraPath = 'select/';
- } elseif (substr($template, 0, 8) == 'install_') {
- // Installation template found
- $extraPath = 'install/';
- } elseif (substr($template, 0, 4) == 'ext_') {
- // Extension template found
- $extraPath = 'ext/';
- } elseif (substr($template, 0, 3) == 'la_') {
- // 'Logical-area' template found
- $extraPath = 'la/';
- } elseif (substr($template, 0, 3) == 'js_') {
- // JavaScript template found
- $extraPath = 'js/';
- } elseif (substr($template, 0, 5) == 'menu_') {
- // Menu template found
- $extraPath = 'menu/';
- } else {
- // Test for extension
- $test = substr($template, 0, strpos($template, '_'));
-
- // Probe for valid extension name
- if (isExtensionNameValid($test)) {
- // Set extra path to extension's name
- $extraPath = $test . '/';
- } // END - if
- }
-
- // Store it in cache
- $GLOBALS['extra_path'][$template] = $extraPath;
- } // END - if
-
- // Return result
- return $GLOBALS['extra_path'][$template];
-}
-
-// Loads an email template and compiles it
-function loadEmailTemplate ($template, $content = array(), $userid = '0') {
- global $DATA;
-
- // Make sure all template names are lowercase!
- $template = strtolower($template);
-
- // Default 'nickname' if extension is not installed
- $nick = '---';
-
- // Neutral email address is default
- $email = getConfig('WEBMASTER');
-
- // Is content an array?
- if (is_array($content)) {
- // Add expiration to array
- if ((isConfigEntrySet('auto_purge')) && (getConfig('auto_purge') == '0')) {
- // Will never expire!
- $content['expiration'] = getMessage('MAIL_WILL_NEVER_EXPIRE');
- } elseif (isConfigEntrySet('auto_purge')) {
- // Create nice date string
- $content['expiration'] = createFancyTime(getConfig('auto_purge'));
- } else {
- // Missing entry
- $content['expiration'] = getMessage('MAIL_NO_CONFIG_AUTO_PURGE');
- }
- } // END - if
-
- // Load user's data
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "UID={$userid},template={$template},content[]=".gettype($content).' ');
- if (($userid > 0) && (is_array($content))) {
- // If nickname extension is installed, fetch nickname as well
- if ((isExtensionActive('nickname')) && (isNicknameUsed($userid))) {
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "NICKNAME! ");
- // Load by nickname
- fetchUserData($userid, 'nickname');
- } else {
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "NO-NICK! ");
- /// Load by userid
- fetchUserData($userid);
- }
-
- // Merge data if valid
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "content()=".count($content)." - PRE ");
- if (isUserDataValid()) {
- $content = merge_array($content, getUserDataArray());
- } // END - if
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "content()=".count($content)." - AFTER ");
- } // END - if
-
- // Translate M to male or F to female if present
- if (isset($content['gender'])) $content['gender'] = translateGender($content['gender']);
-
- // Overwrite email from data if present
- if (isset($content['email'])) $email = $content['email'];
-
- // Store email for some functions in global $DATA array
- // @TODO Do only use $content, not $DATA or raw variables
- $DATA['email'] = $email;
-
- // Base directory
- $basePath = sprintf("%stemplates/%s/emails/", getConfig('PATH'), getLanguage());
-
- // Detect extra path
- $extraPath = detectExtraTemplatePath($template);
-
- // Generate full FQFN
- $FQFN = $basePath . $extraPath . $template . '.tpl';
-
- // Does the special template exists?
- if (!isFileReadable($FQFN)) {
- // Reset to default template
- $FQFN = $basePath . $template . '.tpl';
- } // END - if
-
- // Now does the final template exists?
- $newContent = '';
- if (isFileReadable($FQFN)) {
- // The local file does exists so we load it. :)
- $GLOBALS['tpl_content'] = readFromFile($FQFN);
-
- // Run code
- $GLOBALS['tpl_content'] = '$newContent = decodeEntities("' . compileRawCode(escapeQuotes($GLOBALS['tpl_content'])) . '");';
- eval($GLOBALS['tpl_content']);
- } elseif (!empty($template)) {
- // Template file not found!
- $newContent = '{--TEMPLATE_404--}: ' . $template . '
-{--TEMPLATE_CONTENT--}
-
' . print_r($content, true) . '
-{--TEMPLATE_DATA--}
-
' . print_r($DATA, true) . '
-
';
-
- // Debug mode not active? Then remove the HTML tags
- if (!isDebugModeEnabled()) $newContent = secureString($newContent);
- } else {
- // No template name supplied!
- $newContent = getMessage('NO_TEMPLATE_SUPPLIED');
- }
-
- // Is there some content?
- if (empty($newContent)) {
- // Compiling failed
- $newContent = "Compiler error for template " . $template . " !\nUncompiled content:\n" . $GLOBALS['tpl_content'];
-
- // Add last error if the required function exists
- if (function_exists('error_get_last')) $newContent .= "\n--------------------------------------\nDebug:\n".print_r(error_get_last(), true)."--------------------------------------\nPlease don't alter these informations!\nThanx.";
- } // END - if
-
- // Remove content and data
- unset($content);
- unset($DATA);
-
- // Return content
- return $newContent;
-}
-
-// Send mail out to an email address
-function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '') {
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "TO={$toEmail},SUBJECT={$subject} ");
-
- // Compile subject line (for POINTS constant etc.)
- eval('$subject = decodeEntities("' . compileRawCode(escapeQuotes($subject)) . '");');
-
- // Set from header
- if ((!isInStringIgnoreCase('@', $toEmail)) && ($toEmail > 0)) {
- // Value detected, is the message extension installed?
- // @TODO Extension 'msg' does not exist
- if (isExtensionActive('msg')) {
- ADD_MESSAGE_TO_BOX($toEmail, $subject, $message, $isHtml);
- return;
- } else {
- // Does the user exist?
- if (fetchUserData($toEmail)) {
- // Get the email
- $toEmail = getUserData('email');
- } else {
- // Set webmaster
- $toEmail = getConfig('WEBMASTER');
- }
- }
- } elseif ($toEmail == '0') {
- // Is the webmaster!
- $toEmail = getConfig('WEBMASTER');
- }
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "TO={$toEmail} ");
-
- // Check for PHPMailer or debug-mode
- if (!checkPhpMailerUsage()) {
- // Not in PHPMailer-Mode
- if (empty($mailHeader)) {
- // Load email header template
- $mailHeader = loadEmailTemplate('header');
- } else {
- // 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))) . '";');
-
- // Fix HTML parameter (default is no!)
- if (empty($isHtml)) $isHtml = 'N';
- if (isDebugModeEnabled()) {
- // In debug mode we want to display the mail instead of sending it away so we can debug this part
- outputHtml('
');
- } elseif (($isHtml == 'Y') && (isExtensionActive('html_mail'))) {
- // Send mail as HTML away
- return sendHtmlEmail($toEmail, $subject, $message, $mailHeader);
- } elseif (!empty($toEmail)) {
- // Send Mail away
- return sendRawEmail($toEmail, $subject, $message, $mailHeader);
- } elseif ($isHtml != 'Y') {
- // Problem found!
- return sendRawEmail(getConfig('WEBMASTER'), '[PROBLEM:]' . $subject, $message, $mailHeader);
- }
-}
-
-// Check to use wether legacy mail() command or PHPMailer class
-// @TODO Rewrite this to an extension 'smtp'
-// @private
-function checkPhpMailerUsage() {
- return ((getConfig('SMTP_HOSTNAME') != '') && (getConfig('SMTP_USER') != ''));
-}
-
-// 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
- loadIncludeOnce('inc/phpmailer/class.phpmailer.php');
- loadIncludeOnce('inc/phpmailer/class.smtp.php');
-
- // get new instance
- $mail = new PHPMailer();
-
- // Set charset to UTF-8
- $mail->CharSet = 'UTF-8';
-
- // Path for PHPMailer
- $mail->PluginDir = sprintf("%sinc/phpmailer/", getConfig('PATH'));
-
- $mail->IsSMTP();
- $mail->SMTPAuth = true;
- $mail->Host = getConfig('SMTP_HOSTNAME');
- $mail->Port = 25;
- $mail->Username = getConfig('SMTP_USER');
- $mail->Password = getConfig('SMTP_PASSWORD');
- if (empty($from)) {
- $mail->From = getConfig('WEBMASTER');
- } else {
- $mail->From = $from;
- }
- $mail->FromName = getConfig('MAIN_TITLE');
- $mail->Subject = $subject;
- 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;
- $mail->IsHTML(true);
- } else {
- $mail->Body = decodeEntities($message);
- }
- $mail->AddAddress($toEmail, '');
- $mail->AddReplyTo(getConfig('WEBMASTER'), getConfig('MAIN_TITLE'));
- $mail->AddCustomHeader('Errors-To:' . getConfig('WEBMASTER'));
- $mail->AddCustomHeader('X-Loop:' . getConfig('WEBMASTER'));
- $mail->Send();
-
- // Has an error occured?
- if (!empty($mail->ErrorInfo)) {
- // Log message
- logDebugMessage(__FUNCTION__, __LINE__, 'Error while sending mail: ' . $mail->ErrorInfo);
-
- // Raise an error
- return false;
- } else {
- // All fine!
- return true;
- }
- } else {
- // Use legacy mail() command
- return mail($toEmail, $subject, decodeEntities($message), $from);
- }
-}
-
// Generate a password in a specified length or use default password length
-function generatePassword ($length = '0') {
+function generatePassword ($length = '0', $exclude = array()) {
// Auto-fix invalid length of zero
- if ($length == '0') $length = getConfig('pass_len');
+ if ($length == '0') {
+ $length = getPassLen();
+ } // END - if
- // 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,-,+,_,/,.');
+ // Exclude some entries
+ $localAbc = array_diff($GLOBALS['_abc'], $exclude);
+
+ // $localAbc must have at least 10 entries
+ assert(count($localAbc) >= 10);
// Start creating password
- $PASS = '';
- for ($i = '0'; $i < $length; $i++) {
- $PASS .= $ABC[mt_rand(0, count($ABC) -1)];
- } // END - for
+ $password = '';
+ while (strlen($password) < $length) {
+ $password .= $localAbc[mt_rand(0, count($localAbc) -1)];
+ } // END - while
- // When the size is below 40 we can also add additional security by scrambling
- // it. Otherwise we may corrupt hashes
- if (strlen($PASS) <= 40) {
+ /*
+ * When the size is below 40 we can also add additional security by
+ * scrambling it. Otherwise the hash may corrupted..
+ */
+ if (strlen($password) <= 40) {
// Also scramble the password
- $PASS = scrambleString($PASS);
+ $password = scrambleString($password);
} // END - if
// Return the password
- return $PASS;
+ return $password;
}
// Generates a human-readable timestamp from the Uni* stamp
function generateDateTime ($time, $mode = '0') {
- // Filter out numbers
- $time = bigintval($time);
+ // Is there cache?
+ if (isset($GLOBALS[__FUNCTION__][$time][$mode])) {
+ // Return it instead
+ return $GLOBALS[__FUNCTION__][$time][$mode];
+ } // END - if
// If the stamp is zero it mostly didn't "happen"
- if ($time == '0') {
+ if (($time == '0') || (is_null($time))) {
// Never happend
- return getMessage('NEVER_HAPPENED');
+ return '{--NEVER_HAPPENED--}';
} // END - if
+ // Filter out numbers
+ $timeSecured = bigintval($time);
+
+ // Detect language
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 '0': $ret = date("d.m.Y \u\m H:i \U\h\\r", $timeSecured); break;
+ case '1': $ret = strtolower(date('d.m.Y - H:i', $timeSecured)); break;
+ case '2': $ret = date('d.m.Y|H:i', $timeSecured); break;
+ case '3': $ret = date('d.m.Y', $timeSecured); break;
+ case '4': $ret = date('d.m.Y|H:i:s', $timeSecured); break;
+ case '5': $ret = date('d-m-Y (l-F-T)', $timeSecured); break;
+ case '6': $ret = date('Ymd', $timeSecured); break;
+ case '7': $ret = date('Y-m-d H:i:s', $timeSecured); break; // Compatible with MySQL TIMESTAMP
default:
logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
break;
- }
+ } // END - switch
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;
+ case '0': $ret = date('r', $timeSecured); break;
+ case '1': $ret = strtolower(date('Y-m-d - g:i A', $timeSecured)); break;
+ case '2': $ret = date('y-m-d|H:i', $timeSecured); break;
+ case '3': $ret = date('y-m-d', $timeSecured); break;
+ case '4': $ret = date('d.m.Y|H:i:s', $timeSecured); break;
+ case '5': $ret = date('d-m-Y (l-F-T)', $timeSecured); break;
+ case '6': $ret = date('Ymd', $timeSecured); break;
+ case '7': $ret = date('Y-m-d H:i:s', $timeSecured); break; // Compatible with MySQL TIMESTAMP
default:
logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
break;
} // END - switch
} // END - switch
+ // Store it in cache
+ $GLOBALS[__FUNCTION__][$time][$mode] = $ret;
+
// Return result
return $ret;
}
// Translates Y/N to yes/no
function translateYesNo ($yn) {
- // Default
- $translated = '??? (' . $yn . ')';
- switch ($yn) {
- case 'Y': $translated = getMessage('YES'); break;
- case 'N': $translated = getMessage('NO'); break;
- default:
- // Log unknown value
- logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown value %s. Expected Y/N!", $yn));
- break;
- }
-
- // Return it
- return $translated;
-}
-
-// Translates the "pool type" into human-readable
-function translatePoolType ($type) {
- // Default?type is unknown
- $translated = getMaskedMessage('POOL_TYPE_UNKNOWN', $type);
-
- // Generate constant
- $constName = sprintf("POOL_TYPE_%s", $type);
-
- // Does it exist?
- if (isMessageIdValid($constName)) {
- // Then use it
- $translated = getMessage($constName);
+ // Is it cached?
+ if (!isset($GLOBALS[__FUNCTION__][$yn])) {
+ // Default
+ $GLOBALS[__FUNCTION__][$yn] = '??? (' . $yn . ')';
+ switch ($yn) {
+ case 'Y': $GLOBALS[__FUNCTION__][$yn] = '{--YES--}'; break;
+ case 'N': $GLOBALS[__FUNCTION__][$yn] = '{--NO--}'; break;
+ default:
+ // Log unknown value
+ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown value %s. Expected: Y/N", $yn));
+ break;
+ } // END - switch
} // END - if
- // Return "translation"
- return $translated;
+ // Return it
+ return $GLOBALS[__FUNCTION__][$yn];
}
// Translates the american decimal dot into a german comma
-function translateComma ($dotted, $cut = true, $max = '0') {
+// OPPOMENT: convertCommaToDot()
+function translateComma ($dotted, $cut = TRUE, $max = '0') {
// First, cast all to double, due to PHP changes
$dotted = (double) $dotted;
- // Default is 3 you can change this in admin area "Misc -> Misc Options"
- if (!isConfigEntrySet('max_comma')) setConfigEntry('max_comma', 3);
+ // Default is 3 you can change this in admin area "Settings -> Misc Options"
+ if (!isConfigEntrySet('max_comma')) {
+ setConfigEntry('max_comma', 3);
+ } // END - if
// Use from config is default
$maxComma = getConfig('max_comma');
// Use from parameter?
- if ($max > 0) $maxComma = $max;
+ if ($max > 0) {
+ $maxComma = $max;
+ } // END - if
// Cut zeros off?
- if (($cut === true) && ($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';
- }
+ } // END - if
} // END - if
// Debug log
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "dotted={$dotted},maxComma={$maxComma}");
// Translate it now
+ $translated = $dotted;
switch (getLanguage()) {
case 'de': // German language
- $dotted = number_format($dotted, $maxComma, ',', '.');
+ $translated = number_format($dotted, $maxComma, ',', '.');
break;
default: // All others
- $dotted = number_format($dotted, $maxComma, '.', ',');
+ $translated = number_format($dotted, $maxComma, '.', ',');
break;
- }
+ } // END - switch
// Return translated value
- return $dotted;
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'dotted=' . $dotted . ',translated=' . $translated . ',maxComma=' . $maxComma);
+ return $translated;
}
// Translate Uni*-like gender to human-readable
@@ -832,12 +247,16 @@ 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': // Male
+ case 'F': // Female
+ case 'C': // Company
+ // Use generic function
+ $ret = translateGeneric('GENDER', $gender);
+ break;
+
default:
// Please report bugs on unknown genders
- debug_report_bug(sprintf("Unknown gender %s detected.", $gender));
+ reportBug(__FUNCTION__, __LINE__, sprintf("Unknown gender %s detected.", $gender));
break;
} // END - switch
@@ -847,22 +266,25 @@ function translateGender ($gender) {
// "Translates" the user status
function translateUserStatus ($status) {
+ // Default status is unknown if something goes through
+ $ret = '{--ACCOUNT_STATUS_UNKNOWN--}';
+
// Generate message depending on status
switch ($status) {
case 'UNCONFIRMED':
case 'CONFIRMED':
case 'LOCKED':
- $ret = getMessage(sprintf("ACCOUNT_%s", $status));
+ // Use generic function for all "normal" cases"
+ $ret = translateGeneric('ACCOUNT_STATUS', $status);
break;
- case '':
- case null:
- $ret = getMessage('ACCOUNT_DELETED');
+ case '': // Account deleted
+ case NULL: // Account deleted
+ $ret = '{--ACCOUNT_STATUS_DELETED--}';
break;
- default:
- // Please report all unknown status
- debug_report_bug(sprintf("Unknown status %s detected.", $status));
+ default: // Please report all unknown status
+ reportBug(__FUNCTION__, __LINE__, sprintf("Unknown status %s(%s) detected.", $status, gettype($status)));
break;
} // END - switch
@@ -870,23 +292,71 @@ function translateUserStatus ($status) {
return $ret;
}
+// "Translates" 'visible' and 'locked' to a CSS class
+function translateMenuVisibleLocked ($content, $prefix = '') {
+ // Default is 'menu_unknown'
+ $content['visible_css'] = $prefix . 'menu_unknown';
+
+ // Translate 'visible' and keep an eye on the prefix
+ switch ($content['visible']) {
+ case 'Y': // Should be visible
+ $content['visible_css'] = $prefix . 'menu_visible';
+ break;
+
+ case 'N': // Is invisible
+ $content['visible_css'] = $prefix . 'menu_invisible';
+ break;
+
+ default: // Please report this
+ reportBug(__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']) {
+ case 'Y': // Should be locked, only admins can call this
+ $content['locked_css'] = $prefix . 'menu_locked';
+ break;
+
+ case 'N': // Is unlocked and visible to members/guests/sponsors
+ $content['locked_css'] = $prefix . 'menu_unlocked';
+ break;
+
+ default: // Please report this
+ reportBug(__FUNCTION__, __LINE__, 'Unsupported locked value detected. content=
' . print_r($content, TRUE) . '
');
+ break;
+ } // END - switch
+
+ // Return the resulting array
+ return $content;
+}
+
// Generates an URL for the dereferer
-function generateDerefererUrl ($URL) {
+function generateDereferrerUrl ($url) {
// Don't de-refer our own links!
- if (substr($URL, 0, strlen(getConfig('URL'))) != getConfig('URL')) {
- // De-refer this link
- $URL = '{%url=modules.php?module=loader&url=' . encodeString(compileUriCode($URL)) . '%}';
+ if ((!empty($url)) && (substr($url, 0, strlen(getUrl())) != getUrl())) {
+ // Encode URL
+ $encodedUrl = encodeString(compileUriCode($url));
+
+ // Generate hash
+ $hash = generateHash($url . getSiteKey() . getDateKey());
+
+ // Log plain URL and hash
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'url=' . $url . ',hash=' . $hash . '(' . strlen($hash) . ')');
+
+ // De-refer this URL
+ $url = '{%url=modules.php?module=loader&url=' . $encodedUrl . '&hash=' . encodeHashForCookie($hash) . '&salt=' . substr($hash, 0, getSaltLength()) . '%}';
} // END - if
// Return link
- return $URL;
+ return $url;
}
// Generates an URL for the frametester
-function generateFrametesterUrl ($URL) {
+function generateFrametesterUrl ($url) {
// Prepare frametester URL
$frametesterUrl = sprintf("{%%url=modules.php?module=frametester&url=%s%%}",
- encodeString(compileUriCode($URL))
+ encodeString(compileUriCode($url))
);
// Return the new URL
@@ -898,7 +368,7 @@ function countSelection ($array) {
// Integrity check
if (!is_array($array)) {
// Not an array!
- debug_report_bug(__FUNCTION__.': No array provided.');
+ reportBug(__FUNCTION__, __LINE__, 'No array provided.');
} // END - if
// Init count
@@ -907,24 +377,22 @@ function countSelection ($array) {
// Count all entries
foreach ($array as $key => $selected) {
// Is it checked?
- if (!empty($selected)) $ret++;
+ if (!empty($selected)) {
+ // Yes, then count it
+ $ret++;
+ } // END - if
} // END - foreach
// Return counted selections
return $ret;
}
-// Generate XHTML code for the CAPTCHA
-function generateCaptchaCode ($code, $type, $DATA, $userid) {
- return '';
-}
-
// Generates a timestamp (some wrapper for mktime())
function makeTime ($hours, $minutes, $seconds, $stamp) {
// Extract day, month and year from given timestamp
- $days = date('d', $stamp);
- $months = date('m', $stamp);
- $years = date('Y', $stamp);
+ $days = getDay($stamp);
+ $months = getMonth($stamp);
+ $years = getYear($stamp);
// Create timestamp for wished time which depends on extracted date
return mktime(
@@ -938,174 +406,48 @@ function makeTime ($hours, $minutes, $seconds, $stamp) {
}
// Redirects to an URL and if neccessarry extends it with own base URL
-function redirectToUrl ($URL, $allowSpider = true) {
+function redirectToUrl ($url, $allowSpider = TRUE) {
+ // Is the output mode -2?
+ if (isAjaxOutputMode()) {
+ // This is always (!) an AJAX request and shall not be redirected
+ return;
+ } // END - if
+
+ // Remove {%url=
+ if (substr($url, 0, 6) == '{%url=') {
+ $url = substr($url, 6, -2);
+ } // END - if
+
// Compile out codes
- eval('$URL = "' . compileRawCode(encodeUrl($URL)) . '";');
+ eval('$url = "' . compileRawCode(encodeUrl($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(getConfig('URL'))) == getConfig('URL')) {
+ // Is there internal or external URL?
+ if (substr($url, 0, strlen(getUrl())) == getUrl()) {
// Own (=internal) URL
$rel = '';
} // END - if
// Three different ways to debug...
- //* DEBUG: */ debug_report_bug(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 content-type here to fix a missing array element
- setContentType('text/html');
-
- // Output new location link as anchor
- outputHtml('' . $URL . '');
- } elseif (!headers_sent()) {
- // Clear own output buffer
- $GLOBALS['output'] = '';
+ //* DEBUG: */ reportBug(__FUNCTION__, __LINE__, 'URL=' . $url);
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'URL=' . $url);
+ //* DEBUG: */ die($url);
+ // We should not sent a redirect if headers are already sent
+ if (!headers_sent()) {
// 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');
- loadTemplate('redirect_url', false, str_replace('&', '&', $URL));
+ loadTemplate('redirect_url', FALSE, str_replace('&', '&', $url));
loadInclude('inc/footer.php');
}
// Shut the mailer down here
- shutdown();
-}
-
-// Wrapper for redirectToUrl but URL comes from a configuration entry
-function redirectToConfiguredUrl ($configEntry) {
- // Get the URL
- $URL = getConfig($configEntry);
-
- // Is this URL set?
- if (is_null($URL)) {
- // Then abort here
- debug_report_bug(sprintf("Configuration entry %s is not set!", $configEntry));
- } // END - if
-
- // Load the URL
- redirectToUrl($URL);
-}
-
-// Compiles the given HTML/mail code
-function compileCode ($code, $simple = false, $constants = true, $full = true) {
- // Is the code a string?
- if (!is_string($code)) {
- // Silently return it
- return $code;
- } // END - if
-
- // Start couting
- $startCompile = microtime(true);
-
- // Comile the code
- $code = compileRawCode($code, $simple, $constants, $full);
-
- // Get timing
- $compiled = microtime(true);
-
- // Add timing
- $code .= '';
-
- // Return compiled code
- return $code;
-}
-
-// Compiles the code (use compileCode() only for HTML because of the comments)
-// @TODO $simple is deprecated
-function compileRawCode ($code, $simple = false, $constants = true, $full = true) {
- // Is the code a string?
- if (!is_string($code)) {
- // Silently return it
- return $code;
- } // END - if
-
- // Init replacement-array with smaller set of security characters
- $secChars = $GLOBALS['url_chars'];
-
- // Select full set of chars to replace when we e.g. want to compile URLs
- if ($full === true) $secChars = $GLOBALS['security_chars'];
-
- // Compile more through a filter
- $code = runFilterChain('compile_code', $code);
-
- // Compile constants
- if ($constants === true) {
- // BEFORE 0.2.1 : Language and data constants
- // WITH 0.2.1+ : Only language constants
- $code = str_replace('{--', "\" . getMessage('", str_replace('--}', "') . \"", $code));
-
- // BEFORE 0.2.1 : Not used
- // WITH 0.2.1+ : Data constants
- $code = str_replace('{!', "\" . constant('", str_replace('!}', "') . \"", $code));
- } // END - if
-
- // Compile QUOT and other non-HTML codes
- foreach ($secChars['to'] as $k => $to) {
- // Do the reversed thing as in inc/libs/security_functions.php
- $code = str_replace($to, $secChars['from'][$k], $code);
- } // END - foreach
-
- // Find $content[bla][blub] entries
- // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
- preg_match_all('/\$(content|GLOBALS|DATA)((\[([a-zA-Z0-9-_]+)\])*)/', $code, $matches);
-
- // Are some matches found?
- if ((count($matches) > 0) && (count($matches[0]) > 0)) {
- // Replace all matches
- $matchesFound = array();
- foreach ($matches[0] as $key => $match) {
- // Fuzzy look has failed by default
- $fuzzyFound = false;
-
- // Fuzzy look on match if already found
- foreach ($matchesFound as $found => $set) {
- // Get test part
- $test = substr($found, 0, strlen($match));
-
- // Does this entry exist?
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "found={$found},match={$match},set={$set} ");
- if ($test == $match) {
- // Match found!
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "fuzzyFound! ");
- $fuzzyFound = true;
- break;
- } // END - if
- } // END - foreach
-
- // Skip this entry?
- if ($fuzzyFound === true) continue;
-
- // Take all string elements
- if ((is_string($matches[4][$key])) && (!isset($matchesFound[$match])) && (!isset($matchesFound[$key."_" . $matches[4][$key]]))) {
- // Replace it in the code
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "key={$key},match={$match} ");
- $newMatch = str_replace('[', "['", str_replace(']', "']", $match));
- $code = str_replace($match, '".' . $newMatch . '."', $code);
- $matchesFound[$key . '_' . $matches[4][$key]] = 1;
- $matchesFound[$match] = 1;
- } elseif (!isset($matchesFound[$match])) {
- // Not yet replaced!
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "match={$match} ");
- $code = str_replace($match, '".' . $match . '."', $code);
- $matchesFound[$match] = 1;
- }
- } // END - foreach
- } // END - if
-
- // Return it
- return $code;
+ doShutdown();
}
/************************************************************************
@@ -1115,36 +457,36 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true
* *
* $array - Das 3-dimensionale Array, das paralell sortiert werden soll *
* $a_sort - Array, das die Sortiereihenfolge der ersten Elementeben *
- * $primary_key - Prim.rschl.ssel aus $a_sort, nach dem sortiert wird *
+ * $primary_key - Primaerschl.ssel aus $a_sort, nach dem sortiert wird *
* $order - Sortiereihenfolge: -1 = a-Z, 0 = keine, 1 = Z-a *
- * $nums - true = Als Zahlen sortieren, false = Als Zeichen sortieren *
+ * $nums - TRUE = Als Zahlen sortieren, FALSE = Als Zeichen sortieren *
* *
* $a_sort muss Elemente enthalten, deren Wert Schluessel von $array *
* sind... Klingt kompliziert, suchen Sie mal mein Beispiel, dann sehen *
* Sie, dass es doch nicht so schwer ist! :-) *
* *
************************************************************************/
-function array_pk_sort (&$array, $a_sort, $primary_key = '0', $order = -1, $nums = false) {
- $dummy = $array;
+function array_pk_sort (&$array, $a_sort, $primary_key = '0', $order = -1, $nums = FALSE) {
+ $temporaryArray = $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 === false) {
+ foreach ($temporaryArray[$a_sort[$primary_key]] as $key => $value) {
+ foreach ($temporaryArray[$a_sort[$primary_key]] as $key2 => $value2) {
+ $match = FALSE;
+ 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;
+ if (($key != $key2) && (strcmp(strtolower($temporaryArray[$a_sort[$primary_key]][$key]), strtolower($temporaryArray[$a_sort[$primary_key]][$key2])) == $order)) $match = TRUE;
} elseif ($key != $key2) {
// Sort numbers (E.g.: 9 < 10)
- if (($dummy[$a_sort[$primary_key]][$key] < $dummy[$a_sort[$primary_key]][$key2]) && ($order == -1)) $match = true;
- if (($dummy[$a_sort[$primary_key]][$key] > $dummy[$a_sort[$primary_key]][$key2]) && ($order == 1)) $match = true;
+ if (($temporaryArray[$a_sort[$primary_key]][$key] < $temporaryArray[$a_sort[$primary_key]][$key2]) && ($order == -1)) $match = TRUE;
+ if (($temporaryArray[$a_sort[$primary_key]][$key] > $temporaryArray[$a_sort[$primary_key]][$key2]) && ($order == 1)) $match = TRUE;
}
if ($match) {
// We have found two different values, so let's sort whole array
- foreach ($dummy as $sort_key => $sort_val) {
- $t = $dummy[$sort_key][$key];
- $dummy[$sort_key][$key] = $dummy[$sort_key][$key2];
- $dummy[$sort_key][$key2] = $t;
+ foreach ($temporaryArray as $sort_key => $sort_val) {
+ $t = $temporaryArray[$sort_key][$key];
+ $temporaryArray[$sort_key][$key] = $temporaryArray[$sort_key][$key2];
+ $temporaryArray[$sort_key][$key2] = $t;
unset($t);
} // END - foreach
} // END - if
@@ -1156,482 +498,138 @@ function array_pk_sort (&$array, $a_sort, $primary_key = '0', $order = -1, $nums
} // END - while
// Write back sorted array
- $array = $dummy;
+ $array = $temporaryArray;
}
+
//
-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 .= "