From e41922487c1c0ef1ed3294e31e5fee7d776876fd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sun, 21 Oct 2012 09:06:20 +0000
Subject: [PATCH] Some more fixes, added empty what-forced_textlink.php stub

---
 .gitattributes                              |  1 +
 inc/language/de.php                         |  2 +-
 inc/modules/member/what-forced_textlink.php | 55 +++++++++++++++++++++
 inc/template-functions.php                  |  7 +--
 mailid.php                                  |  4 +-
 modules.php                                 |  1 +
 6 files changed, 64 insertions(+), 6 deletions(-)
 create mode 100644 inc/modules/member/what-forced_textlink.php

diff --git a/.gitattributes b/.gitattributes
index ad4cc977ea..7828a72019 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -710,6 +710,7 @@ inc/modules/member/what-categories.php svneol=native#text/plain
 inc/modules/member/what-doubler.php svneol=native#text/plain
 inc/modules/member/what-earning.php svneol=native#text/plain
 inc/modules/member/what-earnings.php svneol=native#text/plain
+inc/modules/member/what-forced_textlink.php svneol=native#text/plain
 inc/modules/member/what-guest.php svneol=native#text/plain
 inc/modules/member/what-holiday.php svneol=native#text/plain
 inc/modules/member/what-html_mail.php svneol=native#text/plain
diff --git a/inc/language/de.php b/inc/language/de.php
index 48005d0ae0..f466ed30d5 100644
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -430,7 +430,7 @@ addMessages(array(
 	'MEMBER_EMAIL_END_SEND' => "Vollst&auml;ndig versendet",
 	'MEMBER_EMAIL_CONFIRMED' => "Best&auml;tigt",
 	'MEMBER_CLICK_RATE' => "Klickrate",
-	'MEMBER_NO_MAILS_TO_CONFIRM' => "Keine Mails &uuml;brig zum Best&auml;tigen.",
+	'MEMBER_NO_MAILS_TO_CONFIRM' => "Ihr Mitgliedsaccount weist zur Zeit keine Mails zum Best&auml;tigen auf.",
 	'MEMBER_SID' => "Mail-Id",
 	'CONFIRM_LINK' => "Best&auml;tigungslink",
 	'CONFIRM_LINK2' => "Best&auml;tigen",
diff --git a/inc/modules/member/what-forced_textlink.php b/inc/modules/member/what-forced_textlink.php
new file mode 100644
index 0000000000..e63a49f0ad
--- /dev/null
+++ b/inc/modules/member/what-forced_textlink.php
@@ -0,0 +1,55 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 10/20/2012 *
+ * ===================                          Last change: 10/20/2012 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : what-forced_textlink.php                         *
+ * -------------------------------------------------------------------- *
+ * Short description : Display forced textlinks                         *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Anzeigen von Foreced-Textlinks                   *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if (!defined('__SECURITY')) {
+	exit();
+} elseif (!isMember()) {
+	redirectToIndexMemberOnlyModule();
+}
+
+// Add description as navigation point
+addYouAreHereLink('member', __FILE__);
+
+// Continue only if the proper extension is active (admins can always continue)
+if ((!isExtensionActive('forced')) && (!isAdmin())) {
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=forced%}');
+	return;
+} // END - if
+
+// [EOF]
+?>
diff --git a/inc/template-functions.php b/inc/template-functions.php
index f2ee3db151..55a4e8299e 100644
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -1363,14 +1363,15 @@ function compileUriCode ($code, $simple = TRUE) {
 	// Compile constants
 	if ($simple === FALSE) {
 		// Add more 'from'
-		array_push($charsCompile['from'], '{--', '--}');
+		array_unshift($charsCompile['from'], '{--', '--}');
 
 		// Add more 'to'
-		array_push($charsCompile['to'], '".', '."');
+		array_unshift($charsCompile['to'], '".', '."');
 	} // END - if
 
 	// Compile QUOT and other non-HTML codes
-	$code = str_replace($charsCompile['from'], $charsCompile['to'], $code);
+	$code = str_replace($charsCompile['from'], $charsCompile['to'], decodeEntities($code));
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'code=' . $code);
 
 	// Return compiled code
 	return $code;
diff --git a/mailid.php b/mailid.php
index a90ea06eff..289ac310cd 100644
--- a/mailid.php
+++ b/mailid.php
@@ -112,7 +112,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 				redirectOnUninstalledExtension('bonus');
 
 				// Bonus-Mails
-				$result = SQL_QUERY_ESC("SELECT `id`, `url`, `subject` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+				$result = SQL_QUERY_ESC("SELECT `id` AS `pool_id`, `url`, `subject` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
 					array($bonusId), __FILE__, __LINE__);
 				break;
 
@@ -174,7 +174,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 						default: // Invalid mail type
 							reportBug(__FILE__, __LINE__, 'Invalid mail type ' . $ltype . ' detected.');
 							break;
-					}
+					} // END - switch
 
 					// Add header
 					loadIncludeOnce('inc/header.php');
diff --git a/modules.php b/modules.php
index 4a717981da..c1a212c599 100644
--- a/modules.php
+++ b/modules.php
@@ -52,6 +52,7 @@ $GLOBALS['__output_mode'] = '0';
 require('inc/config-global.php');
 
 // Include module
+//die(generateDereferrerUrl(base64_decode(urldecode('aHR0cDovL3d3dy55b29tZWRpYS5kZS9jb2RlL3QtbWFpbC5waHA%2FaWQ9MjQ4NSZzaWQ9NjM5MA%3D%3D'))));
 doIncludeModule();
 
 // [EOF]
-- 
2.39.5