X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=ef6cbde5323b40bf5ff838a7513d39983f08896d;hb=7989ec603971c0dc8dc35d8be4e72f8098b83baa;hp=03d6b7d1ae343d0787bcc239c41a453ec84bf5bc;hpb=8c36a8c89b8231b8d03b2495ceda82a31546406b;p=mailer.git
diff --git a/inc/functions.php b/inc/functions.php
index 03d6b7d1ae..ef6cbde532 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -40,7 +40,7 @@ if (!defined('__SECURITY')) {
// Check if our config file is writeable or not
function IS_INC_WRITEABLE($inc) {
// Generate FQFN
- $fqfn = sprintf("%sinc/%s.php", PATH, $inc);
+ $fqfn = sprintf("%sinc/%s.php", constant('PATH'), $inc);
// Abort by simple test
if ((FILE_READABLE($fqfn)) && (!is_writeable($fqfn))) {
@@ -60,55 +60,55 @@ function IS_INC_WRITEABLE($inc) {
}
// Output HTML code directly or "render" it. You addionally switch the new-line character off
-function OUTPUT_HTML ($HTML, $NEW_LINE = true) {
+function OUTPUT_HTML ($HTML, $newLine = true) {
// Some global variables
global $OUTPUT, $footer, $CSS;
// Do we have HTML-Code here?
if (!empty($HTML)) {
// Yes, so we handle it as you have configured
- switch (OUTPUT_MODE)
+ switch (constant('OUTPUT_MODE'))
{
case "render":
// That's why you don't need any \n at the end of your HTML code... :-)
- if (_OB_CACHING == "on") {
+ if (constant('_OB_CACHING') == "on") {
// Output into PHP's internal buffer
OUTPUT_RAW($HTML);
// That's why you don't need any \n at the end of your HTML code... :-)
- if ($NEW_LINE) echo "\n";
+ if ($newLine) echo "\n";
} else {
// Render mode for old or lame servers...
$OUTPUT .= $HTML;
// That's why you don't need any \n at the end of your HTML code... :-)
- if ($NEW_LINE) $OUTPUT .= "\n";
+ if ($newLine) $OUTPUT .= "\n";
}
break;
case "direct":
// If we are switching from render to direct output rendered code
- if ((!empty($OUTPUT)) && (_OB_CACHING != "on")) { OUTPUT_RAW($OUTPUT); $OUTPUT = ""; }
+ if ((!empty($OUTPUT)) && (constant('_OB_CACHING') != "on")) { OUTPUT_RAW($OUTPUT); $OUTPUT = ""; }
// The same as above... ^
OUTPUT_RAW($HTML);
- if ($NEW_LINE) echo "\n";
+ if ($newLine) echo "\n";
break;
default:
// Huh, something goes wrong or maybe you have edited config.php ???
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid renderer %s detected.", OUTPUT_MODE));
- mxchange_die("{!FATAL_ERROR!}: {!LANG_NO_RENDER_DIRECT!}");
+ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid renderer %s detected.", constant('OUTPUT_MODE')));
+ mxchange_die("{--FATAL_ERROR--}: {--LANG_NO_RENDER_DIRECT--}");
break;
}
- } elseif ((_OB_CACHING == "on") && ($footer == 1)) {
+ } elseif ((constant('_OB_CACHING') == "on") && ($footer == 1)) {
// Headers already sent?
if (headers_sent()) {
// Log this error
DEBUG_LOG(__FUNCTION__, __LINE__, "Headers already sent! We need debug backtrace here.");
// Trigger an user error
- trigger_error("Headers are already sent!");
+ debug_report_bug("Headers are already sent!");
} // END - if
// Output cached HTML code
@@ -139,20 +139,20 @@ function OUTPUT_HTML ($HTML, $NEW_LINE = true) {
while (strpos($OUTPUT, '{!') > 0) {
// Prepare the content and eval() it...
$newContent = "";
- $eval = "\$newContent = \"".COMPILE_CODE(addslashes($OUTPUT))."\";";
+ $eval = "\$newContent = \"".COMPILE_CODE(SQL_ESCAPE($OUTPUT))."\";";
@eval($eval);
// Was that eval okay?
if (empty($newContent)) {
// Something went wrong!
- die("Evaluation error:
".htmlentities($eval)."
");
+ mxchange_die("Evaluation error:
".htmlentities($eval)."
");
} // END - if
$OUTPUT = $newContent;
} // END - while
// Output code here, DO NOT REMOVE! ;-)
OUTPUT_RAW($OUTPUT);
- } elseif ((OUTPUT_MODE == "render") && (!empty($OUTPUT))) {
+ } elseif ((constant('OUTPUT_MODE') == "render") && (!empty($OUTPUT))) {
// Rewrite links when rewrite extension is active
if ((EXT_IS_ACTIVE("rewrite")) && ($CSS != "1") && ($CSS != "-1")) {
$OUTPUT = REWRITE_LINKS($OUTPUT);
@@ -160,7 +160,7 @@ function OUTPUT_HTML ($HTML, $NEW_LINE = true) {
// Compile and run finished rendered HTML code
while (strpos($OUTPUT, '{!') > 0) {
- $eval = "\$OUTPUT = \"".COMPILE_CODE(addslashes($OUTPUT))."\";";
+ $eval = "\$OUTPUT = \"".COMPILE_CODE(SQL_ESCAPE($OUTPUT))."\";";
eval($eval);
} // END - while
@@ -174,8 +174,8 @@ function OUTPUT_RAW ($HTML) {
// Output stripped HTML code to avoid broken JavaScript code, etc.
echo stripslashes(stripslashes($HTML));
- // Flush the output if only _OB_CACHING is not "on"
- if (_OB_CACHING != "on") {
+ // Flush the output if only constant('_OB_CACHING') is not "on"
+ if (constant('_OB_CACHING') != "on") {
// Flush it
flush();
} // END - if
@@ -185,21 +185,23 @@ function OUTPUT_RAW ($HTML) {
function addFatalMessage ($message, $extra="") {
global $FATAL;
- if (empty($extra)) {
- // Regular text message to add to $FATAL
- $FATAL[] = $message;
- } else {
+ if (is_array($extra)) {
+ // Multiple extras for a message with masks
+ $message = call_user_func_array('sprintf', $extra);
+ } elseif (!empty($extra)) {
// $message is text with a mask plus extras to insert into the text
$message = sprintf($message, $extra);
- $FATAL[] = $message;
}
+ // Add message to $FATAL
+ $FATAL[] = $message;
+
// Log fatal messages away
DEBUG_LOG(__FUNCTION__, __LINE__, " message={$message}");
}
// Getter for total fatal message count
-function getTotalFatalMessages () {
+function getTotalFatalErrors () {
global $FATAL;
// Init coun
@@ -238,7 +240,7 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
// @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",
+ $result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
array($GLOBALS['userid']), __FILE__, __LINE__);
// Is content an array?
@@ -249,7 +251,9 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
// Translate gender
$content['gender'] = TRANSLATE_GENDER($content['gender']);
} else {
- // DEPRECATED: Load data in direct variables
+ // @DEPRECATED
+ // @TODO Fine all templates which are using these direct variables and rewrite them.
+ // @TODO After this step is done, this else-block is history
list($gender, $surname, $family, $email) = SQL_FETCHROW($result);
// Translate gender
@@ -265,7 +269,7 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
$date_time = MAKE_DATETIME(time(), "1");
// Base directory
- $BASE = sprintf("%stemplates/%s/html/", PATH, GET_LANGUAGE());
+ $BASE = sprintf("%stemplates/%s/html/", constant('PATH'), GET_LANGUAGE());
$MODE = "";
// Check for admin/guest/member templates
@@ -335,7 +339,7 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
$ret = "";
if ((strpos($tmpl_file, "\$") !== false) || (strpos($tmpl_file, '{--') !== false) || (strpos($tmpl_file, '--}') > 0)) {
// Okay, compile it!
- $tmpl_file = "\$ret=\"".COMPILE_CODE(addslashes($tmpl_file))."\";";
+ $tmpl_file = "\$ret=\"".COMPILE_CODE(SQL_ESCAPE($tmpl_file))."\";";
eval($tmpl_file);
} else {
// Simply return loaded code
@@ -381,7 +385,7 @@ function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML = "N", $FROM = "") {
//* DEBUG: */ print __FUNCTION__."(".__LINE__."):TO={$TO},SUBJECT={$SUBJECT} \n";
// Compile subject line (for POINTS constant etc.)
- $eval = "\$SUBJECT = html_entity_decode(\"".COMPILE_CODE(addslashes($SUBJECT))."\");";
+ $eval = "\$SUBJECT = decodeEntities(\"".COMPILE_CODE(SQL_ESCAPE($SUBJECT))."\");";
eval($eval);
// Set from header
@@ -392,7 +396,7 @@ function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML = "N", $FROM = "") {
return;
} else {
// Load email address
- $result_email = SQL_QUERY_ESC("SELECT email FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1", array(bigintval($TO)), __FILE__, __LINE__);
+ $result_email = SQL_QUERY_ESC("SELECT email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", array(bigintval($TO)), __FILE__, __LINE__);
//* DEBUG: */ print __FUNCTION__."(".__LINE__."):numRows=".SQL_NUMROWS($result_email)." \n";
// Does the user exist?
@@ -401,7 +405,7 @@ function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML = "N", $FROM = "") {
list($TO) = SQL_FETCHROW($result_email);
} else {
// Set webmaster
- $TO = WEBMASTER;
+ $TO = constant('WEBMASTER');
}
// Free result
@@ -409,7 +413,7 @@ function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML = "N", $FROM = "") {
}
} elseif ("$TO" == "0") {
// Is the webmaster!
- $TO = WEBMASTER;
+ $TO = constant('WEBMASTER');
}
//* DEBUG: */ print __FUNCTION__."(".__LINE__."):TO={$TO} \n";
@@ -434,11 +438,11 @@ function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML = "N", $FROM = "") {
}
// Compile "TO"
- $eval = "\$TO = \"".COMPILE_CODE(addslashes($TO))."\";";
+ $eval = "\$TO = \"".COMPILE_CODE(SQL_ESCAPE($TO))."\";";
eval($eval);
// Compile "MSG"
- $eval = "\$MSG = \"".COMPILE_CODE(addslashes($MSG))."\";";
+ $eval = "\$MSG = \"".COMPILE_CODE(SQL_ESCAPE($MSG))."\";";
eval($eval);
// Fix HTML parameter (default is no!)
@@ -459,7 +463,7 @@ Message : ".$MSG."
SEND_RAW_EMAIL($TO, $SUBJECT, $MSG, $FROM);
} elseif ($HTML == "N") {
// Problem found!
- SEND_RAW_EMAIL(WEBMASTER, "[PROBLEM:]".$SUBJECT, $MSG, $FROM);
+ SEND_RAW_EMAIL(constant('WEBMASTER'), "[PROBLEM:]".$SUBJECT, $MSG, $FROM);
}
}
@@ -476,25 +480,25 @@ function SEND_RAW_EMAIL ($to, $subject, $msg, $from) {
// Shall we use PHPMailer class or legacy mode?
if (CHECK_PHPMAILER_USAGE()) {
// Use PHPMailer class with SMTP enabled
- require_once(PATH."inc/phpmailer/class.phpmailer.php");
- require_once(PATH."inc/phpmailer/class.smtp.php");
+ LOAD_INC_ONCE("inc/phpmailer/class.phpmailer.php");
+ LOAD_INC_ONCE("inc/phpmailer/class.smtp.php");
// get new instance
$mail = new PHPMailer();
- $mail->PluginDir = sprintf("%sinc/phpmailer/", PATH);
+ $mail->PluginDir = sprintf("%sinc/phpmailer/", constant('PATH'));
$mail->IsSMTP();
$mail->SMTPAuth = true;
- $mail->Host = SMTP_HOSTNAME;
+ $mail->Host = constant('SMTP_HOSTNAME');
$mail->Port = 25;
- $mail->Username = SMTP_USER;
- $mail->Password = SMTP_PASSWORD;
+ $mail->Username = constant('SMTP_USER');
+ $mail->Password = constant('SMTP_PASSWORD');
if (empty($from)) {
- $mail->From = WEBMASTER;
+ $mail->From = constant('WEBMASTER');
} else {
$mail->From = $from;
}
- $mail->FromName = MAIN_TITLE;
+ $mail->FromName = constant('MAIN_TITLE');
$mail->Subject = $subject;
if ((EXT_IS_ACTIVE("html_mail")) && (strip_tags($msg) != $msg)) {
$mail->Body = $msg;
@@ -502,16 +506,16 @@ function SEND_RAW_EMAIL ($to, $subject, $msg, $from) {
$mail->WordWrap = 70;
$mail->IsHTML(true);
} else {
- $mail->Body = html_entity_decode($msg);
+ $mail->Body = decodeEntities($msg);
}
$mail->AddAddress($to, "");
- $mail->AddReplyTo(WEBMASTER,MAIN_TITLE);
- $mail->AddCustomHeader("Errors-To:".WEBMASTER);
- $mail->AddCustomHeader("X-Loop:".WEBMASTER);
+ $mail->AddReplyTo(constant('WEBMASTER'), constant('MAIN_TITLE'));
+ $mail->AddCustomHeader("Errors-To:".constant('WEBMASTER'));
+ $mail->AddCustomHeader("X-Loop:".constant('WEBMASTER'));
$mail->Send();
} else {
// Use legacy mail() command
- @mail($to, $subject, html_entity_decode($msg), $from);
+ @mail($to, $subject, decodeEntities($msg), $from);
}
}
//
@@ -524,9 +528,6 @@ function GEN_PASS ($LEN = 0) {
// Initialize array with all allowed chars
$ABC = explode(",", "a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,0,1,2,3,4,5,6,7,8,9,-,+,_,/");
- // Initialize randomizer
- mt_srand((double) microtime() * 1000000);
-
// Start creating password
$PASS = "";
for ($i = 0; $i < $LEN; $i++) {
@@ -583,10 +584,8 @@ function MAKE_DATETIME ($time, $mode="0")
// Translates the american decimal dot into a german comma
function TRANSLATE_COMMA ($dotted, $cut=true, $max=0) {
- global $_CONFIG;
-
// Default is 3 you can change this in admin area "Misc -> Misc Options"
- if (getConfig('max_comma') == null) $_CONFIG['max_comma'] = "3";
+ if (!isConfigEntrySet('max_comma')) setConfigEntry('max_comma', "3");
// Use from config is default
$maxComma = getConfig('max_comma');
@@ -627,35 +626,45 @@ 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=".urlencode(base64_encode(gzcompress($URL)));
+ $URL = "modules.php?module=loader&url=".encodeString(compileUriCode($URL));
} // END - if
// Return link
return $URL;
}
-//
+// Translate Uni*-like gender to human-readable
function TRANSLATE_GENDER ($gender) {
- switch ($gender)
- {
- case "M": $ret = GENDER_M; break;
- case "F": $ret = GENDER_F; break;
- case "C": $ret = GENDER_C; break;
- default : $ret = $gender; break;
+ // Default
+ $ret = "!{$gender}!";
+
+ // Male/female or company?
+ switch ($gender) {
+ case "M": $ret = getMessage('GENDER_M'); break;
+ case "F": $ret = getMessage('GENDER_F'); break;
+ case "C": $ret = getMessage('GENDER_C'); break;
+ default:
+ // Log unknown gender
+ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown gender %s detected.", $gender));
+ break;
}
+
+ // Return translated gender
return $ret;
}
+
//
-function FRAMETESTER($URL) {
+function FRAMETESTER ($URL) {
// Prepare frametester URL
$frametesterUrl = sprintf("%s/modules.php?module=frametester&url=%s",
URL,
- urlencode(base64_encode(gzcompress(COMPILE_CODE($URL))))
+ encodeString(compileUriCode($URL))
);
return $frametesterUrl;
}
+
//
-function SELECTION_COUNT($array) {
+function SELECTION_COUNT ($array) {
$ret = 0;
if (is_array($array)) {
foreach ($array as $key => $sel) {
@@ -666,34 +675,30 @@ function SELECTION_COUNT($array) {
}
//
function IMG_CODE ($code, $type, $DATA, $uid) {
- return "";
+ return "";
}
//
-function TRANSLATE_STATUS($status) {
+function TRANSLATE_STATUS ($status) {
switch ($status)
{
case "UNCONFIRMED":
- $ret = ACCOUNT_UNCONFIRMED;
- break;
-
case "CONFIRMED":
- $ret = ACCOUNT_CONFIRMED;
- break;
-
case "LOCKED":
- $ret = ACCOUNT_LOCKED;
+ $ret = getMessage(sprintf("ACCOUNT_%s", $status));
break;
case "":
case null:
- $ret = ACCOUNT_DELETED;
+ $ret = getMessage('ACCOUNT_DELETED');
break;
default:
DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
- $ret = UNKNOWN_STATUS_1.$status.UNKNOWN_STATUS_2;
+ $ret = sprintf(getMessage('UNKNOWN_STATUS"'), $status);
break;
}
+
+ // Return it
return $ret;
}
//
@@ -701,7 +706,7 @@ function GET_LANGUAGE() {
global $cacheArray;
// Set default return value to default language from config
- $ret = DEFAULT_LANG;
+ $ret = constant('DEFAULT_LANG');
// Init variable
$lang = "";
@@ -715,7 +720,7 @@ function GET_LANGUAGE() {
$ret = $cacheArray['language'];
} elseif (!empty($lang)) {
// Check if main language file does exist
- if (FILE_READABLE(PATH."inc/language/".$lang.".php")) {
+ if (FILE_READABLE(constant('PATH')."inc/language/".$lang.".php")) {
// Okay found, so let's update cookies
SET_LANGUAGE($lang);
}
@@ -724,7 +729,7 @@ function GET_LANGUAGE() {
$ret = get_session('mx_lang');
// Fixes a warning before the session has the mx_lang constant
- if (empty($ret)) $ret = DEFAULT_LANG;
+ if (empty($ret)) $ret = constant('DEFAULT_LANG');
}
// Cache entry
@@ -751,15 +756,12 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
// Default "nickname" if extension is not installed
$nick = "---";
- // Keept for backward-compatiblity (please replace these variables against our new {!CONST!} syntax!)
- // No longer used: $MAIN_TITLE = MAIN_TITLE; $URL = URL; $WEBMASTER = WEBMASTER;
-
// Prepare IP number and User Agent
$REMOTE_ADDR = GET_REMOTE_ADDR();
$HTTP_USER_AGENT = GET_USER_AGENT();
// Default admin
- $ADMIN = MAIN_TITLE;
+ $ADMIN = constant('MAIN_TITLE');
// Is the admin logged in?
if (IS_ADMIN()) {
@@ -771,12 +773,12 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
} // END - if
// Neutral email address is default
- $email = WEBMASTER;
+ $email = constant('WEBMASTER');
// Expiration in a nice output format
if (getConfig('auto_purge') == 0) {
// Will never expire!
- $EXPIRATION = MAIL_WILL_NEVER_EXPIRE;
+ $EXPIRATION = getMessage('MAIL_WILL_NEVER_EXPIRE');
} else {
// Create nice date string
$EXPIRATION = CREATE_FANCY_TIME(getConfig('auto_purge'));
@@ -795,12 +797,12 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
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",
+ $result = SQL_QUERY_ESC("SELECT surname, family, gender, email, nickname FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
array(bigintval($UID)), __FILE__, __LINE__);
} else {
//* DEBUG: */ print __FUNCTION__."(".__LINE__."):NO-NICK! \n";
/// Load normal data
- $result = SQL_QUERY_ESC("SELECT surname, family, gender, email FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT surname, family, gender, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
array(bigintval($UID)), __FILE__, __LINE__);
}
@@ -823,7 +825,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
$DATA['email'] = $email;
// Base directory
- $BASE = sprintf("%stemplates/%s/emails/", PATH, GET_LANGUAGE());
+ $BASE = sprintf("%stemplates/%s/emails/", constant('PATH'), GET_LANGUAGE());
// Check for admin/guest/member templates
if (strpos($template, "admin_") > -1) {
@@ -858,25 +860,25 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
if (FILE_READABLE($file)) {
// The local file does exists so we load it. :)
$tmpl_file = READ_FILE($file);
- $tmpl_file = addslashes($tmpl_file);
+ $tmpl_file = SQL_ESCAPE($tmpl_file);
// Run code
- $tmpl_file = "\$newContent=html_entity_decode(\"".COMPILE_CODE($tmpl_file)."\");";
+ $tmpl_file = "\$newContent = decodeEntities(\"".COMPILE_CODE($tmpl_file)."\");";
@eval($tmpl_file);
} elseif (!empty($template)) {
// Template file not found!
- $newContent = TEMPLATE_404.": ".$template."
-".TEMPLATE_CONTENT."
+ $newContent = "{--TEMPLATE_404--}: ".$template."
+{--TEMPLATE_CONTENT--}
".print_r($content, true)."
-".TEMPLATE_DATA."
+{--TEMPLATE_DATA--}
".print_r($DATA, true)."
";
// Debug mode not active? Then remove the HTML tags
- if (!DEBUG_MODE) $newContent = strip_tags($newContent);
+ if (!isBooleanConstantAndTrue('DEBUG_MODE')) $newContent = strip_tags($newContent);
} else {
// No template name supplied!
- $newContent = NO_TEMPLATE_SUPPLIED;
+ $newContent = getMessage('NO_TEMPLATE_SUPPLIED');
}
// Is there some content?
@@ -909,7 +911,7 @@ function LOAD_URL($URL, $addUrlData=true) {
global $CSS, $footer;
// Compile out URI codes
- $URL = COMPILE_CODE($URL);
+ $URL = compileUriCode($URL);
// Check if http(s):// is there
if ((substr($URL, 0, 7) != "http://") && (substr($URL, 0, 8) != "https://")) {
@@ -918,11 +920,7 @@ function LOAD_URL($URL, $addUrlData=true) {
}
// Get output buffer
- /*
- print "
";
- debug_print_backtrace();
- die("
");
- */
+ //* DEBUG: */ debug_report_bug();
$OUTPUT = ob_get_contents();
// Clear it only if there is content
@@ -942,17 +940,13 @@ function LOAD_URL($URL, $addUrlData=true) {
OUTPUT_HTML("".$URL."");
} elseif (!headers_sent()) {
// Load URL when headers are not sent
- /*
- print("
");
- debug_print_backtrace();
- die("
URL={$URL}");
- */
+ //* DEBUG: */ debug_report_bug("URL={$URL}");
header ("Location: ".str_replace("&", "&", $URL));
} else {
// Output error message
- require(PATH."inc/header.php");
+ LOAD_INC("inc/header.php");
LOAD_TEMPLATE("redirect_url", false, str_replace("&", "&", $URL));
- require(PATH."inc/footer.php");
+ LOAD_INC("inc/footer.php");
}
exit();
}
@@ -1213,9 +1207,9 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0") {
case "yn":
$OUT .= "\n";
break;
}
$OUT .= " \n";
@@ -1224,27 +1218,33 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0") {
//
function TRANSLATE_YESNO($yn)
{
- switch ($yn)
- {
- case "Y": $yn = YES; break;
- case "N": $yn = NO; break;
- default : $yn = "??? (".$yn.")"; break;
+ // Default
+ $yn = "??? (".$yn.")";
+ switch ($yn) {
+ case "Y": $yn = getMessage('YES'); break;
+ case "N": $yn = getMessage('NO'); break;
+ default:
+ // Log unknown value
+ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown value %s. Expected Y/N!", $yn));
+ break;
}
+
+ // Return it
return $yn;
}
//
// Deprecated : $length
// Optional : $DATA
//
-function GEN_RANDOM_CODE($length, $code, $uid, $DATA="") {
+function GEN_RANDOM_CODE ($length, $code, $uid, $DATA="") {
// Fix missing _MAX constant
if (!defined('_MAX')) define('_MAX', 15235);
// Build server string
- $server = $_SERVER['PHP_SELF'].":".GET_USER_AGENT().":".getenv('SERVER_SOFTWARE').":".GET_REMOTE_ADDR().":".":".filemtime(PATH."inc/databases.php");
+ $server = $_SERVER['PHP_SELF'].":".GET_USER_AGENT().":".getenv('SERVER_SOFTWARE').":".GET_REMOTE_ADDR().":".":".filemtime(constant('PATH')."inc/databases.php");
// Build key string
- $keys = SITE_KEY.":".DATE_KEY;
+ $keys = constant('SITE_KEY').":".constant('DATE_KEY');
if (getConfig('secret_key') != null) $keys .= ":".getConfig('secret_key');
if (getConfig('file_hash') != null) $keys .= ":".getConfig('file_hash');
$keys .= ":".date("d-m-Y (l-F-T)", bigintval(getConfig('patch_ctime')));
@@ -1261,20 +1261,20 @@ function GEN_RANDOM_CODE($length, $code, $uid, $DATA="") {
if (isset($GLOBALS['refid'])) $data .= ":".$GLOBALS['refid'];
// Calculate number for generating the code
- $a = $code + _ADD - 1;
+ $a = $code + constant('_ADD') - 1;
if (getConfig('master_hash') != null) {
// Generate hash with master salt from modula of number with the prime number and other data
- $saltedHash = generateHash(($a % _PRIME).":".$server.":".$keys.":".$data.":".date("d-m-Y (l-F-T)", time()).":".$a, getConfig('master_salt'));
+ $saltedHash = generateHash(($a % constant('_PRIME')).":".$server.":".$keys.":".$data.":".date("d-m-Y (l-F-T)", time()).":".$a, getConfig('master_salt'));
// Create number from hash
- $rcode = hexdec(substr($saltedHash, strlen(getConfig('master_salt')), 9)) / abs(_MAX - $a + sqrt(_ADD)) / pi();
+ $rcode = hexdec(substr($saltedHash, strlen(getConfig('master_salt')), 9)) / abs(constant('_MAX') - $a + sqrt(constant('_ADD'))) / pi();
} else {
// Generate hash with "hash of site key" from modula of number with the prime number and other data
- $saltedHash = generateHash(($a % _PRIME).":".$server.":".$keys.":".$data.":".date("d-m-Y (l-F-T)", time()).":".$a, substr(sha1(SITE_KEY), 0, 8));
+ $saltedHash = generateHash(($a % constant('_PRIME')).":".$server.":".$keys.":".$data.":".date("d-m-Y (l-F-T)", time()).":".$a, substr(sha1(SITE_KEY), 0, 8));
// Create number from hash
- $rcode = hexdec(substr($saltedHash, 8, 9)) / abs(_MAX - $a + sqrt(_ADD)) / pi();
+ $rcode = hexdec(substr($saltedHash, 8, 9)) / abs(constant('_MAX') - $a + sqrt(constant('_ADD'))) / pi();
}
// At least 10 numbers shall be secure enought!
@@ -1288,6 +1288,7 @@ function GEN_RANDOM_CODE($length, $code, $uid, $DATA="") {
// Done building code
return $return;
}
+
// Does only allow numbers
function bigintval($num, $castValue = true) {
// Filter all numbers out
@@ -1297,29 +1298,28 @@ function bigintval($num, $castValue = true) {
if ($castValue) $ret = (double)$ret;
// Has the whole value changed?
+ // @TODO Remove this if() block if all is working fine
if ("".$ret."" != "".$num."") {
// Log the values
- print("
");
- debug_print_backtrace();
- die("
");
- DEBUG_LOG(__FUNCTION__, __LINE__, " num={$num},ret={$ret}");
+ debug_report_bug("{$ret}<>{$num}");
} // END - if
// Return result
return $ret;
}
+
// Insert the code in $img_code into jpeg or PNG image
-function GENERATE_IMAGE($img_code, $header=true) {
+function GENERATE_IMAGE ($img_code, $header=true) {
if ((strlen($img_code) > 6) || (empty($img_code)) || (getConfig('code_length') == 0)) {
// Stop execution of function here because of over-sized code length
return;
} elseif (!$header) {
// Return in an HTML code code
- return "\n";
+ return "\n";
}
// Load image
- $img = sprintf("%s/theme/%s/images/code_bg.%s", PATH, GET_CURR_THEME(), getConfig('img_type'));
+ $img = sprintf("%s/theme/%s/images/code_bg.%s", constant('PATH'), GET_CURR_THEME(), getConfig('img_type'));
if (FILE_READABLE($img)) {
// Switch image type
switch (getConfig('img_type'))
@@ -1336,6 +1336,7 @@ function GENERATE_IMAGE($img_code, $header=true) {
}
} else {
// Exit function here
+ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("File for image type %s not found.", getConfig('img_type')));
return;
}
@@ -1417,133 +1418,133 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
} else {
// Generate table
$OUT = "
");
+ debug_report_bug("Missing file_hash in ".__FUNCTION__.".");
} // END - if
// When the salt is empty build a new one, else use the first x configured characters as the salt
if (empty($salt)) {
// Build server string
- $server = $_SERVER['PHP_SELF'].":".GET_USER_AGENT().":".getenv('SERVER_SOFTWARE').":".GET_REMOTE_ADDR().":".":".filemtime(PATH."inc/databases.php");
+ $server = $_SERVER['PHP_SELF'].":".GET_USER_AGENT().":".getenv('SERVER_SOFTWARE').":".GET_REMOTE_ADDR().":".":".filemtime(constant('PATH')."inc/databases.php");
// Build key string
- $keys = SITE_KEY.":".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)", bigintval(getConfig('patch_ctime'))).":".getConfig('master_salt');
// Additional data
$data = $plainText.":".uniqid(mt_rand(), true).":".time();
// Calculate number for generating the code
- $a = time() + _ADD - 1;
+ $a = time() + constant('_ADD') - 1;
// Generate SHA1 sum from modula of number and the prime number
- $sha1 = sha1(($a % _PRIME).$server.":".$keys.":".$data.":".date("d-m-Y (l-F-T)", time()).":".$a);
+ $sha1 = sha1(($a % constant('_PRIME')).$server.":".$keys.":".$data.":".date("d-m-Y (l-F-T)", time()).":".$a);
//* DEBUG: */ echo "SHA1=".$sha1." (".strlen($sha1).") ";
$sha1 = scrambleString($sha1);
//* DEBUG: */ echo "Scrambled=".$sha1." (".strlen($sha1).") ";
@@ -2125,9 +2141,8 @@ function descrambleString($str) {
return $orig;
}
//
-function genScrambleString($len) {
- // Prepare randomizer and array for the numbers
- mt_srand((double) microtime() * 1000000);
+function genScrambleString ($len) {
+ // Prepare array for the numbers
$scrambleNumbers = array();
// First we need to setup randomized numbers from 0 to 31
@@ -2148,6 +2163,7 @@ function genScrambleString($len) {
$scrambleString = implode(":", $scrambleNumbers);
return $scrambleString;
}
+
// Append data like session ID or referal ID to the given URL which would
// normally be stored in cookies
function ADD_URL_DATA ($URL) {
@@ -2156,7 +2172,7 @@ function ADD_URL_DATA ($URL) {
// Determine URL binder
$BIND = "?";
- if (strpos($URL, "?") !== false) $BIND = "&";
+ if (strpos($URL, "?") !== false) $BIND = "&";
if ((!defined('__COOKIES')) || ((!__COOKIES))) {
// Cookies are not accepted
@@ -2167,25 +2183,14 @@ function ADD_URL_DATA ($URL) {
// Not found! So let's set default here
$ADD .= $BIND."refid=".getConfig('def_refid');
}
-
- // Is there already added data? Then change the binder
- if (!empty($ADD)) $BIND = "&";
-
- // Add session ID
- if ((!empty($_GET['PHPSESSID'])) && (strpos($URL, "PHPSESSID=") == 0)) {
- // Add session from URL
- $ADD .= $BIND."PHPSESSID=".SQL_ESCAPE(strip_tags($_GET['PHPSESSID']));
- } else {
- // Add current session
- $ADD .= $BIND."PHPSESSID=".session_id();
- }
} // 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
-function generatePassString($passHash) {
+function generatePassString ($passHash) {
// Return vanilla password hash
$ret = $passHash;
@@ -2198,9 +2203,9 @@ function generatePassString($passHash) {
$part2 = hexdec(substr(getConfig('secret_key'), $start, 4));
$mod = dechex($idx);
if ($part1 > $part2) {
- $mod = dechex(sqrt(($part1 - $part2) * _PRIME / pi()));
+ $mod = dechex(sqrt(($part1 - $part2) * constant('_PRIME') / pi()));
} elseif ($part2 > $part1) {
- $mod = dechex(sqrt(($part2 - $part1) * _PRIME / pi()));
+ $mod = dechex(sqrt(($part2 - $part1) * constant('_PRIME') / pi()));
}
$mod = substr(round($mod), 0, 4);
$mod = str_repeat('0', 4-strlen($mod)).$mod;
@@ -2240,13 +2245,13 @@ function FIX_DELETED_COOKIES ($cookies) {
// Output error messages in a fasioned way and die...
function mxchange_die ($msg) {
// Load header
- require_once(PATH."inc/header.php");
+ LOAD_INC_ONCE("inc/header.php");
// Load the message template
LOAD_TEMPLATE("admin_settings_saved", false, $msg);
// Load footer
- require(PATH."inc/footer.php");
+ LOAD_INC_ONCE("inc/footer.php");
// Exit explicitly
exit;
@@ -2400,21 +2405,24 @@ function merge_array ($array1, $array2) {
return array_merge($array1, $array2);
} elseif (is_array($array1)) {
// Return left array
+ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("array2 is not an array. array != %s", gettype($array2)));
return $array1;
+ } elseif (is_array($array2)) {
+ // Return right array
+ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("array1 is not an array. array != %s", gettype($array1)));
+ return $array2;
}
- // Something wired happened here...
- print(__FUNCTION__.":
");
- debug_print_backtrace();
- die("
");
+ // Both are not arrays
+ debug_report_bug(__FUNCTION__.": No arrays provided!");
}
// Debug message logger
function DEBUG_LOG ($file, $line, $message, $force=true) {
// Is debug mode enabled?
- if ((isBooleanConstantAndTrue('DEBUG_MODE')) || ($force)) {
+ if ((isBooleanConstantAndTrue('DEBUG_MODE')) || ($force === true)) {
// Log this message away
- $fp = fopen(PATH."inc/cache/debug.log", 'a') or mxchange_die("Cannot write logfile debug.log!");
+ $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($file)."|".$line."|".strip_tags($message)."\n");
fclose($fp);
} // END - if
@@ -2471,7 +2479,7 @@ function RESET_ADD_INCLUDES () {
} // END - if
// Get more daily reset scripts
- $INC_POOL = GET_DIR_AS_ARRAY(PATH."inc/reset/", "reset_");
+ $INC_POOL = GET_DIR_AS_ARRAY(constant('PATH')."inc/reset/", "reset_");
// Update database
if (!defined('DEBUG_RESET')) UPDATE_CONFIG("last_update", time());
@@ -2482,7 +2490,7 @@ function RESET_ADD_INCLUDES () {
// Has it changed?
if (getConfig('last_week') != $currWeek) {
// Include weekly reset scripts
- $INC_POOL = merge_array($INC_POOL, GET_DIR_AS_ARRAY(PATH."inc/weekly/", "weekly_"));
+ $INC_POOL = merge_array($INC_POOL, GET_DIR_AS_ARRAY(constant('PATH')."inc/weekly/", "weekly_"));
// Update config
if (!defined('DEBUG_WEEKLY')) UPDATE_CONFIG("last_week", $currWeek);
@@ -2494,7 +2502,7 @@ function RESET_ADD_INCLUDES () {
// Has it changed?
if (getConfig('last_month') != $currMonth) {
// Include monthly reset scripts
- $INC_POOL = merge_array($INC_POOL, GET_DIR_AS_ARRAY(PATH."inc/monthly/", "monthly_"));
+ $INC_POOL = merge_array($INC_POOL, GET_DIR_AS_ARRAY(constant('PATH')."inc/monthly/", "monthly_"));
// Update config
if (!defined('DEBUG_MONTHLY')) UPDATE_CONFIG("last_month", $currMonth);
@@ -2601,22 +2609,22 @@ function HANDLE_LOGIN_FAILTURES ($accessLevel) {
$OUT = "";
// Is the session data set?
- if ((isSessionVariableSet('mxchange_'.$accessLevel.'_failtures')) && (isSessionVariableSet('mxchange_'.$accessLevel.'_last_fail'))) {
+ if ((isSessionVariableSet('mxchange_'.$accessLevel.'_failures')) && (isSessionVariableSet('mxchange_'.$accessLevel.'_last_fail'))) {
// Ignore zero values
- if (get_session('mxchange_'.$accessLevel.'_failtures') > 0) {
- // Non-guest has login failtures found, get both data and prepare it for template
+ if (get_session('mxchange_'.$accessLevel.'_failures') > 0) {
+ // Non-guest has login failures found, get both data and prepare it for template
//* DEBUG: */ print __FUNCTION__."(".__LINE__."):accessLevel={$accessLevel} \n";
$content = array(
- 'login_failtures' => get_session('mxchange_'.$accessLevel.'_failtures'),
- 'last_failture' => MAKE_DATETIME(get_session('mxchange_'.$accessLevel.'_last_fail'), "2")
+ 'login_failures' => get_session('mxchange_'.$accessLevel.'_failures'),
+ 'last_failure' => MAKE_DATETIME(get_session('mxchange_'.$accessLevel.'_last_fail'), "2")
);
// Load template
- $OUT = LOAD_TEMPLATE("login_failtures", true, $content);
+ $OUT = LOAD_TEMPLATE("login_failures", true, $content);
} // END - if
// Reset session data
- set_session('mxchange_'.$accessLevel.'_failtures', "");
+ set_session('mxchange_'.$accessLevel.'_failures', "");
set_session('mxchange_'.$accessLevel.'_last_fail', "");
} // END - if
@@ -2639,13 +2647,13 @@ function REBUILD_CACHE ($cache, $inc="") {
// Include file given?
if (!empty($inc)) {
// Construct FQFN
- $fqfn = sprintf("%sinc/loader/load_cache-%s.php", PATH, $inc);
+ $INC = sprintf("inc/loader/load_cache-%s.php", $inc);
// Is the include there?
- if (FILE_READABLE($fqfn)) {
+ if (INCLUDE_READABLE($INC)) {
// And rebuild it from scratch
//* DEBUG: */ print __FUNCTION__."(".__LINE__."): inc={$inc} - LOADED! \n";
- require($fqfn);
+ LOAD_INC($INC);
} else {
// Include not found!
DEBUG_LOG(__FUNCTION__, __LINE__, "Include {$inc} not found. cache={$cache}");
@@ -2666,19 +2674,19 @@ function CACHE_PURGE_ADMIN_MENU ($id=0, $action="", $what="", $str="") {
// No cache instance!
DEBUG_LOG(__FUNCTION__, __LINE__, " No cache instance found.");
return false;
- } elseif ((getConfig('cache_admin_menu') == null) || (getConfig('cache_admin_menu') == "N")) {
+ } elseif ((!isConfigEntrySet('cache_admin_menu')) || (getConfig('cache_admin_menu') != "Y")) {
// Caching disabled (currently experiemental!)
return false;
}
// Experiemental feature!
- trigger_error("Experimental feature: You have to delete the admin_*.cache files by yourself at this point.");
+ debug_report_bug("Experimental feature: You have to delete the admin_*.cache files by yourself at this point.");
}
// Translates the "pool type" into human-readable
function TRANSLATE_POOL_TYPE ($type) {
- // Default type is unknown
- $translated = sprintf(POOL_TYPE_UNKNOWN, $type);
+ // Default type is unknown
+ $translated = sprintf(getMessage('POOL_TYPE_UNKNOWN'), $type);
// Generate constant
$constName = sprintf("POOL_TYPE_%s", $type);
@@ -2686,7 +2694,7 @@ function TRANSLATE_POOL_TYPE ($type) {
// Does it exist?
if (defined($constName)) {
// Then use it
- $translated = constant($constName);
+ $translated = getMessage($constName);
} // END - if
// Return "translation"
@@ -2775,15 +2783,16 @@ function ADD_NEW_BONUS_MAIL ($data, $mode="", $output=true) {
);
// Mail inserted into bonus pool
- if ($output) LOAD_TEMPLATE("admin_settings_saved", false, 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, 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!");
}
}
+
// Determines referal id and sets it
function DETERMINE_REFID () {
global $CLICK, $_SERVER;
@@ -2826,7 +2835,7 @@ function DETERMINE_REFID () {
}
// Destroys the admin session
-function DESTROY_ADMIN_SESSION ($destroy = true) {
+function destroyAdminSession ($destroy = true) {
// Kill maybe existing session variables including array elements
set_session('admin_login', "");
set_session('admin_md5' , "");
@@ -2835,7 +2844,7 @@ function DESTROY_ADMIN_SESSION ($destroy = true) {
// Destroy session and return status
if ($destroy) {
- return @session_destroy();
+ return session_destroy();
} // END - if
// All fine if we shall not really destroy the session
@@ -2848,6 +2857,12 @@ function IF_APACHE_MODULE_LOADED ($apacheModule) {
return (((function_exists('apache_get_modules')) && (in_array($apacheModule, apache_get_modules()))) || (!function_exists('apache_get_modules')));
}
+// Merges $_CONFIG with data in given array
+function mergeConfig ($newConfig) {
+ global $_CONFIG;
+ $_CONFIG = merge_array($_CONFIG, $newConfig);
+}
+
// Getter for $_CONFIG entries
function getConfig ($entry) {
global $_CONFIG;
@@ -2856,7 +2871,7 @@ function getConfig ($entry) {
$value = null;
// Is the entry there?
- if (isset($_CONFIG[$entry])) {
+ if (isConfigEntrySet($entry)) {
// Then use it
$value = $_CONFIG[$entry];
} // END - if
@@ -2865,15 +2880,47 @@ function getConfig ($entry) {
return $value;
}
-// @TODO Rewrite all language constants to this function.
+// Setter for $_CONFIG entries
+function setConfigEntry ($entry, $value) {
+ global $_CONFIG;
+
+ // Secure the entry name
+ $entry = SQL_ESCAPE($entry);
+
+ // And set it
+ $_CONFIG[$entry] = $value;
+}
+
+// Checks wether the given config entry is set
+function isConfigEntrySet ($entry) {
+ global $_CONFIG;
+ return (isset($_CONFIG[$entry]));
+}
+
+// Increment or init with given value or 1 as default the given config entry
+function incrementConfigEntry ($configEntry, $value=1) {
+ global $_CONFIG;
+
+ // Increment it if set or init it with 1
+ if (getConfig($configEntry) > 0) {
+ $_CONFIG[$configEntry] += $value;
+ } else {
+ $_CONFIG[$configEntry] = $value;
+ }
+}
+
// "Getter" for language strings
+// @TODO Rewrite all language constants to this function.
function getMessage ($messageId) {
// Default is not found!
$return = "!".$messageId."!";
// Is the language string found?
- if (isset($GLOBALS['msg'][$messageId])) {
- // Language array element found
+ if (isset($GLOBALS['msg'][strtolower($messageId)])) {
+ // Language array element found in small_letters
+ $return = $GLOBALS['msg'][$messageId];
+ } elseif (isset($GLOBALS['msg'][strtoupper($messageId)])) {
+ // @DEPRECATED Language array element found in BIG_LETTERS
$return = $GLOBALS['msg'][$messageId];
} elseif (defined($messageId)) {
// @DEPRECATED Deprecated constant found
@@ -2912,13 +2959,13 @@ function GET_CURR_THEME() {
} // END - if
} elseif ((!isBooleanConstantAndTrue('mxchange_installed')) && ((isBooleanConstantAndTrue('mxchange_installing')) || ($CSS == true)) && ((!empty($_GET['theme'])) || (!empty($_POST['theme'])))) {
// Prepare FQFN for checking
- $theme = sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($_GET['theme']));
+ $theme = sprintf("%stheme/%s/theme.php", constant('PATH'), SQL_ESCAPE($_GET['theme']));
// Installation mode active
if ((!empty($_GET['theme'])) && (FILE_READABLE($theme))) {
// Set cookie from URL data
set_session('mxchange_theme', SQL_ESCAPE($_GET['theme']));
- } elseif (FILE_READABLE(sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($_POST['theme'])))) {
+ } elseif (FILE_READABLE(sprintf("%stheme/%s/theme.php", constant('PATH'), SQL_ESCAPE($_POST['theme'])))) {
// Set cookie from posted data
set_session('mxchange_theme', SQL_ESCAPE($_POST['theme']));
}
@@ -2931,7 +2978,7 @@ function GET_CURR_THEME() {
}
// Add (maybe) found theme.php file to inclusion list
- $theme = sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($ret));
+ $theme = sprintf("%stheme/%s/theme.php", constant('PATH'), SQL_ESCAPE($ret));
// Try to load the requested include file
if (FILE_READABLE($theme)) $INC_POOL[] = $theme;
@@ -2962,7 +3009,7 @@ function THEME_GET_ID ($name) {
incrementConfigEntry('cache_hits');
} 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",
+ $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_themes` WHERE theme_path='%s' LIMIT 1",
array($name), __FILE__, __LINE__);
// Entry found?
@@ -2979,18 +3026,6 @@ function THEME_GET_ID ($name) {
return $id;
}
-// Increment or init with given value or 1 as default the given config entry
-function incrementConfigEntry ($configEntry, $value=1) {
- global $_CONFIG;
-
- // Increment it if set or init it with 1
- if (getConfig($configEntry) > 0) {
- $_CONFIG[$configEntry] += $value;
- } else {
- $_CONFIG[$configEntry] = $value;
- }
-}
-
// Read a given file
function READ_FILE ($FQFN, $sqlPrepare = false) {
// Load the file
@@ -3013,10 +3048,27 @@ function READ_FILE ($FQFN, $sqlPrepare = false) {
return $content;
}
+// Writes content to a file
+function WRITE_FILE ($FQFN, $content) {
+ // Is the function there?
+ if (function_exists('file_put_contents')) {
+ // Write it directly
+ file_put_contents($FQFN, $content);
+ } else {
+ // Write it with fopen
+ $fp = fopen($FQFN, 'w') or mxchange_die("Cannot write file ".basename($FQFN)."!");
+ fwrite($fp, $content);
+ fclose($fp);
+
+ // Set CHMOD rights
+ chmod($FQFN, 0644);
+ }
+}
+
// Generates an error code from given account status
function GEN_ERROR_CODE_FROM_ACCOUNT_STATUS ($status) {
// Default error code if unknown account status
- $ERROR = CODE_UNKNOWN_STATUS;
+ $ERROR = constant('CODE_UNKNOWN_STATUS');
// Generate constant name
$constantName = sprintf("CODE_ID_%s", $status);
@@ -3039,8 +3091,348 @@ function clearOutputBuffer () {
// Trigger an error on failure
if (!ob_end_clean()) {
// Failed!
- trigger_error(__FUNCTION__.": Failed to clean output buffer.");
+ debug_report_bug(__FUNCTION__.": Failed to clean output buffer.");
+ } // END - if
+}
+
+// "Getter" for revision/version data
+function getActualVersion ($type = 0) {
+ // By default nothing is new... ;-)
+ $new = false;
+
+ // FQFN of revision file
+ $FQFN = sprintf("%sinc/cache/.revision", constant('PATH'));
+
+ // 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));
+
+ // Is the content valid?
+ if ((!is_array($ins_vers)) || (count($ins_vers) <= 0) || (!isset($ins_vers[$type])) || ($ins_vers[0]) == "new") {
+ // File needs update!
+ $new = true;
+ } else {
+ // Revision-File has valid Data and isn't 'new' so return the Rev-Number
+ return trim($ins_vers[$type]);
+ }
+ }
+
+ // 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");
+
+ // Prepare content
+ $akt_vers[] = trim($version[10]);
+ $akt_vers[] = trim($version[9]);
+ $akt_vers[] = trim($version[8]);
+
+ // Write file
+ WRITE_FILE($FQFN, implode("\n", $akt_vers));
+
+ // Return requested content
+ return trim($akt_vers[$type]);
+ }
+}
+
+// Loads an include file and logs any missing files for debug purposes
+function LOAD_INC ($INC) {
+ // Get constant path
+ $PATH = constant('PATH');
+
+ // Use the include file name directly
+ // @TODO Try to find all locations where an FQFN is given to these two
+ // @TODO functions and avoid it.
+ $FQFN = $INC;
+
+ // Check if PATH is in $INC
+ if (substr($INC, 0, $PATH) != $PATH) {
+ // Add it. This is why we need a trailing slash in config.php
+ $FQFN = $PATH . $INC;
+ } // END - if
+
+ // Is the include file there?
+ if (!FILE_READABLE($FQFN)) {
+ // Not there so log it
+ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Include file %s not found.", basename($INC)));
+ return false;
} // END - if
+
+ // Try to load it
+ require($FQFN);
+}
+
+// Loads an include file once
+function LOAD_INC_ONCE ($INC) {
+ global $cacheArray;
+
+ // Is it not loaded?
+ if (!isset($cacheArray['load_once'][$INC])) {
+ // Then try to load it
+ LOAD_INC($INC);
+
+ // And mark it as loaded
+ $cacheArray['load_once'][$INC] = true;
+ } // END - if
+}
+
+// Back-ported from the new ship-simu engine. :-)
+function debug_get_printable_backtrace () {
+ // Init variable
+ $backtrace = "\n";
+
+ // Get and prepare backtrace for output
+ $backtraceArray = debug_backtrace();
+ foreach ($backtraceArray as $key => $trace) {
+ if (!isset($trace['file'])) $trace['file'] = __FILE__;
+ if (!isset($trace['line'])) $trace['line'] = __LINE__;
+ if (!isset($trace['args'])) $trace['args'] = array();
+ $backtrace .= "
\n";
+ } // END - foreach
+
+ // Close it
+ $backtrace .= "\n";
+
+ // Return the backtrace
+ return $backtrace;
+}
+
+// Output a debug backtrace to the user
+function debug_report_bug ($message = "") {
+ // Init message
+ $debug = "";
+ // Is the optional message set?
+ if (!empty($message)) {
+ // Use and log it
+ $debug = sprintf("Note: %s \n",
+ $message
+ );
+
+ // @TODO Add a little more infos here
+ DEBUG_LOG(__FUNCTION__, __LINE__, $message);
+ } // END - if
+
+ // Add output
+ $debug .= ("Please report this error at bugs.mxchange.org: