X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=f4fa1f7e6ae4d055188c7dc025d8476a9dc4a5d9;hb=328a783eb2966228d7d7d9f0293280619aa655af;hp=7a08291573bbb32e871b2b29e23365e7dc3661e8;hpb=a05706f3f5f5e6ae26c2114d2fd3ede01d5fe093;p=mailer.git diff --git a/inc/functions.php b/inc/functions.php index 7a08291573..f4fa1f7e6a 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -33,7 +33,7 @@ // Some security stuff... if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) { - $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; + $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php"; require($INC); } @@ -140,7 +140,7 @@ 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(addslashes($OUTPUT))."\";"; @eval($eval); if (empty($newContent)) { @@ -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(addslashes($OUTPUT))."\";"; eval($eval); } @@ -198,6 +198,9 @@ function LOAD_TEMPLATE($template, $return=false, $content="") { // Add more variables which you want to use in your template files global $DATA, $_CONFIG, $username; + // Make all template names lowercase + $template = strtolower($template); + // Count the template load if (!isset($_CONFIG['num_templates'])) $_CONFIG['num_templates'] = 0; $_CONFIG['num_templates']++; @@ -209,9 +212,10 @@ function LOAD_TEMPLATE($template, $return=false, $content="") { if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = 0; $REFID = $GLOBALS['refid']; + // DEPRECATED!!! if ($template == "member_support_form") { // Support request of a member - $result = SQL_QUERY_ESC("SELECT sex, surname, family FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1", + $result = SQL_QUERY_ESC("SELECT sex, surname, family FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__); list($sex, $surname, $family) = SQL_FETCHROW($result); SQL_FREERESULT($result); @@ -222,7 +226,7 @@ function LOAD_TEMPLATE($template, $return=false, $content="") { $date_time = MAKE_DATETIME(time(), "1"); // Base directory - $BASE = PATH."templates/".GET_LANGUAGE()."/html/"; + $BASE = sprintf("%stemplates/%s/html/", PATH, GET_LANGUAGE()); $MODE = ""; // Check for admin/guest/member templates @@ -289,9 +293,10 @@ function LOAD_TEMPLATE($template, $return=false, $content="") { while (strpos($tmpl_file, "\'") !== false) { $tmpl_file = str_replace("\'", '{QUOT}', $tmpl_file); } // Do we have to compile the code? + $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(addslashes($tmpl_file))."\";"; eval($tmpl_file); } else { // Simply return loaded code @@ -331,21 +336,24 @@ function LOAD_TEMPLATE($template, $return=false, $content="") { // Send mail out to an email address function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML='N', $FROM="") { // Compile subject line (for POINTS constant etc.) - $eval = "\$SUBJECT = \"" . COMPILE_CODE(addslashes($SUBJECT)) . "\";"; + $eval = "\$SUBJECT = \"".COMPILE_CODE(addslashes($SUBJECT))."\";"; eval($eval); $SUBJECT = html_entity_decode($SUBJECT); // Set from header - if (!eregi("@", $TO)) { + if ((!eregi("@", $TO)) && ($TO > 0)) { // Value detected, load email from database if (EXT_IS_ACTIVE("msg")) { ADD_MESSAGE_TO_BOX($TO, $SUBJECT, $MSG, $HTML); return; } else { - $result_email = SQL_QUERY_ESC("SELECT email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d 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__); list($TO) = SQL_FETCHROW($result_email); SQL_FREERESULT($result_email); } + } elseif ($TO == 0) { + // Is the webmaster! + $TO = WEBMASTER; } // Not in PHPMailer-Mode @@ -410,7 +418,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; @@ -472,7 +480,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 @@ -485,8 +493,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; @@ -495,8 +502,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; @@ -507,69 +513,55 @@ 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) { 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); - } + $maxComma = $_CONFIG['max_comma']; - if (substr($dot, -1, 1) == "x") { - // Last char is the 'x' - $dotted = substr($dot, 0, -1); + // 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 don't display them + $maxComma = 0; + } // 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(gzcompress(COMPILE_CODE($URL)))); +function DEREFERER ($URL) { + $URL = URL."/modules.php?module=loader&url=".urlencode(base64_encode(gzcompress($URL))); return $URL; } // -function TRANSLATE_SEX($sex) { +function TRANSLATE_SEX ($sex) { switch ($sex) { case "M": $ret = SEX_M; break; @@ -681,6 +673,9 @@ function SET_LANGUAGE($lang) { function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") { global $DATA, $_CONFIG, $REPLACER; + // Make sure all template names are lowercase! + $template = strtolower($template); + // 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"; @@ -693,7 +688,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") { if (isSessionVariableSet('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__); + array(get_session('admin_login')), __FILE__, __LINE__); list($ADMIN) = SQL_FETCHROW($result); SQL_FREERESULT($result); } @@ -710,6 +705,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") { $EXPIRATION = round($_CONFIG['auto_purge']/60/60/24)." "._DAYS; } + // DEPRECATED switch! switch ($template) { case "bonus-mail": // Load data for the bonus mail @@ -807,13 +803,13 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") { if ($UID > 0) { if (EXT_IS_ACTIVE("nickname")) { // Load nickname - $result = SQL_QUERY_ESC("SELECT surname, family, sex, email, nickname FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1", + $result = SQL_QUERY_ESC("SELECT surname, family, sex, email, nickname FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1", array(bigintval($UID)), __FILE__, __LINE__); list($surname, $family, $sex, $email, $nick) = SQL_FETCHROW($result); SQL_FREERESULT($result); } else { // Load normal data - $result = SQL_QUERY_ESC("SELECT surname, family, sex, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1", + $result = SQL_QUERY_ESC("SELECT surname, family, sex, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1", array(bigintval($UID)), __FILE__, __LINE__); list($surname, $family, $sex, $email) = SQL_FETCHROW($result); SQL_FREERESULT($result); @@ -832,7 +828,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") { $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) { @@ -860,11 +856,10 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") { if ((!@file_exists($file)) || (!is_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))) - { + if ((@file_exists($file)) && (is_readable($file))) { // The local file does exists so we load it. :) $tmpl_file = @implode("", @file($file)); $tmpl_file = addslashes($tmpl_file); @@ -878,9 +873,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") { // Replace HTML confirm chars $content = html_entity_decode($content); - } - elseif (!empty($template)) - { + } elseif (!empty($template)) { // Template file not found! $content = TEMPLATE_404.": ".$template."
".TEMPLATE_CONTENT." @@ -891,17 +884,16 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") { // Debug mode not active? Then remove the HTML tags if (!DEBUG_MODE) $content = strip_tags($content); - } - else - { + } else { // No template name supplied! $content = NO_TEMPLATE_SUPPLIED; } + + // Return compiled content return COMPILE_CODE($content); } // -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); @@ -941,6 +933,11 @@ 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 @@ -1241,20 +1238,15 @@ function GEN_RANDOM_CODE($length, $code, $uid, $DATA="") { return $return; } // Does only allow numbers -function bigintval($num, $castValue = true) -{ +function bigintval($num, $castValue = true) { // Filter all numbers out $ret = preg_replace("/[^0123456789]/", "", $num); - // Cast the value? - if ($castValue) $ret = (int) $ret; - // 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) { global $_CONFIG; if ((strlen($img_code) > 6) || (empty($img_code)) || ($_CONFIG['code_length'] == 0)) { @@ -1271,14 +1263,11 @@ function GENERATE_IMAGE($img_code, $header=true) { case "jpg": // Loads JPEG image - $img = PATH."/theme/".GET_CURR_THEME()."/images/code_bg.jpg"; - if ((file_exists($img)) && (is_readable($img))) - { + $img = sprintf("%s/theme/%s/images/code_bg.jpg", PATH, GET_CURR_THEME()); + if ((file_exists($img)) && (is_readable($img))) { // Okay, load image and hide all errors $image = @imagecreatefromjpeg($img); - } - else - { + } else { // Exit function here return; } @@ -1286,14 +1275,11 @@ function GENERATE_IMAGE($img_code, $header=true) case "png": // Loads PNG image - $img = PATH."/theme/".GET_CURR_THEME()."/images/code_bg.png"; - if ((file_exists($img)) && (is_readable($img))) - { + $img = sprintf("%s/theme/%s/images/code_bg.png", PATH, GET_CURR_THEME()); + if ((file_exists($img)) && (is_readable($img))) { // Okay, load image and hide all errors $image = @imagecreatefrompng($img); - } - else - { + } else { // Exit function here return; } @@ -1310,8 +1296,7 @@ function GENERATE_IMAGE($img_code, $header=true) header ("Content-Type: image/".$_CONFIG['img_type']); // Output image with matching image factory - switch ($_CONFIG['img_type']) - { + switch ($_CONFIG['img_type']) { case "jpg": imagejpeg($image); break; case "png": imagepng($image); break; } @@ -1392,7 +1377,7 @@ function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="cen } if (ereg("s", $display) || (empty($display))) { - $OUT .= " ".SECS."\n"; + $OUT .= " "._SECONDS."\n"; } $OUT .= "\n"; $OUT .= "\n"; @@ -1670,25 +1655,12 @@ function ADD_EMAIL_NAV($PAGES, $offset, $show_form, $colspan, $return=false) { } } -// -function MXCHANGE_OPEN ($script) { - global $_CONFIG; - // Default is not to use proxy - $useProxy = true; - - // Are proxy settins set? - if ((!empty($_CONFIG['proxy_host'])) && ($_CONFIG['proxy_port'] > 0)) { - // Then use it - $useProxy = true; - } - - //* DEBUG */ print("SCRIPT=".$script."
\n"); - // Compile the script name - $script = COMPILE_CODE($script); - //* DEBUG */ print("SCRIPT=".$script."
\n"); - +// Extract host from script name +function EXTRACT_HOST (&$script) { // Use default SERVER_URL by default... ;) So? $url = SERVER_URL; + + // Is this URL valid? if (substr($script, 0, 7) == "http://") { // Use the hostname from script URL as new hostname $url = substr($script, 7); @@ -1714,6 +1686,85 @@ function MXCHANGE_OPEN ($script) { //* DEBUG */ print("SCRIPT=".$script."
\n"); if (substr($script, 0, 1) == "/") $script = substr($script, 1); + // Return host name + return $host; +} + +// Send a GET request +function GET_URL ($script) { + // Compile the script name + $script = COMPILE_CODE($script); + + // Extract host name from script + $host = EXTRACT_HOST($script); + + // Generate GET request header + $request = "GET /" . trim($script) . " HTTP/1.1\r\n"; + $request .= "Host: " . $host . "\r\n"; + $request .= "Referer: " . URL . "/admin.php\r\n"; + $request .= "User-Agent: " . TITLE . "/" . FULL_VERSION . "\r\n"; + $request .= "Content-Type: text/plain\r\n"; + $request .= "Cache-Control: no-cache\r\n"; + $request .= "Connection: Close\r\n\r\n"; + + // Send the raw request + $response = SEND_RAW_REQUEST($host, $request); + + // Return the result to the caller function + return $response; +} + +// Send a POST request +function POST_URL ($script, $postData) { + // Is postData an array? + if (!is_array($postData)) { + // Abort here + return array("", "", ""); + } // END - if + + // Compile the script name + $script = COMPILE_CODE($script); + + // Extract host name from script + $host = EXTRACT_HOST($script); + + // Construct request + $data = http_build_query($postData, '', '&'); + + // Generate POST request header + $request = "POST /" . trim($script) . " HTTP/1.1\r\n"; + $request .= "Host: " . $host . "\r\n"; + $request .= "Referer: " . URL . "/admin.php\r\n"; + $request .= "User-Agent: " . TITLE . "/" . FULL_VERSION . "\r\n"; + $request .= "Content-type: application/x-www-form-urlencoded\r\n"; + $request .= "Content-length: " . strlen($data) . "\r\n"; + $request .= "Cache-Control: no-cache\r\n"; + $request .= "Connection: Close\r\n\r\n"; + $request .= $data; + + // Send the raw request + $response = SEND_RAW_REQUEST($host, $request); + + // Return the result to the caller function + return $response; +} + +// Sends a raw request to another host +function SEND_RAW_REQUEST ($host, $request) { + global $_CONFIG; + + // Initialize array + $response = array("", "", ""); + + // Default is not to use proxy + $useProxy = false; + + // Are proxy settins set? + if ((!empty($_CONFIG['proxy_host'])) && ($_CONFIG['proxy_port'] > 0)) { + // Then use it + $useProxy = true; + } // END - if + // Open connection //* DEBUG */ die("SCRIPT=".$script."
\n"); if ($useProxy) { @@ -1725,33 +1776,33 @@ function MXCHANGE_OPEN ($script) { // Is there a link? if (!is_resource($fp)) { // Failed! - return array("", "", ""); + return $response; } // END - if // Do we use proxy? if ($useProxy) { // Generate CONNECT request header - $request = "CONNECT ".$host.":80 HTTP/1.1\r\n"; - $request .= "Host: ".$host."\r\n"; + $proxyTunnel = "CONNECT ".$host.":80 HTTP/1.1\r\n"; + $proxyTunnel .= "Host: ".$host."\r\n"; // Use login data to proxy? (username at least!) if (!empty($_CONFIG['proxy_username'])) { // Add it as well $encodedAuth = base64_encode(COMPILE_CODE($_CONFIG['proxy_username']).":".COMPILE_CODE($_CONFIG['proxy_password'])); - $request .= "Proxy-Authorization: Basic ".$encodedAuth."\r\n"; + $proxyTunnel .= "Proxy-Authorization: Basic ".$encodedAuth."\r\n"; } // END - if // Add last new-line - $request .= "\r\n"; - //* DEBUG: */ print("Request:
".$request."
"); + $proxyTunnel .= "\r\n"; + //* DEBUG: */ print("proxyTunnel=
".$proxyTunnel."
"); // Write request - fputs($fp, $request); + fputs($fp, $proxyTunnel); // Got response? if (feof($fp)) { // No response received - return array("", "", ""); + return $response; } // END - if // Read the first line @@ -1759,22 +1810,9 @@ function MXCHANGE_OPEN ($script) { $respArray = explode(" ", $resp); if ((strtolower($respArray[0]) !== "http/1.0") || ($respArray[1] != "200")) { // Invalid response! - return array("", "", ""); + return $response; } // END - if } // END - if - - // Generate GET request header - $request = "GET /".trim($script)." HTTP/1.1\r\n"; - $request .= "Host: ".$host."\r\n"; - $request .= "Referer: ".URL."/admin.php\r\n"; - $request .= "User-Agent: ".TITLE."/".FULL_VERSION."\r\n"; - $request .= "Content-Type: text/plain\r\n"; - $request .= "Cache-Control: no-cache\r\n"; - $request .= "Connection: Close\r\n\r\n"; - //* DEBUG: */ print("Request:
".$request."
"); - - // Initialize array - $response = array(); // Write request fputs($fp, $request); @@ -1787,6 +1825,22 @@ function MXCHANGE_OPEN ($script) { // Close socket fclose($fp); + // Skip first empty lines + $resp = $response; + foreach ($resp as $idx => $line) { + // Trim space away + $line = trim($line); + + // Is this line empty? + if (empty($line)) { + // Then remove it + array_shift($response); + } else { + // Abort on first non-empty line + break; + } + } // END - foreach + //* DEBUG: */ print("Response:
".print_r($response, true)."
"); // Proxy agent found? @@ -1872,7 +1926,7 @@ function MEMBER_ACTION_LINKS($uid, $status="") { } // Finish navigation link - $eval = substr($eval, 0, -7) . "]\";"; + $eval = substr($eval, 0, -7)."]\";"; eval($eval); // Return string @@ -1916,6 +1970,14 @@ function generateHash ($plainText, $salt = "") { return $plainText; } // END - if + // Do we miss an arry element here? + if (!isset($_CONFIG['file_hash'])) { + // Stop here + print(__FUNCTION__.":
");
+		debug_print_backtrace();
+		die("
"); + } // END - if + // When the salt is empty build a new one, else use the first x configured characters as the salt if ($salt == "") { // Build server string @@ -1941,14 +2003,14 @@ function generateHash ($plainText, $salt = "") { // Generate the password salt string $salt = substr($sha1, 0, $_CONFIG['salt_length']); //* DEBUG: */ echo $salt." (".strlen($salt).")
"; - } - else - { + } else { + // Use given salt $salt = substr($salt, 0, $_CONFIG['salt_length']); + //* DEBUG: */ echo "GIVEN={$salt}
\n"; } // Return hash - return $salt . sha1($salt . $plainText); + return $salt.sha1($salt.$plainText); } // function scrambleString($str) { @@ -2070,7 +2132,7 @@ function ADD_URL_DATA($URL) // Add all together and return it return $URL.$ADD; } -// +// Generate an PGP-like encrypted hash of given hash for e.g. cookies function generatePassString($passHash) { global $_CONFIG; @@ -2095,10 +2157,11 @@ function generatePassString($passHash) { //* DEBUG: */ echo "*".$start."=".$mod."*
"; $start += 4; $newHash .= $mod; - } + } // END - for - //* DEBUG: */ die($passHash."
".$newHash." (".strlen($newHash).")"); + //* DEBUG: */ print($passHash."
".$newHash." (".strlen($newHash).")"); $ret = generateHash($newHash, $_CONFIG['master_salt']); + //* DEBUG: */ print($ret."
\n"); } else { // Hash it simple //* DEBUG: */ echo "--".$passHash."--
\n"; @@ -2191,6 +2254,9 @@ function set_session ($var, $value) { } elseif (!empty($value)) { // Update session $_SESSION[$var] = $value; + } else { + // Something bad happens! + return false; // Hope this doesn't make so much trouble??? } // Return always true if the session variable is already set. @@ -2220,7 +2286,7 @@ function get_session($var) { if (isSessionVariableSet($var)) { // Then get it secured! $value = SQL_ESCAPE($_SESSION[$var]); - } + } // END - if // Return the value return $value; @@ -2236,7 +2302,109 @@ function SEND_ADMIN_NOTIFICATION($subject, $templateName, $content="", $uid="0") SEND_ADMIN_EMAILS($subject, $msg); } } +// Destroy user session +function destroy_user_session () { + // Remove all user data from session + return ((set_session("userid", "")) && (set_session("u_hash", "")) && (set_session("lifetime", ""))); +} +// Merges an array together but only if both are arrays +function merge_array ($array1, $array2) { + // Are both an array? + if ((is_array($array1)) && (is_array($array2))) { + // Merge all together + return array_merge($array1, $array2); + } elseif (is_array($array1)) { + // Return left array + return $array1; + } + + // Something wired happened here... + print(__FUNCTION__.":
");
+	debug_print_backtrace();
+	die("
"); +} +// Debug message logger +function DEBUG_LOG ($message) { + // Is debug mode enabled? + if (isBooleanConstantAndTrue('DEBUG_MODE')) { + // Log this message away + $fp = fopen(PATH."inc/cache/debug.log", 'a') or mxchange_die("Cannot write logfile debug.log!"); + fwrite($fp, date("d.m.Y|H:i:s", time())."|{$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($baseDir) or mxchange_die("Cannot read ".basename($baseDir)." path!"); + + // Read all entries + while ($baseFile = readdir($dirPointer)) { + // Load file only if extension is active + // Make full path + $file = $baseDir.$baseFile; + + // Is this a valid reset file? + if ((is_file($file)) && (is_readable($file)) && (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[] = $file; + } + } // END - if + } // END - while + + // Close directory + closedir($dirPointer); + + // Return array with include files + return $INCs; +} +// Load more reset scripts +function RESET_ADD_INCLUDES () { + global $_CONFIG, $INC_POOL; + + // Is the reset set or old sql_patches? + if ((!isBooleanConstantAndTrue('__DAILY_RESET')) || (GET_EXT_VERSION("sql_patches") < "0.4.5")) { + // Then abort here + return; + } // END - if + // Get more daily reset scripts + $INC_POOL = array_merge($INC_POOL, GET_DIR_AS_ARRAY(PATH."inc/reset/", "reset_")); + + // Create current week mark + $currWeek = date("W", time()); + + // Has it changed? + if ($_CONFIG['last_week'] != $currWeek) { + // Include weekly reset scripts + $INC_POOL = array_merge($INC_POOL, GET_DIR_AS_ARRAY(PATH."inc/weekly/", "weekly_")); + + // Update config + UPDATE_CONFIG("last_week", $currWeek); + } // END - if + + // Create current month mark + $currMonth = date("m", time()); + + // Has it changed? + if ($_CONFIG['last_month'] != $currMonth) { + // Include monthly reset scripts + $INC_POOL = array_merge($INC_POOL, GET_DIR_AS_ARRAY(PATH."inc/monthly/", "monthly_")); + + // Update config + UPDATE_CONFIG("last_month", $currMonth); + } // END - if +} // ////////////////////////////////////////////////// // //