From 032c58de69aa2ebc83c46d62af9c14ead90004b9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 18 May 2008 19:09:09 +0000 Subject: [PATCH] Modified/added missing files --- .gitattributes | 1 + DOCS/de/AUTHORS.txt | 5 +++++ DOCS/de/THANK_YOU.txt | 2 +- DOCS/en/AUTHORS.txt | 10 +++++++--- inc/modules/admin/what-del_email.php | 8 ++++---- inc/mysql-manager.php | 2 +- .../de/html/admin/admin_logout_sql_patches.tpl | 18 ++++++++++++++++++ 7 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 templates/de/html/admin/admin_logout_sql_patches.tpl diff --git a/.gitattributes b/.gitattributes index 48fcdaa22c..8d0f72443f 100644 --- 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 98bd95f6b5..e041c33908 100644 --- 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 + + (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 d314295028..09a23d6660 100644 --- 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 73bb766297..9d61fc2b6b 100644 --- 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 (Project leader, Webmaster, main coder) +[----------------------------------------] +[-- Contributors (code, designs, etc.) --] +[----------------------------------------] + - Mr. X (requested to be listed... ;-) ) diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php index 635b6443e9..1c4c7e536c 100644 --- 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, "".ADMIN_REMOVE_STATS_ENTRY.""); diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 723f61ecb6..f11a84bf74 100644 --- 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 index 0000000000..83c5ccfaa2 --- /dev/null +++ b/templates/de/html/admin/admin_logout_sql_patches.tpl @@ -0,0 +1,18 @@ +
+ + + + + + + + + + +
 
{--ADMIN_LOGOUT_SQL_PATCHES_DONE--}
+
+ {--ADMIN_RELOGIN_LINK--}
+
+ {--ADMIN_BACK_TO_GUEST_MENU--}
+
 
+
-- 2.30.2