X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=64e185bdec56a990499f7ae4018c482ea523da91;hp=4f55bb8a07e03f4c2e8b2d4c762af5f86b846332;hb=116f17077ae6fa32c7373ccd6aaf94044bb6c276;hpb=97eb53f4fdcc3f433dea23d09efde744d52a3740 diff --git a/inc/functions.php b/inc/functions.php index 4f55bb8a07..64e185bdec 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -10,7 +10,12 @@ * -------------------------------------------------------------------- * * Kurzbeschreibung : Viele Nicht-MySQL-Funktionen (auch Dateizugriff) * * -------------------------------------------------------------------- * - * * + * $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 - 2008 by Roland Haeder * * For more information visit: http://www.mxchange.org * @@ -30,185 +35,172 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, * * MA 02110-1301 USA * ************************************************************************/ - // Some security stuff... if (!defined('__SECURITY')) { - $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php"; + $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php'; require($INC); } -// Check if our config file is writeable or not -function IS_INC_WRITEABLE($inc) { - // Generate FQFN - $fqfn = sprintf("%sinc/%s.php", PATH, $inc); - - // Abort by simple test - if ((FILE_READABLE($fqfn)) && (!is_writeable($fqfn))) { - return false; - } // END - if - - // Test if we can append data - $fp = @fopen($fqfn, 'a'); - if ($inc == "dummy") { - // Remove dummy file - fclose($fp); - return unlink($fqfn); - } else { - // Close all other files - return fclose($fp); - } -} - -// Output HTML code directly or "render" it. You addionally switch the new-line character off -function OUTPUT_HTML ($HTML, $NEW_LINE = true) { +// Output HTML code directly or 'render' it. You addionally switch the new-line character off +function OUTPUT_HTML ($HTML, $newLine = true) { // Some global variables - global $OUTPUT, $footer, $CSS; + global $OUTPUT; // Do we have HTML-Code here? if (!empty($HTML)) { // Yes, so we handle it as you have configured - switch (OUTPUT_MODE) + switch (getConfig('OUTPUT_MODE')) { - case "render": + case 'render': // That's why you don't need any \n at the end of your HTML code... :-) - if (_OB_CACHING == "on") { + if (constant('_OB_CACHING') == 'on') { // Output into PHP's internal buffer - OUTPUT_RAW($HTML); + outputRawCode($HTML); // That's why you don't need any \n at the end of your HTML code... :-) - if ($NEW_LINE) echo "\n"; + if ($newLine) echo "\n"; } else { // Render mode for old or lame servers... $OUTPUT .= $HTML; // That's why you don't need any \n at the end of your HTML code... :-) - if ($NEW_LINE) $OUTPUT .= "\n"; + if ($newLine) $OUTPUT .= "\n"; } break; - case "direct": + case 'direct': // If we are switching from render to direct output rendered code - if ((!empty($OUTPUT)) && (_OB_CACHING != "on")) { OUTPUT_RAW($OUTPUT); $OUTPUT = ""; } + if ((!empty($OUTPUT)) && (constant('_OB_CACHING') != 'on')) { outputRawCode($OUTPUT); $OUTPUT = ''; } // The same as above... ^ - OUTPUT_RAW($HTML); - if ($NEW_LINE) echo "\n"; + outputRawCode($HTML); + if ($newLine) echo "\n"; break; default: // Huh, something goes wrong or maybe you have edited config.php ??? - DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid renderer %s detected.", OUTPUT_MODE)); - mxchange_die("{!FATAL_ERROR!}: {!LANG_NO_RENDER_DIRECT!}"); + DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid renderer %s detected.", getConfig('OUTPUT_MODE'))); + app_die(__FUNCTION__, __LINE__, "{--FATAL_ERROR--}: {--LANG_NO_RENDER_DIRECT--}"); break; } - } elseif ((_OB_CACHING == "on") && ($footer == 1)) { + } elseif ((constant('_OB_CACHING') == '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."); // Trigger an user error - trigger_error("Headers are already sent!"); + debug_report_bug("Headers are already sent!"); } // END - if // Output cached HTML code $OUTPUT = ob_get_contents(); - // Clear output buffer for later output - clearOutputBuffer(); + // Clear output buffer for later output if output is found + if (!empty($OUTPUT)) { + clearOutputBuffer(); + } // END - if // Send HTTP header - header("HTTP/1.1 200"); + sendHeader('HTTP/1.1 200'); // Used later $now = gmdate('D, d M Y H:i:s') . ' GMT'; // General headers for no caching - header("Expired: " . $now); // RFC2616 - Section 14.21 - header("Last-Modified: " . $now); - header("Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0"); // HTTP/1.1 - header("Pragma: no-cache"); // HTTP/1.0 - header("Connection: Close"); - - // Extension "rewrite" installed? - if ((EXT_IS_ACTIVE("rewrite")) && ($CSS != "1") && ($CSS != "-1")) { - $OUTPUT = REWRITE_LINKS($OUTPUT); + 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')) && ($GLOBALS['output_mode'] != '1') && ($GLOBALS['output_mode'] != '-1')) { + $OUTPUT = rewriteLinksInCode($OUTPUT); } // END - if // Compile and run finished rendered HTML code while (strpos($OUTPUT, '{!') > 0) { // Prepare the content and eval() it... - $newContent = ""; - $eval = "\$newContent = \"".COMPILE_CODE(addslashes($OUTPUT))."\";"; - @eval($eval); + $newContent = ''; + $eval = "\$newContent = \"".COMPILE_CODE(smartAddSlashes($OUTPUT))."\";"; + eval($eval); // Was that eval okay? if (empty($newContent)) { // Something went wrong! - die("Evaluation error:
".htmlentities($eval)."
"); + app_die(__FUNCTION__, __LINE__, "Evaluation error:
".htmlentities($eval)."
"); } // END - if $OUTPUT = $newContent; } // END - while // Output code here, DO NOT REMOVE! ;-) - OUTPUT_RAW($OUTPUT); - } elseif ((OUTPUT_MODE == "render") && (!empty($OUTPUT))) { + outputRawCode($OUTPUT); + } elseif ((getConfig('OUTPUT_MODE') == 'render') && (!empty($OUTPUT))) { // Rewrite links when rewrite extension is active - if ((EXT_IS_ACTIVE("rewrite")) && ($CSS != "1") && ($CSS != "-1")) { - $OUTPUT = REWRITE_LINKS($OUTPUT); + if ((EXT_IS_ACTIVE('rewrite')) && ($GLOBALS['output_mode'] != '1') && ($GLOBALS['output_mode'] != '-1')) { + $OUTPUT = rewriteLinksInCode($OUTPUT); } // END - if // Compile and run finished rendered HTML code while (strpos($OUTPUT, '{!') > 0) { - $eval = "\$OUTPUT = \"".COMPILE_CODE(addslashes($OUTPUT))."\";"; + $eval = "\$OUTPUT = \"".COMPILE_CODE(smartAddSlashes($OUTPUT))."\";"; eval($eval); } // END - while // Output code here, DO NOT REMOVE! ;-) - OUTPUT_RAW($OUTPUT); + outputRawCode($OUTPUT); } } // Output the raw HTML code -function OUTPUT_RAW ($HTML) { +function outputRawCode ($HTML) { // Output stripped HTML code to avoid broken JavaScript code, etc. echo stripslashes(stripslashes($HTML)); - // Flush the output if only _OB_CACHING is not "on" - if (_OB_CACHING != "on") { + // Flush the output if only constant('_OB_CACHING') is not 'on' + if (constant('_OB_CACHING') != 'on') { // Flush it flush(); } // END - if } -// Add a fatal error message to the queue array -function addFatalMessage ($message, $extra="") { - global $FATAL; +// Init fatal message array +function initFatalMessages () { + $GLOBALS['fatal_messages'] = array(); +} - if (empty($extra)) { - // Regular text message to add to $FATAL - $FATAL[] = $message; - } else { +// Getter for whole fatal error messages +function getFatalArray () { + return $GLOBALS['fatal_messages']; +} + +// Add a fatal error message to the queue array +function addFatalMessage ($F, $L, $message, $extra='') { + if (is_array($extra)) { + // Multiple extras for a message with masks + $message = call_user_func_array('sprintf', $extra); + } elseif (!empty($extra)) { // $message is text with a mask plus extras to insert into the text $message = sprintf($message, $extra); - $FATAL[] = $message; } + // Add message to $GLOBALS['fatal_messages'] + $GLOBALS['fatal_messages'][] = $message; + // Log fatal messages away - DEBUG_LOG(__FUNCTION__, __LINE__, " message={$message}"); + DEBUG_LOG($F, $L, " message={$message}"); } // Getter for total fatal message count -function getTotalFatalMessages () { - global $FATAL; - +function getTotalFatalErrors () { // Init coun $count = 0; // Do we have at least the first entry? - if (!empty($FATAL[0])) { + if (!empty($GLOBALS['fatal_messages'][0])) { // Get total count - $count = count($FATAL); + $count = count($GLOBALS['fatal_messages']); } // END - if // Return value @@ -218,7 +210,10 @@ function getTotalFatalMessages () { // 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()) { // Add more variables which you want to use in your template files - global $DATA, $_CONFIG, $username; + global $DATA, $username; + + // Get whole config array + $_CONFIG = getConfigArray(); // Make all template names lowercase $template = strtolower($template); @@ -227,19 +222,19 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) { incrementConfigEntry('num_templates'); // Prepare IP number and User Agent - $REMOTE_ADDR = GET_REMOTE_ADDR(); + $REMOTE_ADDR = detectRemoteAddr(); if (!defined('REMOTE_ADDR')) define('REMOTE_ADDR', $REMOTE_ADDR); - $HTTP_USER_AGENT = GET_USER_AGENT(); + $HTTP_USER_AGENT = detectUserAgent(); // Init some data - $ret = ""; + $ret = ''; if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = 0; // @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($GLOBALS['userid']), __FILE__, __LINE__); + $result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", + array(getUserId()), __FUNCTION__, __LINE__); // Is content an array? if (is_array($content)) { @@ -247,13 +242,15 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) { $content = merge_array($content, SQL_FETCHARRAY($result)); // Translate gender - $content['gender'] = TRANSLATE_GENDER($content['gender']); + $content['gender'] = translateGender($content['gender']); } else { - // DEPRECATED: Load data in direct variables + // @DEPRECATED + // @TODO Fine 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); // Translate gender - $gender = TRANSLATE_GENDER($gender); + $gender = translateGender($gender); DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("DEPRECATION-WARNING: content is not array (%s).", gettype($content))); } @@ -262,80 +259,80 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) { } // END - if // Generate date/time string - $date_time = MAKE_DATETIME(time(), "1"); + $date_time = generateDateTime(time(), '1'); // Base directory - $BASE = sprintf("%stemplates/%s/html/", PATH, GET_LANGUAGE()); - $MODE = ""; + $basePath = sprintf("%stemplates/%s/html/", constant('PATH'), getLanguage()); + $mode = ''; // Check for admin/guest/member templates if (strpos($template, "admin_") > -1) { // Admin template found - $MODE = "admin/"; + $mode = "admin/"; } elseif (strpos($template, "guest_") > -1) { // Guest template found - $MODE = "guest/"; + $mode = "guest/"; } elseif (strpos($template, "member_") > -1) { // Member template found - $MODE = "member/"; + $mode = "member/"; } elseif (strpos($template, "install_") > -1) { // Installation template found - $MODE = "install/"; + $mode = "install/"; } elseif (strpos($template, "ext_") > -1) { // Extension template found - $MODE = "ext/"; + $mode = "ext/"; } elseif (strpos($template, "la_") > -1) { // "Logical-area" template found - $MODE = "la/"; + $mode = "la/"; } else { // Test for extension $test = substr($template, 0, strpos($template, "_")); if (EXT_IS_ACTIVE($test)) { // Set extra path to extension's name - $MODE = $test."/"; + $mode = $test.'/'; } } //////////////////////// // Generate file name // //////////////////////// - $file = $BASE.$MODE.$template.".tpl"; + $FQFN = $basePath.$mode.$template.".tpl"; - if ((!empty($GLOBALS['what'])) && ((strpos($template, "_header") > 0) || (strpos($template, "_footer") > 0)) && (($MODE == "guest/") || ($MODE == "member/") || ($MODE == "admin/"))) { + if ((!empty($GLOBALS['what'])) && ((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", - $BASE, - $MODE, + $basePath, + $mode, $template, SQL_ESCAPE($GLOBALS['what']) ); // Probe for it... - if (FILE_READABLE($file2)) $file = $file2; + if (isFileReadable($file2)) $FQFN = $file2; // Remove variable from memory unset($file2); } // Does the special template exists? - if (!FILE_READABLE($file)) { + if (!isFileReadable($FQFN)) { // Reset to default template - $file = $BASE.$template.".tpl"; + $FQFN = $basePath.$template.".tpl"; } // END - if // Now does the final template exists? - if (FILE_READABLE($file)) { + if (isFileReadable($FQFN)) { // The local file does exists so we load it. :) - $tmpl_file = READ_FILE($file); + $tmpl_file = 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 = ""; + $ret = ''; if ((strpos($tmpl_file, "\$") !== false) || (strpos($tmpl_file, '{--') !== false) || (strpos($tmpl_file, '--}') > 0)) { // Okay, compile it! - $tmpl_file = "\$ret=\"".COMPILE_CODE(addslashes($tmpl_file))."\";"; + $tmpl_file = "\$ret=\"".COMPILE_CODE(smartAddSlashes($tmpl_file))."\";"; eval($tmpl_file); } else { // Simply return loaded code @@ -344,14 +341,14 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) { // Add surrounding HTML comments to help finding bugs faster $ret = "\n".$ret."\n"; - } elseif ((IS_ADMIN()) || ((isBooleanConstantAndTrue('mxchange_installing')) && (!isBooleanConstantAndTrue('mxchange_installed')))) { + } elseif ((IS_ADMIN()) || ((isInstalling()) && (!isInstalled()))) { // Only admins shall see this warning or when installation mode is active - $ret = "
".TEMPLATE_404."
-(".basename($file).")
+ $ret = "
{--TEMPLATE_404--}
+(".basename($FQFN).")

