Some more fixes, added empty what-forced_textlink.php stub

diff --git a/.gitattributes b/.gitattributes
index ad4cc977ea277af2ec9252601913ae96ff23a759..7828a72019919b3c73b3bc0a93fb84f5be2c1027 100644 (file)
--- 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 48005d0ae0ac34cfff3d3b2214c2673c5afbc2bf..f466ed30d57559d428728c2281d2d94e0295a5fb 100644 (file)
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -430,7 +430,7 @@ addMessages(array(
        'MEMBER_EMAIL_END_SEND' => "Vollständig versendet",
        'MEMBER_EMAIL_CONFIRMED' => "Bestätigt",
        'MEMBER_CLICK_RATE' => "Klickrate",
-       'MEMBER_NO_MAILS_TO_CONFIRM' => "Keine Mails übrig zum Bestätigen.",
+       'MEMBER_NO_MAILS_TO_CONFIRM' => "Ihr Mitgliedsaccount weist zur Zeit keine Mails zum Bestätigen auf.",
        'MEMBER_SID' => "Mail-Id",
        'CONFIRM_LINK' => "Bestätigungslink",
        'CONFIRM_LINK2' => "Bestätigen",

diff --git a/inc/modules/member/what-forced_textlink.php b/inc/modules/member/what-forced_textlink.php
new file mode 100644 (file)
index 0000000..e63a49f
--- /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 f2ee3db151f1033477ae58616e07e930090b505b..55a4e8299e76071a4a285ba9fdd93fd8a83c3754 100644 (file)
--- 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 a90ea06eff7f577c4ebde4f469f455d6d32f63f1..289ac310cd4a701d728f6993b57a358078e3b5fa 100644 (file)
--- 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 4a717981da624a2fd62a8fed92e543202507fa86..c1a212c599141686bab57e0916f1dc62d8336d7d 100644 (file)
--- 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]