From 82fed8abfe679e6a7636cc86a0de58911e364509 Mon Sep 17 00:00:00 2001 From: Lee <42119604+Leesneaks@users.noreply.github.com> Date: Mon, 26 Nov 2018 05:40:39 +0000 Subject: [PATCH] Account fix (#63) * Admin Panel * fixes -Code Clean Up -Remove dist folder and merged into tools. * Use Acc Name Use Acc Name fix for login. * Pull fix * Dashboard fix - Fix coins table - Fix points table --- system/pages/admin/dashboard.php | 136 +++++++++--------- system/pages/admin/login.php | 4 +- system/templates/admin.dashboard.html.twig | 62 ++++---- .../templates/admin.dashboardstats.html.twig | 126 ---------------- system/templates/admin.login.html.twig | 4 +- 5 files changed, 109 insertions(+), 223 deletions(-) delete mode 100644 system/templates/admin.dashboardstats.html.twig diff --git a/system/pages/admin/dashboard.php b/system/pages/admin/dashboard.php index 9d6c201c..49fe4efb 100644 --- a/system/pages/admin/dashboard.php +++ b/system/pages/admin/dashboard.php @@ -11,42 +11,40 @@ defined('MYAAC') or die('Direct access not allowed!'); $title = 'Dashboard'; $cache = Cache::getInstance(); -if($cache->enabled()) { - if(isset($_GET['clear_cache'])) { - if(clearCache()) - success('Cache cleared.'); - else - error('Error while clearing cache.'); - } +if ($cache->enabled()) { + if (isset($_GET['clear_cache'])) { + if (clearCache()) + success('Cache cleared.'); + else + error('Error while clearing cache.'); + } } -if(isset($_GET['maintenance'])) { - $_status = (int)$_POST['status']; - $message = $_POST['message']; - if(empty($message)) { - error('Message cannot be empty.'); - } - else if(strlen($message) > 255) { - error('Message is too long. Maximum length allowed is 255 chars.'); - } - else { - $tmp = ''; - if(fetchDatabaseConfig('site_closed', $tmp)) - updateDatabaseConfig('site_closed', $_status); - else - registerDatabaseConfig('site_closed', $_status); +if (isset($_GET['maintenance'])) { + $_status = (int)$_POST['status']; + $message = $_POST['message']; + if (empty($message)) { + error('Message cannot be empty.'); + } else if (strlen($message) > 255) { + error('Message is too long. Maximum length allowed is 255 chars.'); + } else { + $tmp = ''; + if (fetchDatabaseConfig('site_closed', $tmp)) + updateDatabaseConfig('site_closed', $_status); + else + registerDatabaseConfig('site_closed', $_status); - if(fetchDatabaseConfig('site_closed_message', $tmp)) - updateDatabaseConfig('site_closed_message', $message); - else - registerDatabaseConfig('site_closed_message', $message); - } + if (fetchDatabaseConfig('site_closed_message', $tmp)) + updateDatabaseConfig('site_closed_message', $message); + else + registerDatabaseConfig('site_closed_message', $message); + } } $is_closed = getDatabaseConfig('site_closed') == '1'; $closed_message = 'Server is under maintenance, please visit later.'; $tmp = ''; -if(fetchDatabaseConfig('site_closed_message', $tmp)) - $closed_message = $tmp; +if (fetchDatabaseConfig('site_closed_message', $tmp)) + $closed_message = $tmp; $query = $db->query('SELECT count(*) as `how_much` FROM `accounts`;'); $query = $query->fetch(); @@ -64,64 +62,74 @@ $query = $db->query('SELECT count(*) as `how_much` FROM `houses`;'); $query = $query->fetch(); $total_houses = $query['how_much']; -$points = $db->query('SELECT `premium_points`, `' . (USE_ACCOUNT_NAME ? 'name' : 'id') . '` as `name` FROM `accounts` ORDER BY `premium_points` DESC LIMIT 10;'); +if ($db->hasColumn('accounts', 'premium_points')) { + $points = $db->query('SELECT `premium_points`, `' . (USE_ACCOUNT_NAME ? 'name' : 'id') . '` as `name` FROM `accounts` ORDER BY `premium_points` DESC LIMIT 10;'); +} else { + $points = 0; +} +if ($db->hasColumn('accounts', 'coins')) { + $coins = $db->query('SELECT `coins`, `' . (USE_ACCOUNT_NAME ? 'name' : 'id') . '` as `name` FROM `accounts` ORDER BY `coins` DESC LIMIT 10;'); +} else { + $coins = 0; +} $twig->display('admin.statistics.html.twig', array( - 'total_accounts' => $total_accounts, - 'total_players' => $total_players, - 'total_guilds' => $total_guilds, - 'total_houses' => $total_houses + 'total_accounts' => $total_accounts, + 'total_players' => $total_players, + 'total_guilds' => $total_guilds, + 'total_houses' => $total_houses )); $twig->display('admin.dashboard.html.twig', array( 'is_closed' => $is_closed, 'closed_message' => $closed_message, 'status' => $status, - 'account_type' => (USE_ACCOUNT_NAME ? 'name' : 'number'), - 'points' => $points + 'account_type' => (USE_ACCOUNT_NAME ? 'name' : 'number'), + 'points' => $points, + 'coins' => $coins, )); function clearCache() { - global $template_name; - $cache = Cache::getInstance(); + global $template_name; + $cache = Cache::getInstance(); - $tmp = ''; - if($cache->fetch('status', $tmp)) - $cache->delete('status'); + $tmp = ''; + if ($cache->fetch('status', $tmp)) + $cache->delete('status'); - if($cache->fetch('templates', $tmp)) - $cache->delete('templates'); + if ($cache->fetch('templates', $tmp)) + $cache->delete('templates'); - if($cache->fetch('config_lua', $tmp)) - $cache->delete('config_lua'); + if ($cache->fetch('config_lua', $tmp)) + $cache->delete('config_lua'); - if($cache->fetch('vocations', $tmp)) - $cache->delete('vocations'); + if ($cache->fetch('vocations', $tmp)) + $cache->delete('vocations'); - if($cache->fetch('towns', $tmp)) - $cache->delete('towns'); + if ($cache->fetch('towns', $tmp)) + $cache->delete('towns'); - if($cache->fetch('groups', $tmp)) - $cache->delete('groups'); + if ($cache->fetch('groups', $tmp)) + $cache->delete('groups'); - if($cache->fetch('visitors', $tmp)) - $cache->delete('visitors'); + if ($cache->fetch('visitors', $tmp)) + $cache->delete('visitors'); - if($cache->fetch('views_counter', $tmp)) - $cache->delete('views_counter'); + if ($cache->fetch('views_counter', $tmp)) + $cache->delete('views_counter'); - if($cache->fetch('failed_logins', $tmp)) - $cache->delete('failed_logins'); + if ($cache->fetch('failed_logins', $tmp)) + $cache->delete('failed_logins'); - if($cache->fetch('news' . $template_name . '_' . NEWS, $tmp)) - $cache->delete('news' . $template_name . '_' . NEWS); + if ($cache->fetch('news' . $template_name . '_' . NEWS, $tmp)) + $cache->delete('news' . $template_name . '_' . NEWS); - if($cache->fetch('news' . $template_name . '_' . TICKER, $tmp)) - $cache->delete('news' . $template_name . '_' . TICKER); + if ($cache->fetch('news' . $template_name . '_' . TICKER, $tmp)) + $cache->delete('news' . $template_name . '_' . TICKER); - if($cache->fetch('template_ini' . $template_name, $tmp)) - $cache->delete('template_ini' . $template_name); + if ($cache->fetch('template_ini' . $template_name, $tmp)) + $cache->delete('template_ini' . $template_name); - return true; + return true; } \ No newline at end of file diff --git a/system/pages/admin/login.php b/system/pages/admin/login.php index e7a4aad9..3bc8a8e5 100644 --- a/system/pages/admin/login.php +++ b/system/pages/admin/login.php @@ -24,7 +24,9 @@ if(isset($errors)) { } } + $twig->display('admin.login.html.twig', array( 'errors' => $search_errors, - 'logout' => $logout + 'logout' => $logout, + 'account' => USE_ACCOUNT_NAME ? 'Name' : 'Number', )); \ No newline at end of file diff --git a/system/templates/admin.dashboard.html.twig b/system/templates/admin.dashboard.html.twig index 4ecbe9b2..b5bb28fe 100644 --- a/system/templates/admin.dashboard.html.twig +++ b/system/templates/admin.dashboard.html.twig @@ -41,39 +41,11 @@ - - + {% if points is iterable %}
-

Top 10 - Most wealthly accounts

-
-
- - - - - - - - {% set i = 0 %} - {% for result in coins %} - {% set i = i + 1 %} - - - - - - {% endfor %} - -
#Account {{ account_type }}Tibia coins
{{ i }}{{ result.name }}{{ result.coins }}
-
-
-
-
-
-
-

Top 10 - Most wealthly accounts

+

Top 10 - Most premium points

@@ -97,4 +69,34 @@ + {% endif %} + {% if coins is iterable %} +
+
+
+

Top 10 - Most coins

+
+
+
+ + + + + + + {% set i = 0 %} + {% for result in coins %} + {% set i = i + 1 %} + + + + + + {% endfor %} + +
#Account {{ account_type }}Tibia coins
{{ i }}{{ result.name }}{{ result.coins }}
+
+
+
+ {% endif %} \ No newline at end of file diff --git a/system/templates/admin.dashboardstats.html.twig b/system/templates/admin.dashboardstats.html.twig deleted file mode 100644 index 6a0c329c..00000000 --- a/system/templates/admin.dashboardstats.html.twig +++ /dev/null @@ -1,126 +0,0 @@ -
-
-
-
-

Maintenance

-
- -
-
-
-
-
-
- -
- -
-
-
- -
- -
-
-
-
- Clear cache -
- -
-
-
-
-
-
- {% if status.online %} -
-
-
-

Server Online

- -
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Status{{ status.uptimeReadable }}, {{ status.players }}/{{ status.playersMax }}
Connection{{ config.lua.ip }} : {{ config.lua.loginPort }}
Server{{ status.server }} {{ status.serverVersion }}
Version {{ status.clientVersion }}
Monsters{{ status.monsters }}
Map{{ status.mapName }}, author: {{ status.mapAuthor }}, - size: {{ status.mapWidth }} x {{ status.mapHeight }}
MOTD{{ status.motd }}
Last updated{{ status.lastCheck|date("H:i:s") }}
-
-
-
- {% endif %} - -
-
-
-

Top 10 - Most wealthly accounts

-
-
- - - - - - - - {% set i = 0 %} - {% for result in points %} - {% set i = i + 1 %} - - - - - - {% endfor %} - -
#Account {{ account_type }}Premium points
{{ i }}{{ result.name }}{{ result.premium_points }}
-
-
-
-
\ No newline at end of file diff --git a/system/templates/admin.login.html.twig b/system/templates/admin.login.html.twig index 7115f064..c008a621 100644 --- a/system/templates/admin.login.html.twig +++ b/system/templates/admin.login.html.twig @@ -17,7 +17,7 @@
+ placeholder="Account {{ account }}" required autofocus>
@@ -35,4 +35,4 @@
- \ No newline at end of file +