-".TEMPLATE_CONTENT." +{--TEMPLATE_CONTENT--} 
".print_r($content, true)."
-".TEMPLATE_DATA." +{--TEMPLATE_DATA--} 
".print_r($DATA, true)."


"; } @@ -363,177 +360,173 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) { // Do we have some content to output or return? if (!empty($ret)) { // Not empty so let's put it out! ;) - if ($return) { + if ($return === true) { // Return the HTML code return $ret; } else { // Output direct OUTPUT_HTML($ret); } - } elseif (isBooleanConstantAndTrue('DEBUG_MODE')) { + } elseif (isDebugModeEnabled()) { // Warning, empty output! return "E:".$template."
\n"; } } // Send mail out to an email address -function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML = "N", $FROM = "") { - //* DEBUG: */ print __FUNCTION__."(".__LINE__."):TO={$TO},SUBJECT={$SUBJECT}
\n"; +function sendEmail($toEmail, $subject, $message, $HTML = 'N', $mailHeader = '') { + //* DEBUG: */ print __FUNCTION__."(".__LINE__."):TO={$toEmail},SUBJECT={$subject}
\n"; // Compile subject line (for POINTS constant etc.) - $eval = "\$SUBJECT = html_entity_decode(\"".COMPILE_CODE(addslashes($SUBJECT))."\");"; + $eval = "\$subject = decodeEntities(\"".COMPILE_CODE(smartAddSlashes($subject))."\");"; eval($eval); // Set from header - if ((!eregi("@", $TO)) && ($TO > 0)) { + if ((!eregi("@", $toEmail)) && ($toEmail > 0)) { // Value detected, is the message extension installed? if (EXT_IS_ACTIVE("msg")) { - ADD_MESSAGE_TO_BOX($TO, $SUBJECT, $MSG, $HTML); + ADD_MESSAGE_TO_BOX($toEmail, $subject, $message, $HTML); return; } else { // Load email address - $result_email = SQL_QUERY_ESC("SELECT email FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1", array(bigintval($TO)), __FILE__, __LINE__); + $result_email = SQL_QUERY_ESC("SELECT email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", array(bigintval($toEmail)), __FUNCTION__, __LINE__); //* DEBUG: */ print __FUNCTION__."(".__LINE__."):numRows=".SQL_NUMROWS($result_email)."
\n"; // Does the user exist? if (SQL_NUMROWS($result_email)) { // Load email address - list($TO) = SQL_FETCHROW($result_email); + list($toEmail) = SQL_FETCHROW($result_email); } else { // Set webmaster - $TO = WEBMASTER; + $toEmail = constant('WEBMASTER'); } // Free result SQL_FREERESULT($result_email); } - } elseif ("$TO" == "0") { + } elseif ("$toEmail" == '0') { // Is the webmaster! - $TO = WEBMASTER; + $toEmail = constant('WEBMASTER'); } - //* DEBUG: */ print __FUNCTION__."(".__LINE__."):TO={$TO}
\n"; + //* DEBUG: */ print __FUNCTION__."(".__LINE__."):TO={$toEmail}
\n"; // Check for PHPMailer or debug-mode - if (!CHECK_PHPMAILER_USAGE()) { + if (!checkPhpMailerUsage()) { // Not in PHPMailer-Mode - if (empty($FROM)) { + if (empty($mailHeader)) { // Load email header template - $FROM = LOAD_EMAIL_TEMPLATE("header"); + $mailHeader = LOAD_EMAIL_TEMPLATE("header"); } else { // Append header - $FROM .= LOAD_EMAIL_TEMPLATE("header"); + $mailHeader .= LOAD_EMAIL_TEMPLATE("header"); } - } elseif (isBooleanConstantAndTrue('DEBUG_MODE')) { - if (empty($FROM)) { + } elseif (isDebugModeEnabled()) { + if (empty($mailHeader)) { // Load email header template - $FROM = LOAD_EMAIL_TEMPLATE("header"); + $mailHeader = LOAD_EMAIL_TEMPLATE("header"); } else { // Append header - $FROM .= LOAD_EMAIL_TEMPLATE("header"); + $mailHeader .= LOAD_EMAIL_TEMPLATE("header"); } } // Compile "TO" - $eval = "\$TO = \"".COMPILE_CODE(addslashes($TO))."\";"; + $eval = "\$toEmail = \"".COMPILE_CODE(smartAddSlashes($toEmail))."\";"; eval($eval); // Compile "MSG" - $eval = "\$MSG = \"".COMPILE_CODE(addslashes($MSG))."\";"; + $eval = "\$message = \"".COMPILE_CODE(smartAddSlashes($message))."\";"; eval($eval); // Fix HTML parameter (default is no!) - if (empty($HTML)) $HTML = "N"; - if (isBooleanConstantAndTrue('DEBUG_MODE')) { + if (empty($HTML)) $HTML = 'N'; + if (isDebugModeEnabled()) { // In debug mode we want to display the mail instead of sending it away so we can debug this part print("
-".htmlentities(trim($FROM))."
-To      : ".$TO."
-Subject : ".$SUBJECT."
-Message : ".$MSG."
+".htmlentities(trim($mailHeader))."
+To      : ".$toEmail."
+Subject : ".$subject."
+Message : ".$message."
\n"); - } elseif (($HTML == "Y") && (EXT_IS_ACTIVE("html_mail"))) { + } elseif (($HTML == 'Y') && (EXT_IS_ACTIVE('html_mail'))) { // Send mail as HTML away - SEND_HTML_EMAIL($TO, $SUBJECT, $MSG, $FROM); - } elseif (!empty($TO)) { + sendHtmlEmail($toEmail, $subject, $message, $mailHeader); + } elseif (!empty($toEmail)) { // Send Mail away - SEND_RAW_EMAIL($TO, $SUBJECT, $MSG, $FROM); - } elseif ($HTML == "N") { + sendRawEmail($toEmail, $subject, $message, $mailHeader); + } elseif ($HTML == 'N') { // Problem found! - SEND_RAW_EMAIL(WEBMASTER, "[PROBLEM:]".$SUBJECT, $MSG, $FROM); + sendRawEmail(constant('WEBMASTER'), '[PROBLEM:]' . $subject, $message, $mailHeader); } } // Check if legacy or PHPMailer command +// @TODO Rewrite this to an extension 'smtp' // @private -function CHECK_PHPMAILER_USAGE() { - return ((defined('SMTP_HOSTNAME')) && (defined('SMTP_USER')) && (defined('SMTP_PASSWORD')) && (SMTP_HOSTNAME != "") && (SMTP_USER != "")); +function checkPhpMailerUsage() { + return ((getConfig('SMTP_HOSTNAME') != '') && (getConfig('SMTP_USER') != '')); } -/* - * Send out a raw email with PHPMailer class or legacy mail() command - */ -function SEND_RAW_EMAIL ($to, $subject, $msg, $from) { +// Send out a raw email with PHPMailer class or legacy mail() command +function sendRawEmail ($toEmail, $subject, $msg, $from) { // Shall we use PHPMailer class or legacy mode? - if (CHECK_PHPMAILER_USAGE()) { + if (checkPhpMailerUsage()) { // Use PHPMailer class with SMTP enabled - require_once(PATH."inc/phpmailer/class.phpmailer.php"); - require_once(PATH."inc/phpmailer/class.smtp.php"); + loadIncludeOnce('inc/phpmailer/class.phpmailer.php'); + loadIncludeOnce('inc/phpmailer/class.smtp.php'); // get new instance $mail = new PHPMailer(); - $mail->PluginDir = sprintf("%sinc/phpmailer/", PATH); + $mail->PluginDir = sprintf("%sinc/phpmailer/", constant('PATH')); $mail->IsSMTP(); $mail->SMTPAuth = true; - $mail->Host = SMTP_HOSTNAME; + $mail->Host = getConfig('SMTP_HOSTNAME'); $mail->Port = 25; - $mail->Username = SMTP_USER; - $mail->Password = SMTP_PASSWORD; + $mail->Username = getConfig('SMTP_USER'); + $mail->Password = getConfig('SMTP_PASSWORD'); if (empty($from)) { - $mail->From = WEBMASTER; + $mail->From = constant('WEBMASTER'); } else { $mail->From = $from; } - $mail->FromName = MAIN_TITLE; + $mail->FromName = constant('MAIN_TITLE'); $mail->Subject = $subject; - if ((EXT_IS_ACTIVE("html_mail")) && (strip_tags($msg) != $msg)) { + if ((EXT_IS_ACTIVE('html_mail')) && (strip_tags($msg) != $msg)) { $mail->Body = $msg; - $mail->AltBody = "Your mail program required HTML support to read this mail!"; + $mail->AltBody = 'Your mail program required HTML support to read this mail!'; $mail->WordWrap = 70; $mail->IsHTML(true); } else { - $mail->Body = html_entity_decode($msg); + $mail->Body = decodeEntities($msg); } - $mail->AddAddress($to, ""); - $mail->AddReplyTo(WEBMASTER,MAIN_TITLE); - $mail->AddCustomHeader("Errors-To:".WEBMASTER); - $mail->AddCustomHeader("X-Loop:".WEBMASTER); + $mail->AddAddress($toEmail, ''); + $mail->AddReplyTo(constant('WEBMASTER'), constant('MAIN_TITLE')); + $mail->AddCustomHeader('Errors-To:' . constant('WEBMASTER')); + $mail->AddCustomHeader('X-Loop:' . constant('WEBMASTER')); $mail->Send(); } else { // Use legacy mail() command - @mail($to, $subject, html_entity_decode($msg), $from); + @mail($toEmail, $subject, decodeEntities($msg), $from); } } -// // Generate a password in a specified length or use default password length -function GEN_PASS ($LEN = 0) { +function generatePassword ($LEN = 0) { // Auto-fix invalid length of zero if ($LEN == 0) $LEN = 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,-,+,_,/"); - - // Initialize randomizer - mt_srand((double) microtime() * 1000000); + $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 = ""; + $PASS = ''; for ($i = 0; $i < $LEN; $i++) { - $PASS .= $ABC[mt_rand(0, sizeof($ABC) -1)]; + $PASS .= $ABC[mt_rand(0, count($ABC) -1)]; } // END - for - // When the size is below 40 we can also add additional security by scrambling it + // When the size is below 40 we can also add additional security by scrambling + // it. Otherwise we may corrupt hashes if (strlen($PASS) <= 40) { // Also scramble the password $PASS = scrambleString($PASS); @@ -542,37 +535,38 @@ function GEN_PASS ($LEN = 0) { // Return the password return $PASS; } -// -function MAKE_DATETIME ($time, $mode="0") -{ + +// Generates a human-readable timestamp from the Uni* stamp +function generateDateTime ($time, $mode = '0') { + // Filter out numbers + $time = bigintval($time); + + // If the stamp is zero it mostly didn't "happen" if ($time == 0) { // Never happend - return NEVER_HAPPENED; - } else { - // Filter out numbers - $time = bigintval($time); - } + return getMessage('NEVER_HAPPENED'); + } // END - if - switch (GET_LANGUAGE()) + switch (getLanguage()) { - case "de": // German date / time format + 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", $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)); break; } break; - default: // Default is the US date / time format! + 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", $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; @@ -581,12 +575,45 @@ function MAKE_DATETIME ($time, $mode="0") return $ret; } -// Translates the american decimal dot into a german comma -function TRANSLATE_COMMA ($dotted, $cut=true, $max=0) { - global $_CONFIG; +// 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 + DEBUG_LOG(__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 = sprintf(getMessage('POOL_TYPE_UNKNOWN'), $type); + + // Generate constant + $constName = sprintf("POOL_TYPE_%s", $type); + + // Does it exist? + if (defined($constName)) { + // Then use it + $translated = getMessage($constName); + } // END - if + + // Return "translation" + return $translated; +} +// Translates the american decimal dot into a german comma +function translateComma ($dotted, $cut = true, $max = 0) { // Default is 3 you can change this in admin area "Misc -> Misc Options" - if (getConfig('max_comma') == null) $_CONFIG['max_comma'] = "3"; + if (!isConfigEntrySet('max_comma')) setConfigEntry('max_comma', '3'); // Use from config is default $maxComma = getConfig('max_comma'); @@ -597,7 +624,7 @@ function TRANSLATE_COMMA ($dotted, $cut=true, $max=0) { // Cut zeros off? if (($cut) && ($max == 0)) { // Test for commata if in cut-mode - $com = explode(".", $dotted); + $com = explode('.', $dotted); if (count($com) < 2) { // Don't display commatas even if there are none... ;-) $maxComma = 0; @@ -608,13 +635,13 @@ function TRANSLATE_COMMA ($dotted, $cut=true, $max=0) { //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "dotted={$dotted},maxComma={$maxComma}"); // Translate it now - switch (GET_LANGUAGE()) { - case "de": - $dotted = number_format($dotted, $maxComma, ",", "."); + switch (getLanguage()) { + case 'de': + $dotted = number_format($dotted, $maxComma, ',', '.'); break; default: - $dotted = number_format($dotted, $maxComma, ".", ","); + $dotted = number_format($dotted, $maxComma, '.', ','); break; } @@ -622,164 +649,170 @@ function TRANSLATE_COMMA ($dotted, $cut=true, $max=0) { return $dotted; } -// +// Translate Uni*-like gender to human-readable +function translateGender ($gender) { + // Default + $ret = '!' . $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; + default: + // Log unknown gender + DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown gender %s detected.", $gender)); + break; + } + + // Return translated gender + return $ret; +} + +// "Translates" the user status +function translateUserStatus ($status) { + switch ($status) + { + case 'UNCONFIRMED': + case 'CONFIRMED': + case 'LOCKED': + $ret = getMessage(sprintf("ACCOUNT_%s", $status)); + break; + + case '': + case null: + $ret = getMessage('ACCOUNT_DELETED'); + break; + + default: + DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status)); + $ret = sprintf(getMessage('UNKNOWN_STATUS'), $status); + break; + } + + // Return it + return $ret; +} + +// Generates an URL for the dereferer function DEREFERER ($URL) { // Don't de-refer our own links! - if (substr($URL, 0, strlen(URL)) != URL) { + if (substr($URL, 0, strlen(constant('URL'))) != constant('URL')) { // De-refer this link - $URL = "modules.php?module=loader&url=".urlencode(base64_encode(gzcompress($URL))); + $URL = 'modules.php?module=loader&url=' . encodeString(compileUriCode($URL)); } // END - if // Return link return $URL; } -// -function TRANSLATE_GENDER ($gender) { - switch ($gender) - { - case "M": $ret = GENDER_M; break; - case "F": $ret = GENDER_F; break; - case "C": $ret = GENDER_C; break; - default : $ret = $gender; break; - } - return $ret; -} -// -function FRAMETESTER($URL) { +// Generates an URL for the frametester +function FRAMETESTER ($URL) { // Prepare frametester URL - $frametesterUrl = sprintf("%s/modules.php?module=frametester&url=%s", - URL, - urlencode(base64_encode(gzcompress(COMPILE_CODE($URL)))) + $frametesterUrl = sprintf("{!URL!}/modules.php?module=frametester&url=%s", + encodeString(compileUriCode($URL)) ); return $frametesterUrl; } -// -function SELECTION_COUNT($array) { + +// Count entries from e.g. a selection box +function countSelection ($array) { $ret = 0; if (is_array($array)) { - foreach ($array as $key => $sel) { - if (!empty($sel)) $ret++; + foreach ($array as $key => $selected) { + if (!empty($selected)) $ret++; } } return $ret; } -// -function IMG_CODE ($code, $type, $DATA, $uid) { - return "\"Code\""; -} -// -function TRANSLATE_STATUS($status) { - switch ($status) - { - case "UNCONFIRMED": - $ret = ACCOUNT_UNCONFIRMED; - break; - - case "CONFIRMED": - $ret = ACCOUNT_CONFIRMED; - break; - case "LOCKED": - $ret = ACCOUNT_LOCKED; - break; - - case "": - case null: - $ret = ACCOUNT_DELETED; - break; - - default: - DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status)); - $ret = UNKNOWN_STATUS_1.$status.UNKNOWN_STATUS_2; - break; - } - return $ret; +// Generate XHTML code for the CAPTCHA +function generateCaptchaCode ($code, $type, $DATA, $uid) { + return 'Code'; } -// -function GET_LANGUAGE() { - global $cacheArray; +// "Getter" for language +function getLanguage () { // Set default return value to default language from config - $ret = DEFAULT_LANG; + $ret = getConfig('DEFAULT_LANG'); // Init variable - $lang = ""; + $lang = ''; // Is the variable set - if (!empty($_GET['mx_lang'])) { + if (REQUEST_ISSET_GET('mx_lang')) { // Accept only first 2 chars - $lang = substr($_GET['mx_lang'], 0, 2); - } elseif (isset($cacheArray['language'])) { + $lang = substr(REQUEST_GET('mx_lang'), 0, 2); + } elseif (isset($GLOBALS['cache_array']['language'])) { // Use cached - $ret = $cacheArray['language']; + $ret = $GLOBALS['cache_array']['language']; } elseif (!empty($lang)) { // Check if main language file does exist - if (FILE_READABLE(PATH."inc/language/".$lang.".php")) { + if (isFileReadable(constant('PATH') . 'inc/language/'.$lang.'.php')) { // Okay found, so let's update cookies - SET_LANGUAGE($lang); - } - } elseif (!isSessionVariableSet('mx_lang')) { + setLanguage($lang); + } // END - if + } elseif (isSessionVariableSet('mx_lang')) { // Return stored value from cookie - $ret = get_session('mx_lang'); + $ret = getSession('mx_lang'); // Fixes a warning before the session has the mx_lang constant - if (empty($ret)) $ret = DEFAULT_LANG; + if (empty($ret)) $ret = getConfig('DEFAULT_LANG'); } // Cache entry - $cacheArray['language'] = $ret; + $GLOBALS['cache_array']['language'] = $ret; // Return value return $ret; } -// -function SET_LANGUAGE ($lang) { + +// "Setter" for language +function setLanguage ($lang) { // Accept only first 2 chars! $lang = substr(SQL_ESCAPE(strip_tags($lang)), 0, 2); // Set cookie - set_session('mx_lang', $lang); + setSession('mx_lang', $lang); } -// -function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") { - global $DATA, $REPLACER, $_CONFIG; + +// Loads an email template and compiles it +function LOAD_EMAIL_TEMPLATE ($template, $content = array(), $UID = '0') { + global $DATA, $_CONFIG; // Make sure all template names are lowercase! $template = strtolower($template); - // Default "nickname" if extension is not installed - $nick = "---"; - - // Keept for backward-compatiblity (please replace these variables against our new {!CONST!} syntax!) - // No longer used: $MAIN_TITLE = MAIN_TITLE; $URL = URL; $WEBMASTER = WEBMASTER; + // Default 'nickname' if extension is not installed + $nick = '---'; // Prepare IP number and User Agent - $REMOTE_ADDR = GET_REMOTE_ADDR(); - $HTTP_USER_AGENT = GET_USER_AGENT(); + $REMOTE_ADDR = detectRemoteAddr(); + $HTTP_USER_AGENT = detectUserAgent(); // Default admin - $ADMIN = MAIN_TITLE; + $ADMIN = constant('MAIN_TITLE'); // Is the admin logged in? if (IS_ADMIN()) { // Get admin id - $aid = GET_CURRENT_ADMIN_ID(); + $aid = getCurrentAdminId(); // Load Admin data - $ADMIN = GET_ADMIN_EMAIL($aid); + $ADMIN = getAdminEmail($aid); } // END - if // Neutral email address is default - $email = WEBMASTER; + $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 = MAIL_WILL_NEVER_EXPIRE; + $EXPIRATION = getMessage('MAIL_WILL_NEVER_EXPIRE'); } else { // Create nice date string - $EXPIRATION = CREATE_FANCY_TIME(getConfig('auto_purge')); + $EXPIRATION = createFancyTime(getConfig('auto_purge')); } // Is content an array? @@ -792,16 +825,16 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") { //* DEBUG: */ print __FUNCTION__."(".__LINE__."):UID={$UID},template={$template},content[]=".gettype($content)."
\n"; if (($UID > 0) && (is_array($content))) { // If nickname extension is installed, fetch nickname as well - if (EXT_IS_ACTIVE("nickname")) { + if (EXT_IS_ACTIVE('nickname')) { //* DEBUG: */ print __FUNCTION__."(".__LINE__."):NICKNAME!
\n"; // 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)), __FILE__, __LINE__); + $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: */ print __FUNCTION__."(".__LINE__."):NO-NICK!
\n"; /// 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)), __FILE__, __LINE__); + $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 @@ -814,7 +847,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") { } // END - if // Translate M to male or F to female if present - if (isset($content['gender'])) $content['gender'] = TRANSLATE_GENDER($content['gender']); + if (isset($content['gender'])) $content['gender'] = translateGender($content['gender']); // Overwrite email from data if present if (isset($content['email'])) $email = $content['email']; @@ -823,60 +856,60 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") { $DATA['email'] = $email; // Base directory - $BASE = sprintf("%stemplates/%s/emails/", PATH, GET_LANGUAGE()); + $basePath = sprintf("%stemplates/%s/emails/", constant('PATH'), getLanguage()); // Check for admin/guest/member templates - if (strpos($template, "admin_") > -1) { + if (strpos($template, 'admin_') > -1) { // Admin template found - $file = $BASE."admin/".$template.".tpl"; - } elseif (strpos($template, "guest_") > -1) { + $FQFN = $basePath.'admin/'.$template.'.tpl'; + } elseif (strpos($template, 'guest_') > -1) { // Guest template found - $file = $BASE."guest/".$template.".tpl"; - } elseif (strpos($template, "member_") > -1) { + $FQFN = $basePath.'guest/'.$template.'.tpl'; + } elseif (strpos($template, 'member_') > -1) { // Member template found - $file = $BASE."member/".$template.".tpl"; + $FQFN = $basePath.'member/'.$template.'.tpl'; } else { // Test for extension - $test = substr($template, 0, strpos($template, "_")); + $test = substr($template, 0, strpos($template, '_')); if (EXT_IS_ACTIVE($test)) { // Set extra path to extension's name - $file = $BASE.$test."/".$template.".tpl"; + $FQFN = $basePath.$test.'/'.$template.'.tpl'; } else { // No special filename - $file = $BASE.$template.".tpl"; + $FQFN = $basePath.$template.'.tpl'; } } // Does the special template exists? - if (!FILE_READABLE($file)) { + if (!isFileReadable($FQFN)) { // Reset to default template - $file = $BASE.$template.".tpl"; + $FQFN = $basePath.$template.'.tpl'; } // END - if // Now does the final template exists? - $newContent = ""; - if (FILE_READABLE($file)) { + $newContent = ''; + if (isFileReadable($FQFN)) { // The local file does exists so we load it. :) - $tmpl_file = READ_FILE($file); - $tmpl_file = addslashes($tmpl_file); + $tmpl_file = readFromFile($FQFN); + $tmpl_file = SQL_ESCAPE($tmpl_file); // Run code - $tmpl_file = "\$newContent=html_entity_decode(\"".COMPILE_CODE($tmpl_file)."\");"; - @eval($tmpl_file); + $tmpl_file = "\$newContent = decodeEntities(\"".COMPILE_CODE($tmpl_file)."\");"; + eval($tmpl_file); } elseif (!empty($template)) { // Template file not found! - $newContent = TEMPLATE_404.": ".$template."
-".TEMPLATE_CONTENT." + $newContent = "{--TEMPLATE_404--}: ".$template."
+{--TEMPLATE_CONTENT--} 
".print_r($content, true)."
-".TEMPLATE_DATA." +{--TEMPLATE_DATA--} 
".print_r($DATA, true)."


