X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Ffunctions.php;h=5acdb2688c6ffd4f175d0e48924813409cca7649;hb=444470f309a050293341c95917beb89d60a394b9;hp=4545846423668f31b61935d1a004fa80c1cf823c;hpb=2bda7ccdfd87b065a61ff976b5f9e98e46f73591;p=mailer.git
diff --git a/inc/functions.php b/inc/functions.php
index 4545846423..5acdb2688c 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -10,10 +10,10 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Viele Nicht-MySQL-Funktionen (auch Dateizugriff) *
* -------------------------------------------------------------------- *
- * $Revision:: 856 $ *
- * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009) $ *
+ * $Revision:: $ *
+ * $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
- * $Author:: stelzi $ *
+ * $Author:: $ *
* Needs to be in all Files and every File needs "svn propset *
* svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
@@ -37,25 +37,11 @@
************************************************************************/
// 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", constant('PATH'), $inc);
-
- // Abort by simple test
- if ((FILE_READABLE($FQFN)) && (!is_writeable($FQFN))) {
- return false;
- } // END - if
-
- // Test write-access on directory
- return is_writeable(dirname($FQFN));
-}
-
-// Output HTML code directly or "render" it. You addionally switch the new-line character off
+// 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;
@@ -63,41 +49,40 @@ function OUTPUT_HTML ($HTML, $newLine = true) {
// Do we have HTML-Code here?
if (!empty($HTML)) {
// Yes, so we handle it as you have configured
- switch (constant('OUTPUT_MODE'))
+ switch (getConfig('OUTPUT_MODE'))
{
- case "render":
- // That's why you don't need any \n at the end of your HTML code... :-)
- if (constant('_OB_CACHING') == "on") {
- // Output into PHP's internal buffer
- OUTPUT_RAW($HTML);
-
+ case 'render':
// That's why you don't need any \n at the end of your HTML code... :-)
- if ($newLine) echo "\n";
- } else {
- // Render mode for old or lame servers...
- $OUTPUT .= $HTML;
+ if (constant('_OB_CACHING') == 'on') {
+ // Output into PHP's internal buffer
+ outputRawCode($HTML);
- // That's why you don't need any \n at the end of your HTML code... :-)
- if ($newLine) $OUTPUT .= "\n";
- }
- break;
+ // That's why you don't need any \n at the end of your HTML code... :-)
+ 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 ($newLine) $OUTPUT .= "\n";
+ }
+ break;
- case "direct":
- // If we are switching from render to direct output rendered code
- if ((!empty($OUTPUT)) && (constant('_OB_CACHING') != "on")) { OUTPUT_RAW($OUTPUT); $OUTPUT = ""; }
+ case 'direct':
+ // If we are switching from render to direct output rendered code
+ if ((!empty($OUTPUT)) && (constant('_OB_CACHING') != 'on')) { outputRawCode($OUTPUT); $OUTPUT = ''; }
- // The same as above... ^
- OUTPUT_RAW($HTML);
- if ($newLine) echo "\n";
- break;
+ // The same as above... ^
+ 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.", constant('OUTPUT_MODE')));
- mxchange_die("{--FATAL_ERROR--}: {--LANG_NO_RENDER_DIRECT--}");
- break;
+ default:
+ // Huh, something goes wrong or maybe you have edited config.php ???
+ app_die(__FUNCTION__, __LINE__, "{--FATAL_ERROR--}: {--LANG_NO_RENDER_DIRECT--}");
+ break;
}
- } elseif ((constant('_OB_CACHING') == "on") && (isset($GLOBALS['footer_sent'])) && ($GLOBALS['footer_sent'] == 1)) {
+ } elseif ((constant('_OB_CACHING') == 'on') && (isset($GLOBALS['footer_sent'])) && ($GLOBALS['footer_sent'] == 1)) {
// Headers already sent?
if (headers_sent()) {
// Log this error
@@ -116,44 +101,47 @@ function OUTPUT_HTML ($HTML, $newLine = true) {
} // 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")) && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-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')) && (getOutputMode() != '1') && (getOutputMode() != '-1')) {
+ $OUTPUT = rewriteLinksInCode($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 = "";
+ $newContent = '';
$eval = "\$newContent = \"".COMPILE_CODE(smartAddSlashes($OUTPUT))."\";";
eval($eval);
// Was that eval okay?
if (empty($newContent)) {
// Something went wrong!
- mxchange_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 ((constant('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")) && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
- $OUTPUT = REWRITE_LINKS($OUTPUT);
+ if ((EXT_IS_ACTIVE('rewrite')) && (getOutputMode() != '1') && (getOutputMode() != '-1')) {
+ $OUTPUT = rewriteLinksInCode($OUTPUT);
} // END - if
// Compile and run finished rendered HTML code
@@ -163,17 +151,17 @@ function OUTPUT_HTML ($HTML, $newLine = true) {
} // 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 constant('_OB_CACHING') is not "on"
- if (constant('_OB_CACHING') != "on") {
+ // Flush the output if only constant('_OB_CACHING') is not 'on'
+ if (constant('_OB_CACHING') != 'on') {
// Flush it
flush();
} // END - if
@@ -190,7 +178,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);
@@ -223,8 +211,14 @@ 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()) {
+ // @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, $_CONFIG, $username;
+ global $DATA, $username;
+
+ // Get whole config array
+ $_CONFIG = getConfigArray();
// Make all template names lowercase
$template = strtolower($template);
@@ -233,19 +227,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") {
+ 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']), __FUNCTION__, __LINE__);
+ array(getUserId()), __FUNCTION__, __LINE__);
// Is content an array?
if (is_array($content)) {
@@ -253,7 +247,7 @@ 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
// @TODO Fine all templates which are using these direct variables and rewrite them.
@@ -261,7 +255,7 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
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)));
}
@@ -270,77 +264,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/", constant('PATH'), GET_LANGUAGE());
- $MODE = "";
+ $basePath = sprintf("%stemplates/%s/html/", constant('PATH'), getLanguage());
+ $mode = '';
// Check for admin/guest/member templates
- if (strpos($template, "admin_") > -1) {
+ if (strpos($template, 'admin_') > -1) {
// Admin template found
- $MODE = "admin/";
- } elseif (strpos($template, "guest_") > -1) {
+ $mode = 'admin/';
+ } elseif (strpos($template, 'guest_') > -1) {
// Guest template found
- $MODE = "guest/";
- } elseif (strpos($template, "member_") > -1) {
+ $mode = 'guest/';
+ } elseif (strpos($template, 'member_') > -1) {
// Member template found
- $MODE = "member/";
- } elseif (strpos($template, "install_") > -1) {
+ $mode = 'member/';
+ } elseif (strpos($template, 'install_') > -1) {
// Installation template found
- $MODE = "install/";
- } elseif (strpos($template, "ext_") > -1) {
+ $mode = 'install/';
+ } elseif (strpos($template, 'ext_') > -1) {
// Extension template found
- $MODE = "ext/";
- } elseif (strpos($template, "la_") > -1) {
- // "Logical-area" template found
- $MODE = "la/";
+ $mode = 'ext/';
+ } elseif (strpos($template, 'la_') > -1) {
+ // 'Logical-area' template found
+ $mode = 'la/';
+ } elseif (strpos($template, 'js_') > -1) {
+ // JavaScript template found
+ $mode = 'js/';
} 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
- $MODE = $test."/";
- }
+ $mode = $test . '/';
+ } // END - if
}
////////////////////////
// Generate file name //
////////////////////////
- $FQFN = $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 ((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",
- $BASE,
- $MODE,
+ $basePath,
+ $mode,
$template,
- SQL_ESCAPE($GLOBALS['what'])
+ getWhat()
);
// Probe for it...
- if (FILE_READABLE($file2)) $FQFN = $file2;
+ if (isFileReadable($file2)) $FQFN = $file2;
// Remove variable from memory
unset($file2);
- }
+ } // END - if
// Does the special template exists?
- if (!FILE_READABLE($FQFN)) {
+ if (!isFileReadable($FQFN)) {
// Reset to default template
- $FQFN = $BASE.$template.".tpl";
+ $FQFN = $basePath . $template . '.tpl';
} // END - if
// Now does the final template exists?
- if (FILE_READABLE($FQFN)) {
+ if (isFileReadable($FQFN)) {
// The local file does exists so we load it. :)
- $tmpl_file = READ_FILE($FQFN);
+ $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(smartAddSlashes($tmpl_file))."\";";
@@ -351,15 +348,15 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
}
// Add surrounding HTML comments to help finding bugs faster
- $ret = "\n".$ret."\n";
+ $ret = "\n" . $ret . "\n";
} elseif ((IS_ADMIN()) || ((isInstalling()) && (!isInstalled()))) {
// Only admins shall see this warning or when installation mode is active
- $ret = "
".TEMPLATE_404."
+ $ret = "
{--TEMPLATE_404--}
(".basename($FQFN).")
-".TEMPLATE_CONTENT."
+{--TEMPLATE_CONTENT--}
".print_r($content, true)."
-".TEMPLATE_DATA."
+{--TEMPLATE_DATA--}
".print_r($DATA, true)."
";
}
@@ -380,113 +377,111 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
}
} elseif (isDebugModeEnabled()) {
// Warning, empty output!
- return "E:".$template."
\n";
+ 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 = decodeEntities(\"".COMPILE_CODE(smartAddSlashes($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)), __FUNCTION__, __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 = constant('WEBMASTER');
+ $toEmail = constant('WEBMASTER');
}
// Free result
SQL_FREERESULT($result_email);
}
- } elseif ("$TO" == "0") {
+ } elseif ($toEmail == '0') {
// Is the webmaster!
- $TO = constant('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 (isDebugModeEnabled()) {
- 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');
}
}
// Compile "TO"
- $eval = "\$TO = \"".COMPILE_CODE(smartAddSlashes($TO))."\";";
+ $eval = "\$toEmail = \"".COMPILE_CODE(smartAddSlashes($toEmail))."\";";
eval($eval);
// Compile "MSG"
- $eval = "\$MSG = \"".COMPILE_CODE(smartAddSlashes($MSG))."\";";
+ $eval = "\$message = \"".COMPILE_CODE(smartAddSlashes($message))."\";";
eval($eval);
// Fix HTML parameter (default is no!)
- if (empty($HTML)) $HTML = "N";
+ 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."
+ OUTPUT_HTML("
+".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(constant('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')) && (constant('SMTP_HOSTNAME') != "") && (constant('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, $message, $from) {
// Shall we use PHPMailer class or legacy mode?
- if (CHECK_PHPMAILER_USAGE()) {
+ if (checkPhpMailerUsage()) {
// Use PHPMailer class with SMTP enabled
- LOAD_INC_ONCE("inc/phpmailer/class.phpmailer.php");
- LOAD_INC_ONCE("inc/phpmailer/class.smtp.php");
+ loadIncludeOnce('inc/phpmailer/class.phpmailer.php');
+ loadIncludeOnce('inc/phpmailer/class.smtp.php');
// get new instance
$mail = new PHPMailer();
@@ -494,10 +489,10 @@ function SEND_RAW_EMAIL ($to, $subject, $msg, $from) {
$mail->IsSMTP();
$mail->SMTPAuth = true;
- $mail->Host = constant('SMTP_HOSTNAME');
+ $mail->Host = getConfig('SMTP_HOSTNAME');
$mail->Port = 25;
- $mail->Username = constant('SMTP_USER');
- $mail->Password = constant('SMTP_PASSWORD');
+ $mail->Username = getConfig('SMTP_USER');
+ $mail->Password = getConfig('SMTP_PASSWORD');
if (empty($from)) {
$mail->From = constant('WEBMASTER');
} else {
@@ -505,41 +500,41 @@ function SEND_RAW_EMAIL ($to, $subject, $msg, $from) {
}
$mail->FromName = constant('MAIN_TITLE');
$mail->Subject = $subject;
- 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!";
+ if ((EXT_IS_ACTIVE('html_mail')) && (strip_tags($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($msg);
+ $mail->Body = decodeEntities($message);
}
- $mail->AddAddress($to, "");
+ $mail->AddAddress($toEmail, '');
$mail->AddReplyTo(constant('WEBMASTER'), constant('MAIN_TITLE'));
- $mail->AddCustomHeader("Errors-To:".constant('WEBMASTER'));
- $mail->AddCustomHeader("X-Loop:".constant('WEBMASTER'));
+ $mail->AddCustomHeader('Errors-To:' . constant('WEBMASTER'));
+ $mail->AddCustomHeader('X-Loop:' . constant('WEBMASTER'));
$mail->Send();
} else {
// Use legacy mail() command
- @mail($to, $subject, decodeEntities($msg), $from);
+ mail($toEmail, $subject, decodeEntities($message), $from);
}
}
-//
// Generate a password in a specified length or use default password length
-function GEN_PASS ($LEN = 0) {
+function generatePassword ($length = 0) {
// Auto-fix invalid length of zero
- if ($LEN == 0) $LEN = 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,-,+,_,/");
+ $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 < $LEN; $i++) {
+ $PASS = '';
+ for ($i = 0; $i < $length; $i++) {
$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);
@@ -548,49 +543,85 @@ 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
- 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;
- default:
- DEBUG_LOG(__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;
- }
+ 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;
+ default:
+ DEBUG_LOG(__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;
+ }
}
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
+ 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 TRANSLATE_COMMA ($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');
@@ -601,7 +632,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;
@@ -612,42 +643,30 @@ 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, ",", ".");
- break;
-
- default:
- $dotted = number_format($dotted, $maxComma, ".", ",");
- break;
+ switch (getLanguage()) {
+ case 'de':
+ $dotted = number_format($dotted, $maxComma, ',', '.');
+ break;
+
+ default:
+ $dotted = number_format($dotted, $maxComma, '.', ',');
+ break;
}
// Return translated value
return $dotted;
}
-//
-function DEREFERER ($URL) {
- // Don't de-refer our own links!
- if (substr($URL, 0, strlen(URL)) != URL) {
- // De-refer this link
- $URL = "modules.php?module=loader&url=".encodeString(compileUriCode($URL));
- } // END - if
-
- // Return link
- return $URL;
-}
-
// Translate Uni*-like gender to human-readable
-function TRANSLATE_GENDER ($gender) {
+function translateGender ($gender) {
// Default
- $ret = "!{$gender}!";
+ $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;
+ 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));
@@ -658,18 +677,54 @@ function TRANSLATE_GENDER ($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(constant('URL'))) != constant('URL')) {
+ // De-refer this link
+ $URL = 'modules.php?module=loader&url=' . encodeString(compileUriCode($URL));
+ } // END - if
+
+ // Return link
+ return $URL;
+}
+
+// Generates an URL for the frametester
function FRAMETESTER ($URL) {
// Prepare frametester URL
- $frametesterUrl = sprintf("%s/modules.php?module=frametester&url=%s",
- URL,
- encodeString(compileUriCode($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 => $selected) {
@@ -678,90 +733,28 @@ function SELECTION_COUNT ($array) {
}
return $ret;
}
-//
-function IMG_CODE ($code, $type, $DATA, $uid) {
- return "";
-}
-//
-function TRANSLATE_STATUS ($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;
+// Generate XHTML code for the CAPTCHA
+function generateCaptchaCode ($code, $type, $DATA, $uid) {
+ return '';
}
-//
-function GET_LANGUAGE() {
- // Set default return value to default language from config
- $ret = constant('DEFAULT_LANG');
-
- // Init variable
- $lang = "";
-
- // Is the variable set
- if (REQUEST_ISSET_GET(('mx_lang'))) {
- // Accept only first 2 chars
- $lang = substr(REQUEST_GET('mx_lang'), 0, 2);
- } elseif (isset($GLOBALS['cache_array']['language'])) {
- // Use cached
- $ret = $GLOBALS['cache_array']['language'];
- } elseif (!empty($lang)) {
- // Check if main language file does exist
- if (FILE_READABLE(constant('PATH')."inc/language/".$lang.".php")) {
- // Okay found, so let's update cookies
- SET_LANGUAGE($lang);
- }
- } elseif (!isSessionVariableSet('mx_lang')) {
- // Return stored value from cookie
- $ret = get_session('mx_lang');
-
- // Fixes a warning before the session has the mx_lang constant
- if (empty($ret)) $ret = constant('DEFAULT_LANG');
- }
-
- // Cache entry
- $GLOBALS['cache_array']['language'] = $ret;
- // Return value
- return $ret;
-}
-//
-function SET_LANGUAGE ($lang) {
- // Accept only first 2 chars!
- $lang = substr(SQL_ESCAPE(strip_tags($lang)), 0, 2);
+// Loads an email template and compiles it
+function LOAD_EMAIL_TEMPLATE ($template, $content = array(), $UID = '0') {
+ global $DATA;
- // Set cookie
- set_session('mx_lang', $lang);
-}
-//
-function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
- global $DATA, $_CONFIG;
+ // 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 = "---";
+ // 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 = constant('MAIN_TITLE');
@@ -769,22 +762,23 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
// 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 = 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 = CREATE_FANCY_TIME(getConfig('auto_purge'));
+ $EXPIRATION = createFancyTime(getConfig('auto_purge'));
}
// Is content an array?
@@ -797,16 +791,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)), __FUNCTION__, __LINE__);
+ 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)), __FUNCTION__, __LINE__);
+ array(bigintval($UID)), __FUNCTION__, __LINE__);
}
// Fetch and merge data
@@ -819,7 +813,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'];
@@ -828,41 +822,41 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
$DATA['email'] = $email;
// Base directory
- $BASE = sprintf("%stemplates/%s/emails/", constant('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
- $FQFN = $BASE."admin/".$template.".tpl";
- } elseif (strpos($template, "guest_") > -1) {
+ $FQFN = $basePath.'admin/' . $template.'.tpl';
+ } elseif (strpos($template, 'guest_') > -1) {
// Guest template found
- $FQFN = $BASE."guest/".$template.".tpl";
- } elseif (strpos($template, "member_") > -1) {
+ $FQFN = $basePath.'guest/' . $template.'.tpl';
+ } elseif (strpos($template, 'member_') > -1) {
// Member template found
- $FQFN = $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
- $FQFN = $BASE.$test."/".$template.".tpl";
+ $FQFN = $basePath . $test.'/' . $template.'.tpl';
} else {
// No special filename
- $FQFN = $BASE.$template.".tpl";
+ $FQFN = $basePath . $template.'.tpl';
}
}
// Does the special template exists?
- if (!FILE_READABLE($FQFN)) {
+ if (!isFileReadable($FQFN)) {
// Reset to default template
- $FQFN = $BASE.$template.".tpl";
+ $FQFN = $basePath . $template.'.tpl';
} // END - if
// Now does the final template exists?
- $newContent = "";
- if (FILE_READABLE($FQFN)) {
+ $newContent = '';
+ if (isFileReadable($FQFN)) {
// The local file does exists so we load it. :)
- $tmpl_file = READ_FILE($FQFN);
+ $tmpl_file = readFromFile($FQFN);
$tmpl_file = SQL_ESCAPE($tmpl_file);
// Run code
@@ -870,7 +864,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
eval($tmpl_file);
} elseif (!empty($template)) {
// Template file not found!
- $newContent = "{--TEMPLATE_404--}: ".$template."
+ $newContent = "{--TEMPLATE_404--}: " . $template."
{--TEMPLATE_CONTENT--}
".print_r($content, true)."
{--TEMPLATE_DATA--}
@@ -887,7 +881,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
// Is there some content?
if (empty($newContent)) {
// Compiling failed
- $newContent = "Compiler error for template {$template}!\nUncompiled content:\n".$tmpl_file;
+ $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
@@ -899,30 +893,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) {
+
+// Redirects to an URL and if neccessarry extends it with own base URL
+function redirectToUrl ($URL) {
// Compile out URI codes
$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
- // Get output buffer
+ // 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
$OUTPUT = ob_get_contents();
// Clear it only if there is content
@@ -930,31 +938,30 @@ function LOAD_URL ($URL, $addUrlData=true) {
clearOutputBuffer();
} // END - if
- // Add some data to URL if cookies are not accepted
- if (((!defined('__COOKIES')) || (!constant('__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
+ // 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);
// Output new location link as anchor
- OUTPUT_HTML("".$URL."");
+ OUTPUT_HTML('' . $URL . '');
} elseif (!headers_sent()) {
// Load URL when headers are not sent
//* DEBUG: */ debug_report_bug("URL={$URL}");
- header ("Location: ".str_replace("&", "&", $URL));
+ sendHeader('Location: '.str_replace('&', '&', $URL));
} else {
// Output error message
- LOAD_INC("inc/header.php");
- LOAD_TEMPLATE("redirect_url", false, str_replace("&", "&", $URL));
- LOAD_INC("inc/footer.php");
+ loadInclude('inc/header.php');
+ LOAD_TEMPLATE('redirect_url', false, str_replace('&', '&', $URL));
+ loadInclude('inc/footer.php');
}
+
+ // 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);
@@ -965,7 +972,7 @@ function LOAD_CONFIGURED_URL ($configEntry) {
} // END - if
// Load the URL
- LOAD_URL($URL);
+ redirectToUrl($URL);
}
//
@@ -976,13 +983,14 @@ function COMPILE_CODE ($code, $simple = false, $constants = true, $full = true)
return $code;
} // END - if
- $ARRAY = $GLOBALS['security_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 = $GLOBALS['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));
@@ -993,16 +1001,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)) {
@@ -1031,17 +1039,17 @@ function COMPILE_CODE ($code, $simple = false, $constants = true, $full = true)
if ($fuzzyFound) continue;
// Take all string elements
- if ((is_string($matches[4][$key])) && (!isset($matchesFound[$match])) && (!isset($matchesFound[$key."_".$matches[4][$key]]))) {
+ if ((is_string($matches[4][$key])) && (!isset($matchesFound[$match])) && (!isset($matchesFound[$key."_" . $matches[4][$key]]))) {
// Replace it in the code
//* DEBUG: */ print __FUNCTION__."(".__LINE__."):key={$key},match={$match}
\n";
- $newMatch = str_replace("[".$matches[4][$key]."]", "['".$matches[4][$key]."']", $match);
- $code = str_replace($match, "\".".$newMatch.".\"", $code);
- $matchesFound[$key."_".$matches[4][$key]] = 1;
+ $newMatch = str_replace("[" . $matches[4][$key]."]", "['" . $matches[4][$key]."']", $match);
+ $code = str_replace($match, "\"." . $newMatch.".\"", $code);
+ $matchesFound[$key."_" . $matches[4][$key]] = 1;
$matchesFound[$match] = 1;
} elseif (!isset($matchesFound[$match])) {
// Not yet replaced!
//* DEBUG: */ print __FUNCTION__."(".__LINE__."):match={$match}
\n";
- $code = str_replace($match, "\".".$match.".\"", $code);
+ $code = str_replace($match, "\"." . $match.".\"", $code);
$matchesFound[$match] = 1;
}
} // END - foreach
@@ -1050,7 +1058,7 @@ function COMPILE_CODE ($code, $simple = false, $constants = true, $full = true)
// Return compiled code
return $code;
}
-//
+
/************************************************************************
* *
* Gaenderter Sortier-Algorythmus, $array wird nach dem Array (!) *
@@ -1103,180 +1111,163 @@ function array_pk_sort (&$array, $a_sort, $primary_key = 0, $order = -1, $nums =
}
//
-function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
- $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 .= "