+
+
+
+
+
+
+
+
+
+
+
+ {% if config.team_display_outfit %}| # | {% endif %}
+ Group |
+ Name |
+ Status |
+ Last Login |
+ World |
+ Country |
+
+ {% for group in groupmember|reverse %}
+ {% if group.members is not empty and group.group_name == 'community manager' %}
+ {% for member in group.members|reverse %}
+ {% set i = i + 1 %}
+
+ {% if config.team_display_outfit %}
+  |
+ {% endif %}
+
+ Community Manager |
+ {{ member.link|raw }} |
+
+ {% if member.status %}
+ Online
+ {% else %}
+ Offline
+ {% endif %}
+ |
+
+
+ {% if member.last_login %}
+ {{ member.last_login }}
+
+ {% else %}
+ Not connected yet
+ {% endif %}
+ |
+
+ {% if member.world_name %}
+ {{ member.world_name }}
+ {% else %}
+ {{ config['lua']['serverName'] }}
+ {% endif %}
+ |
+
+ {% if member.flag_image %}
+ {{ member.flag_image|raw }}
+ {% else %}
+ No Flag
+ {% endif %}
+ |
+
+ {% endfor %}
+ {% endif %}
+ {% endfor %}
@@ -75,3 +229,332 @@
|
+{% endif %}
+
+{% set gmMembersExist = false %}
+{% for group in groupmember|reverse %}
+ {% if not gmMembersExist %}
+ {% if group.members is not empty and group.group_name == 'gamemaster' %}
+ {% set gmMembersExist = true %}
+ {% endif %}
+ {% endif %}
+{% endfor %}
+{% if gmMembersExist %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% if config.team_display_outfit %}| # | {% endif %}
+ Group |
+ Name |
+ Status |
+ Last Login |
+ World |
+ Country |
+
+ {% for group in groupmember|reverse %}
+ {% if group.members is not empty and group.group_name == 'gamemaster' %}
+ {% for member in group.members|reverse %}
+ {% set i = i + 1 %}
+
+ {% if config.team_display_outfit %}
+ |
+ {% endif %}
+
+ GameMaster |
+ {{ member.link|raw }} |
+
+ {% if member.status %}
+ Online
+ {% else %}
+ Offline
+ {% endif %}
+ |
+
+
+ {% if member.last_login %}
+ {{ member.last_login }}
+
+ {% else %}
+ Not connected yet
+ {% endif %}
+ |
+
+ {% if member.world_name %}
+ {{ member.world_name }}
+ {% else %}
+ {{ config['lua']['serverName'] }}
+ {% endif %}
+ |
+
+ {% if member.flag_image %}
+ {{ member.flag_image|raw }}
+ {% else %}
+ No Flag
+ {% endif %}
+ |
+
+ {% endfor %}
+ {% endif %}
+ {% endfor %}
+
+
+
+ |
+
+
+
+ |
+
+
+
+{% endif %}
+
+{% set seniorMembersExist = false %}
+{% for group in groupmember|reverse %}
+ {% if not seniorMembersExist %}
+ {% if group.members is not empty and group.group_name == 'senior tutor' %}
+ {% set seniorMembersExist = true %}
+ {% endif %}
+ {% endif %}
+{% endfor %}
+{% if seniorMembersExist %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% if config.team_display_outfit %}| # | {% endif %}
+ Group |
+ Name |
+ Status |
+ Last Login |
+ World |
+ Country |
+
+ {% for group in groupmember|reverse %}
+ {% if group.members is not empty and group.group_name == 'senior tutor' %}
+ {% for member in group.members|reverse %}
+ {% set i = i + 1 %}
+
+ {% if config.team_display_outfit %}
+ |
+ {% endif %}
+
+ Senior Tutor |
+ {{ member.link|raw }} |
+
+ {% if member.status %}
+ Online
+ {% else %}
+ Offline
+ {% endif %}
+ |
+
+
+ {% if member.last_login %}
+ {{ member.last_login }}
+
+ {% else %}
+ Not connected yet
+ {% endif %}
+ |
+
+ {% if member.world_name %}
+ {{ member.world_name }}
+ {% else %}
+ {{ config['lua']['serverName'] }}
+ {% endif %}
+ |
+
+ {% if member.flag_image %}
+ {{ member.flag_image|raw }}
+ {% else %}
+ No Flag
+ {% endif %}
+ |
+
+ {% endfor %}
+ {% endif %}
+ {% endfor %}
+
+
+
+ |
+
+
+
+ |
+
+
+
+{% endif %}
+
+{% set tutorMembersExist = false %}
+{% for group in groupmember|reverse %}
+ {% if not tutorMembersExist %}
+ {% if group.members is not empty and group.group_name == 'tutor' %}
+ {% set tutorMembersExist = true %}
+ {% endif %}
+ {% endif %}
+{% endfor %}
+{% if tutorMembersExist %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% if config.team_display_outfit %}| # | {% endif %}
+ Group |
+ Name |
+ Status |
+ Last Login |
+ World |
+ Country |
+
+ {% for group in groupmember|reverse %}
+ {% if group.members is not empty and group.group_name == 'tutor' %}
+ {% for member in group.members|reverse %}
+ {% set i = i + 1 %}
+
+ {% if config.team_display_outfit %}
+ |
+ {% endif %}
+
+ Tutor |
+ {{ member.link|raw }} |
+
+ {% if member.status %}
+ Online
+ {% else %}
+ Offline
+ {% endif %}
+ |
+
+
+ {% if member.last_login %}
+ {{ member.last_login }}
+
+ {% else %}
+ Not connected yet
+ {% endif %}
+ |
+
+ {% if member.world_name %}
+ {{ member.world_name }}
+ {% else %}
+ {{ config['lua']['serverName'] }}
+ {% endif %}
+ |
+
+ {% if member.flag_image %}
+ {{ member.flag_image|raw }}
+ {% else %}
+ No Flag
+ {% endif %}
+ |
+
+ {% endfor %}
+ {% endif %}
+ {% endfor %}
+
+
+
+ |
+
+
+
+ |
+
+
+
+{% endif %}
\ No newline at end of file
From efb49bb001e63f830f83237e14b2c24b235e32c0 Mon Sep 17 00:00:00 2001
From: LeoTK <41605307+LeoTKBR@users.noreply.github.com>
Date: Mon, 20 Nov 2023 00:01:54 -0300
Subject: [PATCH 02/16] #fix serverinfo informations
---
system/pages/serverinfo.php | 18 +++---
system/templates/serverinfo.html.twig | 79 ++++++++++++++++-----------
2 files changed, 57 insertions(+), 40 deletions(-)
diff --git a/system/pages/serverinfo.php b/system/pages/serverinfo.php
index f83c7d784b..cded4e5fe2 100644
--- a/system/pages/serverinfo.php
+++ b/system/pages/serverinfo.php
@@ -56,22 +56,22 @@
if(isset($whiteSkullTime))
$whiteSkullTime = eval('return ' . $whiteSkullTime . ';');
-$redSkullLength = isset($config['lua']['redSkullLength']) ? $config['lua']['redSkullLength'] : NULL;
+$redSkullLength = isset($config['lua']['redSkullDuration']) ? $config['lua']['redSkullDuration'] : NULL;
if(!isset($redSkullLength) && isset($config['lua']['red_skull_duration']))
$redSkullLength = $config['lua']['red_skull_duration'];
if(isset($redSkullLength))
$redSkullLength = eval('return ' . $redSkullLength . ';');
-$blackSkull = false;
-$blackSkullLength = NULL;
+$blackSkull = true;
+$blackSkullLength = isset($config['lua']['blackSkullDuration']) ? $config['lua']['blackSkullDuration'] : NULL;
if(isset($config['lua']['useBlackSkull']) && getBoolean($config['lua']['useBlackSkull']))
{
- $blackSkullLength = $config['lua']['blackSkullLength'];
+ $blackSkullLength = $config['lua']['blackSkullDuration'];
$blackSkull = true;
}
else if(isset($config['lua']['black_skull_duration'])) {
- $blackSkullLength = eval('return ' . $config['lua']['blackSkullLength'] . ';');
+ $blackSkullLength = eval('return ' . $config['lua']['blackSkullDuration'] . ';');
$blackSkull = true;
}
@@ -88,7 +88,7 @@
$twig->display('serverinfo.html.twig', array(
'server_save' => $explodeServerSave,
'experienceStages' => isset($config['lua']['experienceStages']) && getBoolean($config['lua']['experienceStages']) ? $config['lua']['experienceStages'] : null,
- 'serverIp' => str_replace('/', '', str_replace('http://', '', $config['lua']['url'])),
+ 'serverIp' => str_replace('/', '', str_replace('http://', '', $config['lua']['ip'])),
'clientVersion' => $clientVersion,
'globalSaveHour' => isset($config['lua']['globalSaveEnabled']) && getBoolean($config['lua']['globalSaveEnabled']) ? $config['lua']['globalSaveHour'] : null,
'protectionLevel' => $config['lua']['protectionLevel'],
@@ -106,9 +106,9 @@
'redSkullLength' => $redSkullLength,
'blackSkull' => $blackSkull,
'blackSkullLength' => $blackSkullLength,
- 'dailyFragsToRedSkull' => isset($config['lua']['dailyFragsToRedSkull']) ? $config['lua']['dailyFragsToRedSkull'] : (isset($config['lua']['kills_per_day_red_skull']) ? $config['lua']['kills_per_day_red_skull'] : null),
- 'weeklyFragsToRedSkull' => isset($config['lua']['weeklyFragsToRedSkull']) ? $config['lua']['weeklyFragsToRedSkull'] : (isset($config['lua']['kills_per_week_red_skull']) ? $config['lua']['kills_per_week_red_skull'] : null),
- 'monthlyFragsToRedSkull' => isset($config['lua']['monthlyFragsToRedSkull']) ? $config['lua']['monthlyFragsToRedSkull'] : (isset($config['lua']['kills_per_month_red_skull']) ? $config['lua']['kills_per_month_red_skull'] : null),
+ 'dailyFragsToRedSkull' => isset($config['lua']['dayKillsToRedSkull']) ? $config['lua']['dayKillsToRedSkull'] : (isset($config['lua']['dayKillsToRedSkull']) ? $config['lua']['dayKillsToRedSkull'] : null),
+ 'weeklyFragsToRedSkull' => isset($config['lua']['weekKillsToRedSkull']) ? $config['lua']['weekKillsToRedSkull'] : (isset($config['lua']['weekKillsToRedSkull']) ? $config['lua']['weekKillsToRedSkull'] : null),
+ 'monthlyFragsToRedSkull' => isset($config['lua']['monthKillsToRedSkull']) ? $config['lua']['monthKillsToRedSkull'] : (isset($config['lua']['monthKillsToRedSkull']) ? $config['lua']['monthKillsToRedSkull'] : null),
'dailyFragsToBlackSkull' => isset($config['lua']['dailyFragsToBlackSkull']) ? $config['lua']['dailyFragsToBlackSkull'] : (isset($config['lua']['kills_per_day_black_skull']) ? $config['lua']['kills_per_day_black_skull'] : null),
'weeklyFragsToBlackSkull' => isset($config['lua']['weeklyFragsToBlackSkull']) ? $config['lua']['weeklyFragsToBlackSkull'] : (isset($config['lua']['kills_per_week_black_skull']) ? $config['lua']['kills_per_week_black_skull'] : null),
'monthlyFragsToBlackSkull' => isset($config['lua']['monthlyFragsToBlackSkull']) ? $config['lua']['monthlyFragsToBlackSkull'] : (isset($config['lua']['kills_per_month_black_skull']) ? $config['lua']['kills_per_month_black_skull'] : null),
diff --git a/system/templates/serverinfo.html.twig b/system/templates/serverinfo.html.twig
index 401a23c8a9..e91eb82e26 100644
--- a/system/templates/serverinfo.html.twig
+++ b/system/templates/serverinfo.html.twig
@@ -1,23 +1,26 @@
+
{{ config.lua.serverName }}
@@ -94,7 +97,7 @@
| IP: {{ serverIp }} (Port: {{ config.lua.loginPort }}) |
| Client: {{ clientVersion }} |
- | Online: 24/7 |
+ | Uptime: {{ status.uptimeReadable }} |
| Global save: {{ server_save.0 }}:{{ server_save.1 }} |
| World type: {{ config.lua.worldType|upper }} |
| Protection level: {{ protectionLevel }} |
@@ -153,7 +156,7 @@
| Skills: x{{ rateSkill }} |
| Loot: x{{ rateLoot }} |
| Spawn: x{{ rateSpawn }} |
- | Guilds: {{ config.guild_need_level }} |
+ | Need level to create Guild: {{ config.guild_need_level }} |
{% if houseLevel %}
| Houses: {{ houseLevel }} level |
{% endif %}
@@ -201,29 +204,43 @@
| PZ Lock: {{ pzLocked / (60 * 1000) }} min |
- | White Skull Time: {{ whiteSkullTime }} min |
- | Red skull length: {{ redSkullLength / (24 * 60 * 60) }} days |
+ {% set whiteSkullTime = 7 * 60 %}
+ {# Converter para dias, horas, minutos e segundos #}
+ {% set days = whiteSkullTime // (24 * 60) %}
+ {% set hours = (whiteSkullTime % (24 * 60)) // 60 %}
+ {% set minutes = whiteSkullTime % 60 %}
+ {% set seconds = 0 %}
+
+ |
+ Frag Duration:
+ {% if days > 0 %} {{ days }} days {% endif %}
+ {% if hours > 0 %} {{ hours }} hours {% endif %}
+ {% if minutes > 0 %} {{ minutes }} mins {% endif %}
+ {% if seconds > 0 %} {{ seconds }} segs {% endif %}
+ |
+
+ | RedSkull Duration: {{ redSkullLength }} days |
{% if blackSkull %}
- | Black skull length: {{ blackSkullLength / (24 * 60 * 60) }} days |
+ | BlackSkull Duration: {{ blackSkullLength }} days |
{% endif %}
- {% if killsToRedSkull is defined %}
- Kills to red skull: {{ config.lua.killsToRedSkull }}
- {% elseif config.lua.dailyFragsToRedSkull is defined or config.lua.kills_per_day_red_skull is defined %}
-
+ {% if dayKillsToRedSkull is defined %}
+ Kills to red skull: {{ config.lua.dayKillsToRedSkull }}
+ {% elseif config.lua.dayKillsToRedSkull is defined or config.lua.kills_per_day_red_skull is defined %}
+
Red skull
- {{ dailyFragsToRedSkull }} frags daily
- {{ weeklyFragsToRedSkull }} frags weekly
- {{ monthlyFragsToRedSkull }} frags monthly
- {% if blackSkull and config.lua.dailyFragsToBlackSkull is defined or config.lua.kills_per_day_black_skull is defined %}
+
Black skull
- - {{ dailyFragsToBlackSkull }} frags daily
- - {{ weeklyFragsToBlackSkull }} frags weekly
- - {{ monthlyFragsToBlackSkull }} frags monthly
+ - {{ dailyFragsToRedSkull * 2}} frags daily
+ - {{ weeklyFragsToRedSkull * 2}} frags weekly
+ - {{ monthlyFragsToRedSkull * 2}} frags monthly
- {% elseif config.lua.dailyFragsToBanishment is defined %}
+ {% if config.lua.dailyFragsToBanishment is defined %}
Banishment
- {{ config.lua.dailyFragsToBanishment }} frags daily
@@ -231,7 +248,7 @@
- {{ config.lua.monthlyFragsToBanishment }} frags monthly
{% endif %}
-
+
{% endif %}
{% if banishmentLength %}
Banishment length: {{ banishmentLength }} days
From b221d35a0e1f929bd30a2ed5156227ddc0584d23 Mon Sep 17 00:00:00 2001
From: LeoTK <41605307+LeoTKBR@users.noreply.github.com>
Date: Mon, 20 Nov 2023 01:05:19 -0300
Subject: [PATCH 03/16] #fix buttons hover
---
templates/tibiacom/index.php | 33 +++++++++++++++++++++++++++++----
1 file changed, 29 insertions(+), 4 deletions(-)
diff --git a/templates/tibiacom/index.php b/templates/tibiacom/index.php
index 3f3dc23d8d..0bdeb46cd4 100644
--- a/templates/tibiacom/index.php
+++ b/templates/tibiacom/index.php
@@ -345,8 +345,8 @@ function MouseOutSubmenuItem(source) {
style="background-image:url(/images/loginbox/loginbox-textfield-background.gif)">
|
