\n";
+
+ // Log the mail away
+ if (defined('DEBUG_MAIL')) DEBUG_LOG(__FUNCTION__.":to={$TO},subject={$SUBJECT},msg={$MSG}");
+ } elseif (($HTML == "Y") && (EXT_IS_ACTIVE("html_mail"))) {
// Send mail as HTML away
SEND_HTML_EMAIL($TO, $SUBJECT, $MSG, $FROM);
} elseif (!empty($TO)) {
- // Compile email
- $TO = COMPILE_CODE($TO);
-
// Send Mail away
- SEND_RAW_EMAIL($TO, COMPILE_CODE($SUBJECT), COMPILE_CODE($MSG), $FROM);
- } elseif ($HTML == 'N') {
+ SEND_RAW_EMAIL($TO, $SUBJECT, $MSG, $FROM);
+ } elseif ($HTML == "N") {
// Problem found!
- SEND_RAW_EMAIL(WEBMASTER, COMPILE_CODE($SUBJECT), COMPILE_CODE($MSG), $FROM);
+ SEND_RAW_EMAIL(WEBMASTER, "[PROBLEM:]".$SUBJECT, $MSG, $FROM);
}
}
@@ -404,7 +474,7 @@ function SEND_RAW_EMAIL ($to, $subject, $msg, $from) {
// get new instance
$mail = new PHPMailer();
- $mail->PluginDir = PATH."inc/phpmailer/";
+ $mail->PluginDir = sprintf("%sinc/phpmailer/", PATH);
$mail->IsSMTP();
$mail->SMTPAuth = true;
@@ -412,7 +482,11 @@ function SEND_RAW_EMAIL ($to, $subject, $msg, $from) {
$mail->Port = 25;
$mail->Username = SMTP_USER;
$mail->Password = SMTP_PASSWORD;
- $mail->From = $from;
+ if (empty($from)) {
+ $mail->From = WEBMASTER;
+ } else {
+ $mail->From = $from;
+ }
$mail->FromName = MAIN_TITLE;
$mail->Subject = $subject;
if ((EXT_IS_ACTIVE("html_mail")) && (strip_tags($msg) != $msg)) {
@@ -421,7 +495,7 @@ function SEND_RAW_EMAIL ($to, $subject, $msg, $from) {
$mail->WordWrap = 70;
$mail->IsHTML(true);
} else {
- $mail->Body = $msg;
+ $mail->Body = html_entity_decode($msg);
}
$mail->AddAddress($to, "");
$mail->AddReplyTo(WEBMASTER,MAIN_TITLE);
@@ -430,7 +504,7 @@ function SEND_RAW_EMAIL ($to, $subject, $msg, $from) {
$mail->Send();
} else {
// Use legacy mail() command
- @mail($to, $subject, $msg, $from);
+ @mail($to, $subject, html_entity_decode($msg), $from);
}
}
//
@@ -462,7 +536,7 @@ function GEN_PASS($LEN = 0) {
return $PASS;
}
//
-function MAKE_DATETIME($time, $mode="0")
+function MAKE_DATETIME ($time, $mode="0")
{
if ($time == 0) {
// Never happend
@@ -475,8 +549,7 @@ function MAKE_DATETIME($time, $mode="0")
switch (GET_LANGUAGE())
{
case "de": // German date / time format
- switch ($mode)
- {
+ switch ($mode) {
case "0": $ret = date("d.m.Y \u\m H:i \U\h\\r", $time); break;
case "1": $ret = strtolower(date("d.m.Y - H:i", $time)); break;
case "2": $ret = date("d.m.Y|H:i", $time); break;
@@ -485,8 +558,7 @@ function MAKE_DATETIME($time, $mode="0")
break;
default: // Default is the US date / time format!
- switch ($mode)
- {
+ switch ($mode) {
case "0": $ret = date("r", $time); break;
case "1": $ret = date("Y-m-d - g:i A", $time); break;
case "2": $ret = date("y-m-d|H:i", $time); break;
@@ -497,122 +569,100 @@ function MAKE_DATETIME($time, $mode="0")
}
// Translates the american decimal dot into a german comma
-function TRANSLATE_COMMA($dotted, $cut=true)
-{
+function TRANSLATE_COMMA ($dotted, $cut=true, $max=0) {
global $_CONFIG;
+
// Default is 3 you can change this in admin area "Misc -> Misc Options"
if (empty($_CONFIG['max_comma'])) $_CONFIG['max_comma'] = "3";
- if (!ereg("\.", $dotted)) $dotted .= ".".str_repeat("0", $_CONFIG['max_comma']);
- if ($cut) {
- // Remove trailing zeros
- $dot = str_replace(".", "x", $dotted);
- while(substr($dot, -1, 1) == "0") {
- $dot = substr($dot, 0, -1);
- }
- if (substr($dot, -1, 1) == "x") {
- // Last char is the 'x'
- $dotted = substr($dot, 0, -1);
+ // Use from config is default
+ $maxComma = $_CONFIG['max_comma'];
+
+ // Use from parameter?
+ if ($max > 0) $maxComma = $max;
+
+ // Cut zeros off?
+ if ($cut) {
+ // Test for commata if in cut-mode
+ $com = explode(".", $dotted);
+ if (count($com) > 1) {
+ // Commata found, so only zeros?
+ if ($com[1] == str_repeat("0", strlen($com[1]))) {
+ // Only zeros, so display only one
+ $maxComma = 1;
+ } // END - if
} else {
- // Last char is a number
- $dotted = str_replace("x", ".", $dot);
+ // Don't display commatas even if there are none... ;-)
+ $maxComma = 0;
}
- }
+ } // END - if
+
+ // Debug log
+ //DEBUG_LOG(__FUNCTION__.":dotted={$dotted},maxComma={$maxComma}");
// Translate it now
switch (GET_LANGUAGE()) {
case "de":
- $pos = strpos($dotted, ".");
- if ($pos > 0) {
- if ($cut) {
- // Cut x numbers behind comma
- $dotted = str_replace(".", ",", substr($dotted, 0, ($pos + $_CONFIG['max_comma'] + 1)));
- } else {
- // Replace comma with dot
- $dotted = str_replace(".", ",", $dotted);
- }
- } elseif (!$cut) {
- if (empty($pos)) {
- $dotted = "0,".str_repeat("0", $_CONFIG['max_comma']);
- } else {
- $dotted .= ",".str_repeat("0", $_CONFIG['max_comma']);
- }
- }
+ $dotted = number_format($dotted, $maxComma, ",", ".");
break;
default:
- if (!$cut) {
- if ($pos > 0) {
- $dotted = substr($dotted, 0, ($pos + $_CONFIG['max_comma'] + 1));
- } else {
- $dotted .= ".".str_repeat("0", $_CONFIG['max_comma']);
- }
- }
+ $dotted = number_format($dotted, $maxComma, ".", ",");
break;
}
+
+ // Return translated value
return $dotted;
}
//
-function DEREFERER($URL) {
- $URL = URL."/modules.php?module=loader&url=".urlencode(base64_encode(COMPILE_CODE($URL)));
+function DEREFERER ($URL) {
+ // Don't de-refer our own links!
+ if (substr($URL, 0, strlen(URL)) != URL) {
+ // De-refer this link
+ $URL = URL."/modules.php?module=loader&url=".urlencode(base64_encode(gzcompress($URL)));
+ } // END - if
+
+ // Return link
return $URL;
}
//
-function TRANSLATE_SEX($sex) {
- switch ($sex)
- {
- case "M": $ret = SEX_M; break;
- case "F": $ret = SEX_F; break;
- case "C": $ret = SEX_C; break;
- default : $ret = $sex; break;
- }
- return $ret;
-}
-//
-function GET_POOL_TYPE($PT)
-{
- switch ($PT)
+function TRANSLATE_GENDER ($gender) {
+ switch ($gender)
{
- case "TEMP" : $ret = POOL_TEMP; break;
- case "SEND" : $ret = POOL_SEND; break;
- case "NEW" : $ret = POOL_NEW; break;
- case "ADMIN" : $ret = POOL_ADMIN; break;
- case "ACTIVE" : $ret = POOL_ACTIVE; break;
- case "DELETED": $ret = POOL_DELETED; break;
- default : $ret = POOL_UNKNOWN." (".$PT.")"; break;
+ case "M": $ret = GENDER_M; break;
+ case "F": $ret = GENDER_F; break;
+ case "C": $ret = GENDER_C; break;
+ default : $ret = $gender; break;
}
return $ret;
}
//
-function FRAMETESTER($URL)
-{
- global $_SERVER;
- $URL = URL."/modules.php?module=frametester&url=".urlencode(base64_encode(COMPILE_CODE($URL)));
- return $URL;
+function FRAMETESTER($URL) {
+ // Prepare frametester URL
+ $frametesterUrl = sprintf("%s/modules.php?module=frametester&url=%s",
+ URL,
+ urlencode(base64_encode(gzcompress(COMPILE_CODE($URL))))
+ );
+ return $frametesterUrl;
}
//
-function SELECTION_COUNT($array)
-{
- $ret = "0";
- if (is_array($array))
- {
- foreach ($array as $key=>$sel)
- {
+function SELECTION_COUNT($array) {
+ $ret = 0;
+ if (is_array($array)) {
+ foreach ($array as $key => $sel) {
if (!empty($sel)) $ret++;
}
}
return $ret;
}
//
-function IMG_CODE ($code, $type, $DATA, $uid)
-{
+function IMG_CODE ($code, $type, $DATA, $uid) {
return "";
}
//
-function TRANSLATE_STATUS($status)
-{
+function TRANSLATE_STATUS($status) {
switch ($status)
{
case "UNCONFIRMED":
@@ -627,6 +677,11 @@ function TRANSLATE_STATUS($status)
$ret = ACCOUNT_LOCKED;
break;
+ case "":
+ case null:
+ $ret = ACCOUNT_DELETED;
+ break;
+
default:
$ret = UNKNOWN_STATUS_1.$status.UNKNOWN_STATUS_2;
break;
@@ -649,7 +704,7 @@ function GET_LANGUAGE() {
// Check GET variable and cookie
if (!empty($lang)) {
// Check if main language file does exist
- if (file_exists(PATH."inc/language/".$lang.".php")) {
+ if (FILE_READABLE(PATH."inc/language/".$lang.".php")) {
// Okay found, so let's update cookies
SET_LANGUAGE($lang);
}
@@ -673,25 +728,36 @@ function SET_LANGUAGE($lang) {
set_session("mx_lang", $lang);
}
//
-function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
+function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
global $DATA, $_CONFIG, $REPLACER;
- // Keept for backward-compatiblity (please replace these variables against our new {--CONST--} syntax!)
- $MAIN_TITLE = MAIN_TITLE; $URL = URL; $WEBMASTER = WEBMASTER;
- $surname = ""; $family = ""; $nick = ""; $sex = 'N';
+ // Make sure all template names are lowercase!
+ $template = strtolower($template);
+
+ // Default "nickname" if extension is not installed
+ $nick = "---";
+
+ // Keept for backward-compatiblity (please replace these variables against our new {!CONST!} syntax!)
+ // No longer used: $MAIN_TITLE = MAIN_TITLE; $URL = URL; $WEBMASTER = WEBMASTER;
// Prepare IP number and User Agent
- $REMOTE_ADDR = getenv('REMOTE_ADDR');
- $HTTP_USER_AGENT = getenv('HTTP_USER_AGENT');
+ $REMOTE_ADDR = GET_REMOTE_ADDR();
+ $HTTP_USER_AGENT = GET_USER_AGENT();
+ // Default admin
$ADMIN = MAIN_TITLE;
- if (isSessionVariableSet('admin_login')) {
+
+ // Is the admin logged in?
+ if (IS_ADMIN()) {
+ // Get admin id
+ $aid = GET_ADMIN_ID(get_session('admin_login'));
+
// Load Admin data
- $result = SQL_QUERY_ESC("SELECT email FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
- array(SQL_ESCAPE(get_session('admin_login'))), __FILE__, __LINE__);
- list($ADMIN) = SQL_FETCHROW($result);
- SQL_FREERESULT($result);
- }
+ $ADMIN = GET_ADMIN_EMAIL($aid);
+ } // END - if
+
+ // Neutral email address is default
+ $email = WEBMASTER;
// Expiration in a nice output format
if ($_CONFIG['auto_purge'] == 0) {
@@ -705,125 +771,51 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
$EXPIRATION = round($_CONFIG['auto_purge']/60/60/24)." "._DAYS;
}
- switch ($template)
- {
- case "bonus-mail": // Load data for the bonus mail
- $BONUSID = $DATA[0];
- $content = $DATA[2];
- $points = TRANSLATE_COMMA($DATA[4]);
- $TIME = $DATA[5];
- $TARGET_URL = $DATA[8];
- $CATEGORY = GET_CATEGORY($DATA[9]);
- $DATA[10] = $UID;
-
- // Replace variables
- foreach ($REPLACER as $key=>$value)
- {
- if (isset($DATA[$key])) $content = str_replace($value, $DATA[$key], $content);
- }
- break;
-
- case "order-admin":
- case "order-member":
- $BLOCKS = $_CONFIG['max_send'];
- $SUBJECT = $DATA[0];
- $content = $DATA[1];
- $PAYMENT = GET_PAYMENT($DATA[3]);
- $TARGET_URL = $DATA[5];
- $CATEGORY = GET_CATEGORY($DATA[6]);
- break;
-
- case "order-reject":
- case "order-deleted":
- case "order-accept":
- $TARGET_URL = $DATA[0];
- $URL = $DATA[0];
- $SUBJECT = $DATA[1];
- break;
-
- case "new-pass":
- $PASS = $DATA[0];
- $REMOTE = $DATA[1];
- break;
-
- case "confirm-member":
- $points = $_CONFIG['points_register'];
- break;
-
- case "confirm-referral":
- $PERCENT = $DATA[0];
- $LEVEL = $DATA[1];
- $points = $DATA[2];
- $REFID = $DATA[3];
- break;
-
- case "normal-mail":
- $SEND_UID = $DATA[1];
- $CATEGORY = GET_CATEGORY($DATA[9]);
- $TIME = GET_PAY_POINTS($DATA[5], "time");
- $TARGET_URL = $DATA[7];
- $points = TRANSLATE_COMMA(GET_PAY_POINTS($DATA[5], "payment"));
- // Warning! This ID has changed from 10 to 11!
- $MAILID = $DATA[11];
-
- // Replace variables
- foreach ($REPLACER as $key=>$value)
- {
- if (isset($DATA[$key])) $content = str_replace($value, $DATA[$key], $content);
- }
- break;
-
- case "done-member":
- case "done-admin":
- $SEND_UID = $DATA[1];
- $CATEGORY = GET_CATEGORY($DATA[9]);
- $TARGET_URL = $DATA[7];
- break;
-
- case "back-admin":
- case "back-member":
- $points = TRANSLATE_COMMA($DATA[10]);
- break;
-
- case "add-points":
- $points = bigintval($_POST['points']);
- break;
-
- case "guest_request_confirm":
- $HASH = $DATA[2];
- break;
- }
+ // Is content an array?
+ if (is_array($content)) {
+ // Add expiration to array, $EXPIRATION is now deprecated!
+ $content['expiration'] = $EXPIRATION;
+ } // END - if
// Load user's data
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):UID={$UID},template={$template} \n";
if ($UID > 0) {
if (EXT_IS_ACTIVE("nickname")) {
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):NICKNAME! \n";
// Load nickname
- $result = SQL_QUERY_ESC("SELECT surname, family, sex, email, nickname FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1",
- array(bigintval($UID)), __FILE__, __LINE__);
- list($surname, $family, $sex, $email, $nick) = SQL_FETCHROW($result);
- SQL_FREERESULT($result);
+ $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 {
- // Load normal data
- $result = SQL_QUERY_ESC("SELECT surname, family, sex, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1",
- array(bigintval($UID)), __FILE__, __LINE__);
- list($surname, $family, $sex, $email) = SQL_FETCHROW($result);
- SQL_FREERESULT($result);
- $nick = "---";
- }
- } else {
- // Neutral sex and email address is default
- $sex = 'N';
- $email = WEBMASTER;
- }
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):NO-NICK! \n";
+ /// Load normal data
+ $result = SQL_QUERY_ESC("SELECT surname, family, gender, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+ array(bigintval($UID)), __FILE__, __LINE__);
+ }
+
+ // Is content an array?
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):content[]=".gettype($content)." \n";
+ if (is_array($content)) {
+ // Fetch and migrate data
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):content()=".count($content)." - PRE \n";
+ $content = array_merge($content, SQL_FETCHARRAY($result));
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):content()=".count($content)." - AFTER \n";
+ } // END - if
+
+ // Free result
+ SQL_FREERESULT($result);
+ } // END - if
+
+ // Translate M to male or F to female if present
+ if (isset($content['gender'])) $content['gender'] = TRANSLATE_GENDER($content['gender']);
- // Translate M to male or F to female
- $salut = TRANSLATE_SEX($sex);
+ // Overwrite email from data if present
+ if (isset($content['email'])) $email = $content['email'];
// Store email for some functions in global data array
$DATA['email'] = $email;
// Base directory
- $BASE = PATH."templates/".GET_LANGUAGE()."/emails/";
+ $BASE = sprintf("%stemplates/%s/emails/", PATH, GET_LANGUAGE());
// Check for admin/guest/member templates
if (strpos($template, "admin_") > -1) {
@@ -848,51 +840,53 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
}
// Does the special template exists?
- if ((!@file_exists($file)) || (!is_readable($file))) {
+ if (!FILE_READABLE($file)) {
// Reset to default template
$file = $BASE.$template.".tpl";
- }
+ } // END - if
// Now does the final template exists?
- if ((@file_exists($file)) && (is_readable($file)))
- {
+ $newContent = "";
+ if (FILE_READABLE($file)) {
// The local file does exists so we load it. :)
- $tmpl_file = @implode("", @file($file));
+ $tmpl_file = implode("", file($file));
$tmpl_file = addslashes($tmpl_file);
- // Compile code
- $tmpl_file = COMPILE_CODE($tmpl_file);
-
// Run code
- $tmpl_file = "\$content=\"".$tmpl_file."\";";
- eval($tmpl_file);
-
- // Replace HTML confirm chars
- $content = html_entity_decode($content);
- }
- elseif (!empty($template))
- {
+ $tmpl_file = "\$newContent=html_entity_decode(\"".COMPILE_CODE($tmpl_file)."\");";
+ @eval($tmpl_file);
+ } elseif (!empty($template)) {
// Template file not found!
- $content = TEMPLATE_404.": ".$template."
+ $newContent = TEMPLATE_404.": ".$template."
".TEMPLATE_CONTENT."
-
".print_r($content, true)."
+
".print_r($content, true)."
".TEMPLATE_DATA."
-
".print_r($DATA, true)."
+
".print_r($DATA, true)."
";
// Debug mode not active? Then remove the HTML tags
- if (!DEBUG_MODE) $content = strip_tags($content);
- }
- else
- {
+ if (!DEBUG_MODE) $newContent = strip_tags($newContent);
+ } else {
// No template name supplied!
- $content = NO_TEMPLATE_SUPPLIED;
+ $newContent = NO_TEMPLATE_SUPPLIED;
}
- return COMPILE_CODE($content);
+
+ // Is there some content?
+ if (empty($newContent)) {
+ // Compiling failed
+ $newContent = "Compiler error for template {$template}!\nUncompiled content:\n".$tmpl_file;
+ if (function_exists('error_get_last')) $newContent .= "\n--------------------------------------\nDebug:\n".print_r(error_get_last(), true)."--------------------------------------\nPlease don't alter these informations!\nThanx.";
+ } // END - if
+
+ // Remove content and data
+ unset($content);
+ unset($DATA);
+
+ // Return compiled content
+ return COMPILE_CODE($newContent);
}
//
-function MAKE_TIME($H, $M, $S, $stamp)
-{
+function MAKE_TIME($H, $M, $S, $stamp) {
// Extract day, month and year from given timestamp
$DAY = date("d", $stamp);
$MONTH = date("m", $stamp);
@@ -903,7 +897,7 @@ function MAKE_TIME($H, $M, $S, $stamp)
}
//
function LOAD_URL($URL, $addUrlData=true) {
- global $CSS, $_CONFIG, $link, $db, $footer;
+ global $CSS, $_CONFIG, $footer;
// Check if http(s):// is there
if ((substr($URL, 0, 7) != "http://") && (substr($URL, 0, 8) != "https://")) {
@@ -914,11 +908,19 @@ function LOAD_URL($URL, $addUrlData=true) {
// Compile out URI codes
$URL = COMPILE_CODE($URL);
+ // Get output buffer
+ $OUTPUT = ob_get_contents();
+
+ // Clear it only if there is content
+ if (!empty($OUTPUT)) {
+ ob_end_clean();
+ } // END - if
+
// Add some data to URL if cookies are not accepted
if (((!defined('__COOKIES')) || (!__COOKIES)) && ($addUrlData)) $URL = ADD_URL_DATA($URL);
// Probe for bot from search engine
- if ((eregi("spider", getenv('HTTP_USER_AGENT'))) || (eregi("bot", getenv('HTTP_USER_AGENT'))) || (eregi("spider", getenv('HTTP_USER_AGENT')))) {
+ if ((eregi("spider", GET_USER_AGENT())) || (eregi("bot", GET_USER_AGENT())) || (eregi("spider", GET_USER_AGENT()))) {
// Search engine bot detected so let's rewrite many chars for the link
$URL = htmlentities(strip_tags($URL), ENT_QUOTES);
@@ -926,11 +928,16 @@ 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}");
+ */
@header ("Location: ".str_replace("&", "&", $URL));
} else {
// Output error message
include(PATH."inc/header.php");
- LOAD_TEMPLATE("redirect_url", false, $URL);
+ LOAD_TEMPLATE("redirect_url", false, str_replace("&", "&", $URL));
include(PATH."inc/footer.php");
}
exit();
@@ -938,6 +945,12 @@ function LOAD_URL($URL, $addUrlData=true) {
//
function COMPILE_CODE($code, $simple = false, $constants = true, $full = true) {
global $SEC_CHARS, $URL_CHARS;
+ // Is the code a string?
+ if (!is_string($code)) {
+ // Silently return it
+ return $code;
+ } // END - if
+
$ARRAY = $SEC_CHARS;
// Select smaller set of chars to replace when we e.g. want to compile URLs
@@ -947,18 +960,18 @@ function COMPILE_CODE($code, $simple = false, $constants = true, $full = true) {
if ($constants) {
// BEFORE 0.2.1 : Language and data constants
// WITH 0.2.1+ : Only language constants
- $code = str_replace('{--', '".', str_replace('--}', '."', $code));
+ $code = str_replace('{--','".', str_replace('--}','."', $code));
// BEFORE 0.2.1 : Not used
// WITH 0.2.1+ : Data constants
- $code = str_replace('{!', '".', str_replace("!}", '."', $code));
- }
+ $code = str_replace('{!','".', str_replace("!}", '."', $code));
+ } // END - if
// Compile QUOT and other non-HTML codes
foreach ($ARRAY['to'] as $k => $to) {
// Do the reversed thing as in inc/libs/security_functions.php
$code = str_replace($to, $ARRAY['from'][$k], $code);
- }
+ } // END - foreach
// But shall I keep simple quotes for later use?
if ($simple) $code = str_replace("\'", '{QUOT}', $code);
@@ -970,22 +983,44 @@ function COMPILE_CODE($code, $simple = false, $constants = true, $full = true) {
if ((count($matches) > 0) && (count($matches[0]) > 0)) {
// Replace all matches
$matchesFound = array();
- foreach ($matches[0] as $key=>$match) {
- // Avoid replacing matches multiple times
- if (!isset($matchesFound[$match])) {
- // Not yet replaced!
- $code = str_replace($match, "\".".$match.".\"", $code);
- $matchesFound[$match] = 1;
- }
+ foreach ($matches[0] as $key => $match) {
+ // Fuzzy look has failed by default
+ $fuzzyFound = false;
+
+ // Fuzzy look on match if already found
+ foreach ($matchesFound as $found => $set) {
+ // Get test part
+ $test = substr($found, 0, strlen($match));
+
+ // Does this entry exist?
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):found={$found},match={$match},set={$set} \n";
+ if ($test == $match) {
+ // Match found!
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):fuzzyFound! \n";
+ $fuzzyFound = true;
+ break;
+ } // END - if
+ } // END - foreach
+
+ // Skip this entry?
+ if ($fuzzyFound) continue;
// Take all string elements
- if (("".bigintval($matches[4][$key])."" != $matches[4][$key]) && (!isset($matchesFound[$key."_".$matches[4][$key]]))) {
+ if ((is_string($matches[4][$key])) && (!isset($matchesFound[$match])) && (!isset($matchesFound[$key."_".$matches[4][$key]]))) {
// Replace it in the code
- $code = str_replace("[".$matches[4][$key]."]", "['".$matches[4][$key]."']", $code);
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):key={$key},match={$match} \n";
+ $newMatch = str_replace("[".$matches[4][$key]."]", "['".$matches[4][$key]."']", $match);
+ $code = str_replace($match, "\".".$newMatch.".\"", $code);
$matchesFound[$key."_".$matches[4][$key]] = 1;
+ $matchesFound[$match] = 1;
+ } elseif (!isset($matchesFound[$match])) {
+ // Not yet replaced!
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):match={$match} \n";
+ $code = str_replace($match, "\".".$match.".\"", $code);
+ $matchesFound[$match] = 1;
}
- }
- }
+ } // END - foreach
+ } // END - if
// Return compiled code
return $code;
@@ -1010,41 +1045,34 @@ function COMPILE_CODE($code, $simple = false, $constants = true, $full = true) {
function array_pk_sort(&$array, $a_sort, $primary_key = 0, $order = -1, $nums = false)
{
$dummy = $array;
- while ($primary_key < count($a_sort))
- {
- foreach ($dummy[$a_sort[$primary_key]] as $key=>$value)
- {
- foreach ($dummy[$a_sort[$primary_key]] as $key2=>$value2)
- {
+ while ($primary_key < count($a_sort)) {
+ foreach ($dummy[$a_sort[$primary_key]] as $key => $value) {
+ foreach ($dummy[$a_sort[$primary_key]] as $key2 => $value2) {
$match = false;
- if (!$nums)
- {
+ if (!$nums) {
// Sort byte-by-byte (also numbers will be interpreted as chars! E.g.: "9" > "10")
if (($key != $key2) && (strcmp(strtolower($dummy[$a_sort[$primary_key]][$key]), strtolower($dummy[$a_sort[$primary_key]][$key2])) == $order)) $match = true;
- }
- elseif ($key != $key2)
- {
+ } elseif ($key != $key2) {
// Sort numbers (E.g.: 9 < 10)
if (($dummy[$a_sort[$primary_key]][$key] < $dummy[$a_sort[$primary_key]][$key2]) && ($order == -1)) $match = true;
if (($dummy[$a_sort[$primary_key]][$key] > $dummy[$a_sort[$primary_key]][$key2]) && ($order == 1)) $match = true;
}
- if ($match)
- {
+
+ if ($match) {
// We have found two different values, so let's sort whole array
- foreach ($dummy as $sort_key=>$sort_val)
- {
+ foreach ($dummy as $sort_key => $sort_val) {
$t = $dummy[$sort_key][$key];
$dummy[$sort_key][$key] = $dummy[$sort_key][$key2];
$dummy[$sort_key][$key2] = $t;
unset($t);
- }
- }
- }
- }
+ } // END - foreach
+ } // END - if
+ } // END - foreach
+ } // END - foreach
// Count one up
$primary_key++;
- }
+ } // END - while
// Write back sorted array
$array = $dummy;
@@ -1072,16 +1100,16 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0")
case "day": // Day
for ($idx = 1; $idx < 32; $idx++)
{
- $OUT .= " \n";
+ $OUT .= "\n";
}
}
else
{
// Get current year and subtract 16 (for erotic content)
- $OUT .= " \n";
+ $OUT .= "\n";
$YEAR = date('Y', time()) - 16;
for ($idx = 1930; $idx <= $YEAR; $idx++)
{
- $OUT .= "