From 92d2964b51c5aefdad256b46147819f1391a7661 Mon Sep 17 00:00:00 2001 From: Martin Ambrus Date: Sun, 22 Oct 2017 13:43:43 +0200 Subject: [PATCH] feat: mass message sent as Support rather than Multihunter --- Admin/error_log | 28 ---------------------------- README | 1 + massmessage.php | 6 +++--- todo.txt | 1 - 4 files changed, 4 insertions(+), 32 deletions(-) diff --git a/Admin/error_log b/Admin/error_log index c1503fac..e69de29b 100644 --- a/Admin/error_log +++ b/Admin/error_log @@ -1,28 +0,0 @@ -[20-Jan-2014 13:36:23 Europe/Bucharest] PHP Warning: mysql_fetch_assoc() expects parameter 1 to be resource, boolean given in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/report.tpl on line 14 -[20-Jan-2014 14:39:18 Europe/Bucharest] PHP Warning: mysql_fetch_assoc() expects parameter 1 to be resource, boolean given in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/report.tpl on line 14 -[23-Jan-2014 14:08:26 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:08:27 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:08:28 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:08:28 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:08:28 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:08:28 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:09:07 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:09:08 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:09:29 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:10:05 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:10:05 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:10:05 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:10:06 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:10:06 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:10:22 Europe/Bucharest] PHP Parse error: syntax error, unexpected '<' in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/playerinfo.tpl on line 185 -[23-Jan-2014 14:10:29 Europe/Bucharest] PHP Parse error: syntax error, unexpected '<' in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/playerinfo.tpl on line 185 -[23-Jan-2014 14:10:30 Europe/Bucharest] PHP Parse error: syntax error, unexpected '<' in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/playerinfo.tpl on line 185 -[23-Jan-2014 14:10:33 Europe/Bucharest] PHP Parse error: syntax error, unexpected '<' in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/playerinfo.tpl on line 185 -[23-Jan-2014 14:12:13 Europe/Bucharest] PHP Parse error: syntax error, unexpected '<' in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/playerinfo.tpl on line 185 -[23-Jan-2014 14:12:14 Europe/Bucharest] PHP Parse error: syntax error, unexpected '<' in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/playerinfo.tpl on line 185 -[23-Jan-2014 14:12:16 Europe/Bucharest] PHP Parse error: syntax error, unexpected '<' in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/playerinfo.tpl on line 185 -[23-Jan-2014 14:12:17 Europe/Bucharest] PHP Parse error: syntax error, unexpected '<' in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/playerinfo.tpl on line 185 -[23-Jan-2014 14:12:17 Europe/Bucharest] PHP Parse error: syntax error, unexpected '<' in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/playerinfo.tpl on line 185 -[23-Jan-2014 14:12:18 Europe/Bucharest] PHP Parse error: syntax error, unexpected '<' in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/playerinfo.tpl on line 185 -[23-Jan-2014 14:12:19 Europe/Bucharest] PHP Parse error: syntax error, unexpected '<' in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/playerinfo.tpl on line 185 -[23-Jan-2014 14:12:19 Europe/Bucharest] PHP Parse error: syntax error, unexpected '<' in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/playerinfo.tpl on line 185 diff --git a/README b/README index 36674058..7075a726 100644 --- a/README +++ b/README @@ -43,6 +43,7 @@ martinambrus changes: 31. Support user is now a part of the installation and can be logged into Admin and in-game (albeit in game, they have no village, so can not access fields or village views) 32. messages sent to Multihunter now have the correct recepient shown next to them (was empty) 33. new links in Admin to access in-game messages + Mass Message & System Message dialogs +34. mass messages sent out under Support rather than Multihunter (we should not be scaring people :D) Shadowss changes: diff --git a/massmessage.php b/massmessage.php index 34c98b1e..5a0f7482 100644 --- a/massmessage.php +++ b/massmessage.php @@ -52,18 +52,18 @@ if (isset($_GET['send']) && isset($_GET['from'])) if($i > 5){ if ($_SESSION['m_color']) { - $sql .= "($i, 5, '{$_SESSION['m_subject']}', \"{$_SESSION['m_message']}\", 0, 0, 0, ".time().",0,0,0,0,0,0),"; + $sql .= "($i, 1, '{$_SESSION['m_subject']}', \"{$_SESSION['m_message']}\", 0, 0, 0, ".time().",0,0,0,0,0,0),"; } else { - $sql .= "($i, 5, '{$_SESSION['m_subject']}', \"{$_SESSION['m_message']}\", 0, 0, 0, ".time().",0,0,0,0,0,0),"; + $sql .= "($i, 1, '{$_SESSION['m_subject']}', \"{$_SESSION['m_message']}\", 0, 0, 0, ".time().",0,0,0,0,0,0),"; } } } if($i > 5){ if ($_SESSION['m_color']) { - $sql .= "($i, 5, '{$_SESSION['m_subject']}', \"{$_SESSION['m_message']}\", 0, 0, 0, ".time().",0,0,0,0,0,0)"; + $sql .= "($i, 1, '{$_SESSION['m_subject']}', \"{$_SESSION['m_message']}\", 0, 0, 0, ".time().",0,0,0,0,0,0)"; } else { diff --git a/todo.txt b/todo.txt index 5f5825c8..69dd4f68 100644 --- a/todo.txt +++ b/todo.txt @@ -1,4 +1,3 @@ -- send mass message as Support rather than Multihunter - fix editing current task from Taskmaster -> number never match the edited quest after save - cannot delete a single medal in admin - add back buttons to Admin where there are not (like editing a user)