X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=c59093bd5004e57c7190a10929cc6e1c0099dc23;hb=9b27fd714bd5db5ca84ec1bd019c7614441f504b;hp=e24be85a2de601d7eb0a4784f70a6b90418b9051;hpb=898d17a09c66527b1e5d45149e23b88d42487c35;p=mailer.git
diff --git a/inc/functions.php b/inc/functions.php
index e24be85a2d..c59093bd50 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1646,8 +1646,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;
@@ -1664,10 +1666,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!
@@ -1790,7 +1802,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")) {
@@ -1805,7 +1817,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?
@@ -1997,6 +2009,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