From 7edc9be57dcdb36c2b7de1e78a9110a10eb10ae3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 21 Nov 2009 17:12:42 +0000
Subject: [PATCH] Fix for URL detection

---
 inc/functions.php                           | 2 +-
 inc/modules/admin/what-unlock_emails.php    | 2 +-
 templates/de/html/member/member_doubler.tpl | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index 4df8f56b0d..8bb05f320e 100644
--- 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 7ca464c889..d4b0986a4d 100644
--- 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 2707cd8ada..5281e48f38 100644
--- 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>
-- 
2.39.5