X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=8c8d7e15bdba31c04a8f5f8a73e2b16f948daea6;hp=bfead5a33ee9ba7c8b810a35e540848429ad0318;hb=eeee0af1c4bb14b8438e2bfcb62dc14eb8f8fa5e;hpb=2e0f1bfd10fc3d9fe9b43d29cc3e32622b262c63
diff --git a/inc/functions.php b/inc/functions.php
index bfead5a33e..8c8d7e15bd 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,35 +35,12 @@
* 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";
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 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, $newLine = true) {
// Some global variables
@@ -88,7 +70,7 @@ function OUTPUT_HTML ($HTML, $newLine = true) {
case "direct":
// If we are switching from render to direct output rendered code
- if ((!empty($OUTPUT)) && (constant('_OB_CACHING') != "on")) { OUTPUT_RAW($OUTPUT); $OUTPUT = ""; }
+ if ((!empty($OUTPUT)) && (constant('_OB_CACHING') != "on")) { OUTPUT_RAW($OUTPUT); $OUTPUT = ''; }
// The same as above... ^
OUTPUT_RAW($HTML);
@@ -98,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)) {
@@ -132,22 +114,22 @@ function OUTPUT_HTML ($HTML, $newLine = true) {
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")) {
+ // Extension 'rewrite' installed?
+ if ((EXT_IS_ACTIVE('rewrite')) && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
$OUTPUT = REWRITE_LINKS($OUTPUT);
} // END - if
// Compile and run finished rendered HTML code
while (strpos($OUTPUT, '{!') > 0) {
// 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
@@ -156,7 +138,7 @@ function OUTPUT_HTML ($HTML, $newLine = true) {
OUTPUT_RAW($OUTPUT);
} elseif ((constant('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")) {
+ if ((EXT_IS_ACTIVE('rewrite')) && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
$OUTPUT = REWRITE_LINKS($OUTPUT);
} // END - if
@@ -194,7 +176,8 @@ function getFatalArray () {
}
// Add a fatal error message to the queue array
-function addFatalMessage ($F, $L, $message, $extra="") {
+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);
@@ -228,7 +211,10 @@ 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()) {
// 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);
@@ -242,14 +228,14 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
$HTTP_USER_AGENT = GET_USER_AGENT();
// 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']), __FUNCTION__, __LINE__);
+ array(getUserId()), __FUNCTION__, __LINE__);
// Is content an array?
if (is_array($content)) {
@@ -277,47 +263,47 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
$date_time = MAKE_DATETIME(time(), "1");
// Base directory
- $BASE = sprintf("%stemplates/%s/html/", constant('PATH'), GET_LANGUAGE());
- $MODE = "";
+ $basePath = sprintf("%stemplates/%s/html/", constant('PATH'), GET_LANGUAGE());
+ $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 //
////////////////////////
- $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 ((!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'])
);
@@ -332,7 +318,7 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
// Does the special template exists?
if (!FILE_READABLE($FQFN)) {
// Reset to default template
- $FQFN = $BASE.$template.".tpl";
+ $FQFN = $basePath.$template.".tpl";
} // END - if
// Now does the final template exists?
@@ -344,7 +330,7 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
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))."\";";
@@ -375,7 +361,7 @@ 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 {
@@ -389,68 +375,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!)
@@ -458,20 +444,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"))) {
+ } 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);
- } elseif ($HTML == "N") {
+ 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);
}
}
@@ -485,7 +471,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
@@ -509,7 +495,7 @@ 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)) {
+ 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->WordWrap = 70;
@@ -517,14 +503,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);
}
}
//
@@ -538,9 +524,9 @@ function GEN_PASS ($LEN = 0) {
$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
@@ -635,7 +621,7 @@ 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));
+ $URL = 'modules.php?module=loader&url=' . encodeString(compileUriCode($URL));
} // END - if
// Return link
@@ -645,13 +631,13 @@ function DEREFERER ($URL) {
// Translate Uni*-like gender to human-readable
function TRANSLATE_GENDER ($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));
@@ -665,8 +651,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;
@@ -682,28 +667,30 @@ function SELECTION_COUNT ($array) {
}
return $ret;
}
+
//
function IMG_CODE ($code, $type, $DATA, $uid) {
- return " ";
+ return ' ';
}
+
//
function TRANSLATE_STATUS ($status) {
switch ($status)
{
- case "UNCONFIRMED":
- case "CONFIRMED":
- case "LOCKED":
+ case 'UNCONFIRMED':
+ case 'CONFIRMED':
+ case 'LOCKED':
$ret = getMessage(sprintf("ACCOUNT_%s", $status));
break;
- case "":
+ 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);
+ $ret = sprintf(getMessage('UNKNOWN_STATUS'), $status);
break;
}
@@ -716,7 +703,7 @@ function GET_LANGUAGE() {
$ret = constant('DEFAULT_LANG');
// Init variable
- $lang = "";
+ $lang = '';
// Is the variable set
if (REQUEST_ISSET_GET(('mx_lang'))) {
@@ -727,7 +714,7 @@ function GET_LANGUAGE() {
$ret = $GLOBALS['cache_array']['language'];
} elseif (!empty($lang)) {
// Check if main language file does exist
- if (FILE_READABLE(constant('PATH')."inc/language/".$lang.".php")) {
+ if (FILE_READABLE(constant('PATH').'inc/language/'.$lang.'.php')) {
// Okay found, so let's update cookies
SET_LANGUAGE($lang);
}
@@ -754,14 +741,14 @@ function SET_LANGUAGE ($lang) {
set_session('mx_lang', $lang);
}
//
-function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
+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 = "---";
+ // Default 'nickname' if extension is not installed
+ $nick = '---';
// Prepare IP number and User Agent
$REMOTE_ADDR = GET_REMOTE_ADDR();
@@ -801,7 +788,7 @@ 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",
@@ -832,38 +819,38 @@ 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'), GET_LANGUAGE());
// Check for admin/guest/member templates
if (strpos($template, "admin_") > -1) {
// Admin template found
- $FQFN = $BASE."admin/".$template.".tpl";
+ $FQFN = $basePath."admin/".$template.".tpl";
} elseif (strpos($template, "guest_") > -1) {
// Guest template found
- $FQFN = $BASE."guest/".$template.".tpl";
+ $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, "_"));
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)) {
// Reset to default template
- $FQFN = $BASE.$template.".tpl";
+ $FQFN = $basePath.$template.".tpl";
} // END - if
// Now does the final template exists?
- $newContent = "";
+ $newContent = '';
if (FILE_READABLE($FQFN)) {
// The local file does exists so we load it. :)
$tmpl_file = READ_FILE($FQFN);
@@ -922,11 +909,14 @@ function LOAD_URL ($URL, $addUrlData=true) {
if ((substr($URL, 0, 7) != "http://") && (substr($URL, 0, 8) != "https://")) {
// Make all URLs full-qualified
$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);
+
+ // Get output buffer
$OUTPUT = ob_get_contents();
// Clear it only if there is content
@@ -950,11 +940,13 @@ function LOAD_URL ($URL, $addUrlData=true) {
header ("Location: ".str_replace("&", "&", $URL));
} else {
// Output error message
- LOAD_INC("inc/header.php");
+ LOAD_INC('inc/header.php');
LOAD_TEMPLATE("redirect_url", false, str_replace("&", "&", $URL));
- LOAD_INC("inc/footer.php");
+ LOAD_INC('inc/footer.php');
}
- exit();
+
+ // Shut the mailer down here
+ shutdown();
}
// Wrapper for LOAD_URL but URL comes from a configuration entry
@@ -980,13 +972,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));
@@ -997,16 +990,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)) {
@@ -1108,10 +1101,9 @@ function array_pk_sort (&$array, $a_sort, $primary_key = 0, $order = -1, $nums =
//
function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
- global $MONTH_DESCR;
- $OUT = "";
+ $OUT = '';
- if ($type == "yn") {
+ if ($type == 'yn') {
// This is a yes/no selection only!
if ($id > 0) $prefix .= "[".$id."]";
$OUT .= " \n";
@@ -1127,15 +1119,15 @@ function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
case "day": // Day
for ($idx = 1; $idx < 32; $idx++) {
$OUT .= "\n";
} // END - for
break;
case "month": // Month
- foreach ($MONTH_DESCR as $month => $descr) {
+ foreach ($GLOBALS['month_descr'] as $month => $descr) {
$OUT .= " \n";
} // END - for
break;
@@ -1145,7 +1137,7 @@ function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
$YEAR = date('Y', time());
// Use configured min age or fixed?
- if (GET_EXT_VERSION("other") >= "0.2.1") {
+ if (GET_EXT_VERSION('other') >= '0.2.1') {
// Configured
$startYear = $YEAR - getConfig('min_age');
} else {
@@ -1160,7 +1152,7 @@ function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
if (($DEFAULT > $minYear) && ($DEFAULT >= $YEAR)) {
for ($idx = $YEAR; $idx < ($YEAR + 11); $idx++) {
$OUT .= " \n";
} // END - for
} elseif ($DEFAULT == -1) {
@@ -1173,7 +1165,7 @@ function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
// Get current year and subtract the configured minimum age
$OUT .= " <".$minYear." \n";
// Calculate earliest year depending on extension version
- if (GET_EXT_VERSION("other") >= "0.2.1") {
+ if (GET_EXT_VERSION('other') >= '0.2.1') {
// Use configured minimum age
$YEAR = date('Y', time()) - getConfig('min_age');
} else {
@@ -1184,7 +1176,7 @@ function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
// Construct year selection list
for ($idx = $minYear; $idx <= $YEAR; $idx++) {
$OUT .= "\n";
} // END - for
}
@@ -1195,7 +1187,7 @@ function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
for ($idx = 0; $idx < 60; $idx+=5) {
if (strlen($idx) == 1) $idx = "0".$idx;
$OUT .= " \n";
} // END - for
break;
@@ -1204,16 +1196,16 @@ function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
for ($idx = 0; $idx < 24; $idx++) {
if (strlen($idx) == 1) $idx = "0".$idx;
$OUT .= " \n";
} // END - for
break;
- case "yn":
+ case 'yn':
$OUT .= " \n";
for ($idx = 0; $idx <= 10; $idx++) {
$OUT .= " \n";
}
$OUT .= " \n";
@@ -1478,7 +1470,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
for ($idx = 0; $idx <= 11; $idx++)
{
$OUT .= " \n";
}
$OUT .= " \n";
@@ -1491,7 +1483,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
$OUT .= " \n";
for ($idx = 0; $idx <= 4; $idx++) {
$OUT .= " \n";
}
$OUT .= " \n";
@@ -1504,7 +1496,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
$OUT .= " \n";
for ($idx = 0; $idx <= 31; $idx++) {
$OUT .= " \n";
}
$OUT .= " \n";
@@ -1517,7 +1509,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
$OUT .= " \n";
for ($idx = 0; $idx <= 23; $idx++) {
$OUT .= " \n";
}
$OUT .= " \n";
@@ -1530,7 +1522,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
$OUT .= " \n";
for ($idx = 0; $idx <= 59; $idx++) {
$OUT .= " \n";
}
$OUT .= " \n";
@@ -1543,7 +1535,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
$OUT .= " \n";
for ($idx = 0; $idx <= 59; $idx++) {
$OUT .= " \n";
}
$OUT .= " \n";
@@ -1596,11 +1588,6 @@ function SEND_ADMIN_EMAILS_PRO ($subj, $template, $content, $UID) {
// Load email template
$msg = LOAD_EMAIL_TEMPLATE($template, $content, $UID);
- if (EXT_VERSION_IS_OLDER("admins", "0.4.0")) {
- // Older version detected!
- return SEND_ADMIN_EMAILS($subj, $msg);
- } // END - if
-
// Check which admin shall receive this mail
$result = SQL_QUERY_ESC("SELECT DISTINCT admin_id FROM `{!_MYSQL_PREFIX!}_admins_mails` WHERE mail_template='%s' ORDER BY admin_id",
array($template), __FUNCTION__, __LINE__);
@@ -1610,9 +1597,10 @@ function SEND_ADMIN_EMAILS_PRO ($subj, $template, $content, $UID) {
array($template), __FUNCTION__, __LINE__);
} else {
// Load admin IDs...
- $aids = array();
- while (list($aid) = SQL_FETCHROW($result)) {
- $aids[] = $aid;
+ // @TODO This can be, somehow, rewritten
+ $adminIds = array();
+ while ($content = SQL_FETCHARRAY($result)) {
+ $adminIds[] = $content['admin_id'];
} // END - while
// Free memory
@@ -1622,9 +1610,9 @@ function SEND_ADMIN_EMAILS_PRO ($subj, $template, $content, $UID) {
$result = false;
// "implode" IDs and query string
- $aid = implode(",", $aids);
+ $aid = implode(",", $adminIds);
if ($aid == "-1") {
- if (EXT_IS_ACTIVE("events")) {
+ if (EXT_IS_ACTIVE('events')) {
// Add line to user events
EVENTS_ADD_LINE($subj, $msg, $UID);
} else {
@@ -1637,16 +1625,18 @@ function SEND_ADMIN_EMAILS_PRO ($subj, $template, $content, $UID) {
}
} elseif ($aid == "0") {
// Select all email adresses
- $result = SQL_QUERY("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY `id`", __FUNCTION__, __LINE__);
+ $result = SQL_QUERY("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY `id`",
+ __FUNCTION__, __LINE__);
} else {
// If Admin-ID is not "to-all" select
- $result = SQL_QUERY_ESC("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` WHERE id IN (%s) ORDER BY `id`", array($aid), __FUNCTION__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` WHERE id IN (%s) ORDER BY `id`",
+ array($aid), __FUNCTION__, __LINE__);
}
}
// Load email addresses and send away
- while (list($email) = SQL_FETCHROW($result)) {
- SEND_EMAIL($email, $subj, $msg);
+ while ($content = SQL_FETCHARRAY($result)) {
+ SEND_EMAIL($content['email'], $subj, $msg);
} // END - while
// Free memory
@@ -1656,8 +1646,8 @@ function SEND_ADMIN_EMAILS_PRO ($subj, $template, $content, $UID) {
//
function CREATE_FANCY_TIME ($stamp) {
// Get data array with years/months/weeks/days/...
- $data = CREATE_TIME_SELECTIONS($stamp, "", "", "", true);
- $ret = "";
+ $data = CREATE_TIME_SELECTIONS($stamp, '', '', '', true);
+ $ret = '';
foreach($data as $k => $v) {
if ($v > 0) {
// Value is greater than 0 "eval" data to return string
@@ -1682,16 +1672,16 @@ function CREATE_FANCY_TIME ($stamp) {
//
function ADD_EMAIL_NAV ($PAGES, $offset, $show_form, $colspan, $return=false) {
- $SEP = ""; $TOP = "";
+ $SEP = ''; $TOP = '';
if (!$show_form) {
$TOP = " top2";
$SEP = " ";
}
- $NAV = "";
+ $NAV = '';
for ($page = 1; $page <= $PAGES; $page++) {
// Is the page currently selected or shall we generate a link to it?
- if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET(('page'))) && ($page == "1"))) {
+ if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET('page')) && ($page == "1"))) {
// Is currently selected, so only highlight it
$NAV .= "-";
} else {
@@ -1699,13 +1689,13 @@ function ADD_EMAIL_NAV ($PAGES, $offset, $show_form, $colspan, $return=false) {
$NAV .= " 0)) $NAV .= "&uid=".bigintval(REQUEST_GET('uid'));
+ if ((REQUEST_ISSET_GET('uid')) && (bigintval(REQUEST_GET('uid')) > 0)) $NAV .= "&uid=".bigintval(REQUEST_GET('uid'));
// Close open anchor tag
$NAV .= "\">";
}
$NAV .= $page;
- if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET(('page'))) && ($page == "1"))) {
+ if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET('page')) && ($page == "1"))) {
// Is currently selected, so only highlight it
$NAV .= "- ";
} else {
@@ -1728,7 +1718,7 @@ function ADD_EMAIL_NAV ($PAGES, $offset, $show_form, $colspan, $return=false) {
// Load navigation template
$OUT = LOAD_TEMPLATE("admin_email_nav_row", true);
- if ($return) {
+ if ($return === true) {
// Return generated HTML-Code
return $OUT;
} else {
@@ -1752,7 +1742,7 @@ function EXTRACT_HOST (&$script) {
} // END - if
// Extract host name
- $host = str_replace("http://", "", $url);
+ $host = str_replace("http://", '', $url);
if (ereg("/", $host)) $host = substr($host, 0, strpos($host, "/"));
// Generate relative URL
@@ -1784,7 +1774,11 @@ function GET_URL ($script) {
$request = "GET /" . trim($script) . " HTTP/1.1\r\n";
$request .= "Host: " . $host . "\r\n";
$request .= "Referer: " . constant('URL') . "/admin.php\r\n";
- $request .= "User-Agent: " . constant('TITLE') . "/" . constant('FULL_VERSION') . "\r\n";
+ if (defined('FULL_VERSION')) {
+ $request .= "User-Agent: " . constant('TITLE') . "/" . constant('FULL_VERSION') . "\r\n";
+ } else {
+ $request .= "User-Agent: " . constant('TITLE') . "/?.?.?\r\n";
+ }
$request .= "Content-Type: text/plain\r\n";
$request .= "Cache-Control: no-cache\r\n";
$request .= "Connection: Close\r\n\r\n";
@@ -1802,7 +1796,7 @@ function POST_URL ($script, $postData) {
if (!is_array($postData)) {
// Abort here
DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("postData is not an array. Type: %s", gettype($postData)));
- return array("", "", "");
+ return array("", '', '');
} // END - if
// Compile the script name
@@ -1835,7 +1829,7 @@ function POST_URL ($script, $postData) {
// Sends a raw request to another host
function SEND_RAW_REQUEST ($host, $request) {
// Initialize array
- $response = array("", "", "");
+ $response = array("", '', '');
// Default is not to use proxy
$useProxy = false;
@@ -1899,7 +1893,7 @@ function SEND_RAW_REQUEST ($host, $request) {
fputs($fp, $request);
// Read response
- while(!feof($fp)) {
+ while (!feof($fp)) {
$response[] = trim(fgets($fp, 1024));
} // END - while
@@ -1934,7 +1928,7 @@ function SEND_RAW_REQUEST ($host, $request) {
// Was the request successfull?
if ((!eregi("200 OK", $response[0])) || (empty($response[0]))) {
// Not found / access forbidden
- $response = array("", "", "");
+ $response = array("", '', '');
} // END - if
// Return response
@@ -1942,7 +1936,7 @@ function SEND_RAW_REQUEST ($host, $request) {
}
// Taken from www.php.net eregi() user comments
-function VALIDATE_EMAIL($email) {
+function VALIDATE_EMAIL ($email) {
// Compile email
$email = COMPILE_CODE($email);
@@ -2018,18 +2012,18 @@ function MEMBER_ACTION_LINKS ($uid, $status = "") {
}
// Generate an email link
-function CREATE_EMAIL_LINK ($email, $table = "admins") {
+function CREATE_EMAIL_LINK ($email, $table = 'admins') {
// Default email link (INSECURE! Spammer can read this by harvester programs)
$EMAIL = "mailto:".$email;
// Check for several extensions
- if ((EXT_IS_ACTIVE("admins")) && ($table == "admins")) {
+ if ((EXT_IS_ACTIVE('admins')) && ($table == 'admins')) {
// Create email link for contacting admin in guest area
$EMAIL = ADMINS_CREATE_EMAIL_LINK($email);
- } elseif ((EXT_IS_ACTIVE("user")) && (GET_EXT_VERSION("user") >= "0.3.3") && ($table == "user_data")) {
+ } elseif ((EXT_IS_ACTIVE('user')) && (GET_EXT_VERSION('user') >= '0.3.3') && ($table == "user_data")) {
// Create email link for contacting a member within admin area (or later in other areas, too?)
$EMAIL = USER_CREATE_EMAIL_LINK($email);
- } elseif ((EXT_IS_ACTIVE("sponsor")) && ($table == "sponsor_data")) {
+ } elseif ((EXT_IS_ACTIVE('sponsor')) && ($table == "sponsor_data")) {
// Create email link to contact sponsor within admin area (or like the link above?)
$EMAIL = SPONSOR_CREATE_EMAIL_LINK($email);
}
@@ -2043,10 +2037,8 @@ 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))) {
+ // 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
return md5($plainText);
} // END - if
@@ -2063,7 +2055,7 @@ function generateHash ($plainText, $salt = "") {
$server = $_SERVER['PHP_SELF'].":".GET_USER_AGENT().":".getenv('SERVER_SOFTWARE').":".GET_REMOTE_ADDR().":".":".filemtime(constant('PATH')."inc/databases.php");
// Build key string
- $keys = constant('SITE_KEY').":".constant('DATE_KEY').":".getConfig('secret_key').":".getConfig('file_hash').":".date("d-m-Y (l-F-T)", bigintval(getConfig('patch_ctime'))).":".getConfig('master_salt');
+ $keys = constant('SITE_KEY').":".constant('DATE_KEY').":".getConfig('secret_key').":".getConfig('file_hash').":".date("d-m-Y (l-F-T)", getConfig(('patch_ctime'))).":".getConfig('master_salt');
// Additional data
$data = $plainText.":".uniqid(mt_rand(), true).":".time();
@@ -2095,7 +2087,7 @@ function generateHash ($plainText, $salt = "") {
// Scramble a string
function scrambleString($str) {
// Init
- $scrambled = "";
+ $scrambled = '';
// Final check, in case of failture it will return unscrambled string
if (strlen($str) > 40) {
@@ -2176,7 +2168,7 @@ function genScrambleString ($len) {
// normally be stored in cookies
function ADD_URL_DATA ($URL) {
// Init add
- $ADD = "";
+ $add = '';
// Determine URL binder
$BIND = "?";
@@ -2186,15 +2178,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'));
- } elseif ((GET_EXT_VERSION("sql_patches") != '') && (getConfig('def_refid') > 0)) {
+ $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
@@ -2205,7 +2197,7 @@ function generatePassString ($passHash) {
// Is a secret key and master salt already initialized?
if ((getConfig('secret_key') != "") && (getConfig('master_salt') != "")) {
// Only calculate when the secret key is generated
- $newHash = ""; $start = 9;
+ $newHash = ''; $start = 9;
for ($idx = 0; $idx < 10; $idx++) {
$part1 = hexdec(substr($passHash, $start, 4));
$part2 = hexdec(substr(getConfig('secret_key'), $start, 4));
@@ -2244,25 +2236,28 @@ function FIX_DELETED_COOKIES ($cookies) {
foreach ($cookies as $cookieName) {
// Is the cookie set to "deleted"?
if (get_session($cookieName) == "deleted") {
- set_session($cookieName, "");
+ set_session($cookieName, '');
}
} // END - foreach
} // END - if
}
// 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");
+ 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);
+ LOAD_TEMPLATE('admin_settings_saved', false, $msg);
// Load footer
- LOAD_INC_ONCE("inc/footer.php");
+ LOAD_INC_ONCE('inc/footer.php');
// Exit explicitly
- exit;
+ shutdown();
}
// Display parsing time and number of SQL queries in footer
@@ -2356,8 +2351,6 @@ function getMessage ($messageId) {
// Get current theme name
function GET_CURR_THEME() {
- global $INC_POOL;
-
// The default theme is 'default'... ;-)
$ret = "default";
@@ -2367,7 +2360,7 @@ function GET_CURR_THEME() {
if (!isSessionVariableSet('mxchange_theme')) {
// Set default theme
set_session('mxchange_theme', $ret);
- } elseif ((isSessionVariableSet('mxchange_theme')) && (GET_EXT_VERSION("sql_patches") >= "0.1.4")) {
+ } elseif ((isSessionVariableSet('mxchange_theme')) && (GET_EXT_VERSION('sql_patches') >= '0.1.4')) {
//die("".print_r($GLOBALS['cache_array']['themes'], true)." ");
// Get theme from cookie
$ret = get_session('mxchange_theme');
@@ -2377,14 +2370,14 @@ function GET_CURR_THEME() {
// Fix it to default
$ret = "default";
} // END - if
- } elseif ((!isInstalled()) && ((isInstalling()) || ($GLOBALS['output_mode'] == true)) && ((REQUEST_ISSET_GET(('theme'))) || (REQUEST_ISSET_POST(('theme'))))) {
+ } elseif ((!isInstalled()) && ((isInstalling()) || ($GLOBALS['output_mode'] == true)) && ((REQUEST_ISSET_GET('theme')) || (REQUEST_ISSET_POST('theme')))) {
// Prepare FQFN for checking
- $theme = sprintf("%stheme/%s/theme.php", constant('PATH'), REQUEST_GET(('theme')));
+ $theme = sprintf("%stheme/%s/theme.php", constant('PATH'), REQUEST_GET('theme'));
// Installation mode active
- if ((REQUEST_ISSET_GET(('theme'))) && (FILE_READABLE($theme))) {
+ if ((REQUEST_ISSET_GET('theme')) && (FILE_READABLE($theme))) {
// Set cookie from URL data
- set_session('mxchange_theme', REQUEST_GET(('theme')));
+ set_session('mxchange_theme', REQUEST_GET('theme'));
} elseif (FILE_READABLE(sprintf("%stheme/%s/theme.php", constant('PATH'), SQL_ESCAPE(REQUEST_POST('theme'))))) {
// Set cookie from posted data
set_session('mxchange_theme', SQL_ESCAPE(REQUEST_POST('theme')));
@@ -2398,10 +2391,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)) $INC_POOL[] = $theme;
+ if (INCLUDE_READABLE($INC)) ADD_INC_TO_POOL($INC);
// Return theme value
return $ret;
@@ -2409,8 +2402,8 @@ function GET_CURR_THEME() {
// Get id from theme
function THEME_GET_ID ($name) {
- // Is the extension "theme" installed?
- if (!EXT_IS_ACTIVE("theme")) {
+ // Is the extension 'theme' installed?
+ if (!EXT_IS_ACTIVE('theme')) {
// Then abort here
return 0;
} // END - if
@@ -2425,7 +2418,7 @@ function THEME_GET_ID ($name) {
// Count up
incrementConfigEntry('cache_hits');
- } elseif (GET_EXT_VERSION("cache") != "0.1.8") {
+ } elseif (GET_EXT_VERSION('cache') != '0.1.8') {
// Check if current theme is already imported or not
$result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_themes` WHERE theme_path='%s' LIMIT 1",
array($name), __FUNCTION__, __LINE__);
@@ -2458,7 +2451,7 @@ function READ_FILE ($FQFN, $sqlPrepare = false) {
// Prepare SQL queries?
if ($sqlPrepare === true) {
// Remove some unwanted chars
- $content = str_replace("\r", "", $content);
+ $content = str_replace("\r", '', $content);
$content = str_replace("\n\n", "\n", $content);
} // END - if
@@ -2486,7 +2479,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);
@@ -2501,22 +2494,22 @@ 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 = constant('CODE_UNKNOWN_STATUS');
+ $errorCode = getCode('UNKNOWN_STATUS');
// Generate constant name
- $constantName = sprintf("CODE_ID_%s", $status);
+ $constantName = sprintf("ID_%s", $status);
// Is the constant there?
- if (defined($constantName)) {
+ if (isCodeSet($constantName)) {
// Then get it!
- $ERROR = constant($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.
@@ -2528,59 +2521,192 @@ function clearOutputBuffer () {
} // END - if
}
+// Function to search for the last modifified file
+function searchDirsRecursive ($dir, &$last_changed) {
+ // Get dir as array
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__." ):dir=".$dir." \n";
+ // 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
+ foreach ($ds as $d) {
+ // Generate proper FQFN
+ $FQFN = str_replace("//", "/", constant('PATH') . $dir. "/". $d);
+
+ // 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
+}
+
// "Getter" for revision/version data
-function getActualVersion ($type = 0) {
+function getActualVersion ($type = 'Revision') {
// By default nothing is new... ;-)
$new = false;
- // FQFN of revision file
- $FQFN = sprintf("%sinc/cache/.revision", constant('PATH'));
+ if (EXT_IS_ACTIVE('cache')) {
+ // Check if REQUEST_GET('check_revision_data') is setted (switch for manually rewrite the .revision-File)
+ if (REQUEST_ISSET_GET('check_revision_data') && REQUEST_GET('check_revision_data') == 'yes') $new = true;
+ if (!isset($GLOBALS['cache_array']['revision'][$type])
+ || count($GLOBALS['cache_array']['revision']) < 3
+ || !$GLOBALS['cache_instance']->loadCacheFile('revision')) $new = true;
+
+ // Is the cache file outdated/invalid?
+ if ($new === true){
+ $GLOBALS['cache_instance']->destroyCacheFile(); // @TODO isn't it better to do $GLOBALS['cache_instance']->destroyCacheFile('revision')?
+
+ // @TODO shouldn't do the unset and the reloading $GLOBALS['cache_instance']->destroyCacheFile() Or a new methode like forceCacheReload('revision')?
+ unset($GLOBALS['cache_array']['revision']);
+
+ // Reload load_cach-revison.php
+ LOAD_INC('inc/loader/load_cache-revision.php');
+ } // END - if
+
+ // Return found value
+ return $GLOBALS['cache_array']['revision'][$type][0];
- // Check for revision file
- if (!FILE_READABLE($FQFN)) {
- // Not found, so we need to create it
- $new = true;
} else {
- // Revision file found
- $ins_vers = explode("\n", READ_FILE($FQFN));
+ // Old Version without ext-cache active (deprecated ?)
+
+ // FQFN of revision file
+ $FQFN = sprintf("%sinc/cache/.revision", constant('PATH'));
- // Is the content valid?
- if ((!is_array($ins_vers)) || (count($ins_vers) <= 0) || (!isset($ins_vers[$type])) || ($ins_vers[0]) == "new") {
- // File needs update!
+ // Check if REQUEST_GET('check_revision_data') is setted (switch for manually rewrite the .revision-File)
+ if ((REQUEST_ISSET_GET('check_revision_data')) && (REQUEST_GET('check_revision_data') == 'yes')) {
+ // Has changed!
$new = true;
} else {
- // Revision-File has valid Data and isn't 'new' so return the Rev-Number
- return trim($ins_vers[$type]);
+ // Check for revision file
+ if (!FILE_READABLE($FQFN)) {
+ // Not found, so we need to create it
+ $new = true;
+ } else {
+ // Revision file found
+ $ins_vers = explode("\n", READ_FILE($FQFN));
+
+ // Get array for mapping information
+ $mapper = array_flip(getSearchFor());
+ //* DEBUG: */ print("".print_r($mapper, true).print_r($ins_vers, true)." ");
+
+ // Is the content valid?
+ if ((!is_array($ins_vers)) || (count($ins_vers) <= 0) || (!isset($ins_vers[$mapper[$type]])) || (trim($ins_vers[$mapper[$type]]) == "") || ($ins_vers[0]) == "new") {
+ // File needs update!
+ $new = true;
+ } else {
+ // Return found value
+ return trim($ins_vers[$mapper[$type]]);
+ }
+ }
}
+
+ // Has it been updated?
+ if ($new === true) {
+ WRITE_FILE($FQFN, implode("\n", getAkt_vers()));
+ } // END - if
}
+}
- // Has it been updated?
- if ($new === true) {
- // No Revision-File or has no valid Data so read the Revision from the Server.
- $version = GET_URL("check-updates3.php");
+// 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');
- // Prepare content
- $akt_vers[] = trim($version[10]);
- $akt_vers[] = trim($version[9]);
- $akt_vers[] = trim($version[8]);
+ // Return the created array
+ return $searchFor;
+}
+
+function getAkt_vers () {
+ // Init variables
+ $next_dir = ''; // Directory to start with search
+ $last_changed = array(
+ 'path_name' => "",
+ 'time' => 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); // @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();
- // Write file
- WRITE_FILE($FQFN, implode("\n", $akt_vers));
+ // 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
+
+ // 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 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!! Should not be removed I think.
+ $version = GET_URL("check-updates3.php");
- // Return requested content
- return trim($akt_vers[$type]);
+ // Prepare content
+ // 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
+ return $akt_vers;
}
+
// Loads an include file and logs any missing files for debug purposes
function LOAD_INC ($INC) {
// Add the path. This is why we need a trailing slash in config.php
$FQFN = constant('PATH') . $INC;
// Is the include file there?
- if (!FILE_READABLE($FQFN)) {
+ if (!INCLUDE_READABLE($INC)) {
// Not there so log it
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Include file %s not found.", basename($INC)));
+ debug_report_bug(sprintf("Include file %s not found.", $INC));
return false;
} // END - if
@@ -2624,7 +2750,7 @@ function debug_get_printable_backtrace () {
// Output a debug backtrace to the user
function debug_report_bug ($message = "") {
// Init message
- $debug = "";
+ $debug = '';
// Is the optional message set?
if (!empty($message)) {
// Use and log it
@@ -2637,11 +2763,13 @@ function debug_report_bug ($message = "") {
} // END - if
// Add output
- $debug .= ("Please report this error at bugs.mxchange.org :");
- $debug .= (debug_get_printable_backtrace());
- $debug .= (" Thank you for your help finding bugs.");
+ $debug .= "Please report this bug at bugs.mxchange.org :";
+ $debug .= debug_get_printable_backtrace();
+ $debug .= " Request-URI: ".$_SERVER['REQUEST_URI']." \n";
+ $debug .= "Thank you for finding bugs.";
// And abort here
+ // @TODO This cannot be rewritten to app_die(), try to find a solution for this.
die($debug);
}
@@ -2653,26 +2781,26 @@ function generateSeed () {
// Converts a message code to a human-readable message
function convertCodeToMessage ($code) {
- $msg = "";
+ $msg = '';
switch ($code) {
- case constant('CODE_LOGOUT_DONE') : $msg = getMessage('LOGOUT_DONE'); break;
- case constant('CODE_LOGOUT_FAILED') : $msg = "{--LOGOUT_FAILED--} "; break;
- case constant('CODE_DATA_INVALID') : $msg = getMessage('MAIL_DATA_INVALID'); break;
- case constant('CODE_POSSIBLE_INVALID') : $msg = getMessage('MAIL_POSSIBLE_INVALID'); break;
- case constant('CODE_ACCOUNT_LOCKED') : $msg = getMessage('MEMBER_ACCOUNT_LOCKED_UNC'); break;
- case constant('CODE_USER_404') : $msg = getMessage('USER_NOT_FOUND'); break;
- case constant('CODE_STATS_404') : $msg = getMessage('MAIL_STATS_404'); break;
- case constant('CODE_ALREADY_CONFIRMED'): $msg = getMessage('MAIL_ALREADY_CONFIRMED'); break;
-
- case constant('CODE_ERROR_MAILID'):
+ case getCode('LOGOUT_DONE') : $msg = getMessage('LOGOUT_DONE'); break;
+ case getCode('LOGOUT_FAILED') : $msg = "{--LOGOUT_FAILED--} "; break;
+ case getCode('DATA_INVALID') : $msg = getMessage('MAIL_DATA_INVALID'); break;
+ case getCode('POSSIBLE_INVALID') : $msg = getMessage('MAIL_POSSIBLE_INVALID'); break;
+ case getCode('ACCOUNT_LOCKED') : $msg = getMessage('MEMBER_ACCOUNT_LOCKED_UNC'); break;
+ case getCode('USER_404') : $msg = getMessage('USER_NOT_FOUND'); break;
+ case getCode('STATS_404') : $msg = getMessage('MAIL_STATS_404'); break;
+ case getCode('ALREADY_CONFIRMED'): $msg = getMessage('MAIL_ALREADY_CONFIRMED'); break;
+
+ case getCode('ERROR_MAILID'):
if (EXT_IS_ACTIVE($ext, true)) {
$msg = getMessage('ERROR_CONFIRMING_MAIL');
} else {
- $msg = sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), "mailid");
+ $msg = sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'mailid');
}
break;
- case constant('CODE_EXTENSION_PROBLEM'):
+ case getCode('EXTENSION_PROBLEM'):
if (REQUEST_ISSET_GET(('ext'))) {
$msg = sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), REQUEST_GET(('ext')));
} else {
@@ -2680,10 +2808,18 @@ function convertCodeToMessage ($code) {
}
break;
- case constant('CODE_COOKIES_DISABLED') : $msg = getMessage('LOGIN_NO_COOKIES'); break;
- case constant('CODE_BEG_SAME_AS_OWN') : $msg = getMessage('BEG_SAME_UID_AS_OWN'); break;
- case constant('CODE_LOGIN_FAILED') : $msg = getMessage('LOGIN_FAILED_GENERAL'); break;
- default : $msg = sprintf(getMessage('UNKNOWN_MAILID_CODE'), $code); break;
+ 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;
+ 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
@@ -2696,7 +2832,7 @@ function REDIRCT_ON_UNINSTALLED_EXTENSION ($ext_name) {
// Is the extension uninstalled/inactive?
if (!EXT_IS_ACTIVE($ext_name)) {
// Redirect to index
- LOAD_URL("modules.php?module=index&msg=".constant('CODE_EXTENSION_PROBLEM')."&ext=".$ext_name);
+ LOAD_URL('modules.php?module=index&msg=' . getCode('EXTENSION_PROBLEM') . '&ext=' . $ext_name);
} // END - if
}
@@ -2706,17 +2842,19 @@ 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")) {
+ if (EXT_IS_ACTIVE('admins')) {
// Admin found
$admin = "".$login." ";
} else {
// Extension not found
- $admin = sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), "admins");
+ $admin = sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'admins');
}
} else {
// Maybe deleted?
@@ -2776,7 +2914,7 @@ function compileUriCode ($code, $simple=true) {
// Function taken from user comments on www.php.net / function eregi()
function isUrlValid ($url) {
// Prepare URL
- $url = strip_tags(str_replace("\\", "", compileUriCode(urldecode($url))));
+ $url = strip_tags(str_replace("\\", '', compileUriCode(urldecode($url))));
// Allows http and https
$http = "(http|https)+(:\/\/)";
@@ -2842,7 +2980,7 @@ function isUrlValid ($url) {
// Smartly adds slashes
function smartAddSlashes ($unquoted) {
- $unquoted = str_replace("\\", "", $unquoted);
+ $unquoted = str_replace("\\", '', $unquoted);
return addslashes($unquoted);
}
@@ -2927,12 +3065,12 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) {
return false;
}
// Send notification to admin
-function SEND_ADMIN_NOTIFICATION($subject, $templateName, $content=array(), $uid="0") {
- if (GET_EXT_VERSION("admins") >= "0.4.1") {
+function SEND_ADMIN_NOTIFICATION ($subject, $templateName, $content=array(), $uid="0") {
+ if (GET_EXT_VERSION('admins') >= '0.4.1') {
// Send new way
SEND_ADMIN_EMAILS_PRO($subject, $templateName, $content, $uid);
} else {
- // Send outdated way
+ // Send out out-dated way
$msg = LOAD_EMAIL_TEMPLATE($templateName, $content, $uid);
SEND_ADMIN_EMAILS($subject, $msg);
}
@@ -2962,96 +3100,59 @@ function merge_array ($array1, $array2) {
function DEBUG_LOG ($funcFile, $line, $message, $force=true) {
// Is debug mode enabled?
if ((isDebugModeEnabled()) || ($force === true)) {
+ // Remove CRLF
+ $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!");
- fwrite($fp, date("d.m.Y|H:i:s", time())."|".basename($funcFile)."|".$line."|".strip_tags($message)."\n");
+ $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())."|".$GLOBALS['module']."|".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) {
- $INCs = array();
-
- // Open directory
- $dirPointer = opendir(constant('PATH') . $baseDir) or mxchange_die("Cannot read ".basename($baseDir)." path!");
-
- // Read all entries
- while ($baseFile = readdir($dirPointer)) {
- // Load file only if extension is active
- $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")) {
- // 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
- $INCs[] = $INC;
- } elseif ($extId == 0) {
- // Add non-extension files as well
- $INCs[] = $INC;
- }
- } // 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?
- if ((!isResetModeEnabled()) || (EXT_VERSION_IS_OLDER("sql_patches", "0.4.5"))) {
+ if ((!isResetModeEnabled()) || (EXT_VERSION_IS_OLDER('sql_patches', '0.4.5'))) {
// Then abort here
DEBUG_LOG(__FUNCTION__, __LINE__, "Cannot run reset! Please report this bug. Thanks");
} // END - if
// Get more daily reset scripts
- $INC_POOL = GET_DIR_AS_ARRAY("inc/reset/", "reset_");
+ SET_INC_POOL(GET_DIR_AS_ARRAY("inc/reset/", "reset_"));
// Update database
if (!defined('DEBUG_RESET')) UPDATE_CONFIG("last_update", time());
- // Create current week mark
- $currWeek = date("W", time());
+ // Is the config entry set?
+ if (GET_EXT_VERSION('sql_patches') >= '0.4.2') {
+ // Create current week mark
+ $currWeek = date("W", time());
- // Has it changed?
- if (getConfig('last_week') != $currWeek) {
- // Include weekly reset scripts
- $INC_POOL = merge_array($INC_POOL, GET_DIR_AS_ARRAY("inc/weekly/", "weekly_"));
+ // Has it changed?
+ if (getConfig('last_week') != $currWeek) {
+ // Include weekly reset scripts
+ MERGE_INC_POOL(GET_DIR_AS_ARRAY("inc/weekly/", "weekly_"));
- // Update config
- if (!defined('DEBUG_WEEKLY')) UPDATE_CONFIG("last_week", $currWeek);
- } // END - if
+ // Update config
+ if (!defined('DEBUG_WEEKLY')) UPDATE_CONFIG("last_week", $currWeek);
+ } // END - if
- // Create current month mark
- $currMonth = date("m", time());
+ // Create current month mark
+ $currMonth = date("m", time());
- // Has it changed?
- if (getConfig('last_month') != $currMonth) {
- // Include monthly reset scripts
- $INC_POOL = merge_array($INC_POOL, GET_DIR_AS_ARRAY("inc/monthly/", "monthly_"));
+ // Has it changed?
+ if (getConfig('last_month') != $currMonth) {
+ // Include monthly reset scripts
+ MERGE_INC_POOL(GET_DIR_AS_ARRAY("inc/monthly/", "monthly_"));
- // Update config
- if (!defined('DEBUG_MONTHLY')) UPDATE_CONFIG("last_month", $currMonth);
+ // Update config
+ if (!defined('DEBUG_MONTHLY')) UPDATE_CONFIG("last_month", $currMonth);
+ } // END - if
} // END - if
// Run the filter
- runFilterChain('load_includes', $INC_POOL);
+ runFilterChain('load_includes');
}
// Handle extra values
@@ -3088,15 +3189,15 @@ function HANDLE_EXTRA_VALUES ($filterFunction, $value, $extraValue) {
}
// Check if given FQFN is a readable file
-function FILE_READABLE($fqfn) {
+function FILE_READABLE ($FQFN) {
// Check all...
- return ((file_exists($fqfn)) && (is_file($fqfn)) && (is_readable($fqfn)));
+ return ((file_exists($FQFN)) && (is_file($FQFN)) && (is_readable($FQFN)));
}
// Converts timestamp selections into a timestamp
-function CONVERT_SELECTIONS_TO_TIMESTAMP(&$POST, &$DATA, &$id, &$skip) {
+function CONVERT_SELECTIONS_TO_TIMESTAMP (&$POST, &$DATA, &$id, &$skip) {
// Init test variable
- $test2 = "";
+ $test2 = '';
// Get last three chars
$test = substr($id, -3);
@@ -3121,7 +3222,7 @@ function CONVERT_SELECTIONS_TO_TIMESTAMP(&$POST, &$DATA, &$id, &$skip) {
} else {
// Process this entry
$skip = false;
- $test2 = "";
+ $test2 = '';
}
}
@@ -3134,7 +3235,7 @@ function REVERT_COMMA ($str) {
switch (GET_LANGUAGE()) {
case "de": // German language
// Remove german thousand dots first
- $str = str_replace(".", "", $str);
+ $str = str_replace(".", '', $str);
// Replace german commata with decimal dot and cast it
$float = (float)str_replace(",", ".", $str);
@@ -3142,7 +3243,7 @@ function REVERT_COMMA ($str) {
default: // US and so on
// Remove thousand dots first and cast
- $float = (float)str_replace(",", "", $str);
+ $float = (float)str_replace(",", '', $str);
break;
}
@@ -3153,7 +3254,7 @@ function REVERT_COMMA ($str) {
// Handle menu-depending failed logins and return the rendered content
function HANDLE_LOGIN_FAILTURES ($accessLevel) {
// Default output is empty ;-)
- $OUT = "";
+ $OUT = '';
// Is the session data set?
if ((isSessionVariableSet('mxchange_'.$accessLevel.'_failures')) && (isSessionVariableSet('mxchange_'.$accessLevel.'_last_fail'))) {
@@ -3171,8 +3272,8 @@ function HANDLE_LOGIN_FAILTURES ($accessLevel) {
} // END - if
// Reset session data
- set_session('mxchange_'.$accessLevel.'_failures', "");
- set_session('mxchange_'.$accessLevel.'_last_fail', "");
+ set_session('mxchange_'.$accessLevel.'_failures', '');
+ set_session('mxchange_'.$accessLevel.'_last_fail', '');
} // END - if
// Return rendered content
@@ -3182,7 +3283,7 @@ function HANDLE_LOGIN_FAILTURES ($accessLevel) {
// Rebuild cache
function rebuildCacheFiles ($cache, $inc="") {
// Shall I remove the cache file?
- if ((EXT_IS_ACTIVE("cache")) && (is_object($GLOBALS['cache_instance']))) {
+ if ((EXT_IS_ACTIVE('cache')) && (isCacheInstanceValid())) {
// Rebuild cache
if ($GLOBALS['cache_instance']->loadCacheFile($cache)) {
// Destroy it
@@ -3210,14 +3311,14 @@ function rebuildCacheFiles ($cache, $inc="") {
// Purge admin menu cache
function CACHE_PURGE_ADMIN_MENU ($id=0, $action="", $what="", $str="") {
// Is the cache extension enabled or no cache instance or admin menu cache disabled?
- if (!EXT_IS_ACTIVE("cache")) {
+ if (!EXT_IS_ACTIVE('cache')) {
// Cache extension not active
return false;
- } elseif (!is_object($GLOBALS['cache_instance'])) {
+ } elseif (!isCacheInstanceValid()) {
// No cache instance!
DEBUG_LOG(__FUNCTION__, __LINE__, " No cache instance found.");
return false;
- } elseif ((!isConfigEntrySet('cache_admin_menu')) || (getConfig('cache_admin_menu') != "Y")) {
+ } elseif ((!isConfigEntrySet('cache_admin_menu')) || (getConfig('cache_admin_menu') != 'Y')) {
// Caching disabled (currently experiemental!)
return false;
}
@@ -3228,7 +3329,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
@@ -3244,13 +3345,37 @@ 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")) {
+ if (EXT_IS_ACTIVE('removeip')) {
// Then anonymize it
$remoteAddr = GET_ANONYMOUS_REMOTE_ADDR($remoteAddr);
} // END - if
@@ -3265,7 +3390,7 @@ function GET_REMOTE_HOST () {
$remoteHost = getenv('REMOTE_HOST');
// Is removeip installed?
- if (EXT_IS_ACTIVE("removeip")) {
+ if (EXT_IS_ACTIVE('removeip')) {
// Then anonymize it
$remoteHost = GET_ANONYMOUS_REMOTE_HOST($remoteHost);
} // END - if
@@ -3280,7 +3405,7 @@ function GET_USER_AGENT () {
$userAgent = getenv('HTTP_USER_AGENT');
// Is removeip installed?
- if (EXT_IS_ACTIVE("removeip")) {
+ if (EXT_IS_ACTIVE('removeip')) {
// Then anonymize it
$userAgent = GET_ANONYMOUS_USER_AGENT($userAgent);
} // END - if
@@ -3295,7 +3420,7 @@ function GET_REFERER () {
$referer = getenv('HTTP_REFERER');
// Is removeip installed?
- if (EXT_IS_ACTIVE("removeip")) {
+ if (EXT_IS_ACTIVE('removeip')) {
// Then anonymize it
$referer = GET_ANONYMOUS_REFERER($referer);
} // END - if
@@ -3329,10 +3454,10 @@ function ADD_NEW_BONUS_MAIL ($data, $mode="", $output=true) {
);
// Mail inserted into bonus pool
- if ($output) LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BONUS_SEND'));
+ if ($output) LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_BONUS_SEND'));
} elseif ($output) {
// More entered than can be reached!
- LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_MORE_SELECTED'));
+ LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_MORE_SELECTED'));
} else {
// Debug log
DEBUG_LOG(__FUNCTION__, __LINE__, " cat={$data['cat']},receiver={$data['receiver']},data=".base64_encode(serialize($data))." More selected, than available!");
@@ -3341,10 +3466,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'])) {
@@ -3359,10 +3482,10 @@ function DETERMINE_REFID () {
} elseif ((isSessionVariableSet('refid')) && (get_session('refid') != 0)) {
// Set session refid als global
$GLOBALS['refid'] = bigintval(get_session('refid'));
- } elseif ((GET_EXT_VERSION("sql_patches") != "") && (getConfig('def_refid') > 0)) {
+ } elseif ((GET_EXT_VERSION('sql_patches') != "") && (getConfig('def_refid') > 0)) {
// Set default refid as refid in URL
- $GLOBALS['refid'] = bigintval(getConfig('def_refid'));
- } elseif ((GET_EXT_VERSION("user") >= "0.3.4") && (getConfig('select_user_zero_refid')) == "Y") {
+ $GLOBALS['refid'] = getConfig(('def_refid'));
+ } elseif ((GET_EXT_VERSION('user') >= '0.3.4') && (getConfig('select_user_zero_refid')) == 'Y') {
// Select a random user which has confirmed enougth mails
$GLOBALS['refid'] = SELECT_RANDOM_REFID();
} else {
@@ -3382,7 +3505,9 @@ function DETERMINE_REFID () {
// Check wether we are installing
function isInstalling () {
- return (isset($GLOBALS['mxchange_installing']));
+ $installing = ((isset($GLOBALS['mxchange_installing'])) || (REQUEST_ISSET_GET('installing')));
+ //* DEBUG: */ var_dump($installing);
+ return $installing;
}
// Check wether this script is installed
@@ -3417,6 +3542,82 @@ function isDebugModeEnabled () {
return isBooleanConstantAndTrue('DEBUG_MODE');
}
+// Checks wether the cache instance is valid
+function isCacheInstanceValid () {
+ return ((isset($GLOBALS['cache_instance'])) && (is_object($GLOBALS['cache_instance'])));
+}
+
+// Our shutdown-function
+function shutdown () {
+ // Call the filter chain 'shutdown'
+ runFilterChain('shutdown', null, false);
+
+ if (SQL_IS_LINK_UP()) {
+ // Close link
+ SQL_CLOSE(__FILE__, __LINE__);
+ } elseif ((!isInstalling()) && (isInstalled())) {
+ // No database link
+ addFatalMessage(__FILE__, __LINE__, getMessage('NO_DB_LINK_SHUTDOWN'));
+ }
+
+ // Stop executing here
+ exit;
+}
+
+// Setter for userid
+function setUserId ($userid) {
+ $GLOBALS['userid'] = bigintval($userid);
+}
+
+// Getter for userid or returns zero
+function getUserId () {
+ // Default userid
+ $userid = 0;
+
+ // Is the userid set?
+ if (isUserIdSet()) {
+ // Then use it
+ $userid = $GLOBALS['userid'];
+ } // END - if
+
+ // Return it
+ return $userid;
+}
+
+// Checks ether the userid is set
+function isUserIdSet () {
+ return (isset($GLOBALS['userid']));
+}
+
+// Checks wether the given FQFN is a directory and not .,.. or .svn
+function isDirectory ($FQFN) {
+ // Generate baseName
+ $baseName = basename($FQFN);
+
+ // Check it
+ $isDirectory = ((is_dir($FQFN)) && ($baseName != ".") && ($baseName != "..") && ($baseName != ".svn"));
+
+ // Return the result
+ return $isDirectory;
+}
+
+// Handle message codes from URL
+function handleCodeMessage () {
+ if (REQUEST_ISSET_GET(('msg'))) {
+ // Default extension is "unknown"
+ $ext = "unknown";
+
+ // Is extension given?
+ if (REQUEST_ISSET_GET(('ext'))) $ext = REQUEST_GET(('ext'));
+
+ // Convert the 'msg' parameter from URL to a human-readable message
+ $msg = convertCodeToMessage(REQUEST_GET('msg'));
+
+ // Load message template
+ LOAD_TEMPLATE("message", false, $msg);
+ } // END - if
+}
+
//////////////////////////////////////////////////
// AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
//////////////////////////////////////////////////