X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Ffunctions.php;h=56d8a184117263c2e6c825eeaa467b27bc550bcb;hb=d960730a8020419ab679935e5d55b5d9692a3d68;hp=3cdabf7e3e09ff0c32816a90d0a133e6ad209b27;hpb=feebd0199748544fe8c930b70e97452001a13f76;p=mailer.git
diff --git a/inc/functions.php b/inc/functions.php
index 3cdabf7e3e..56d8a18411 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -786,7 +786,11 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
break;
case "add-points":
- $points = bigintval($_POST['points']);
+ if (isset($_POST['points'])) {
+ $points = bigintval($_POST['points']);
+ } else {
+ $points = __POINTS_VALUE;
+ }
break;
case "guest_request_confirm":
@@ -914,6 +918,12 @@ function LOAD_URL($URL, $addUrlData=true) {
// Compile out URI codes
$URL = COMPILE_CODE($URL);
+ // Get output buffer
+ $OUTPUT = ob_get_contents();
+
+ // Clear it
+ ob_end_clean();
+
// Add some data to URL if cookies are not accepted
if (((!defined('__COOKIES')) || (!__COOKIES)) && ($addUrlData)) $URL = ADD_URL_DATA($URL);
@@ -1212,9 +1222,15 @@ function GEN_RANDOM_CODE($length, $code, $uid, $DATA="")
return $return;
}
// Does only allow numbers
-function bigintval($num)
+function bigintval($num, $castValue = true)
{
- $ret = (int) preg_replace("/[^0123456789]/", "", $num);
+ // 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
@@ -1636,8 +1652,10 @@ function ADD_EMAIL_NAV($PAGES, $offset, $show_form, $colspan, $return=false) {
//
function MXCHANGE_OPEN ($script) {
+ //* DEBUG */ print("SCRIPT=".$script."
\n");
// Compile the script name
$script = COMPILE_CODE($script);
+ //* DEBUG */ print("SCRIPT=".$script."
\n");
// Use default SERVER_URL by default... ;) So?
$url = SERVER_URL;
@@ -1654,10 +1672,20 @@ function MXCHANGE_OPEN ($script) {
if (ereg("/", $host)) $host = substr($host, 0, strpos($host, "/"));
// Generate relative URL
- $script = substr($script, (strlen($url) + 7));
+ //* DEBUG */ print("SCRIPT=".$script."
\n");
+ if (substr(strtolower($script), 0, 7) == "http://") {
+ // But only if http:// is in front!
+ $script = substr($script, (strlen($url) + 7));
+ } elseif (substr(strtolower($script), 0, 8) == "https://") {
+ // Does this work?!
+ $script = substr($script, (strlen($url) + 8));
+ }
+
+ //* DEBUG */ print("SCRIPT=".$script."
\n");
if (substr($script, 0, 1) == "/") $script = substr($script, 1);
// Open connection
+ //* DEBUG */ die("SCRIPT=".$script."
\n");
$fp = @fsockopen($host, 80, $errno, $errdesc, 30);
if (!$fp) {
// Failed!
@@ -1780,7 +1808,7 @@ function CREATE_EMAIL_LINK($email, $table="admins") {
if ((EXT_IS_ACTIVE("admins")) && ($table == "admins")) {
// Create email link for contacting admin in guest area
$EMAIL = ADMINS_CREATE_EMAIL_LINK($email);
- } elseif ((GET_EXT_VERSION("user") >= "0.3.3") && ($table == "user_data")) {
+ } elseif ((EXT_IS_ACTIVE("user", true)) && (GET_EXT_VERSION("user") >= "0.3.3") && ($table == "user_data")) {
// Create email link for contacting a member within admin area (or later in other areas, too?)
$EMAIL = USER_CREATE_EMAIL_LINK($email);
} elseif ((EXT_IS_ACTIVE("sponsor")) && ($table == "sponsor_data")) {
@@ -1795,7 +1823,7 @@ function CREATE_EMAIL_LINK($email, $table="admins") {
return $EMAIL;
}
// Generate a hash for extra-security for all passwords
-function generateHash($plainText, $salt = "") {
+function generateHash ($plainText, $salt = "") {
global $_CONFIG, $_SERVER;
// Is the required extension "sql_patches" there?
@@ -1987,6 +2015,11 @@ function generatePassString($passHash) {
//* DEBUG: */ die($passHash."
".$newHash." (".strlen($newHash).")");
$ret = generateHash($newHash, $_CONFIG['master_salt']);
+ } else {
+ // Hash it simple
+ //* DEBUG: */ echo "--".$passHash."--
\n";
+ $ret = md5($passHash);
+ //* DEBUG: */ echo "++".$ret."++
\n";
}
// Return result