From 48ceada956394a296d7b7c0d4071a61983e1f4b4 Mon Sep 17 00:00:00 2001 From: slawkens Date: Thu, 13 Jul 2023 15:13:15 +0200 Subject: [PATCH] Rename team_* variables + add to deprecated --- system/compat/config.php | 19 +++++++++++++------ system/pages/team.php | 12 ++++++------ system/settings.php | 8 ++++---- system/templates/team.html.twig | 32 ++++++++++++++++---------------- 4 files changed, 39 insertions(+), 32 deletions(-) diff --git a/system/compat/config.php b/system/compat/config.php index 39cb5833..256620f7 100644 --- a/system/compat/config.php +++ b/system/compat/config.php @@ -17,19 +17,26 @@ $deprecatedConfig = [ 'visitors_counter_ttl', 'views_counter', 'outfit_images_url', + 'outfit_images_wrong_looktypes', 'item_images_url', 'account_country', - 'team_display_outfit', - 'team_display_status', - 'team_display_world', - 'team_display_lastlogin', + 'online_record', + 'online_vocations', + 'online_vocations_images', + 'online_skulls', + 'online_outfit', + 'online_afk', + 'team_display_outfit' => 'team_outfit', + 'team_display_status' => 'team_status', + 'team_display_world' => 'team_world', + 'team_display_lastlogin' => 'team_lastlogin', 'multiworld', ]; -foreach ($deprecatedConfig as $value) { +foreach ($deprecatedConfig as $key => $value) { config( [ - $value, + (is_string($key) ? $key : $value), setting('core.'.$value) ] ); diff --git a/system/pages/team.php b/system/pages/team.php index fbc0df99..b1fd15dc 100644 --- a/system/pages/team.php +++ b/system/pages/team.php @@ -23,7 +23,7 @@ if(!$groups->count()) $outfit_addons = false; $outfit = ''; -if($config['team_display_outfit']) { +if(setting('core.team_outfit')) { $outfit = ', lookbody, lookfeet, lookhead, looklegs, looktype'; if($db->hasColumn('players', 'lookaddons')) { $outfit .= ', lookaddons'; @@ -56,12 +56,12 @@ foreach($groupList as $id => $group) $members[] = array( 'group_name' => $group->getName(), 'player' => $member, - 'outfit' => $config['team_display_outfit'] ? $config['outfit_images_url'] . '?id=' . $member->getLookType() . ($outfit_addons ? '&addons=' . $member->getLookAddons() : '') . '&head=' . $member->getLookHead() . '&body=' . $member->getLookBody() . '&legs=' . $member->getLookLegs() . '&feet=' . $member->getLookFeet() : null, - 'status' => $config['team_display_status'] ? $member->isOnline() : null, + 'outfit' => setting('core.team_outfit') ? setting('core.outfit_images_url') . '?id=' . $member->getLookType() . ($outfit_addons ? '&addons=' . $member->getLookAddons() : '') . '&head=' . $member->getLookHead() . '&body=' . $member->getLookBody() . '&legs=' . $member->getLookLegs() . '&feet=' . $member->getLookFeet() : null, + 'status' => setting('core.team_status') ? $member->isOnline() : null, 'link' => getPlayerLink($member->getName()), - 'flag_image' => $config['account_country'] ? getFlagImage($member->getAccount()->getCountry()) : null, - 'world_name' => ($config['multiworld'] || $config['team_display_world']) ? getWorldName($member->getWorldId()) : null, - 'last_login' => $config['team_display_lastlogin'] ? $lastLogin : null + 'flag_image' => setting('core.account_country') ? getFlagImage($member->getAccount()->getCountry()) : null, + 'world_name' => (setting('core.multiworld') || setting('core.team_world')) ? getWorldName($member->getWorldId()) : null, + 'last_login' => setting('core.team_lastlogin') ? $lastLogin : null ); } diff --git a/system/settings.php b/system/settings.php index e4e3debe..d30e8eb8 100644 --- a/system/settings.php +++ b/system/settings.php @@ -588,25 +588,25 @@ Sent by MyAAC,
'options' => ['normal table', 'in boxes, grouped by group id'], 'default' => 1, ], - 'team_display_status' => [ + 'team_status' => [ 'name' => 'Display Online Status', 'type' => 'boolean', 'desc' => '', 'default' => true, ], - 'team_display_lastlogin' => [ + 'team_lastlogin' => [ 'name' => 'Display Last Login', 'type' => 'boolean', 'desc' => '', 'default' => true, ], - 'team_display_world' => [ + 'team_world' => [ 'name' => 'Display World', 'type' => 'boolean', 'desc' => '', 'default' => false, ], - 'team_display_outfit' => [ + 'team_outfit' => [ 'name' => 'Display Outfit', 'type' => 'boolean', 'desc' => '', diff --git a/system/templates/team.html.twig b/system/templates/team.html.twig index bbbe35cd..a979e670 100644 --- a/system/templates/team.html.twig +++ b/system/templates/team.html.twig @@ -25,7 +25,7 @@ Group - {% if config.team_display_outfit %} + {% if setting('core.team_outfit') %} Outfit @@ -35,19 +35,19 @@ Name - {% if config.team_display_status %} + {% if setting('core.team_status') %} Status {% endif %} - {% if (config.multiworld or config.team_display_world) %} + {% if (setting('core.multiworld') or setting('core.team_world')) %} World {% endif %} - {% if config.team_display_lastlogin %} + {% if setting('core.team_lastlogin') %} Last login @@ -61,7 +61,7 @@ {{ group.group_name|capitalize }} - {% if config.team_display_outfit %} + {% if setting('core.team_outfit') %} player outfit @@ -74,7 +74,7 @@ {{ member.link|raw }} - {% if config.team_display_status %} + {% if setting('core.team_status') %} {% if member.status %} Online @@ -84,13 +84,13 @@ {% endif %} - {% if (config.multiworld or config.team_display_world) %} + {% if (setting('core.multiworld') or setting('core.team_world')) %} {{ member.world_name }} {% endif %} - {% if config.team_display_lastlogin %} + {% if setting('core.team_lastlogin') %} {{ member.last_login }} @@ -107,7 +107,7 @@ - {% if config.team_display_outfit %} + {% if setting('core.team_outfit') %} @@ -117,19 +117,19 @@ Name - {% if config.team_display_status %} + {% if setting('core.team_status') %} {% endif %} - {% if (config.multiworld or config.team_display_world) %} + {% if (setting('core.multiworld') or setting('core.team_world')) %} {% endif %} - {% if config.team_display_lastlogin %} + {% if setting('core.team_lastlogin') %} @@ -139,7 +139,7 @@ {% for member in group.members %} {% set i = i + 1 %} - {% if config.team_display_outfit %} + {% if setting('core.team_outfit') %} @@ -152,7 +152,7 @@ {{ member.link|raw }} - {% if config.team_display_status %} + {% if setting('core.team_status') %} {% endif %} - {% if (config.multiworld or config.team_display_world) %} + {% if (setting('core.multiworld') or setting('core.team_world')) %} {% endif %} - {% if config.team_display_lastlogin %} + {% if setting('core.team_lastlogin') %}
Outfit Status World Last login
player outfit {% if member.status %} Online @@ -162,13 +162,13 @@ {{ member.world_name }} {{ member.last_login }}