Fix for URL detection

diff --git a/inc/functions.php b/inc/functions.php
index 4df8f56b0d712e981ab6df255419c174142611e6..8bb05f320e0b26e2c8b97af2e63faa6bce27159b 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -3835,7 +3835,7 @@ function encodeUrl ($url, $outputMode = '0') {
        } // END - if
 
        // Add {?URL?} ?
-       if ((substr($url, 0, strlen(getConfig('URL'))) != getConfig('URL')) && (substr($url, 0, 7) != '{?URL?}')) {
+       if ((substr($url, 0, strlen(getConfig('URL'))) != getConfig('URL')) && (substr($url, 0, 7) != '{?URL?}') && (substr($url, 0, 7) != 'http://') && (substr($url, 0, 8) != 'https://')) {
                // Add it
                $url = '{?URL?}/' . $url;
        } // END - if

diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php
index 7ca464c8892a95bcf1077b9b975fb7b2a1c25fec..d4b0986a4d13695482dda4f4053b7dbe0932bf78 100644 (file)
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -148,7 +148,7 @@ LIMIT 1",
                                sendEmail($content['sender'], getMessage('MEMBER_ORDER_REJECTED'), $message_user);
 
                                // If you do not enter an URL to redirect to, your URL will be set!
-                               if ((!isPostRequestElementSet(('redirect'))) || (postRequestElement('redirect') == 'http://')) setRequestPostElement('redirect', getConfig('URL'));
+                               if ((!isPostRequestElementSet('redirect')) || (postRequestElement('redirect') == 'http://')) setRequestPostElement('redirect', getConfig('URL'));
 
                                // Redirect URL
                                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET url='%s', `data_type`='NEW' WHERE `id`=%s LIMIT 1",

diff --git a/templates/de/html/member/member_doubler.tpl b/templates/de/html/member/member_doubler.tpl
index 2707cd8adaa669a30d430d1dafb309536f8b37fe..5281e48f38723278041ca478d0b4b41a7ac2b0a6 100644 (file)
--- a/templates/de/html/member/member_doubler.tpl
+++ b/templates/de/html/member/member_doubler.tpl
@@ -4,7 +4,7 @@
                <strong><a target="_blank" title="Benutzen Sie diesen Link zum Verdoppeln!" href="{?URL?}/doubler.php?refid=$content[userid]%}">{?URL?}/doubler.php?refid=$content[userid]</a></strong>
        </div>
        <div>
-               <strong>Tipp:</strong> Nutzen Sie diesen zum Werben unseres {?mt_word2?}, um die <strong>$content[refid]%</strong> Referal-Verg&uuml;tung zu erhalten!
+               <strong>Tipp:</strong> Nutzen Sie diesen zum Werben unseres {?mt_word2?}, um die <strong>$content[ref]%</strong> Referal-Verg&uuml;tung zu erhalten!
        </div>
 
        <div class="big">{--DOUBLER_MEMBER_ALREADY_PAYOUT--}:</div>