X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=e202db15d3e7750537b78684bf6b0ae533f3c5be;hp=dd46f2f13475a0bba3e63babaf6495b636c5216a;hb=ee0625c4882bb462985c504abf65a3ef0e7bf1eb;hpb=f26aab4a55972825a0d3ef9346c8c8dea8752b7b
diff --git a/inc/functions.php b/inc/functions.php
index dd46f2f134..e202db15d3 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -41,20 +41,6 @@ if (!defined('__SECURITY')) {
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
function OUTPUT_HTML ($HTML, $newLine = true) {
// Some global variables
@@ -94,7 +80,7 @@ function OUTPUT_HTML ($HTML, $newLine = true) {
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--}");
+ app_die(__FUNCTION__, __LINE__, "{--FATAL_ERROR--}: {--LANG_NO_RENDER_DIRECT--}");
break;
}
} elseif ((constant('_OB_CACHING') == "on") && (isset($GLOBALS['footer_sent'])) && ($GLOBALS['footer_sent'] == 1)) {
@@ -143,7 +129,7 @@ function OUTPUT_HTML ($HTML, $newLine = true) {
// 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
@@ -191,6 +177,7 @@ function getFatalArray () {
// Add a fatal error message to the queue array
function addFatalMessage ($F, $L, $message, $extra="") {
+ debug_report_bug($message);
if (is_array($extra)) {
// Multiple extras for a message with masks
$message = call_user_func_array('sprintf', $extra);
@@ -385,68 +372,68 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
}
// 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 SEND_EMAIL($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()) {
// 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!)
@@ -454,20 +441,20 @@ function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML = "N", $FROM = "") {
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"))) {
// Send mail as HTML away
- SEND_HTML_EMAIL($TO, $SUBJECT, $MSG, $FROM);
- } elseif (!empty($TO)) {
+ SEND_HTML_EMAIL($toEmail, $subject, $message, $mailHeader);
+ } elseif (!empty($toEmail)) {
// Send Mail away
- SEND_RAW_EMAIL($TO, $SUBJECT, $MSG, $FROM);
+ SEND_RAW_EMAIL($toEmail, $subject, $message, $mailHeader);
} elseif ($HTML == "N") {
// Problem found!
- SEND_RAW_EMAIL(constant('WEBMASTER'), "[PROBLEM:]".$SUBJECT, $MSG, $FROM);
+ SEND_RAW_EMAIL(constant('WEBMASTER'), "[PROBLEM:]".$subject, $message, $mailHeader);
}
}
@@ -481,7 +468,7 @@ function CHECK_PHPMAILER_USAGE() {
/*
* Send out a raw email with PHPMailer class or legacy mail() command
*/
-function SEND_RAW_EMAIL ($to, $subject, $msg, $from) {
+function SEND_RAW_EMAIL ($toEmail, $subject, $msg, $from) {
// Shall we use PHPMailer class or legacy mode?
if (CHECK_PHPMAILER_USAGE()) {
// Use PHPMailer class with SMTP enabled
@@ -513,14 +500,14 @@ function SEND_RAW_EMAIL ($to, $subject, $msg, $from) {
} else {
$mail->Body = decodeEntities($msg);
}
- $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->Send();
} else {
// Use legacy mail() command
- @mail($to, $subject, decodeEntities($msg), $from);
+ @mail($toEmail, $subject, decodeEntities($msg), $from);
}
}
//
@@ -661,8 +648,7 @@ function TRANSLATE_GENDER ($gender) {
//
function FRAMETESTER ($URL) {
// Prepare frametester URL
- $frametesterUrl = sprintf("%s/modules.php?module=frametester&url=%s",
- URL,
+ $frametesterUrl = sprintf("{!URL!}/modules.php?module=frametester&url=%s",
encodeString(compileUriCode($URL))
);
return $frametesterUrl;
@@ -699,7 +685,7 @@ function TRANSLATE_STATUS ($status) {
default:
DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
- $ret = sprintf(getMessage('UNKNOWN_STATUS"'), $status);
+ $ret = sprintf(getMessage('UNKNOWN_STATUS'), $status);
break;
}
@@ -976,13 +962,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 +980,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)) {
@@ -2040,8 +2027,6 @@ function CREATE_EMAIL_LINK ($email, $table = "admins") {
// Generate a hash for extra-security for all passwords
function generateHash ($plainText, $salt = "") {
- global $_SERVER;
-
// Is the required extension "sql_patches" there and a salt is not given?
if (((EXT_VERSION_IS_OLDER("sql_patches", "0.3.6")) || (!EXT_IS_ACTIVE("sql_patches"))) && (empty($salt))) {
// Extension sql_patches is missing/outdated so we hash the plain text with MD5
@@ -2173,7 +2158,7 @@ function genScrambleString ($len) {
// normally be stored in cookies
function ADD_URL_DATA ($URL) {
// Init add
- $ADD = "";
+ $add = "";
// Determine URL binder
$BIND = "?";
@@ -2183,15 +2168,15 @@ function ADD_URL_DATA ($URL) {
// Cookies are not accepted
if ((REQUEST_ISSET_GET(('refid'))) && (strpos($URL, "refid=") == 0)) {
// Cookie found in URL
- $ADD .= $BIND."refid=".bigintval(REQUEST_GET('refid'));
+ $add .= $BIND."refid=".bigintval(REQUEST_GET('refid'));
} elseif ((GET_EXT_VERSION("sql_patches") != '') && (getConfig('def_refid') > 0)) {
// Not found! So let's set default here
- $ADD .= $BIND."refid=".getConfig('def_refid');
+ $add .= $BIND."refid=".getConfig('def_refid');
}
} // END - if
// Add all together and return it
- return $URL . $ADD;
+ return $URL . $add;
}
// Generate an PGP-like encrypted hash of given hash for e.g. cookies
@@ -2248,10 +2233,13 @@ function FIX_DELETED_COOKIES ($cookies) {
}
// Output error messages in a fasioned way and die...
-function mxchange_die ($msg) {
+function app_die ($F, $L, $msg) {
// Load header
LOAD_INC_ONCE("inc/header.php");
+ // Prepare message for output
+ $msg = sprintf(getMessage('MXCHANGE_HAS_DIED'), basename($F), $L, $msg);
+
// Load the message template
LOAD_TEMPLATE("admin_settings_saved", false, $msg);
@@ -2393,10 +2381,10 @@ function GET_CURR_THEME() {
}
// Add (maybe) found theme.php file to inclusion list
- $theme = sprintf("%stheme/%s/theme.php", constant('PATH'), SQL_ESCAPE($ret));
+ $INC = sprintf("theme/%s/theme.php", SQL_ESCAPE($ret));
// Try to load the requested include file
- if (FILE_READABLE($theme)) ADD_INC_TO_POOL($theme);
+ if (INCLUDE_READABLE($INC)) ADD_INC_TO_POOL($INC);
// Return theme value
return $ret;
@@ -2481,7 +2469,7 @@ function WRITE_FILE ($FQFN, $content) {
$return = file_put_contents($FQFN, $content);
} else {
// Write it with fopen
- $fp = fopen($FQFN, 'w') or mxchange_die("Cannot write file ".basename($FQFN)."!");
+ $fp = fopen($FQFN, 'w') or app_die(__FUNCTION__, __LINE__, "Cannot write file ".basename($FQFN)."!");
fwrite($fp, $content);
fclose($fp);
@@ -2496,7 +2484,7 @@ function WRITE_FILE ($FQFN, $content) {
// Generates an error code from given account status
function GEN_ERROR_CODE_FROM_ACCOUNT_STATUS ($status) {
// Default error code if unknown account status
- $ERROR = getCode('UNKNOWN_STATUS');
+ $errorCode = getCode('UNKNOWN_STATUS');
// Generate constant name
$constantName = sprintf("ID_%s", $status);
@@ -2504,14 +2492,14 @@ function GEN_ERROR_CODE_FROM_ACCOUNT_STATUS ($status) {
// Is the constant there?
if (isCodeSet($constantName)) {
// Then get it!
- $ERROR = getCode($constantName);
+ $errorCode = getCode($constantName);
} else {
// Unknown status
DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown error status %s detected.", $status));
}
// Return error code
- return $ERROR;
+ return $errorCode;
}
// Clears the output buffer. This function does *NOT* backup sent content.
@@ -2527,7 +2515,10 @@ function clearOutputBuffer () {
function searchDirsRecursive ($dir, &$last_changed) {
// Get dir as array
//* DEBUG: */ print __FUNCTION__."(".__LINE__."):dir=".$dir."
\n";
- $ds = GET_DIR_AS_ARRAY($dir, "", true, false);
+ // Does it match what we are looking for? (We skip a lot files already!)
+ // RegexPattern to exclude ., .., .revision, .svn, debug.log or .cache in the filenames
+ $excludePattern = '@(\.|\.\.|\.revision|\.svn|debug\.log|\.cache|config\.php)$@';
+ $ds = GET_DIR_AS_ARRAY($dir, "", true, false, $excludePattern);
//* DEBUG: */ print __FUNCTION__."(".__LINE__."):ds[]=".count($ds)."
\n";
// Walk through all entries
@@ -2535,28 +2526,25 @@ function searchDirsRecursive ($dir, &$last_changed) {
// Generate proper FQFN
$FQFN = str_replace("//", "/", constant('PATH') . $dir. "/". $d);
- // Does it match what we are looking for? (We skip a lot files already!)
- if (!preg_match('@(\.|\.\.|\.revision|\.svn|debug\.log|\.cache)$@', $d)) { // no . or .. or .revision or .svn in the filename
- // Is it a file and readable?
- //* DEBUG: */ print __FUNCTION__."(".__LINE__."):FQFN={$FQFN}
\n";
- if (isDirectory($FQFN)) {
- // $FQFN is a directory so also crawl into this directory
- $newDir = $d;
- if (!empty($dir)) $newDir = $dir . "/". $d;
- //* DEBUG: */ print __FUNCTION__."(".__LINE__."):DESCENT: ".$newDir."
\n";
- searchDirsRecursive($newDir, $last_changed);
- } elseif (FILE_READABLE($FQFN)) {
- // $FQFN is a filename and no directory
- $time = filemtime($FQFN);
- //* DEBUG: */ print __FUNCTION__."(".__LINE__."):File: ".$d." found. (".($last_changed['time'] - $time).")
\n";
- if ($last_changed['time'] < $time) {
- // This file is newer as the file before
- //* DEBUG: */ print __FUNCTION__."(".__LINE__.") - NEWER!
\n";
- $last_changed['path_name'] = $FQFN;
- $last_changed['time'] = $time;
- } // END - if
- }
- } // END - if
+ // Is it a file and readable?
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):FQFN={$FQFN}
\n";
+ if (isDirectory($FQFN)) {
+ // $FQFN is a directory so also crawl into this directory
+ $newDir = $d;
+ if (!empty($dir)) $newDir = $dir . "/". $d;
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):DESCENT: ".$newDir."
\n";
+ searchDirsRecursive($newDir, $last_changed);
+ } elseif (FILE_READABLE($FQFN)) {
+ // $FQFN is a filename and no directory
+ $time = filemtime($FQFN);
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):File: ".$d." found. (".($last_changed['time'] - $time).")
\n";
+ if ($last_changed['time'] < $time) {
+ // This file is newer as the file before
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__.") - NEWER!
\n";
+ $last_changed['path_name'] = $FQFN;
+ $last_changed['time'] = $time;
+ } // END - if
+ }
} // END - foreach
}
@@ -2628,6 +2616,7 @@ function getActualVersion ($type = 'Revision') {
}
// Repares an array we are looking for
+// The returned Array is needed twice (in getAkt_vers() and in getActualVersion() in the old .revision-fallback) so I puted it in an extra function to not polute the global namespace
function getSearchFor () {
// Add Revision, Date, Tag and Author
$searchFor = array('Revision', 'Date', 'Tag', 'Author');
@@ -2638,47 +2627,60 @@ function getSearchFor () {
function getAkt_vers () {
// Init variables
- $next_dir = "";
+ $next_dir = ""; // Directory to start with search
$last_changed = array(
'path_name' => "",
'time' => 0
);
- $akt_vers = array();
- $res = 0;
+ $akt_vers = array(); // Init return array
+ $res = 0; // Init value for counting the founded keywords
// Searches all Files and there date of the last modifikation and puts the newest File in $last_changed.
- searchDirsRecursive($next_dir, $last_changed);
+ searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time);
// Get file
$last_file = READ_FILE($last_changed['path_name']);
+
+ // Get all the keywords to search for
$searchFor = getSearchFor();
- // @TODO What does this loop/regex do? Document it, please.
+ // This foreach loops the $searchFor-Tags (array('Revision', 'Date', 'Tag', 'Author') --> could easaly extended in the future)
foreach ($searchFor as $search) {
+ //Searches for "$search-tag:VALUE$" or "$search-tag::VALUE$"(the stylish keywordversion ;-)) in the lates modified file
$res += preg_match('@\$'.$search.'(:|::) (.*) \$@U', $last_file, $t);
+ // This trimms the search-result and puts it in the $akt_vers-return array
if (isset($t[2])) $akt_vers[$search] = trim($t[2]);
} // END - foreach
- if ($res && $res >= 3) {
- // Prepare content
- preg_match('@(....)-(..)-(..) (..):(..):(..)@', $akt_vers['Date'], $match_d);
+ // Save the last-changed filename for debugging
+ $akt_vers['File'] = $last_changed['path_name'];
+
+ // at least 3 keyword-Tags are needed for propper values
+ if ($res && $res >= 3
+ && isset($akt_vers['Revision']) && $akt_vers['Revision'] != ''
+ && isset($akt_vers['Date']) && $akt_vers['Date'] != ''
+ && isset($akt_vers['Tag']) && $akt_vers['Tag'] != '') {
+ // Prepare content witch need special treadment
// Prepare timestamp for date
+ preg_match('@(....)-(..)-(..) (..):(..):(..)@', $akt_vers['Date'], $match_d);
$akt_vers['Date'] = mktime($match_d[4], $match_d[5], $match_d[6], $match_d[2], $match_d[3], $match_d[1]);
- // Add Tag if the author is set and is not quix0r (lead coder)
+ // Add author to the Tag if the author is set and is not quix0r (lead coder)
if ((isset($akt_vers['Author'])) && ($akt_vers['Author'] != "quix0r")) {
$akt_vers['Tag'] .= '-'.strtoupper($akt_vers['Author']);
} // END - if
+
} else {
- // No valid Data from the last modificated file so read the Revision from the Server. Fallback-solution!! Could be removed I think.
+ // No valid Data from the last modificated file so read the Revision from the Server. Fallback-solution!! Should not be removed I think.
$version = GET_URL("check-updates3.php");
// Prepare content
- $akt_vers['Revision'] = trim($version[10]);
- $akt_vers['Date'] = trim($version[9]);
- $akt_vers['Tag'] = trim($version[8]);
- $akt_vers['Author'] = "quix0r";
+ // Only sets not setted or not proper values to the Online-Server-Fallback-Solution
+ if (!isset($akt_vers['Revision']) || $akt_vers['Revision'] == '') $akt_vers['Revision'] = trim($version[10]);
+ if (!isset($akt_vers['Date']) || $akt_vers['Date'] == '') $akt_vers['Date'] = trim($version[9]);
+ if (!isset($akt_vers['Tag']) || $akt_vers['Tag'] == '') $akt_vers['Tag'] = trim($version[8]);
+ if (!isset($akt_vers['Author']) || $akt_vers['Author'] == '') $akt_vers['Author'] = "quix0r";
}
// Return prepared array
@@ -2692,7 +2694,7 @@ function LOAD_INC ($INC) {
$FQFN = constant('PATH') . $INC;
// Is the include file there?
- if (!FILE_READABLE($FQFN)) {
+ if (!INCLUDE_READABLE($INC)) {
// Not there so log it
debug_report_bug(sprintf("Include file %s not found.", $INC));
return false;
@@ -2751,12 +2753,13 @@ function debug_report_bug ($message = "") {
} // END - if
// Add output
- $debug .= "Please report this error at bugs.mxchange.org:";
+ $debug .= "Please report this bug at bugs.mxchange.org:";
$debug .= debug_get_printable_backtrace();
- $debug .= "
Thank you for finding bugs.";
+ $debug .= "
Request-URI: ".$_SERVER['REQUEST_URI']."
\n";
+ $debug .= "Thank you for finding bugs.";
// And abort here
- // @TODO This cannot be rewritten to mxchange_die(), try to find a solution for this.
+ // @TODO This cannot be rewritten to app_die(), try to find a solution for this.
die($debug);
}
@@ -2798,7 +2801,15 @@ function convertCodeToMessage ($code) {
case getCode('COOKIES_DISABLED') : $msg = getMessage('LOGIN_NO_COOKIES'); break;
case getCode('BEG_SAME_AS_OWN') : $msg = getMessage('BEG_SAME_UID_AS_OWN'); break;
case getCode('LOGIN_FAILED') : $msg = getMessage('LOGIN_FAILED_GENERAL'); break;
- default : $msg = sprintf(getMessage('UNKNOWN_MAILID_CODE'), $code); break;
+ case getCode('MODULE_MEM_ONLY') : $msg = sprintf(getMessage('MODULE_MEM_ONLY'), REQUEST_GET('mod')); break;
+
+ default:
+ // Missing/invalid code
+ $msg = sprintf(getMessage('UNKNOWN_MAILID_CODE'), $code);
+
+ // Log it
+ DEBUG_LOG(__FUNCTION__, __LINE__, $msg);
+ break;
} // END - switch
// Return the message
@@ -2821,9 +2832,11 @@ function GENERATE_AID_LINK ($aid) {
$admin = "{--ADMIN_NO_ADMIN_ASSIGNED--}";
// Zero? = Not assigned
- if ($aid > 0) {
+ if (bigintval($aid) > 0) {
// Load admin's login
$login = GET_ADMIN_LOGIN($aid);
+
+ // Is the login valid?
if ($login != "***") {
// Is the extension there?
if (EXT_IS_ACTIVE("admins")) {
@@ -3081,62 +3094,12 @@ function DEBUG_LOG ($funcFile, $line, $message, $force=true) {
$message = str_replace("\r", "", str_replace("\n", "", $message));
// Log this message away
- $fp = fopen(constant('PATH')."inc/cache/debug.log", 'a') or mxchange_die("Cannot write logfile debug.log!");
+ $fp = fopen(constant('PATH')."inc/cache/debug.log", 'a') or app_die(__FUNCTION__, __LINE__, "Cannot write logfile debug.log!");
fwrite($fp, date("d.m.Y|H:i:s", time())."|".basename($funcFile)."|".$line."|".strip_tags($message)."\n");
fclose($fp);
} // END - if
}
-// Reads a directory with PHP files in and gets only files back
-function GET_DIR_AS_ARRAY ($baseDir, $prefix, $includeDirs = false, $addBaseDir = true) {
- // Init includes
- $INCs = array();
-
- // Open directory
- $dirPointer = opendir(constant('PATH') . $baseDir) or mxchange_die("Cannot read ".basename($baseDir)." path!");
-
- // Read all entries
- while ($baseFile = readdir($dirPointer)) {
- // Construct include filename and FQFN
- $INC = $baseDir . "/" . $baseFile;
- $FQFN = constant('PATH') . $INC;
-
- // Is this a valid reset file?
- //* DEBUG: */ print __FUNCTION__."(".__LINE__."):baseDir={$baseDir},prefix={$prefix},baseFile={$baseFile}
\n";
- if (((FILE_READABLE($FQFN)) && (substr($baseFile, 0, strlen($prefix)) == $prefix) && (substr($baseFile, -4, 4) == ".php")) || (($includeDirs) && (isDirectory($FQFN)))) {
- // Remove both for extension name
- $extName = substr($baseFile, strlen($prefix), -4);
-
- // Try to find it
- $extId = GET_EXT_ID($extName);
-
- // Is the extension valid and active?
- if (($extId > 0) && (EXT_IS_ACTIVE($extName))) {
- // Then add this file
- //* DEBUG: */ print __FUNCTION__."(".__LINE__."): Extension entry ".$baseFile." added.
\n";
- $INCs[] = $INC;
- } elseif ($extId == 0) {
- // Add non-extension files as well
- //* DEBUG: */ print __FUNCTION__."(".__LINE__."): Regular entry ".$baseFile." added.
\n";
- if ($addBaseDir) {
- $INCs[] = $INC;
- } else {
- $INCs[] = $baseFile;
- }
- }
- } // END - if
- } // END - while
-
- // Close directory
- closedir($dirPointer);
-
- // Sort array
- asort($INCs);
-
- // Return array with include files
- return $INCs;
-}
-
// Load more reset scripts
function runResetIncludes () {
// Is the reset set or old sql_patches?
@@ -3356,7 +3319,7 @@ function CACHE_PURGE_ADMIN_MENU ($id=0, $action="", $what="", $str="") {
// Translates the "pool type" into human-readable
function TRANSLATE_POOL_TYPE ($type) {
- // Default type is unknown
+ // Default?type is unknown
$translated = sprintf(getMessage('POOL_TYPE_UNKNOWN'), $type);
// Generate constant
@@ -3372,10 +3335,34 @@ function TRANSLATE_POOL_TYPE ($type) {
return $translated;
}
+// Determines the real remote address
+function determineRealRemoteAddress () {
+ // Is a proxy in use?
+ if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])){
+ // Proxy was used
+ $address = $_SERVER['HTTP_X_FORWARDED_FOR'];
+ } elseif (isset($_SERVER['HTTP_CLIENT_IP'])){
+ // Yet, another proxy
+ $address = $_SERVER['HTTP_CLIENT_IP'];
+ } else {
+ // The regular address when no proxy was used
+ $address = $_SERVER['REMOTE_ADDR'];
+ }
+
+ // This strips out the real address from proxy output
+ if (strstr($address, ",")){
+ $addressArray = explode(",", $address);
+ $address = $addressArray[0];
+ } // END - if
+
+ // Return the result
+ return $address;
+}
+
// "Getter" for remote IP number
function GET_REMOTE_ADDR () {
// Get remote ip from environment
- $remoteAddr = getenv('REMOTE_ADDR');
+ $remoteAddr = determineRealRemoteAddress();
// Is removeip installed?
if (EXT_IS_ACTIVE("removeip")) {
@@ -3469,10 +3456,8 @@ function ADD_NEW_BONUS_MAIL ($data, $mode="", $output=true) {
// Determines referal id and sets it
function DETERMINE_REFID () {
- global $CLICK, $_SERVER;
-
// Check if refid is set
- if ((!empty($_GET['user'])) && ($CLICK == 1) && (basename($_SERVER['PHP_SELF']) == "click.php")) {
+ if ((!empty($_GET['user'])) && (basename($_SERVER['PHP_SELF']) == "click.php")) {
// The variable user comes from the click-counter script click.php and we only accept this here
$GLOBALS['refid'] = bigintval($_GET['user']);
} elseif (!empty($_POST['refid'])) {
@@ -3560,7 +3545,7 @@ function shutdown () {
if (SQL_IS_LINK_UP()) {
// Close link
SQL_CLOSE(__FILE__, __LINE__);
- } elseif (!isInstalling()) {
+ } elseif ((!isInstalling()) && (isInstalled())) {
// No database link
addFatalMessage(__FILE__, __LINE__, getMessage('NO_DB_LINK_SHUTDOWN'));
}
@@ -3606,48 +3591,20 @@ function isDirectory ($FQFN) {
return $isDirectory;
}
-// Init INC_POOL
-function INIT_INC_POOL () {
- $GLOBALS['inc_pool'] = array();
-}
-
-// Setter for INC_POOL
-function SET_INC_POOL ($includePool) {
- $GLOBALS['inc_pool'] = (array) $includePool;
-}
-
-// Getter for INC_POOL
-function GET_INC_POOL () {
- return $GLOBALS['inc_pool'];
-}
-
-// Count INC_POOL
-function COUNT_INC_POOL () {
- return count($GLOBALS['inc_pool']);
-}
-
-// Merge INC_POOL into given
-function MERGE_INC_POOL ($includePool) {
- SET_INC_POOL(merge_array(GET_INC_POOL(), $includePool));
-}
-
-// Add single include file to INC_POOL
-function ADD_INC_TO_POOL ($INC) {
- $GLOBALS['inc_pool'][] = (string) $INC;
-}
+// Handle message codes from URL
+function handleCodeMessage () {
+ if (REQUEST_ISSET_GET(('msg'))) {
+ // Default extension is "unknown"
+ $ext = "unknown";
-// Remove an include file from INC_POOL
-function REMOVE_INC_FROM_POOL ($INC) {
- // First look it up
- $key = array_search($INC, GET_INC_POOL());
+ // Is extension given?
+ if (REQUEST_ISSET_GET(('ext'))) $ext = REQUEST_GET(('ext'));
- // Is it valid?
- if ($key !== false) {
- // Then remove it
- unset($GLOBALS['inc_pool'][$key]);
+ // Convert the 'msg' parameter from URL to a human-readable message
+ $msg = convertCodeToMessage(REQUEST_GET('msg'));
- // And sort the list
- asort($GLOBALS['inc_pool']);
+ // Load message template
+ LOAD_TEMPLATE("message", false, $msg);
} // END - if
}