From ac3691dc08a880479b7c3c2c134dbb41ad37c213 Mon Sep 17 00:00:00 2001 From: slawkens Date: Wed, 13 Sep 2017 15:30:18 +0200 Subject: [PATCH] * update to 0.4.0 * fixed some bugs in bugtracker * updated database to version 9 --- CHANGELOG | 16 +++ common.php | 4 +- config.php | 2 +- index.php | 2 +- install/includes/schema.sql | 14 +- system/compat_pages.php | 2 +- system/counter.php | 2 +- system/countries.conf.php | 2 +- system/functions.php | 2 +- system/hooks.php | 2 +- system/init.php | 2 +- system/item.php | 2 +- system/libs/cache.php | 2 +- system/libs/cache_apc.php | 2 +- system/libs/cache_eaccelerator.php | 2 +- system/libs/cache_file.php | 2 +- system/libs/cache_xcache.php | 2 +- system/libs/data.php | 2 +- system/libs/items.php | 2 +- system/libs/timer.php | 2 +- system/libs/validator.php | 2 +- system/libs/visitors.php | 2 +- system/login.php | 2 +- system/migrations/9.php | 9 ++ system/pages/404.php | 2 +- system/pages/account.php | 2 +- system/pages/accountmanagement.php | 2 +- system/pages/admin/changelog.php | 2 +- system/pages/admin/dashboard.php | 2 +- system/pages/admin/login.php | 2 +- system/pages/admin/logs.php | 2 +- system/pages/admin/mailer.php | 2 +- system/pages/admin/notepad.php | 2 +- system/pages/admin/pages.php | 2 +- system/pages/admin/phpinfo.php | 2 +- system/pages/admin/players.php | 2 +- system/pages/admin/plugins.php | 2 +- system/pages/admin/statistics.php | 2 +- system/pages/admin/tools.php | 2 +- system/pages/admin/version.php | 2 +- system/pages/admin/visitors.php | 2 +- system/pages/bans.php | 2 +- system/pages/bugtracker.php | 22 +-- system/pages/changelog.php | 2 +- system/pages/characters.php | 2 +- system/pages/commands.php | 2 +- system/pages/createaccount.php | 2 +- system/pages/creatures.php | 2 +- system/pages/custom.php | 2 +- system/pages/downloads.php | 2 +- system/pages/experiencestages.php | 2 +- system/pages/experiencetable.php | 2 +- system/pages/faq.php | 2 +- system/pages/forum.php | 2 +- system/pages/guilds.php | 2 +- system/pages/highscores.php | 2 +- system/pages/houses.php | 2 +- system/pages/lastkills.php | 2 +- system/pages/lostaccount.php | 2 +- system/pages/movies.php | 2 +- system/pages/news.php | 2 +- system/pages/newsarchive.php | 2 +- system/pages/online.php | 2 +- system/pages/polls.php | 2 +- system/pages/records.php | 2 +- system/pages/rules.php | 2 +- system/pages/screenshots.php | 2 +- system/pages/serverinfo.php | 2 +- system/pages/spells.php | 2 +- system/pages/team.php | 2 +- system/status.php | 2 +- system/template.php | 2 +- templates/kathrine/template.php | 208 +++++++++++++++-------------- tools/validate.php | 2 +- 74 files changed, 219 insertions(+), 190 deletions(-) create mode 100644 system/migrations/9.php diff --git a/CHANGELOG b/CHANGELOG index 36a2aa65..00bdfb68 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,19 @@ +[0.4.0 - 13.09.2017 + - added option to add/edit/delete/hide/move forum boards + - added bug_report configurable which can enable/disable bug tracker + - log errors instead of showing them to users with system directories + - fix when $_SERVER['HTTP_ACCEPT_ENCODING'] is not set + - when it fails to load config.lua it will output error also to error.log + - automatically detect json file in .zip instead of basing on filename (admin panel - plugins) + - hopefully fixed the error with "The file you are trying to upload is not a .zip file. Please try again." + - fixed wrong name of table in bugtracker + - fixed some bugs in bugtracker + - added report bug link in templates + - fixed some rare error when user is logged in for longer than 15 minutes and tries to login again + - fixed some grammar errors + - some small improvements + - fixed some separators in kathrine template + [0.3.0 - 28.08.2017] - added administration panel for screenshots management with auto thumbnail generator and image auto-resizing - added Twig template engine and moved some html-in-php code to it diff --git a/common.php b/common.php index 83497cbe..bf7a0f60 100644 --- a/common.php +++ b/common.php @@ -21,14 +21,14 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ session_start(); define('MYAAC', true); define('MYAAC_VERSION', '0.3.0'); -define('DATABASE_VERSION', 8); +define('DATABASE_VERSION', 9); define('TABLE_PREFIX', 'myaac_'); define('START_TIME', microtime(true)); define('MYAAC_OS', (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? 'WINDOWS' : (strtoupper(PHP_OS) == 'DARWIN' ? 'MAC' : 'LINUX')); diff --git a/config.php b/config.php index ba12e164..830ce082 100644 --- a/config.php +++ b/config.php @@ -13,7 +13,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ diff --git a/index.php b/index.php index c6a05105..1fcf38d7 100644 --- a/index.php +++ b/index.php @@ -21,7 +21,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ diff --git a/install/includes/schema.sql b/install/includes/schema.sql index 25a22cec..3d7b428d 100644 --- a/install/includes/schema.sql +++ b/install/includes/schema.sql @@ -11,15 +11,15 @@ CREATE TABLE `myaac_account_actions` CREATE TABLE `myaac_bugtracker` ( `account` VARCHAR(255) NOT NULL, - `type` INT(11) NOT NULL, - `status` INT(11) NOT NULL, + `type` INT(11) NOT NULL DEFAULT 0, + `status` INT(11) NOT NULL DEFAULT 0, `text` text NOT NULL, - `id` INT(11) NOT NULL, - `subject` VARCHAR(255) NOT NULL, - `reply` INT(11) NOT NULL, - `who` INT(11) NOT NULL, + `id` INT(11) NOT NULL DEFAULT 0, + `subject` VARCHAR(255) NOT NULL DEFAULT '', + `reply` INT(11) NOT NULL DEFAULT 0, + `who` INT(11) NOT NULL DEFAULT 0, `uid` INT(11) NOT NULL AUTO_INCREMENT, - `tag` INT(11) NOT NULL, + `tag` INT(11) NOT NULL DEFAULT 0, PRIMARY KEY (`uid`) ) ENGINE = MyISAM; diff --git a/system/compat_pages.php b/system/compat_pages.php index bb64929b..640fe080 100644 --- a/system/compat_pages.php +++ b/system/compat_pages.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/counter.php b/system/counter.php index 99461b63..779f7f50 100644 --- a/system/counter.php +++ b/system/counter.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/countries.conf.php b/system/countries.conf.php index 2e933d8f..6187828b 100644 --- a/system/countries.conf.php +++ b/system/countries.conf.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/functions.php b/system/functions.php index 8f84b863..09b872ec 100644 --- a/system/functions.php +++ b/system/functions.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/hooks.php b/system/hooks.php index ae95e28b..62f5ae0f 100644 --- a/system/hooks.php +++ b/system/hooks.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/init.php b/system/init.php index d41315ba..2831e6cc 100644 --- a/system/init.php +++ b/system/init.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/item.php b/system/item.php index 621dd8fa..a4b2bbe2 100644 --- a/system/item.php +++ b/system/item.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/libs/cache.php b/system/libs/cache.php index 27cdef99..476f72ea 100644 --- a/system/libs/cache.php +++ b/system/libs/cache.php @@ -6,7 +6,7 @@ * @author Slawkens * @author Mark Samman (Talaturen) * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/libs/cache_apc.php b/system/libs/cache_apc.php index 4de26cd8..135c2759 100644 --- a/system/libs/cache_apc.php +++ b/system/libs/cache_apc.php @@ -6,7 +6,7 @@ * @author Slawkens * @author Mark Samman (Talaturen) * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/libs/cache_eaccelerator.php b/system/libs/cache_eaccelerator.php index c224c819..9c9b23d1 100644 --- a/system/libs/cache_eaccelerator.php +++ b/system/libs/cache_eaccelerator.php @@ -6,7 +6,7 @@ * @author Slawkens * @author Mark Samman (Talaturen) * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/libs/cache_file.php b/system/libs/cache_file.php index afcdbdcd..47c807e2 100644 --- a/system/libs/cache_file.php +++ b/system/libs/cache_file.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/libs/cache_xcache.php b/system/libs/cache_xcache.php index 7569ae36..c615303f 100644 --- a/system/libs/cache_xcache.php +++ b/system/libs/cache_xcache.php @@ -6,7 +6,7 @@ * @author Slawkens * @author Mark Samman (Talaturen) * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/libs/data.php b/system/libs/data.php index 8014c9c7..b8a87412 100644 --- a/system/libs/data.php +++ b/system/libs/data.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/libs/items.php b/system/libs/items.php index c27b6794..680d37d9 100644 --- a/system/libs/items.php +++ b/system/libs/items.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/libs/timer.php b/system/libs/timer.php index bdf37db3..e40e291b 100644 --- a/system/libs/timer.php +++ b/system/libs/timer.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/libs/validator.php b/system/libs/validator.php index b6039d20..b86a6f80 100644 --- a/system/libs/validator.php +++ b/system/libs/validator.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/libs/visitors.php b/system/libs/visitors.php index d13a3d75..89ff349d 100644 --- a/system/libs/visitors.php +++ b/system/libs/visitors.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/login.php b/system/login.php index 2c916791..272a962f 100644 --- a/system/login.php +++ b/system/login.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/migrations/9.php b/system/migrations/9.php new file mode 100644 index 00000000..d4869c10 --- /dev/null +++ b/system/migrations/9.php @@ -0,0 +1,9 @@ +query("ALTER TABLE `" . TABLE_PREFIX . "bugtracker` MODIFY `type` INT(11) NOT NULL DEFAULT 0;"); + $db->query("ALTER TABLE `" . TABLE_PREFIX . "bugtracker` MODIFY `status` INT(11) NOT NULL DEFAULT 0;"); + $db->query("ALTER TABLE `" . TABLE_PREFIX . "bugtracker` MODIFY `id` INT(11) NOT NULL DEFAULT 0;"); + $db->query("ALTER TABLE `" . TABLE_PREFIX . "bugtracker` MODIFY `subject` VARCHAR(255) NOT NULL DEFAULT '';"); + $db->query("ALTER TABLE `" . TABLE_PREFIX . "bugtracker` MODIFY `reply` INT(11) NOT NULL DEFAULT 0;"); + $db->query("ALTER TABLE `" . TABLE_PREFIX . "bugtracker` MODIFY `who` INT(11) NOT NULL DEFAULT 0;"); + $db->query("ALTER TABLE `" . TABLE_PREFIX . "bugtracker` MODIFY `tag` INT(11) NOT NULL DEFAULT 0;"); +?> \ No newline at end of file diff --git a/system/pages/404.php b/system/pages/404.php index 4d8922af..2f7f2e36 100644 --- a/system/pages/404.php +++ b/system/pages/404.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/account.php b/system/pages/account.php index ad93dd23..a3ebccd4 100644 --- a/system/pages/account.php +++ b/system/pages/account.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/accountmanagement.php b/system/pages/accountmanagement.php index 50ed2d0f..f8d8e966 100644 --- a/system/pages/accountmanagement.php +++ b/system/pages/accountmanagement.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/changelog.php b/system/pages/admin/changelog.php index 64916f5c..4b59a944 100644 --- a/system/pages/admin/changelog.php +++ b/system/pages/admin/changelog.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/dashboard.php b/system/pages/admin/dashboard.php index fde5bb44..19253d6d 100644 --- a/system/pages/admin/dashboard.php +++ b/system/pages/admin/dashboard.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/login.php b/system/pages/admin/login.php index 14322d34..76101fdd 100644 --- a/system/pages/admin/login.php +++ b/system/pages/admin/login.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/logs.php b/system/pages/admin/logs.php index 8703ff62..1e511182 100644 --- a/system/pages/admin/logs.php +++ b/system/pages/admin/logs.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/mailer.php b/system/pages/admin/mailer.php index 2ad4a21d..e90436e9 100644 --- a/system/pages/admin/mailer.php +++ b/system/pages/admin/mailer.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/notepad.php b/system/pages/admin/notepad.php index 73ad6867..02396714 100644 --- a/system/pages/admin/notepad.php +++ b/system/pages/admin/notepad.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/pages.php b/system/pages/admin/pages.php index f91ef59d..bae1a624 100644 --- a/system/pages/admin/pages.php +++ b/system/pages/admin/pages.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/phpinfo.php b/system/pages/admin/phpinfo.php index e089d5b4..d9a00357 100644 --- a/system/pages/admin/phpinfo.php +++ b/system/pages/admin/phpinfo.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/players.php b/system/pages/admin/players.php index 6d7b3384..da9d2713 100644 --- a/system/pages/admin/players.php +++ b/system/pages/admin/players.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/plugins.php b/system/pages/admin/plugins.php index db6564a1..f10c9433 100644 --- a/system/pages/admin/plugins.php +++ b/system/pages/admin/plugins.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/statistics.php b/system/pages/admin/statistics.php index 2c857bec..aceba993 100644 --- a/system/pages/admin/statistics.php +++ b/system/pages/admin/statistics.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/tools.php b/system/pages/admin/tools.php index 597b4f01..9f52d57d 100644 --- a/system/pages/admin/tools.php +++ b/system/pages/admin/tools.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/version.php b/system/pages/admin/version.php index 0381d6ba..aac1a554 100644 --- a/system/pages/admin/version.php +++ b/system/pages/admin/version.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/visitors.php b/system/pages/admin/visitors.php index 1dfe533c..91ca767c 100644 --- a/system/pages/admin/visitors.php +++ b/system/pages/admin/visitors.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/bans.php b/system/pages/bans.php index 9dfadfe4..f45f909d 100644 --- a/system/pages/bans.php +++ b/system/pages/bans.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/bugtracker.php b/system/pages/bugtracker.php index 32f08545..35e72fc1 100644 --- a/system/pages/bugtracker.php +++ b/system/pages/bugtracker.php @@ -6,14 +6,19 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); $title = 'Bug tracker'; -if($logged) +if(!$logged) { + echo 'You are not logged in. Log in to post on the bug tracker.

'; + return; +} + +$showed = $post = $reply = false; // type (1 = question; 2 = answer) // status (1 = open; 2 = new message; 3 = closed;) @@ -22,7 +27,7 @@ if($logged) $tags = array(1 => "[MAP]", "[WEBSITE]", "[CLIENT]", "[MONSTER]", "[NPC]", "[OTHER]"); - if(admin() and $_REQUEST['control'] == "true") + if(admin() and isset($_REQUEST['control']) && $_REQUEST['control'] == "true") { if(empty($_REQUEST['id']) and empty($_REQUEST['acc']) or !is_numeric($_REQUEST['acc']) or !is_numeric($_REQUEST['id']) ) $bug[1] = $db->query('SELECT * FROM '.$db->tableName(TABLE_PREFIX . 'bugtracker').' where `type` = 1 order by `uid` desc'); @@ -249,7 +254,7 @@ if($logged) if(!$post) { - if($_REQUEST['add'] != TRUE) + if(!isset($_REQUEST['add']) || $_REQUEST['add'] != TRUE) { echo ''; foreach($bug[1] as $report) @@ -283,7 +288,7 @@ if($logged) echo '
[ADD REPORT]'; } - elseif($_REQUEST['add'] == TRUE) + elseif(isset($_REQUEST['add']) && $_REQUEST['add'] == TRUE) { $thread = $db->query('SELECT * FROM `' . TABLE_PREFIX . 'bugtracker` where `account` = '.$acc.' and `type` = 1 order by `id` desc')->fetch(); $id_next = $db->query('SELECT MAX(id) FROM `' . TABLE_PREFIX . 'bugtracker` where `account` = '.$acc.' and `type` = 1')->fetch(); @@ -314,7 +319,7 @@ if($logged) { $type = 1; $status = 1; - $INSERT = $db->query('INSERT INTO `' . TABLE_PREFIX . 'bugtracker` (`account`,`id`,`text`,`type`,`subject`,`status`,`tag`) VALUES ('.$db->quote($acc).','.$db->quote($id_next).','.$db->quote($_POST['text']).','.$db->quote($type).','.$db->quote($_POST['subject']).','.$db->quote($status).','.$db->quote($_POST['tags']).')'); + $INSERT = $db->query('INSERT INTO `' . TABLE_PREFIX . 'bugtracker` (`account`,`id`,`text`,`type`,`subject`, `reply`,`status`,`tag`) VALUES ('.$db->quote($acc).','.$db->quote($id_next).','.$db->quote($_POST['text']).','.$db->quote($type).','.$db->quote($_POST['subject']).', 0,'.$db->quote($status).','.$db->quote($_POST['tags']).')'); header('Location: index.php?subtopic=bugtracker&id='.$id_next.''); } @@ -335,9 +340,4 @@ if($logged) { echo '

[ADMIN PANEL]'; } -} -else -{ - echo 'Please enter your account name and your password.
Create an account if you do not have one yet.

Bug Tracker
Account Login
Account Name:
Password:

'; -} ?> diff --git a/system/pages/changelog.php b/system/pages/changelog.php index feeafb3a..9191f5e9 100644 --- a/system/pages/changelog.php +++ b/system/pages/changelog.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/characters.php b/system/pages/characters.php index 4bee5e82..3a79e258 100644 --- a/system/pages/characters.php +++ b/system/pages/characters.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/commands.php b/system/pages/commands.php index 80027688..6e3a3c26 100644 --- a/system/pages/commands.php +++ b/system/pages/commands.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/createaccount.php b/system/pages/createaccount.php index 710b46dc..e4647cdf 100644 --- a/system/pages/createaccount.php +++ b/system/pages/createaccount.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/creatures.php b/system/pages/creatures.php index 2dec483c..b099e801 100644 --- a/system/pages/creatures.php +++ b/system/pages/creatures.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/custom.php b/system/pages/custom.php index 70371ae7..6dfc0629 100644 --- a/system/pages/custom.php +++ b/system/pages/custom.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/downloads.php b/system/pages/downloads.php index 145cb527..d788b3ea 100644 --- a/system/pages/downloads.php +++ b/system/pages/downloads.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ $title = 'Downloads'; diff --git a/system/pages/experiencestages.php b/system/pages/experiencestages.php index 758cbec0..fe21b729 100644 --- a/system/pages/experiencestages.php +++ b/system/pages/experiencestages.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/experiencetable.php b/system/pages/experiencetable.php index 14c6eae1..56d3d79a 100644 --- a/system/pages/experiencetable.php +++ b/system/pages/experiencetable.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/faq.php b/system/pages/faq.php index 48305499..e4b5e15e 100644 --- a/system/pages/faq.php +++ b/system/pages/faq.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/forum.php b/system/pages/forum.php index f2b7783b..f754a99b 100644 --- a/system/pages/forum.php +++ b/system/pages/forum.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/guilds.php b/system/pages/guilds.php index 6a1ebe98..a721dd50 100644 --- a/system/pages/guilds.php +++ b/system/pages/guilds.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/highscores.php b/system/pages/highscores.php index ace963cd..2bb62ec5 100644 --- a/system/pages/highscores.php +++ b/system/pages/highscores.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/houses.php b/system/pages/houses.php index 1da2ab8f..0494e370 100644 --- a/system/pages/houses.php +++ b/system/pages/houses.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/lastkills.php b/system/pages/lastkills.php index ef7af434..165deec2 100644 --- a/system/pages/lastkills.php +++ b/system/pages/lastkills.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/lostaccount.php b/system/pages/lostaccount.php index a4eb746c..7091b2b2 100644 --- a/system/pages/lostaccount.php +++ b/system/pages/lostaccount.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/movies.php b/system/pages/movies.php index e69068d6..e679735c 100644 --- a/system/pages/movies.php +++ b/system/pages/movies.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/news.php b/system/pages/news.php index b213f2e0..242a7275 100644 --- a/system/pages/news.php +++ b/system/pages/news.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/newsarchive.php b/system/pages/newsarchive.php index 7c88431f..caa2c9ab 100644 --- a/system/pages/newsarchive.php +++ b/system/pages/newsarchive.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ $_GET['archive'] = true; diff --git a/system/pages/online.php b/system/pages/online.php index 2dfd8e5d..aa427c19 100644 --- a/system/pages/online.php +++ b/system/pages/online.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/polls.php b/system/pages/polls.php index 85852517..fa7daade 100644 --- a/system/pages/polls.php +++ b/system/pages/polls.php @@ -6,7 +6,7 @@ * @author Averatec * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/records.php b/system/pages/records.php index ad64a5c2..e3e23cd4 100644 --- a/system/pages/records.php +++ b/system/pages/records.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/rules.php b/system/pages/rules.php index f1cbeeb3..e9dd739e 100644 --- a/system/pages/rules.php +++ b/system/pages/rules.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/screenshots.php b/system/pages/screenshots.php index 59b5514d..0b0da276 100644 --- a/system/pages/screenshots.php +++ b/system/pages/screenshots.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/serverinfo.php b/system/pages/serverinfo.php index 100f43bf..f82b16a8 100644 --- a/system/pages/serverinfo.php +++ b/system/pages/serverinfo.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/spells.php b/system/pages/spells.php index a172620e..b5071c4d 100644 --- a/system/pages/spells.php +++ b/system/pages/spells.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/team.php b/system/pages/team.php index 10580337..5ddc993e 100644 --- a/system/pages/team.php +++ b/system/pages/team.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/status.php b/system/status.php index 11b8bc96..9e459fb4 100644 --- a/system/status.php +++ b/system/status.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/template.php b/system/template.php index b4427fe0..9aaa3231 100644 --- a/system/template.php +++ b/system/template.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/templates/kathrine/template.php b/templates/kathrine/template.php index 04183f79..d2ec0144 100644 --- a/templates/kathrine/template.php +++ b/templates/kathrine/template.php @@ -3,12 +3,12 @@ defined('MYAAC') or die('Direct access not allowed!'); ?> - - - - + + + + - - - + + - +
-
- +
+ - - - + + + - -
- Latest News - Account - Community - Library - +
+ Latest News + Account + Community + Library + Shop'; - } - ?> -
+ echo 'Shop'; + } + ?> +
-
- +
+ -
+ + + + Report Bug + +
-
- Who is Online? - - Characters - - Guilds - +
+ Who is Online? + + Characters + + Guilds + Wars - + - Highscores - - Last Deaths + Highscores + + Last Deaths - - Houses + + Houses - Bans + Bans + if($config['forum'] != ''): ?> Forum - + - Team -
+ Team +
- - + Monsters + + Spells + + Server Info + + Downloads + + Commands + + Movies + + Screenshots + + Experience Table + + FAQ +
+ '; } ?> -
- +
+ - -
-
- - - - + +
» - +
+
+ + + + - -
» + Server Online » @@ -166,28 +170,28 @@ defined('MYAAC') or die('Direct access not allowed!'); else echo 'Server Offline'; ?> -
-
-
+
+
+
- -
-
-
-
-
-

+ +
+ + +
+
+

Template:
' . template_form(); ?> -
- + + - - - - + + + + diff --git a/tools/validate.php b/tools/validate.php index 226d915f..cbf776d1 100644 --- a/tools/validate.php +++ b/tools/validate.php @@ -6,7 +6,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.3.0 + * @version 0.4.0 * @link http://my-aac.org */