Modified/added missing files

diff --git a/.gitattributes b/.gitattributes
index 48fcdaa22c1b78bfbdbd91bf7bd52fdbadefea7f..8d0f72443f52e146f525037761747ec2a4945f08 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -838,6 +838,7 @@ templates/de/html/admin/admin_login_form.tpl -text
 templates/de/html/admin/admin_login_msg.tpl -text
 templates/de/html/admin/admin_logout.tpl -text
 templates/de/html/admin/admin_logout_form.tpl -text
+templates/de/html/admin/admin_logout_sql_patches.tpl -text
 templates/de/html/admin/admin_main_footer.tpl -text
 templates/de/html/admin/admin_main_header.tpl -text
 templates/de/html/admin/admin_maintenance_form.tpl -text

diff --git a/DOCS/de/AUTHORS.txt b/DOCS/de/AUTHORS.txt
index 98bd95f6b548d23fc266d57c10635aacf6cb9f43..e041c33908bcb98cf551bbf7c408febce378b5f0 100644 (file)
--- a/DOCS/de/AUTHORS.txt
+++ b/DOCS/de/AUTHORS.txt
@@ -24,6 +24,11 @@
    in $_SERVER['SERVER_ADDR'] und getaddrbyname($_SERVER['SERVER_NAME']) seinen
    FTP-Zugang ausgeliehen)
 
+- Dominik "monakoianar/Nike" Schmauder <dominikschmauder [AT] gmx DOT de>
+
+  (Beta-Tester, hat mir bei der Fehlersuche auf Win32-PCs (apachefriends.org,
+  kein Bindestrich!!!) und bei der allgemeinen Bugsuche geholfen)
+
 - Ich suche mehr Alpha- und Beta-Tester! Bitte testet mein Script auf anderer
   Hard- und Softwarewareumgebung als ich habe. (Debian Linux auf P4/AMD64)
 

diff --git a/DOCS/de/THANK_YOU.txt b/DOCS/de/THANK_YOU.txt
index d31429502854214366f3907aaf8a82f4d0d1a8a8..09a23d66600c7743001b76503701f5f490cd0358 100644 (file)
--- a/DOCS/de/THANK_YOU.txt
+++ b/DOCS/de/THANK_YOU.txt
@@ -10,7 +10,7 @@ Personen:
   existieren!
 - Meiner Frau Angei fuer ihr Verstaendis fuer mein Projekt und moralischem
   Support
-- Meinen einzigen Bruder Thiemo fuer persoenlichen/moralischen Support
+- Meinem Bruder Thiemo fuer persoenlichen/moralischen Support
 - Einem alten Ex-Kumpel namens "Phoenix" fuer die damaligen Hilfestellungen
 - Linus Torwalds: Wenn Sie diesen Typen nicht kennen, kennen Sie Linux nicht! ;)
   (http://www.kernel.org)

diff --git a/DOCS/en/AUTHORS.txt b/DOCS/en/AUTHORS.txt
index 73bb766297dd1af36a3b10ffc169d60472b7aad8..9d61fc2b6bb3d328e5d1236d5147cdc48edf1b11 100644 (file)
--- a/DOCS/en/AUTHORS.txt
+++ b/DOCS/en/AUTHORS.txt
@@ -1,11 +1,15 @@
-[---------------------------------]
-[-- All authors of this script: --]
-[---------------------------------]
+[--------------------------------------]
+[-- All main authors of this script: --]
+[--------------------------------------]
 
 - Roland Haeder <webmaster@mxchange.org>
 
   (Project leader, Webmaster, main coder)
 
+[----------------------------------------]
+[-- Contributors (code, designs, etc.) --]
+[----------------------------------------]
+
 - Mr. X <maybe.your@adress.com>
 
   (requested to be listed... ;-) )

diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index 635b6443e9a8399d987dfd9579420f75d676ad7f..1c4c7e536c6ade2c1dad3a591f861fec18b08ef7 100644 (file)
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -75,8 +75,8 @@ if (!empty($_GET['mid'])) {
                SEND_EMAIL($sender, MEMBER_ORDER_DELETED, $msg_user);
 
                // Delete mail from queue
-               $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_pool WHERE id=%d LIMIT 1",
-                array(bigintval($_GET['mid'])), __FILE__, __LINE__);
+               //$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_pool WHERE id=%d LIMIT 1",
+               // array(bigintval($_GET['mid'])), __FILE__, __LINE__);
 
                // Fetch right stats_id from pool
                $result = SQL_QUERY_ESC("SELECT s.id FROM "._MYSQL_PREFIX."_user_stats AS s
@@ -128,8 +128,8 @@ WHERE s.pool_id=%d LIMIT 1",
                        }
 
                        // Remove links from DB
-                       $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_links WHERE stats_id=%d",
-                        array(bigintval($stats_id)), __FILE__, __LINE__);
+                       //$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_links WHERE stats_id=%d",
+                       // array(bigintval($stats_id)), __FILE__, __LINE__);
 
                        // Output link for manually removing stats entry
                        LOAD_TEMPLATE("admin_settings_saved", false, "<A href=\"".URL."/modules.php?module=admin&amp;what=del_email&amp;pid=".bigintval($_GET['mid'])."\">".ADMIN_REMOVE_STATS_ENTRY."</A>");

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 723f61ecb63bea6f39d14401b5d8d9645e7ab716..f11a84bf7493969c8533f933f211cb52f77fbb37 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -1115,7 +1115,7 @@ function ADD_POINTS_REFSYSTEM($uid, $points, $send_notify=false, $rid="0", $lock
 
                                // And sent it away
                                SEND_EMAIL($email, SUBJECT_DIRECT_PAYMENT, $msg);
-                               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_POINTS_ADDED);
+                               if (!isset($_GET['mid'])) LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_POINTS_ADDED);
                        }
 
                        // Maybe there's another ref?

diff --git a/templates/de/html/admin/admin_logout_sql_patches.tpl b/templates/de/html/admin/admin_logout_sql_patches.tpl
new file mode 100644 (file)
index 0000000..83c5ccf
--- /dev/null
+++ b/templates/de/html/admin/admin_logout_sql_patches.tpl
@@ -0,0 +1,18 @@
+<DIV align="center">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="500" class="admin dashed">
+       <TR>
+               <TD height="5" class="seperator">&nbsp;</TD>
+       </TR>
+       <TR>
+               <TD align="center" class="admin_content"><STRONG>{--ADMIN_LOGOUT_SQL_PATCHES_DONE--}</STRONG><BR>
+               <BR>
+               <A class="admin_content" href="{!URL!}/modules.php?module=admin&amp;action=login">{--ADMIN_RELOGIN_LINK--}</A><BR>
+               <BR>
+               <A class="admin_content" href="{!URL!}/modules.php?module=index">{--ADMIN_BACK_TO_GUEST_MENU--}</A><BR>
+               </TD>
+       </TR>
+       <TR>
+               <TD height="5" class="seperator">&nbsp;</TD>
+       </TR>
+</TABLE>
+</DIV>