"; // Debug mode not active? Then remove the HTML tags - if (!DEBUG_MODE) $newContent = strip_tags($newContent); + if (!isDebugModeEnabled()) $newContent = strip_tags($newContent); } else { // No template name supplied! - $newContent = NO_TEMPLATE_SUPPLIED; + $newContent = getMessage('NO_TEMPLATE_SUPPLIED'); } // Is there some content? @@ -894,35 +927,44 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") { // Return compiled content return COMPILE_CODE($newContent); } -// -function MAKE_TIME($H, $M, $S, $stamp) { + +// Generates a timestamp (some wrapper for mktime()) +function makeTime ($H, $M, $S, $stamp) { // Extract day, month and year from given timestamp - $DAY = date("d", $stamp); - $MONTH = date("m", $stamp); - $YEAR = date('Y', $stamp); + $day = date('d', $stamp); + $month = date('m', $stamp); + $year = date('Y', $stamp); // Create timestamp for wished time which depends on extracted date - return mktime($H, $M, $S, $MONTH, $DAY, $YEAR); + return mktime($H, $M, $S, $month, $day, $year); } -// -function LOAD_URL($URL, $addUrlData=true) { - global $CSS, $footer; +// Redirects to an URL and if neccessarry extends it with own base URL +function redirectToUrl ($URL) { // Compile out URI codes - $URL = COMPILE_CODE($URL); + $URL = compileUriCode($URL); // Check if http(s):// is there - if ((substr($URL, 0, 7) != "http://") && (substr($URL, 0, 8) != "https://")) { + if ((substr($URL, 0, 7) != 'http://') && (substr($URL, 0, 8) != 'https://')) { // Make all URLs full-qualified - $URL = "".$URL; - } + $URL = constant('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: */ 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')) { + // Own (=internal) URL + $rel = ''; + } // END - if // Get output buffer - /* - print "
";
-	debug_print_backtrace();
-	die("
"); - */ $OUTPUT = ob_get_contents(); // Clear it only if there is content @@ -930,64 +972,59 @@ function LOAD_URL($URL, $addUrlData=true) { clearOutputBuffer(); } // END - if - // Add some data to URL if cookies are not accepted - if (((!defined('__COOKIES')) || (!__COOKIES)) && ($addUrlData)) $URL = ADD_URL_DATA($URL); - - // Probe for bot from search engine - if ((eregi("spider", GET_USER_AGENT())) || (eregi("bot", GET_USER_AGENT()))) { - // Search engine bot detected so let's rewrite many chars for the link - $URL = htmlentities(strip_tags($URL), ENT_QUOTES); + // Secure the URL against bad things such als HTML insertions and so on... + $URL = htmlentities(strip_tags($URL), ENT_QUOTES); + // Simple probe for bots/spiders from search engines + if ((strpos(detectUserAgent(), 'spider') !== false) || (strpos(detectUserAgent(), 'bot') !== false)) { // Output new location link as anchor - OUTPUT_HTML("".$URL.""); + OUTPUT_HTML('' . $URL . ''); } elseif (!headers_sent()) { // Load URL when headers are not sent - /* - print("
");
-		debug_print_backtrace();
-		die("
URL={$URL}"); - */ - header ("Location: ".str_replace("&", "&", $URL)); + //* DEBUG: */ debug_report_bug("URL={$URL}"); + sendHeader('Location: '.str_replace('&', '&', $URL)); } else { // Output error message - require(PATH."inc/header.php"); - LOAD_TEMPLATE("redirect_url", false, str_replace("&", "&", $URL)); - require(PATH."inc/footer.php"); + loadInclude('inc/header.php'); + LOAD_TEMPLATE('redirect_url', false, str_replace('&', '&', $URL)); + loadInclude('inc/footer.php'); } - exit(); + + // Shut the mailer down here + shutdown(); } -// Wrapper for LOAD_URL but URL comes from a configuration entry -function LOAD_CONFIGURED_URL ($configEntry) { +// 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 - trigger_error(sprintf("Configuration entry %s is not set!", $configEntry); + trigger_error(sprintf("Configuration entry %s is not set!", $configEntry)); } // END - if // Load the URL - LOAD_URL($URL); + redirectToUrl($URL); } // -function COMPILE_CODE($code, $simple = false, $constants = true, $full = true) { - global $SEC_CHARS, $URL_CHARS; +function COMPILE_CODE ($code, $simple = false, $constants = true, $full = true) { // Is the code a string? if (!is_string($code)) { // Silently return it return $code; } // END - if - $ARRAY = $SEC_CHARS; + // Init replacement-array with full security characters + $secChars = $GLOBALS['security_chars']; // Select smaller set of chars to replace when we e.g. want to compile URLs - if (!$full) $ARRAY = $URL_CHARS; + if (!$full) $secChars = $GLOBALS['url_chars']; // Compile constants - if ($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)); @@ -998,16 +1035,16 @@ function COMPILE_CODE($code, $simple = false, $constants = true, $full = true) { } // END - if // Compile QUOT and other non-HTML codes - foreach ($ARRAY['to'] as $k => $to) { + foreach ($secChars['to'] as $k => $to) { // Do the reversed thing as in inc/libs/security_functions.php - $code = str_replace($to, $ARRAY['from'][$k], $code); + $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); + preg_match_all('/\$(content|DATA)((\[([a-zA-Z0-9-_]+)\])*)/', $code, $matches); // Are some matches found? if ((count($matches) > 0) && (count($matches[0]) > 0)) { @@ -1055,7 +1092,7 @@ function COMPILE_CODE($code, $simple = false, $constants = true, $full = true) { // Return compiled code return $code; } -// + /************************************************************************ * * * Gaenderter Sortier-Algorythmus, $array wird nach dem Array (!) * @@ -1072,8 +1109,7 @@ 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) { @@ -1107,12 +1143,12 @@ function array_pk_sort(&$array, $a_sort, $primary_key = 0, $order = -1, $nums = // Write back sorted array $array = $dummy; } + // -function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0") { - global $MONTH_DESCR; - $OUT = ""; +function ADD_SELECTION ($type, $default, $prefix = '', $id = '0') { + $OUT = ''; - if ($type == "yn") { + if ($type == 'yn') { // This is a yes/no selection only! if ($id > 0) $prefix .= "[".$id."]"; $OUT .= " \n"; + $OUT .= " \n"; + $OUT .= " \n"; } else { $OUT .= "\n"; } if (ereg("M", $display) || (empty($display))) { // Generate month selection - $OUT .= " \n"; for ($idx = 0; $idx <= 11; $idx++) { $OUT .= "