From 911be7001808104011efdccb9c9aeef0adfdfc6f Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Thu, 2 Jun 2022 20:33:17 +0200
Subject: [PATCH 001/337] Remove manual setting queries

---
 modules/Core/pages/panel/avatars.php          | 49 ++++---------------
 modules/Core/pages/panel/emails.php           | 31 ++----------
 .../Core/pages/panel/emails_mass_message.php  |  7 +--
 3 files changed, 16 insertions(+), 71 deletions(-)

diff --git a/modules/Core/pages/panel/avatars.php b/modules/Core/pages/panel/avatars.php
index a26248974f..aa49094ef8 100644
--- a/modules/Core/pages/panel/avatars.php
+++ b/modules/Core/pages/panel/avatars.php
@@ -24,21 +24,11 @@
 if (Input::exists()) {
     if (Token::check()) {
         if (isset($_POST['avatar_source'])) {
-            // Custom avatars?
-            if (isset($_POST['custom_avatars']) && $_POST['custom_avatars'] == 1) {
-                $custom_avatars = 1;
-            } else {
-                $custom_avatars = 0;
-            }
-
             try {
-                DB::getInstance()->update('settings', ['name', 'user_avatars'], ['value' => $custom_avatars]);
-
-                DB::getInstance()->update('settings', ['name', 'default_avatar_type'], ['value' => Input::get('default_avatar')]);
-
-                DB::getInstance()->update('settings', ['name', 'avatar_site'], ['value' => Input::get('avatar_source')]);
-
-                DB::getInstance()->update('settings', ['name', 'avatar_type'], ['value' => Input::get('avatar_perspective')]);
+                Util::setSetting('user_avatars', (isset($_POST['custom_avatars']) && $_POST['custom_avatars']) ? '1' : '0');
+                Util::setSetting('default_avatar_type', Input::get('default_avatar'));
+                Util::setSetting('avatar_site', Input::get('avatar_source'));
+                Util::setSetting('avatar_type', Input::get('avatar_perspective'));
 
                 $cache->setCache('avatar_settings_cache');
                 $cache->store('custom_avatars', $custom_avatars);
@@ -52,10 +42,7 @@
             if (isset($_POST['avatar'])) {
                 // Selecting a new default avatar
                 try {
-                    $default_avatar = DB::getInstance()->get('settings', ['name', 'custom_default_avatar'])->results();
-                    $default_avatar = $default_avatar[0]->id;
-                    DB::getInstance()->update('settings', $default_avatar, ['value' => Input::get('avatar')]);
-
+                    Util::setSetting('custom_default_avatar', Input::get('avatar'));
                     $cache->setCache('avatar_settings_cache');
                     $cache->store('default_avatar_image', Input::get('avatar'));
                 } catch (Exception $e) {
@@ -98,22 +85,6 @@
     ]);
 }
 
-// Get setting values
-$custom_avatars = DB::getInstance()->get('settings', ['name', 'user_avatars'])->results();
-$custom_avatars = $custom_avatars[0]->value;
-
-$default_avatar_type = DB::getInstance()->get('settings', ['name', 'default_avatar_type'])->results();
-$default_avatar_type = $default_avatar_type[0]->value;
-
-$mc_avatar_source = DB::getInstance()->get('settings', ['name', 'avatar_site'])->results();
-$mc_avatar_source = $mc_avatar_source[0]->value;
-
-$mc_avatar_perspective = DB::getInstance()->get('settings', ['name', 'avatar_type'])->results();
-$mc_avatar_perspective = $mc_avatar_perspective[0]->value;
-
-$default_avatar_image = DB::getInstance()->get('settings', ['name', 'custom_default_avatar'])->results();
-$default_avatar_image = $default_avatar_image[0]->value;
-
 $image_path = implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'uploads', 'avatars', 'defaults']);
 $images = scandir($image_path);
 $template_images = [];
@@ -141,16 +112,16 @@
     'TOKEN' => Token::get(),
     'SUBMIT' => $language->get('general', 'submit'),
     'CUSTOM_AVATARS' => $language->get('admin', 'allow_custom_avatars'),
-    'CUSTOM_AVATARS_VALUE' => $custom_avatars,
+    'CUSTOM_AVATARS_VALUE' => Util::getSetting('users_avatars'),
     'DEFAULT_AVATAR' => $language->get('admin', 'default_avatar'),
-    'DEFAULT_AVATAR_VALUE' => $default_avatar_type,
+    'DEFAULT_AVATAR_VALUE' => Utils::getSetting('default_avatar_type'),
     'MINECRAFT_AVATAR' => $language->get('admin', 'minecraft_avatar'),
     'CUSTOM_AVATAR' => $language->get('admin', 'custom_avatar'),
     'MINECRAFT_AVATAR_SOURCE' => $language->get('admin', 'minecraft_avatar_source'),
     'MINECRAFT_AVATAR_VALUES' => AvatarSource::getAllSourceNames(),
-    'MINECRAFT_AVATAR_VALUE' => $mc_avatar_source,
+    'MINECRAFT_AVATAR_VALUE' => Util::getSetting('avatar_site'),
     'MINECRAFT_AVATAR_PERSPECTIVE' => $language->get('admin', 'minecraft_avatar_perspective'),
-    'MINECRAFT_AVATAR_PERSPECTIVE_VALUE' => $mc_avatar_perspective,
+    'MINECRAFT_AVATAR_PERSPECTIVE_VALUE' => Util::getSetting('avatar_type'),
     'MINECRAFT_AVATAR_PERSPECTIVE_VALUES' => AvatarSource::getAllPerspectives(),
     'HEAD' => $language->get('admin', 'head'),
     'FACE' => $language->get('admin', 'face'),
@@ -158,7 +129,7 @@
     'SELECT_DEFAULT_AVATAR' => $language->get('admin', 'select_default_avatar'),
     'IMAGES' => $template_images,
     'NO_AVATARS' => $language->get('admin', 'no_avatars_available'),
-    'DEFAULT_AVATAR_IMAGE' => $default_avatar_image,
+    'DEFAULT_AVATAR_IMAGE' => Util::getSetting('custom_default_avatar'),
     'UPLOAD_NEW_IMAGE' => $language->get('admin', 'upload_new_image'),
     'UPLOAD_FORM_ACTION' => (defined('CONFIG_PATH') ? CONFIG_PATH : '') . '/core/includes/image_upload.php',
     'DRAG_FILES_HERE' => $language->get('admin', 'drag_files_here'),
diff --git a/modules/Core/pages/panel/emails.php b/modules/Core/pages/panel/emails.php
index 2c9d14a9bc..0010df22d9 100644
--- a/modules/Core/pages/panel/emails.php
+++ b/modules/Core/pages/panel/emails.php
@@ -158,27 +158,10 @@
                 Session::flash('emails_success', $language->get('admin', 'email_settings_updated_successfully'));
                 Redirect::to(URL::build('/panel/core/emails', 'action=edit_messages'));
             } else {
-
-                if (isset($_POST['enable_mailer']) && $_POST['enable_mailer'] == 1) {
-                    $mailer = '1';
-                } else {
-                    $mailer = '0';
-                }
-
-                $php_mailer = DB::getInstance()->get('settings', ['name', 'phpmailer'])->results();
-                $php_mailer = $php_mailer[0]->id;
-
-                DB::getInstance()->update('settings', $php_mailer, [
-                    'value' => $mailer
-                ]);
+                Util::setSetting('phpmailer', (isset($_POST['enable_mailer']) && $_POST['enable_mailer']) ? '1' : '0')
 
                 if (!empty($_POST['email'])) {
-                    $outgoing_email = DB::getInstance()->get('settings', ['name', 'outgoing_email'])->results();
-                    $outgoing_email = $outgoing_email[0]->id;
-
-                    DB::getInstance()->update('settings', $outgoing_email, [
-                        'value' => Output::getClean($_POST['email'])
-                    ]);
+                    Util::setSetting('outgoing_email', $_POST['email']);
                 }
 
                 if ($_POST['port'] && !is_numeric($_POST['port'])) {
@@ -247,12 +230,6 @@
         }
     }
 
-    $php_mailer = DB::getInstance()->get('settings', ['name', 'phpmailer'])->results();
-    $php_mailer = $php_mailer[0]->value;
-
-    $outgoing_email = DB::getInstance()->get('settings', ['name', 'outgoing_email'])->results();
-    $outgoing_email = $outgoing_email[0]->value;
-
     require(ROOT_PATH . '/core/email.php');
 
     if ($user->hasPermission('admincp.core.emails_mass_message')) {
@@ -272,7 +249,7 @@
         'EMAIL_ERRORS' => $language->get('admin', 'email_errors'),
         'EMAIL_ERRORS_LINK' => URL::build('/panel/core/emails/errors'),
         'ENABLE_MAILER' => $language->get('admin', 'enable_mailer'),
-        'ENABLE_MAILER_VALUE' => $php_mailer,
+        'ENABLE_MAILER_VALUE' => Util::getSetting('phpmailer'),
         'INFO' => $language->get('general', 'info'),
         'DEFAULT_LANGUAGE_HELP' => $language->get('admin', 'default_language_help', [
             'docLinkStart' => "<a href='https://docs.namelessmc.com/home#translations' target='_blank'>",
@@ -288,7 +265,7 @@
         ]),
         'OUTGOING_EMAIL' => $language->get('admin', 'outgoing_email'),
         'OUTGOING_EMAIL_INFO' => $language->get('admin', 'outgoing_email_info'),
-        'OUTGOING_EMAIL_VALUE' => Output::getClean($outgoing_email),
+        'OUTGOING_EMAIL_VALUE' => Output::getClean(Util::getSetting('outgoing_email')),
         'USERNAME' => $language->get('user', 'username'),
         'USERNAME_VALUE' => (!empty($GLOBALS['email']['username']) ? Output::getClean($GLOBALS['email']['username']) : ''),
         'PASSWORD' => $language->get('user', 'password'),
diff --git a/modules/Core/pages/panel/emails_mass_message.php b/modules/Core/pages/panel/emails_mass_message.php
index 734fdbf45d..f0fd725c1e 100644
--- a/modules/Core/pages/panel/emails_mass_message.php
+++ b/modules/Core/pages/panel/emails_mass_message.php
@@ -71,11 +71,8 @@
     }
 }
 
-$php_mailer = DB::getInstance()->get('settings', ['name', 'phpmailer'])->results();
-$php_mailer = $php_mailer[0]->value;
-
-$outgoing_email = DB::getInstance()->get('settings', ['name', 'outgoing_email'])->results();
-$outgoing_email = $outgoing_email[0]->value;
+$php_mailer = Util::getSetting('phpmailer');
+$outgoing_email = Util::getSetting('outgoing_email');
 
 require(ROOT_PATH . '/core/email.php');
 

From 218825dca65e143cb3b178e50ce6a2cb42f9f30b Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Thu, 2 Jun 2022 20:45:06 +0200
Subject: [PATCH 002/337] Remove manual setting queries

---
 core/classes/Core/User.php                     |  7 ++-----
 core/installation/steps/site_configuration.php | 12 ++----------
 modules/Core/pages/complete_signup.php         |  8 ++------
 modules/Core/pages/login.php                   |  8 +-------
 modules/Core/pages/privacy.php                 |  5 +++--
 5 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/core/classes/Core/User.php b/core/classes/Core/User.php
index 2fc5d5421b..40f40d9fb7 100644
--- a/core/classes/Core/User.php
+++ b/core/classes/Core/User.php
@@ -1008,10 +1008,7 @@ public function getProfileViews(): int {
      * @return bool Whether profile privatizing is allowed and if they have permission to use it.
      */
     public function canPrivateProfile(): bool {
-        $settings_data = $this->_db->get('settings', ['name', 'private_profile']);
-        $settings_results = $settings_data->results();
-
-        return (($settings_results[0]->value == 1) && ($this->hasPermission('usercp.private_profile')));
+        return Util::getSetting('private_profile') === '1' && $this->hasPermission('usercp.private_profile');
     }
 
     /**
@@ -1031,7 +1028,7 @@ public function isPrivateProfile(): bool {
     public function getUserTemplates(): array {
         $groups = '(';
         foreach ($this->_groups as $group) {
-            $groups .= ((int)$group->id) . ',';
+            $groups .= ((int) $group->id) . ',';
         }
         $groups = rtrim($groups, ',') . ')';
 
diff --git a/core/installation/steps/site_configuration.php b/core/installation/steps/site_configuration.php
index 32d4bdcfdd..1a3a52aca8 100644
--- a/core/installation/steps/site_configuration.php
+++ b/core/installation/steps/site_configuration.php
@@ -39,16 +39,8 @@
 
         try {
             Util::setSetting('sitename', Input::get('sitename'));
-
-            DB::getInstance()->insert('settings', [
-                'name' => 'incoming_email',
-                'value' => Input::get('incoming')
-            ]);
-
-            DB::getInstance()->insert('settings', [
-                'name' => 'outgoing_email',
-                'value' => Input::get('outgoing')
-            ]);
+            Util::setSetting('incoming_email', Input::get('incoming'));
+            Util::setSetting('outgoing_email', Input::get('outgoing'));
 
             $_SESSION['default_language'] = Input::get('language');
 
diff --git a/modules/Core/pages/complete_signup.php b/modules/Core/pages/complete_signup.php
index f828cd0122..f00f4c4317 100644
--- a/modules/Core/pages/complete_signup.php
+++ b/modules/Core/pages/complete_signup.php
@@ -24,12 +24,8 @@
 }
 
 // Ensure API is enabled
-$is_api_enabled = DB::getInstance()->get('settings', ['name', 'use_api'])->results();
-if ($is_api_enabled[0]->value != '1') {
-    $is_legacy_enabled = DB::getInstance()->get('settings', ['name', 'use_legacy_api'])->results();
-    if ($is_legacy_enabled[0]->value != '1') {
-        die('Legacy API is disabled');
-    }
+if (Util::getSetting('use_api') !== 1) {
+    die('API is disabled');
 }
 
 if (!$user->isLoggedIn()) {
diff --git a/modules/Core/pages/login.php b/modules/Core/pages/login.php
index 59a2948ba6..0490f83160 100644
--- a/modules/Core/pages/login.php
+++ b/modules/Core/pages/login.php
@@ -151,16 +151,10 @@
                         // Did the user check 'remember me'?
                         $remember = Input::get('remember') == 1;
 
-                        // Is Minecraft and AuthMe integration enabled?
-                        $minecraft = MINECRAFT;
-
-                        $authme_enabled = DB::getInstance()->get('settings', ['name', 'authme'])->results();
-                        $authme_enabled = $authme_enabled[0]->value;
-
                         $cache->setCache('authme_cache');
                         $authme_db = $cache->retrieve('authme');
 
-                        if ($minecraft == '1' && $authme_enabled == '1' && $authme_db['sync'] == '1') {
+                        if (defined(MINECRAFT) && MINECRAFT && Util::getSetting('authme') === '1' && $authme_db['sync'] == '1') {
 
                             // Sync AuthMe password
                             try {
diff --git a/modules/Core/pages/privacy.php b/modules/Core/pages/privacy.php
index 0d7fc2b926..2cb027762a 100644
--- a/modules/Core/pages/privacy.php
+++ b/modules/Core/pages/privacy.php
@@ -17,9 +17,10 @@
 // Retrieve privacy policy from database
 $policy = DB::getInstance()->get('privacy_terms', ['name', 'privacy'])->results();
 if (!count($policy)) {
-    $policy = DB::getInstance()->get('settings', ['name', 'privacy_policy'])->results();
+    $policy = Output::getPurified(Util::getSetting('privacy_policy'));
+} else {
+    $policy = Output::getPurified($policy[0]->value);
 }
-$policy = Output::getPurified($policy[0]->value);
 
 $smarty->assign([
     'PRIVACY_POLICY' => $language->get('general', 'privacy_policy'),

From ada1c7953d996420c98cdcab52a23f1c912f784a Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Thu, 2 Jun 2022 23:00:21 +0200
Subject: [PATCH 003/337] Check MariaDB version separately

---
 modules/Core/pages/panel/index.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/Core/pages/panel/index.php b/modules/Core/pages/panel/index.php
index 8945ae3916..9d7b5fdd18 100644
--- a/modules/Core/pages/panel/index.php
+++ b/modules/Core/pages/panel/index.php
@@ -173,10 +173,12 @@
             $pdo_server_version = explode('-', $pdo_server_version)[0];
         }
     }
-    if (!in_array($pdo_driver, ['MySQL', 'MariaDB']) || version_compare($pdo_server_version, '5.7.0', '<')) {
-        $compat_errors[] = $pdo_driver . ' Server ' . $pdo_server_version;
-    } else {
+
+    if ($pdo_driver === 'MySQL' && version_compare($pdo_server_version, '5.7', '>=') ||
+        $pdo_driver === 'MariaDB' && version_compare($pdo_server_version, '10.3', '>=')) {
         $compat_success[] = $pdo_driver . ' Server ' . $pdo_server_version;
+    } else {
+        $compat_errors[] = $pdo_driver . ' Server ' . $pdo_server_version;
     }
 
     // Permissions

From 37d6ff515630c5d8dcae65989c38f6db06647678 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Thu, 2 Jun 2022 15:05:06 -0600
Subject: [PATCH 004/337] Fix discord widget when error occurs

---
 modules/Discord Integration/language/en_UK.json       |  1 +
 modules/Discord Integration/widgets/DiscordWidget.php | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/Discord Integration/language/en_UK.json b/modules/Discord Integration/language/en_UK.json
index b862c76c11..b34762ed21 100644
--- a/modules/Discord Integration/language/en_UK.json	
+++ b/modules/Discord Integration/language/en_UK.json	
@@ -35,6 +35,7 @@
     "discord_integration\/discord_username": "Discord Username",
     "discord_integration\/discord_usernames_updated": "Discord usernames updated successfully",
     "discord_integration\/discord_widget_disabled": "The widget is disabled for the specified Discord server. Please go to the 'Widget' tab in your Discord server settings, and ensure the Discord widget is enabled and that the ID is correct.",
+    "discord_integration\/discord_widget_error": "An error occurred when getting Discord widget: {{error}}.",
     "discord_integration\/discord_widget_theme": "Discord Widget Theme",
     "discord_integration\/enable_discord_integration": "Enable Discord integration?",
     "discord_integration\/get_link_code": "Get link code",
diff --git a/modules/Discord Integration/widgets/DiscordWidget.php b/modules/Discord Integration/widgets/DiscordWidget.php
index 1ba6db7e3b..218806727e 100644
--- a/modules/Discord Integration/widgets/DiscordWidget.php	
+++ b/modules/Discord Integration/widgets/DiscordWidget.php	
@@ -49,7 +49,15 @@ public function initialise(): void {
             $result = $this->_cache->retrieve('discord_widget_check');
 
         } else {
-            $result = HttpClient::get('https://discord.com/api/guilds/' . Output::getClean($this->_guild_id) . '/widget.json')->json();
+            $request = HttpClient::get('https://discord.com/api/guilds/' . Output::getClean($this->_guild_id) . '/widget.json');
+            if ($request->hasError()) {
+                $this->_content = Discord::getLanguageTerm('discord_widget_error', [
+                    'error' => $request->getError()
+                ]);
+                return;
+            }
+
+            $result = $request->json();
 
             // Cache for 60 seconds
             $this->_cache->store('discord_widget_check', $result, 60);

From 8ce8a3e2587dcceec5172c409780e4b576815257 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Thu, 2 Jun 2022 23:09:32 +0200
Subject: [PATCH 005/337] urlencode should be used for urls

---
 modules/Discord Integration/widgets/DiscordWidget.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/Discord Integration/widgets/DiscordWidget.php b/modules/Discord Integration/widgets/DiscordWidget.php
index 218806727e..388b441509 100644
--- a/modules/Discord Integration/widgets/DiscordWidget.php	
+++ b/modules/Discord Integration/widgets/DiscordWidget.php	
@@ -49,7 +49,7 @@ public function initialise(): void {
             $result = $this->_cache->retrieve('discord_widget_check');
 
         } else {
-            $request = HttpClient::get('https://discord.com/api/guilds/' . Output::getClean($this->_guild_id) . '/widget.json');
+            $request = HttpClient::get('https://discord.com/api/guilds/' . urlencode($this->_guild_id) . '/widget.json');
             if ($request->hasError()) {
                 $this->_content = Discord::getLanguageTerm('discord_widget_error', [
                     'error' => $request->getError()
@@ -76,8 +76,7 @@ public function initialise(): void {
                 $theme = $this->_cache->retrieve('discord_widget_theme');
             }
 
-            $this->_content = '<iframe src="https://discord.com/widget?id=' . Output::getClean($this->_guild_id) . '&theme=' . Output::getClean($theme) . '" width="100%" height="500" allowtransparency="true" frameborder="0"></iframe><br />';
-
+            $this->_content = '<iframe src="https://discord.com/widget?id=' . urlencode($this->_guild_id) . '&theme=' . urlencode($theme) . '" width="100%" height="500" allowtransparency="true" frameborder="0"></iframe><br />';
         }
     }
 }

From 67f6d8cc72119851f893faa4411bc760b36974a6 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Thu, 2 Jun 2022 23:19:09 +0200
Subject: [PATCH 006/337] fix typos

---
 modules/Core/pages/complete_signup.php | 2 +-
 modules/Core/pages/panel/avatars.php   | 2 +-
 modules/Core/pages/panel/emails.php    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/Core/pages/complete_signup.php b/modules/Core/pages/complete_signup.php
index f00f4c4317..8f4478e827 100644
--- a/modules/Core/pages/complete_signup.php
+++ b/modules/Core/pages/complete_signup.php
@@ -24,7 +24,7 @@
 }
 
 // Ensure API is enabled
-if (Util::getSetting('use_api') !== 1) {
+if (Util::getSetting('use_api') !== '1') {
     die('API is disabled');
 }
 
diff --git a/modules/Core/pages/panel/avatars.php b/modules/Core/pages/panel/avatars.php
index aa49094ef8..cdea863dc0 100644
--- a/modules/Core/pages/panel/avatars.php
+++ b/modules/Core/pages/panel/avatars.php
@@ -114,7 +114,7 @@
     'CUSTOM_AVATARS' => $language->get('admin', 'allow_custom_avatars'),
     'CUSTOM_AVATARS_VALUE' => Util::getSetting('users_avatars'),
     'DEFAULT_AVATAR' => $language->get('admin', 'default_avatar'),
-    'DEFAULT_AVATAR_VALUE' => Utils::getSetting('default_avatar_type'),
+    'DEFAULT_AVATAR_VALUE' => Util::getSetting('default_avatar_type'),
     'MINECRAFT_AVATAR' => $language->get('admin', 'minecraft_avatar'),
     'CUSTOM_AVATAR' => $language->get('admin', 'custom_avatar'),
     'MINECRAFT_AVATAR_SOURCE' => $language->get('admin', 'minecraft_avatar_source'),
diff --git a/modules/Core/pages/panel/emails.php b/modules/Core/pages/panel/emails.php
index 0010df22d9..e1c4f1070e 100644
--- a/modules/Core/pages/panel/emails.php
+++ b/modules/Core/pages/panel/emails.php
@@ -158,7 +158,7 @@
                 Session::flash('emails_success', $language->get('admin', 'email_settings_updated_successfully'));
                 Redirect::to(URL::build('/panel/core/emails', 'action=edit_messages'));
             } else {
-                Util::setSetting('phpmailer', (isset($_POST['enable_mailer']) && $_POST['enable_mailer']) ? '1' : '0')
+                Util::setSetting('phpmailer', (isset($_POST['enable_mailer']) && $_POST['enable_mailer']) ? '1' : '0');
 
                 if (!empty($_POST['email'])) {
                     Util::setSetting('outgoing_email', $_POST['email']);

From 29d36d4eedc8b3c80b493228b471fffd73e0f8f5 Mon Sep 17 00:00:00 2001
From: PadowYT2 <me@padow.ru>
Date: Sat, 4 Jun 2022 22:52:57 +0800
Subject: [PATCH 007/337] Make colors for statistics (#2818)

* make colors

* remove the border color
---
 custom/panel_templates/Default/index.tpl | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/custom/panel_templates/Default/index.tpl b/custom/panel_templates/Default/index.tpl
index fe7dd189a6..477bf20a13 100644
--- a/custom/panel_templates/Default/index.tpl
+++ b/custom/panel_templates/Default/index.tpl
@@ -179,8 +179,7 @@
         }
 
         graphs = [
-            {foreach from=$GRAPHS item=graph}
-            {
+            {foreach from=$GRAPHS item=graph} {
                 type: 'line',
                 data: {
                     labels: [
@@ -238,12 +237,12 @@
                         ]
                     },
                     tooltips: {
-                        backgroundColor: "rgb(255,255,255)",
-                        bodyFontColor: "#858796",
+                        backgroundColor: currentPanelTheme === "dark" ? "#161c25" : "#f8f9fc",
+                        bodyFontColor: currentPanelTheme === "dark" ? "rgb(189,189,189)" : "#858796",
+                        titleFontColor: currentPanelTheme === "dark" ? "rgb(189,189,189)" : "#6e707e",
+                        borderColor: currentPanelTheme !== "dark" ? "#dddfeb" : "#161c25",
                         titleMarginBottom: 10,
-                        titleFontColor: '#6e707e',
                         titleFontSize: 14,
-                        borderColor: '#dddfeb',
                         borderWidth: 1,
                         xPadding: 15,
                         yPadding: 15,

From fc8bbd4dbdd2ae908ec86c2a1c4f806df85f8b28 Mon Sep 17 00:00:00 2001
From: PadowYT2 <me@padow.ru>
Date: Sat, 4 Jun 2022 22:53:05 +0800
Subject: [PATCH 008/337] Hide statistics on small devices (#2810)

---
 .../Default/assets/css/custom.css             |  6 +++
 custom/panel_templates/Default/index.tpl      | 45 +++++++++----------
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/custom/panel_templates/Default/assets/css/custom.css b/custom/panel_templates/Default/assets/css/custom.css
index 041caa1f91..bf80588365 100644
--- a/custom/panel_templates/Default/assets/css/custom.css
+++ b/custom/panel_templates/Default/assets/css/custom.css
@@ -451,4 +451,10 @@ footer.sticky-footer {
 .toast .move-right {
     position: absolute;
     left: 20px;
+}
+
+@media only screen and (max-width: 425px) {
+    .statistics {
+        display: none;
+    }
 }
\ No newline at end of file
diff --git a/custom/panel_templates/Default/index.tpl b/custom/panel_templates/Default/index.tpl
index 477bf20a13..4cbd45e66b 100644
--- a/custom/panel_templates/Default/index.tpl
+++ b/custom/panel_templates/Default/index.tpl
@@ -46,7 +46,7 @@
                         <div class="col-md-9">
                             {if count($GRAPHS)}
                             <!-- Area Chart -->
-                            <div class="card shadow mb-4">
+                            <div class="card shadow mb-4 statistics">
                                 <!-- Card Header - Dropdown -->
                                 <div class="card-header bg-primary py-3 d-flex flex-row align-items-center justify-content-between">
                                     <h6 class="m-0 font-weight-bold text-white">
@@ -188,28 +188,27 @@
                         {/foreach}
                     ],
                     datasets: [
-                        {foreach from=$graph.datasets item=dataset}
-                            {
-                                fill: false,
-                                borderColor: '{$dataset.colour}',
-                                label: '{$dataset.label}',
-                                yAxisID: '{$dataset.axis}',
-                                lineTension: 0.3,
-                                backgroundColor: "rgba(78, 115, 223, 0.05)",
-                                pointRadius: 3,
-                                pointBackgroundColor: "{$dataset.colour}",
-                                pointBorderColor: "{$dataset.colour}",
-                                pointHoverRadius: 3,
-                                pointHoverBackgroundColor: "{$dataset.colour}",
-                                pointHoverBorderColor: "{$dataset.colour}",
-                                pointHitRadius: 10,
-                                pointBorderWidth: 2,
-                                data: [
-                                    {foreach from=$dataset.data item=data name=ds}
-                                        {$data}{if not $smarty.foreach.ds.last}, {/if}
-                                    {/foreach}
-                                ]
-                            },
+                        {foreach from=$graph.datasets item=dataset} {
+                            fill: false,
+                            borderColor: '{$dataset.colour}',
+                            label: '{$dataset.label}',
+                            yAxisID: '{$dataset.axis}',
+                            lineTension: 0.3,
+                            backgroundColor: "rgba(78, 115, 223, 0.05)",
+                            pointRadius: 3,
+                            pointBackgroundColor: "{$dataset.colour}",
+                            pointBorderColor: "{$dataset.colour}",
+                            pointHoverRadius: 3,
+                            pointHoverBackgroundColor: "{$dataset.colour}",
+                            pointHoverBorderColor: "{$dataset.colour}",
+                            pointHitRadius: 10,
+                            pointBorderWidth: 2,
+                            data: [
+                                {foreach from=$dataset.data item=data name=ds}
+                                    {$data}{if not $smarty.foreach.ds.last}, {/if}
+                                {/foreach}
+                            ]
+                        },
                         {/foreach}
                     ]
                 },

From c802169c035a4094b12daaea63b395d15acf8329 Mon Sep 17 00:00:00 2001
From: Supercrafter100 <admin@supercrafter100.com>
Date: Thu, 2 Jun 2022 19:20:25 +0000
Subject: [PATCH 009/337] Translated using Weblate (Dutch)

Currently translated at 100.0% (1220 of 1220 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/nl/
---
 custom/languages/nl_NL.json | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/custom/languages/nl_NL.json b/custom/languages/nl_NL.json
index d9ff6a726e..c3a8c2d1b4 100644
--- a/custom/languages/nl_NL.json
+++ b/custom/languages/nl_NL.json
@@ -111,7 +111,7 @@
     "admin/default_avatar": "Standaard avatar",
     "admin/default_group": "Is de standaardgroep (voor nieuwe gebruikers)?",
     "admin/default_language": "Standaard taal",
-    "admin/default_language_help": "Gebruikers kunnen kiezen uit alle geinstalleerde talen.",
+    "admin/default_language_help": "Gebruikers kunnen kiezen uit alle geinstalleerde talen. {{docLinkStart}}Lees meer »{{docLinkEnd}}",
     "admin/default_server": "Standaard server",
     "admin/default_template_set": "Standaard sjabloon verzet naar {{template}} succesvol.",
     "admin/default_timezone": "Standaard tijdzone",
@@ -176,7 +176,7 @@
     "admin/enable_authme": "AuthMe integratie aanzetten?",
     "admin/enable_debug_mode": "Wil je debug modus inschakelen?",
     "admin/enable_mailer": "PHPMailer inschakelen?",
-    "admin/enable_mailer_help": "Zet dit aan als de emails standaard niet worden verzonden. Als je gebruik wilt maken van PHPMailer heb je een email dienst nodig waarmee je emails kan verzenden, zoals Gmail of een SMTP provider (Outlook/Hotmail).",
+    "admin/enable_mailer_help": "Als dit aanstaat, worden e-mails verzonden met PHPMailer in plaats van de standaard van het system. Dit zou kunnen helpen met het verzenden van e-mails maar vereist wel dat je een SMTP aanbieder configureert. {{docLinkStart}}Lees meer »{{docLinkEnd}}",
     "admin/enable_maintenance_mode": "Wil je onderhoud modus inschakelen?",
     "admin/enable_minecraft_integration": "Minecraft integratie inschakelen?",
     "admin/enable_nicknames_on_registration": "Bijnamen inschakelen bij het registreren van gebruikers?",
@@ -251,7 +251,7 @@
     "admin/hook_edited": "Webhook succesvol aangepast",
     "admin/hook_events": "Gebeurtenissen om deze webhook te activeren",
     "admin/hook_name": "Webhook Naam",
-    "admin/hook_select_info": "Alleen Webhooks met 'Nieuw onderwerp' als evenement worden getoond.",
+    "admin/hook_select_info": "Alleen Webhooks met 'Nieuw onderwerp' of 'Onderwerp reactie' als evenementen worden getoond.",
     "admin/hook_type": "Webhook-type",
     "admin/hook_url": "Webhook-URL",
     "admin/hooks": "Webhooks",
@@ -329,7 +329,7 @@
     "admin/navbar_icon": "Navbar Icoon",
     "admin/navbar_icon_instructions": "U kunt hier ook een pictogram aan elk item op de navigatiebalk toevoegen, bijvoorbeeld met behulp van {{faLink}}, {{semLink}}.",
     "admin/navbar_order": "Navbar ordening",
-    "admin/navbar_order_instructions": "Je kan elk item een nummer boven de 0 geven om items te ordenen in de navbar, met 1 de eerste en hogere nummers erna.",
+    "admin/navbar_order_instructions": "Je kan elk item een nummer boven de 0 geven om items te ordenen in de navbar, waar het laagste nummer eerst in de navbar zal komen en hogere nummers erna.",
     "admin/navigation": "Navigatie",
     "admin/navigation_settings_updated_successfully": "Navigatie-instellingen succesvol bijgewerkt.",
     "admin/negative": "Negatief",
@@ -571,7 +571,7 @@
     "admin/upgrade_php_version": "Upgrade alstublieft uw PHP versie naar tenminste 7.4 - de volgende Nameless release zal de versie die u gebruikt niet langer ondersteunen.",
     "admin/upload_new_image": "Upload nieuwe afbeelding",
     "admin/use_friendly_urls": "Vriendelijke URLs",
-    "admin/use_friendly_urls_help": "BELANGRIJK: Je webserver/webhosting moet geconfigureerd zijn om gebruik te maken van mod_rewrite en .htaccess vooraleer dit werkt.",
+    "admin/use_friendly_urls_help": "Als dit aanstaat, worden schoner lijkende web adressen gebruikt. Je moet het gebruik van mod_rewrite en .htaccess bestanden toelaten om dit te laten werken. {{docLinkStart}}Lees meer »{{docLinkEnd}}",
     "admin/user": "Gebruiker",
     "admin/user_deleted": "Gebruiker succesvol verwijderd.",
     "admin/user_id": "User ID",
@@ -1206,5 +1206,17 @@
     "general/purple": "Paars",
     "general/pink": "Roze",
     "general/brown": "Bruin",
-    "general/grey": "Grijs"
+    "general/grey": "Grijs",
+    "admin/home_custom_content": "Hoofd Aanpasbare Inhoud",
+    "installer/database_configured": "De database is geconfigureerd.",
+    "admin/page_url_contains_nameless_path": "Je aangepaste pagina zou een NamelessMC pagina overschrijven.",
+    "admin/api_disabled": "API staat uit",
+    "user/no_providers_admin": "Er zijn nog geen OAuth aanbieders geconfigureerd door de site administrators.",
+    "admin/debug_link_info": "Belangrijk - Deel deze link alleen met mensen die je vertrouwt!",
+    "admin/test_email_query": "Komt het niet in je inbox? Probeer het volgende:",
+    "admin/test_email_suggest_1": "Wacht een paar minuten en check je spam map.",
+    "admin/test_email_suggest_2": "Update je site zijn DNS records (check SPF & DKIM).",
+    "admin/test_email_suggest_3": "Configureer een SMTP server. {{docLinkStart}}Lees meer »{{docLinkEnd}}",
+    "installer/upgrade_error": "Er zijn fouten ontstaan tijdens het upgraden.",
+    "admin/custom_content": "Aangepaste Inhoud"
 }

From e074cd3ecc1e7d901514a85683a613c05a27e579 Mon Sep 17 00:00:00 2001
From: Supercrafter100 <admin@supercrafter100.com>
Date: Thu, 2 Jun 2022 19:39:06 +0000
Subject: [PATCH 010/337] Translated using Weblate (Dutch)

Currently translated at 100.0% (195 of 195 strings)

Translation: NamelessMC/Website - Forum
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-forum/nl/
---
 modules/Forum/language/nl_NL.json | 38 +++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/modules/Forum/language/nl_NL.json b/modules/Forum/language/nl_NL.json
index 0d232f05e3..a5ca958685 100644
--- a/modules/Forum/language/nl_NL.json
+++ b/modules/Forum/language/nl_NL.json
@@ -144,7 +144,7 @@
     "forum/forum_icon_maximum": "Het forum icoon mag maximaal 256 karakters lang zijn.",
     "forum/forum_search": "Forum Zoeken",
     "forum/forum_updated_successfully": "Forum succesvol geüpdatet.",
-    "forum/include_in_hook": "Betrek nieuwe berichten van dit forum in webhooks?",
+    "forum/include_in_hook": "Betrek evenementen van dit forum in webhooks?",
     "forum/invalid_search_query": "Vul alsjeblieft een zoekterm in tussen {{min}} en {{max}} karakters lang.",
     "forum/label": "Label",
     "forum/label_deleted_successfully": "Label succesvol verwijdert.",
@@ -159,5 +159,39 @@
     "forum/new_search": "Nieuwe zoekopdracht",
     "forum/new_topic_hook_info": "Nieuw onderwerp",
     "forum/new_topic_text": "Onderwerp gemaakt in {{forum}} door {{author}}",
-    "forum/new_reply_in_topic": "{{author}} Heeft gereageerd op onderwerp {{topic}}"
+    "forum/new_reply_in_topic": "{{author}} Heeft gereageerd op onderwerp {{topic}}",
+    "forum/search_again_in_x_seconds": "Wacht alstublieft {{count}} seconden voor opnieuw te zoeken.",
+    "forum/no_news": "Er zijn geen nieuws posts.",
+    "forum/not_following_any_topics": "Je volgt geen onderwerpen.",
+    "forum/now_following_topic": "Je volgt nu dit onderwerp, en zult meldingen krijgen van nieuwe reacties.",
+    "forum/post_id": "Post ID",
+    "forum/topic_reply": "Onderwerp reactie",
+    "forum/your_posts": "Jouw post aantal",
+    "forum/label_type_in_use": "Label type wordt gebruikt, kan niet worden verwijderd.",
+    "forum/new_topic_reply_text": "Onderwerp reactie gemaakt in {{forum}} door {{author}}",
+    "forum/no_longer_following_topic": "Je volgt dit onderwerp niet meer, en krijgt geen meldingen meer van nieuwe reacties.",
+    "forum/no_results_found": "Geen resultaten gevonden.",
+    "forum/posts_title": "Posts",
+    "forum/pre_post_create_hook_info": "Voor post aanmaak",
+    "forum/pre_post_edit_hook_info": "Voor post bewerking",
+    "forum/pre_topic_create_hook_info": "Voor reactie aanmaak",
+    "forum/pre_topic_edit_hook_info": "Voor reactie bewerking",
+    "forum/recent_posts": "Recente Posts",
+    "forum/recent_topics": "Recente onderwerpen",
+    "forum/redirect_forum": "Leid forum om?",
+    "forum/redirect_url": "Omleid URL",
+    "forum/search_results": "Zoekresultaten",
+    "forum/settings_updated_successfully": "Instellingen succesvol aangepast.",
+    "forum/started_by_x": "Gestart door {{author}}",
+    "forum/sticky_topics": "Plakkende Onderwerpen",
+    "forum/topic_id": "Onderwerp ID",
+    "forum/topic_placeholder": "Onderwerp placeholder",
+    "forum/topics_title": "Onderwerpen",
+    "forum/total_posts": "Totale post aantal",
+    "forum/topic_author_uuid": "Onderwerp auteur gebruikers ID",
+    "forum/topic_author_username": "Onderwerp auteur gebruikersnaam",
+    "forum/topic_author_nickname": "Topic auteur bijnaam",
+    "forum/unfollow": "Ontvolg",
+    "forum/unfollow_all_topics": "Ontvolg alle onderwerpen",
+    "forum/user_object": "Gebruikersobject"
 }

From 67a8ab545cd5b4ae07460532ee12653bc8646cab Mon Sep 17 00:00:00 2001
From: Marcos <marckos03br@gmail.com>
Date: Thu, 2 Jun 2022 21:28:32 +0000
Subject: [PATCH 011/337] Translated using Weblate (Spanish)

Currently translated at 100.0% (50 of 50 strings)

Translation: NamelessMC/Website - Discord Integration
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-discord-integration/es/
---
 modules/Discord Integration/language/es_ES.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/Discord Integration/language/es_ES.json b/modules/Discord Integration/language/es_ES.json
index 4ec6a3034c..f6f7575e65 100644
--- a/modules/Discord Integration/language/es_ES.json	
+++ b/modules/Discord Integration/language/es_ES.json	
@@ -47,5 +47,6 @@
     "discord_integration/get_link_code": "Obtener código de enlace",
     "discord_integration/discord_invite_info": "Para invitar al bot Nameless Link a tu servidor de Discord, haz clic en {{inviteLinkStart}}aquí{{inviteLinkEnd}}. A continuación, ejecuta el comando {{command}} para enlazar el bot con tu sitio web. También puedes {{selfHostLinkStart}}alojar el bot tú mismo{{selfHostLinkEnd}}.",
     "discord_integration/discord_user_id": "ID de usuario de Discord",
-    "discord_integration/discord_widget_disabled": "El widget está desactivado para el servidor de Discord especificado. Ve a la pestaña \"Widget\" en la configuración de tu servidor de Discord y asegúrate de que el widget de Discord está activado y de que el ID es correcto."
+    "discord_integration/discord_widget_disabled": "El widget está desactivado para el servidor de Discord especificado. Ve a la pestaña \"Widget\" en la configuración de tu servidor de Discord y asegúrate de que el widget de Discord está activado y de que el ID es correcto.",
+    "discord_integration/discord_widget_error": "Se ha producido un error al obtener el widget de Discord: {{error}}."
 }

From b16e31514d1393c8be341d1f20697e1ca976b87e Mon Sep 17 00:00:00 2001
From: Marcos <marckos03br@gmail.com>
Date: Thu, 2 Jun 2022 21:30:17 +0000
Subject: [PATCH 012/337] Translated using Weblate (Spanish)

Currently translated at 100.0% (1220 of 1220 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/es/
---
 custom/languages/es_ES.json | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/custom/languages/es_ES.json b/custom/languages/es_ES.json
index 7df73dcf27..bb1aec710b 100644
--- a/custom/languages/es_ES.json
+++ b/custom/languages/es_ES.json
@@ -115,7 +115,7 @@
     "admin/default_avatar": "Avatar por defecto",
     "admin/default_group": "¿Es el grupo por defecto (para los nuevos usuarios)?",
     "admin/default_language": "Idioma por defecto",
-    "admin/default_language_help": "Los usuarios podrán elegir entre los idiomas instalados.",
+    "admin/default_language_help": "Los usuarios podrán elegir entre los idiomas instalados. {{docLinkStart}}Leer más »{{docLinkEnd}}",
     "admin/default_server": "Servidor por defecto",
     "admin/default_template_set": "Plantilla por defecto establecida en {{template}} con éxito.",
     "admin/default_timezone": "Zona horaria por defecto",
@@ -182,7 +182,7 @@
     "admin/enable_authme": "¿Activar la integración de AuthMe?",
     "admin/enable_debug_mode": "¿Activar el modo de depuración?",
     "admin/enable_mailer": "¿Activar PHPMailer?",
-    "admin/enable_mailer_help": "Habilite esto si los correos electrónicos no están siendo enviados por defecto. El uso de PHPMailer requiere tener un servicio capaz de enviar correos electrónicos, como Gmail o un proveedor SMTP.",
+    "admin/enable_mailer_help": "Si se activa, los correos electrónicos se enviarán utilizando PHPMailer en lugar del sistema por defecto. Esto puede ayudar a la entrega, pero requiere que se configure un proveedor SMTP. {{docLinkStart}}Leer más »{{docLinkEnd}}",
     "admin/enable_maintenance_mode": "¿Activar el modo de mantenimiento?",
     "admin/enable_minecraft_integration": "¿Permitir la integración de Minecraft?",
     "admin/enable_nicknames_on_registration": "¿Permitir apodos para el registro de usuarios?",
@@ -212,7 +212,7 @@
     "admin/find_modules": "Buscar módulos",
     "admin/find_templates": "Buscar plantillas",
     "admin/force_https": "¿Forzar https?",
-    "admin/force_https_help": "Si se activa, todas las peticiones a su sitio web serán redirigidas a https. Debe tener un certificado SSL válido activo para que esto funcione correctamente.",
+    "admin/force_https_help": "Si se activa, todas las peticiones a su sitio web serán redirigidas a https. Debe tener un certificado SSL válido activo para que esto funcione.",
     "admin/force_premium_accounts": "¿Forzar las cuentas premium de Minecraft?",
     "admin/force_tfa": "¿Forzar la autenticación de dos factores para los miembros del grupo?",
     "admin/force_tfa_alert": "Su grupo requiere que tenga activada la autenticación de dos factores.",
@@ -337,7 +337,7 @@
     "admin/navbar_icon": "Icono de la barra de navegación",
     "admin/navbar_icon_instructions": "Aquí también puedes añadir un icono a cada elemento de la barra de navegación, por ejemplo con {{faLink}}, {{semLink}}.",
     "admin/navbar_order": "Orden en la barra de navegación",
-    "admin/navbar_order_instructions": "Puede dar a cada elemento un número superior al 0 para ordenar los elementos en la barra de navegación, siendo el 1 el primer elemento y los números superiores los que vienen después.",
+    "admin/navbar_order_instructions": "A cada elemento se le puede asignar un número positivo, donde el número más bajo aparecerá primero en la barra de navegación y los números más altos vendrán después.",
     "admin/navigation": "Navegación",
     "admin/navigation_settings_updated_successfully": "La configuración de la navegación se ha actualizado correctamente.",
     "admin/negative": "Negativo",
@@ -583,7 +583,7 @@
     "admin/updated_user_languages": "Se han actualizado los idiomas de los usuarios.",
     "admin/upload_new_image": "Subir una nueva imagen",
     "admin/use_friendly_urls": "URLs amigables",
-    "admin/use_friendly_urls_help": "IMPORTANTE: Su servidor debe estar configurado para permitir el uso de archivos mod_rewrite y .htaccess para que esto funcione.",
+    "admin/use_friendly_urls_help": "Si se activa, se utilizarán direcciones web de aspecto más limpio. Debe permitir el uso de \"mod_rewrite\" y archivos \".htaccess\" para que esto funcione. {{docLinkStart}}Leer más »{{docLinkEnd}}",
     "admin/user": "Usuario",
     "admin/user_deleted": "Usuario eliminado con éxito.",
     "admin/user_id": "ID del usuario",
@@ -1208,5 +1208,15 @@
     "general/purple": "Morado",
     "general/pink": "Rosa",
     "general/brown": "Marrón",
-    "general/grey": "Gris"
+    "general/grey": "Gris",
+    "admin/page_url_contains_nameless_path": "Su página personalizada sobrescribiría una página de NamelessMC.",
+    "admin/debug_link_info": "Importante: ¡comparte este enlace sólo con personas de confianza!",
+    "admin/test_email_query": "¿No llega a su bandeja de entrada? Pruebe lo siguiente:",
+    "admin/test_email_suggest_1": "Espere unos minutos y revise su carpeta de \"Spam\".",
+    "admin/test_email_suggest_2": "Actualice los registros DNS de su sitio (compruebe SPF y DKIM).",
+    "admin/test_email_suggest_3": "Configurar un servidor SMTP. {{docLinkStart}}Leer más »{{docLinkEnd}}",
+    "admin/api_disabled": "La API está desactivada",
+    "installer/database_configured": "La base de datos ha sido configurada.",
+    "installer/upgrade_error": "Se han producido errores durante la actualización.",
+    "user/no_providers_admin": "Los administradores del sitio aún no han configurado ningún proveedor de OAuth."
 }

From b5d1fc1981d34f0c224aa0b1147f6e15acbf0660 Mon Sep 17 00:00:00 2001
From: PadowYT2 <me@padow.ml>
Date: Fri, 3 Jun 2022 01:04:55 +0000
Subject: [PATCH 013/337] Translated using Weblate (Russian)

Currently translated at 100.0% (1220 of 1220 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/ru/
---
 custom/languages/ru_RU.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/custom/languages/ru_RU.json b/custom/languages/ru_RU.json
index 514af7e8cd..a71cc49002 100644
--- a/custom/languages/ru_RU.json
+++ b/custom/languages/ru_RU.json
@@ -1215,5 +1215,8 @@
     "admin/test_email_query": "Не получаете в ваших входящих? Попробуйте:",
     "admin/test_email_suggest_1": "Подождите несколько минут и проверьте вашу Спам папку.",
     "admin/test_email_suggest_2": "Обновите DNS рекорды вашего сайта (проверьте SPF & DKIM).",
-    "admin/test_email_suggest_3": "Настройте SMTP сервер. {{docLinkStart}}Прочитать больше »{{docLinkEnd}}"
+    "admin/test_email_suggest_3": "Настройте SMTP сервер. {{docLinkStart}}Прочитать больше »{{docLinkEnd}}",
+    "installer/database_configured": "Датабаза была настроена.",
+    "installer/upgrade_error": "Произошли ошибки при обновлении.",
+    "admin/debug_link_info": "Важно - только делитесь этой ссылкой с людьми которыми вы доверяете!"
 }

From 444e6048d9f5d7a9d77c30b0a2946a77fabf9ad1 Mon Sep 17 00:00:00 2001
From: PadowYT2 <me@padow.ml>
Date: Fri, 3 Jun 2022 01:06:12 +0000
Subject: [PATCH 014/337] Translated using Weblate (Russian)

Currently translated at 100.0% (50 of 50 strings)

Translation: NamelessMC/Website - Discord Integration
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-discord-integration/ru/
---
 modules/Discord Integration/language/ru_RU.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/Discord Integration/language/ru_RU.json b/modules/Discord Integration/language/ru_RU.json
index e93c62224a..b637dd24f4 100644
--- a/modules/Discord Integration/language/ru_RU.json	
+++ b/modules/Discord Integration/language/ru_RU.json	
@@ -47,5 +47,6 @@
     "discord_integration/unable_to_set_discord_id": "Не удалось установить Discord ID.",
     "discord_integration/unable_to_update_discord_bot_username": "Не удалось обновить никнейм бота в Discord.",
     "discord_integration/unable_to_update_discord_roles": "Не удалось обновить роли в Discord.",
-    "discord_integration/unable_to_update_discord_username": "Не удалось обновить никнеймы в Discord."
+    "discord_integration/unable_to_update_discord_username": "Не удалось обновить никнеймы в Discord.",
+    "discord_integration/discord_widget_error": "Произошла ошибка при Discord виджете: {{error}}."
 }

From d55141684507c10ad63a356813698e2b52749be7 Mon Sep 17 00:00:00 2001
From: PikaMug <pikamug@gmail.com>
Date: Fri, 3 Jun 2022 05:42:34 +0000
Subject: [PATCH 015/337] Translated using Weblate (English (United States))

Currently translated at 100.0% (1220 of 1220 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/en_US/
---
 custom/languages/en_US.json | 44 ++++++++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/custom/languages/en_US.json b/custom/languages/en_US.json
index 6734d46606..efb03e7ed6 100644
--- a/custom/languages/en_US.json
+++ b/custom/languages/en_US.json
@@ -118,7 +118,7 @@
     "admin/default_avatar": "Default Avatar",
     "admin/default_group": "Is the group the default group (for new users)?",
     "admin/default_language": "Default Language",
-    "admin/default_language_help": "Users will be able to choose from any installed languages.",
+    "admin/default_language_help": "Users will be able to choose from any installed languages. {{docLinkStart}}Read more »{{docLinkEnd}}",
     "admin/default_server": "Default Server",
     "admin/default_template_set": "Default template set to {{template}} successfully.",
     "admin/default_timezone": "Default Timezone",
@@ -185,7 +185,7 @@
     "admin/enable_authme": "Enable AuthMe integration?",
     "admin/enable_debug_mode": "Enable debug mode?",
     "admin/enable_mailer": "Enable PHPMailer?",
-    "admin/enable_mailer_help": "Enable this if emails aren't being sent by default. The use of PHPMailer requires you to have a service capable of sending emails, such as Gmail or an SMTP provider.",
+    "admin/enable_mailer_help": "If enabled, emails will be sent using PHPMailer instead of the system default. This may help with delivery, but requires you to configure an SMTP provider. {{docLinkStart}}Read more »{{docLinkEnd}}",
     "admin/enable_maintenance_mode": "Enable maintenance mode?",
     "admin/enable_minecraft_integration": "Enable Minecraft integration?",
     "admin/enable_nicknames_on_registration": "Enable nicknames for registering users?",
@@ -215,7 +215,7 @@
     "admin/find_modules": "Find Modules",
     "admin/find_templates": "Find Templates",
     "admin/force_https": "Force https?",
-    "admin/force_https_help": "If enabled, all requests to your website will be redirected to https. You must have a valid SSL certificate active for this to work correctly.",
+    "admin/force_https_help": "If enabled, all requests to your website will be redirected to https. You must have a valid SSL certificate active for this to work.",
     "admin/force_premium_accounts": "Force premium Minecraft accounts?",
     "admin/force_tfa": "Force Two Factor Authentication for group members?",
     "admin/force_tfa_alert": "Your group requires you to have Two Factor Authentication enabled.",
@@ -342,7 +342,7 @@
     "admin/navbar_icon": "Navbar Icon",
     "admin/navbar_icon_instructions": "You can also add an icon to each navbar item here, for example using {{faLink}}, {{semLink}}.",
     "admin/navbar_order": "Navbar Order",
-    "admin/navbar_order_instructions": "You can give each item a number above 0 to order items in the navbar, with 1 being the first item and higher numbers coming after it.",
+    "admin/navbar_order_instructions": "Each item can be assigned a positive number, where the lowest number will appear first in the navbar and higher numbers will come after it.",
     "admin/navigation": "Navigation",
     "admin/navigation_settings_updated_successfully": "Navigation settings updated successfully.",
     "admin/negative": "Negative",
@@ -598,7 +598,7 @@
     "admin/upgrade_php_version": "Please upgrade your PHP version to at least 7.4 - the next Nameless release will no longer support the version you are using.",
     "admin/upload_new_image": "Upload New Image",
     "admin/use_friendly_urls": "Friendly URLs",
-    "admin/use_friendly_urls_help": "IMPORTANT: Your server must be configured to allow the use of mod_rewrite and .htaccess files for this to work.",
+    "admin/use_friendly_urls_help": "If enabled, cleaner-looking web addresses will be used. You must allow the use of mod_rewrite and .htaccess files for this to work. {{docLinkStart}}Read more »{{docLinkEnd}}",
     "admin/user": "User",
     "admin/user_deleted": "User deleted successfully.",
     "admin/user_id": "User ID",
@@ -1186,5 +1186,37 @@
     "general/or": "OR",
     "user/nickname_maximum_20": "Your nickname must be a maximum of 20 characters.",
     "user/nickname_required": "A nickname is required.",
-    "user/nickname_minimum_3": "Your nickname must be a minimum of 3 characters."
+    "user/nickname_minimum_3": "Your nickname must be a minimum of 3 characters.",
+    "admin/debug_link_info": "Important - only share this link with people you trust!",
+    "installer/database_configured": "The database has been configured.",
+    "admin/page_url_contains_nameless_path": "Your custom page would overwrite a NamelessMC page.",
+    "admin/group_name": "Group Name",
+    "admin/home_custom_content": "Home Custom Content",
+    "admin/homepage_news": "News",
+    "admin/user_group_added_hook_info": "User Group Added",
+    "admin/test_email_query": "Not reaching your inbox? Try the following:",
+    "admin/test_email_suggest_1": "Wait a few minutes and check your Spam folder.",
+    "admin/test_email_suggest_2": "Update your site's DNS records (check SPF & DKIM).",
+    "admin/test_email_suggest_3": "Set up an SMTP server. {{docLinkStart}}Read more »{{docLinkEnd}}",
+    "admin/user_group_removed_hook_info": "User Group Removed",
+    "admin/updated": "Updated",
+    "general/auto_language": "Auto language",
+    "general/default": "Default",
+    "installer/upgrade_error": "There were errors encountered while upgrading.",
+    "general/violet": "Violet",
+    "general/purple": "Purple",
+    "admin/api_disabled": "API is disabled",
+    "general/teal": "Teal",
+    "general/blue": "Blue",
+    "general/pink": "Pink",
+    "general/orange": "Orange",
+    "general/yellow": "Yellow",
+    "general/olive": "Olive",
+    "general/green": "Green",
+    "general/brown": "Brown",
+    "general/grey": "Grey",
+    "admin/custom_content": "Custom Content",
+    "user/no_providers_admin": "No OAuth providers have been configured by site administrators yet.",
+    "general/red": "Red",
+    "admin/not_set": "Not set"
 }

From d6934c1671360c49ede25ddfe9b6b27476000c46 Mon Sep 17 00:00:00 2001
From: PikaMug <pikamug@gmail.com>
Date: Fri, 3 Jun 2022 06:02:00 +0000
Subject: [PATCH 016/337] Translated using Weblate (English (United States))

Currently translated at 100.0% (51 of 51 strings)

Translation: NamelessMC/Website - Discord Integration
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-discord-integration/en_US/
---
 modules/Discord Integration/language/en_US.json | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/Discord Integration/language/en_US.json b/modules/Discord Integration/language/en_US.json
index 345ae86a24..3410a3de5b 100644
--- a/modules/Discord Integration/language/en_US.json	
+++ b/modules/Discord Integration/language/en_US.json	
@@ -17,8 +17,8 @@
     "discord_integration/discord_guild_id": "Discord Server ID",
     "discord_integration/discord_id_confirm": "Please run the command \"/verify {{token}}\" in Discord to finish linking your Discord account.",
     "discord_integration/discord_id_help": "For information on where to find Discord IDs, please read {{linkStart}}this.{{linkEnd}}",
-    "discord_integration/discord_id_length": "Please ensure your Discord ID is 18 characters long.",
-    "discord_integration/discord_id_numeric": "Please ensure your Discord ID is numeric (Numbers only).",
+    "discord_integration/discord_id_length": "Please ensure your Discord Server ID is 18 characters long.",
+    "discord_integration/discord_id_numeric": "Please ensure your Discord Server ID is numeric (Numbers only).",
     "discord_integration/discord_id_set": "Discord ID set successfully",
     "discord_integration/discord_id_taken": "That Discord User ID has already been taken.",
     "discord_integration/discord_id_unlinked": "Successfully unlinked your Discord User ID.",
@@ -47,5 +47,7 @@
     "discord_integration/unable_to_set_discord_id": "Unable to set Discord ID.",
     "discord_integration/unable_to_update_discord_bot_username": "Unable to update Discord bot username.",
     "discord_integration/unable_to_update_discord_roles": "Unable to update Discord roles list.",
-    "discord_integration/unable_to_update_discord_username": "Unable to update Discord username."
+    "discord_integration/unable_to_update_discord_username": "Unable to update Discord username.",
+    "discord_integration/discord_widget_error": "An error occurred when getting Discord widget: {{error}}.",
+    "discord_integration/discord_id_required": "Please enter your Discord Server ID."
 }

From ca9afc25348cc396ddf15f0b0521c4df73342b0d Mon Sep 17 00:00:00 2001
From: PikaMug <pikamug@gmail.com>
Date: Fri, 3 Jun 2022 06:00:29 +0000
Subject: [PATCH 017/337] Translated using Weblate (English (United States))

Currently translated at 100.0% (195 of 195 strings)

Translation: NamelessMC/Website - Forum
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-forum/en_US/
---
 modules/Forum/language/en_US.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/Forum/language/en_US.json b/modules/Forum/language/en_US.json
index 5ec0a40880..e797dfa25b 100644
--- a/modules/Forum/language/en_US.json
+++ b/modules/Forum/language/en_US.json
@@ -186,5 +186,12 @@
     "forum/topic_id": "Topic ID",
     "forum/post_id": "Post ID",
     "forum/pre_post_create_hook_info": "Pre post create",
-    "forum/user_object": "User object"
+    "forum/user_object": "User object",
+    "forum/no_news": "There are no news posts.",
+    "forum/topic_reply": "Topic reply",
+    "forum/label_type_in_use": "Label type is being used, cannot be deleted.",
+    "forum/new_topic_reply_text": "Topic reply created in {{forum}} by {{author}}",
+    "forum/topic_author_uuid": "Topic author user ID",
+    "forum/topic_author_username": "Topic author username",
+    "forum/topic_author_nickname": "Topic author nickname"
 }

From 2bc11f4c3bfccb6cfe2a9ac75ede7a1f8e538247 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Loskot?= <fjuro@seznam.cz>
Date: Fri, 3 Jun 2022 13:57:21 +0000
Subject: [PATCH 018/337] Translated using Weblate (Czech)

Currently translated at 100.0% (1220 of 1220 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/cs/
---
 custom/languages/cs_CZ.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/custom/languages/cs_CZ.json b/custom/languages/cs_CZ.json
index afd75394e0..5ea78c2d91 100644
--- a/custom/languages/cs_CZ.json
+++ b/custom/languages/cs_CZ.json
@@ -1217,5 +1217,6 @@
     "admin/test_email_query": "Nedorazilo? Zkuste následující:",
     "admin/test_email_suggest_1": "Počkejte pár minut a zkontrolujte složku s nevyžádanou poštou.",
     "admin/test_email_suggest_2": "Aktualizujte záznamy DNS vašeho webu (zkontrolujte SPF a DKIM).",
-    "admin/test_email_suggest_3": "Nastavte server SMTP. {{docLinkStart}}Zjistit více »{{docLinkEnd}}"
+    "admin/test_email_suggest_3": "Nastavte server SMTP. {{docLinkStart}}Zjistit více »{{docLinkEnd}}",
+    "admin/debug_link_info": "Důležité - tento odkaz sdílejte pouze s lidmi, kterým důvěřujete!"
 }

From ea791c78bf585b35cf9967b92b98621c511ce924 Mon Sep 17 00:00:00 2001
From: enno123 <admin@enno123.de>
Date: Fri, 3 Jun 2022 13:47:35 +0000
Subject: [PATCH 019/337] Translated using Weblate (German)

Currently translated at 100.0% (1220 of 1220 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/
---
 custom/languages/de_DE.json | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index af35ebc1d9..df8c801402 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -107,7 +107,7 @@
     "admin/default_avatar": "Standard Avatar",
     "admin/default_group": "Ist diese Gruppe die Standard Gruppe (Für neue User)??",
     "admin/default_language": "Standardsprache",
-    "admin/default_language_help": "Benutzer können aus einer Liste ihre eigene Sprache auswählen.",
+    "admin/default_language_help": "Die Benutzer können aus allen installierten Sprachen wählen. {{docLinkStart}}Weiterlesen \"{{docLinkEnd}}",
     "admin/default_server": "Standardserver",
     "admin/default_template_set": "Die Vorlage {{template}} wurde als Standard gesetzt.",
     "admin/default_timezone": "Standard Zeitzone",
@@ -174,7 +174,7 @@
     "admin/enable_authme": "Aktiviere AuthMe Integration?",
     "admin/enable_debug_mode": "Aktiviere den Fehlerbenachrichtungs Modus?",
     "admin/enable_mailer": "Aktiviere PHPMailer?",
-    "admin/enable_mailer_help": "Aktiviere dies, wenn E-Mails standardmäßig nicht gesendet werden. Die Verwendung von PHPMailer erfordert, dass Du einen Dienst hast, der in der Lage ist, E-Mails an einen SMTP-Provider zu senden wie zum Beispiel Gmail oder GMX.",
+    "admin/enable_mailer_help": "Wenn diese Option aktiviert ist, werden E-Mails mit PHPMailer anstelle der Systemvorgabe gesendet. Dies kann bei der Zustellung helfen, erfordert aber die Konfiguration eines SMTP-Providers. {{docLinkStart}}Weiterlesen \"{{docLinkEnd}}",
     "admin/enable_maintenance_mode": "Wartungsmodus aktivieren?",
     "admin/enable_minecraft_integration": "Minecraft Integration aktivieren?",
     "admin/enable_nicknames_on_registration": "Nicknames für registrierte Benutzer?",
@@ -202,7 +202,7 @@
     "admin/find_modules": "Entdecke Module",
     "admin/find_templates": "Entdecke Vorlagen",
     "admin/force_https": "Erzwinge https?",
-    "admin/force_https_help": "Falls https aktiviert wird, werden alle Anfragen auf das https Protokoll umgeleitet. Bitte überprüfe ob dein SSL Zertifikat gültig und richtig eingerichtet worden ist.",
+    "admin/force_https_help": "Wenn diese Option aktiviert ist, werden alle Anfragen an deine Website auf https umgeleitet. Du musst ein gültiges SSL-Zertifikat aktiviert haben, damit dies funktioniert.",
     "admin/force_premium_accounts": "Premium-Minecraft-Konten erzwingen?",
     "admin/force_tfa": "Zwei-Faktor-Authentifizierung für Gruppenmitglieder erzwingen?",
     "admin/force_tfa_alert": "Für Deine Gruppe muss die Zwei-Faktor-Authentifizierung aktiviert sein.",
@@ -324,7 +324,7 @@
     "admin/navbar_icon": "Navbar Icon",
     "admin/navbar_icon_instructions": "Du kannst hier auch jedem Navigationsleistenelement ein Symbol hinzufügen, z. B. mithilfe von {{faLink}}, {{semLink}}.",
     "admin/navbar_order": "Navbar Ordnen",
-    "admin/navbar_order_instructions": "Du kannst jedem Artikel eine Zahl über 0 geben, um Artikel in der Navigationsleiste zu ordnen, wobei 1 der erste Artikel ist und höhere Zahlen danach.",
+    "admin/navbar_order_instructions": "Jedem Element kann eine positive Nummer zugewiesen werden, wobei die niedrigste Nummer zuerst in der Navigationsleiste erscheint und höhere Nummern danach folgen.",
     "admin/navigation": "Navigation",
     "admin/navigation_settings_updated_successfully": "Navigations Einstellungen wurden gespeichert.",
     "admin/negative": "Negativ",
@@ -555,7 +555,7 @@
     "admin/upgrade_php_version": "Bitte aktualisiere deine PHP-Version auf mindestens 7.4 - die nächste Nameless-Version wird die von dir verwendete Version nicht mehr unterstützen.",
     "admin/upload_new_image": "Neues Bild hochladen",
     "admin/use_friendly_urls": "Benutzerfreundliche URLs",
-    "admin/use_friendly_urls_help": "WICHTIG: Dein Server muss so konfiguriert sein, dass er die Verwendung von mod_rewrite und .htaccess-Dateien zulässt, damit dies funktioniert.",
+    "admin/use_friendly_urls_help": "Wenn diese Option aktiviert ist, werden sauberer aussehende Webadressen verwendet. Sie müssen die Verwendung von mod_rewrite und .htaccess-Dateien erlauben, damit dies funktioniert. {{docLinkStart}}Weiterlesen \"{{docLinkEnd}}",
     "admin/user": "Nutzer",
     "admin/user_deleted": "Benutzer wurde erfolgreich gelöscht.",
     "admin/user_management": "Benutzerverwaltung",
@@ -1211,5 +1211,12 @@
     "admin/group_name": "Gruppen Name",
     "admin/api_disabled": "API ist deaktiviert",
     "admin/page_url_contains_nameless_path": "Deine benutzerdefinierte Seite würde eine NamelessMC-Seite überschreiben.",
-    "user/no_providers_admin": "Es wurden noch keine OAuth-Anbieter von Website-Administratoren konfiguriert."
+    "user/no_providers_admin": "Es wurden noch keine OAuth-Anbieter von Website-Administratoren konfiguriert.",
+    "installer/database_configured": "Die Datenbank wurde konfiguriert.",
+    "installer/upgrade_error": "Während des Upgrades traten Fehler auf.",
+    "admin/test_email_query": "Du erreichst deinen Posteingang nicht? Versuche folgendes:",
+    "admin/test_email_suggest_1": "Warte ein paar Minuten und überprüfe deinen Spam-Ordner.",
+    "admin/test_email_suggest_2": "Aktualisiere die DNS-Einträge deiner Website (prüfe SPF und DKIM).",
+    "admin/test_email_suggest_3": "Einen SMTP-Server einrichten. {{docLinkStart}}Weiterlesen \"{{docLinkEnd}}",
+    "admin/debug_link_info": "Wichtig - teile diesen Link nur mit Personen, denen du vertraust!"
 }

From 70daa6d6d8ef43c655af6ac9ac945d89541b9dc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Loskot?= <fjuro@seznam.cz>
Date: Fri, 3 Jun 2022 13:58:11 +0000
Subject: [PATCH 020/337] Translated using Weblate (Czech)

Currently translated at 100.0% (51 of 51 strings)

Translation: NamelessMC/Website - Discord Integration
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-discord-integration/cs/
---
 modules/Discord Integration/language/cs_CZ.json | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/Discord Integration/language/cs_CZ.json b/modules/Discord Integration/language/cs_CZ.json
index 34f83cde77..4793950d4a 100644
--- a/modules/Discord Integration/language/cs_CZ.json	
+++ b/modules/Discord Integration/language/cs_CZ.json	
@@ -14,8 +14,8 @@
     "discord_integration/discord_database_error": "Databáze Nameless Link momentálně není dostupná. Zkuste to prosím znovu za chvíli.",
     "discord_integration/discord_guild_id": "ID Discord serveru",
     "discord_integration/discord_id_help": "Pro informace, kde nalézt Discord ID, si přečtěte {{linkStart}}toto.{{linkEnd}}",
-    "discord_integration/discord_id_length": "Ujistěte se, že vaše Discord ID je dlouhé 18 znaků.",
-    "discord_integration/discord_id_numeric": "Ujistěte se, že vaše Discord ID obsahuje pouze čísla.",
+    "discord_integration/discord_id_length": "Ujistěte se, že ID vašeho Discord serveru je dlouhé 18 znaků.",
+    "discord_integration/discord_id_numeric": "Ujistěte se, že ID vašeho Discord serveru obsahuje pouze čísla.",
     "discord_integration/discord_id_set": "ID Discordu úspěšně nastaveno",
     "discord_integration/discord_id_taken": "Toto Discord ID je již zabráno.",
     "discord_integration/discord_id_unlinked": "Úspěšně jste odpojili své uživatelské ID.",
@@ -47,5 +47,7 @@
     "discord_integration/discord_bot_check_logs": "Zkuste se podívat po specifičtější chybě (pokud existuje) v Panel -> Zabezpečení -> Všechny protokoly.",
     "discord_integration/discord_bot_error_partsuccess": "Bot nemohl upravit jednu nebo více rolí kvůli nesprávné konfiguraci hierarchie na Discordu.",
     "discord_integration/discord_invite_info": "Pro pozvání bota Nameless Link na váš Discord server klikněte {{inviteLinkStart}}sem{{inviteLinkEnd}}. Poté spusťte příkaz {{command}} pro propojení bota s vaším webem. Můžete také {{selfHostLinkStart}}sami hostovat bota{{selfHostLinkEnd}}.",
-    "discord_integration/discord_widget_disabled": "U zadaného Discord serveru je zakázán widget. Běžte prosím do záložky 'Widget' v nastavení vašeho Discord serveru a ujistěte se, že je možnost povolena a že je ID správné."
+    "discord_integration/discord_widget_disabled": "U zadaného Discord serveru je zakázán widget. Běžte prosím do záložky 'Widget' v nastavení vašeho Discord serveru a ujistěte se, že je možnost povolena a že je ID správné.",
+    "discord_integration/discord_widget_error": "Při načítání Discord widgetu se vyskytla chyba: {{error}}.",
+    "discord_integration/discord_id_required": "Zadejte ID vašeho Discord serveru."
 }

From 556e13df6c54864290bcb3e0f5d47f7769813cb3 Mon Sep 17 00:00:00 2001
From: enno123 <admin@enno123.de>
Date: Fri, 3 Jun 2022 13:46:16 +0000
Subject: [PATCH 021/337] Translated using Weblate (German)

Currently translated at 100.0% (51 of 51 strings)

Translation: NamelessMC/Website - Discord Integration
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-discord-integration/de/
---
 modules/Discord Integration/language/de_DE.json | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/Discord Integration/language/de_DE.json b/modules/Discord Integration/language/de_DE.json
index e815327b4c..7c4af23e1b 100644
--- a/modules/Discord Integration/language/de_DE.json	
+++ b/modules/Discord Integration/language/de_DE.json	
@@ -12,8 +12,8 @@
     "discord_integration/discord_communication_error": "Bei der Kommunikation mit dem Discord Bot ist ein Fehler aufgetreten. Bitte stellen Sie sicher, dass der Bot ausgeführt wird und Ihre Bot-URL korrekt ist.",
     "discord_integration/discord_database_error": "Die Nameless Link-Datenbank ist derzeit nicht verfügbar. Bitte versuchen Sie es später noch einmal.",
     "discord_integration/discord_id_help": "Für Informationen darüber, wo man Discord-IDs findet, lies bitte {{linkStart}}hier.{{linkEnd}}",
-    "discord_integration/discord_id_length": "Bitte stellen Sie sicher, dass Ihre Discord ID 18 Zeichen lang ist.",
-    "discord_integration/discord_id_numeric": "Bitte stellen Sie sicher, dass Ihre Discord ID numerisch ist (nur Zahlen)..",
+    "discord_integration/discord_id_length": "Bitte stelle sicher, dass deine Discord Server ID 18 Zeichen lang ist.",
+    "discord_integration/discord_id_numeric": "Bitte stelle sicher, dass deine Discord Server ID numerisch ist (nur Zahlen)..",
     "discord_integration/discord_id_set": "Discord ID erfolgreich eingestellt",
     "discord_integration/discord_id_taken": "Diese Discord ID wurde bereits vergeben.",
     "discord_integration/discord_id_unlinked": "Die Verknüpfung Ihrer Discord-Benutzer-ID wurde erfolgreich aufgehoben.",
@@ -47,5 +47,7 @@
     "discord_integration/discord_guild_id": "Discord Server ID",
     "discord_integration/discord_id_confirm": "Bitte führe den Befehl \"/verify {{token}}\" in Discord aus, um die Verknüpfung deines Discord-Kontos abzuschließen.",
     "discord_integration/discord_invite_info": "Um den Nameless Link-Bot auf deinen Discord-Server einzuladen, klicke auf {{inviteLinkStart}}hier{{inviteLinkEnd}}. Führe dann den Befehl {{command}} aus, um den Bot mit deiner Website zu verbinden. Alternativ kannst du {{selfHostLinkStart}} den Bot auch selbst hosten{{selfHostLinkEnd}}.",
-    "discord_integration/discord_widget_theme": "Discord Widget Theme"
+    "discord_integration/discord_widget_theme": "Discord Widget Theme",
+    "discord_integration/discord_widget_error": "Beim Abrufen des Discord-Widgets ist ein Fehler aufgetreten: {{error}}.",
+    "discord_integration/discord_id_required": "Bitte gib deine Discord Server ID ein."
 }

From f0ef495f7d1fb30a03e89f7a6b15e2b599f0d74e Mon Sep 17 00:00:00 2001
From: Supercrafter100 <admin@supercrafter100.com>
Date: Fri, 3 Jun 2022 15:42:36 +0000
Subject: [PATCH 022/337] Translated using Weblate (Dutch)

Currently translated at 100.0% (51 of 51 strings)

Translation: NamelessMC/Website - Discord Integration
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-discord-integration/nl/
---
 modules/Discord Integration/language/nl_NL.json | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/Discord Integration/language/nl_NL.json b/modules/Discord Integration/language/nl_NL.json
index a9199125ae..77460db8bf 100644
--- a/modules/Discord Integration/language/nl_NL.json	
+++ b/modules/Discord Integration/language/nl_NL.json	
@@ -10,8 +10,8 @@
     "discord_integration/discord_communication_error": "Er was een fout in de communicatie met de Discord Bot. Zorg ervoor dat de bot werkt en dat uw Bot-URL correct is.",
     "discord_integration/discord_database_error": "De Nameless Link database is op dit moment offline. Probeer het later nog eens.",
     "discord_integration/discord_id_help": "Voor informatie over waar je de Discord IDs kunt vinden, lees alsjeblieft {{linkStart}}dit.{{linkEnd}}",
-    "discord_integration/discord_id_length": "Zorg ervoor dat uw Discord ID 18 karakters lang is.",
-    "discord_integration/discord_id_numeric": "Zorg ervoor dat uw Discord ID numeriek is (alleen cijfers).",
+    "discord_integration/discord_id_length": "Zorg ervoor dat uw Discord server ID 18 karakters lang is.",
+    "discord_integration/discord_id_numeric": "Zorg ervoor dat uw Discord server ID numeriek is (alleen cijfers).",
     "discord_integration/discord_id_set": "Discord ID met succes ingesteld",
     "discord_integration/discord_id_taken": "Die Discord Gebruikers-ID is al ingenomen.",
     "discord_integration/discord_id_unlinked": "Succesvol ontkoppeld van uw Discord Gebruikers-ID.",
@@ -47,5 +47,7 @@
     "discord_integration/unable_to_set_discord_bot_url": "Niet mogelijk om de Discord bot URL in te stellen",
     "discord_integration/unable_to_update_discord_roles": "Niet mogelijk om de Discord rollen lijst up te daten.",
     "discord_integration/unable_to_update_discord_username": "Niet in staat om de Discord gebruikersnaam aan te passen.",
-    "discord_integration/no_pending_verification_for_token": "Er zijn geen verificaties in afwachting onder de ingegeven token."
+    "discord_integration/no_pending_verification_for_token": "Er zijn geen verificaties in afwachting onder de ingegeven token.",
+    "discord_integration/discord_widget_error": "Er is een fout opgetreden tijdens het ophalen van de Discord widget: {{error}}.",
+    "discord_integration/discord_id_required": "Vul alsjeblieft je Discord server ID in."
 }

From 4b3e3e63ca089b7d0ace1c70b3349495c5b65290 Mon Sep 17 00:00:00 2001
From: PadowYT2 <me@padow.ml>
Date: Fri, 3 Jun 2022 15:42:24 +0000
Subject: [PATCH 023/337] Translated using Weblate (Russian)

Currently translated at 100.0% (51 of 51 strings)

Translation: NamelessMC/Website - Discord Integration
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-discord-integration/ru/
---
 modules/Discord Integration/language/ru_RU.json | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/Discord Integration/language/ru_RU.json b/modules/Discord Integration/language/ru_RU.json
index b637dd24f4..91e346de2b 100644
--- a/modules/Discord Integration/language/ru_RU.json	
+++ b/modules/Discord Integration/language/ru_RU.json	
@@ -14,11 +14,11 @@
     "discord_integration/discord_bot_setup": "Бот настроен?",
     "discord_integration/discord_communication_error": "Произошла ошибка во время связи с Discord. Убедитесь что бот активен и URL страница бота корректна.",
     "discord_integration/discord_database_error": "База бота Nameless Link не работает в данный момент. Попробуйте в другой раз.",
-    "discord_integration/discord_guild_id": "ID сервера в Discord",
+    "discord_integration/discord_guild_id": "Discord Сервер ID",
     "discord_integration/discord_id_confirm": "Введите команду \"/verify {{token}}\" в Discord для завершения привязки.",
     "discord_integration/discord_id_help": "Чтобы найти ваш ID сервера в Discord, прочитайте это {{linkStart}}руководство{{linkEnd}}",
-    "discord_integration/discord_id_length": "Убедитесь что ваш ID длинее 18 символов.",
-    "discord_integration/discord_id_numeric": "Убедитесь что ваш ID состоит из цифр.",
+    "discord_integration/discord_id_length": "Убедитесь что ваш Discord Сервер ID длинее 18 символов.",
+    "discord_integration/discord_id_numeric": "Убедитесь что ваш Discord Сервер ID состоит из цифр.",
     "discord_integration/discord_id_set": "Discord ID установлен",
     "discord_integration/discord_id_taken": "Этот User ID в Discord уже занят.",
     "discord_integration/discord_id_unlinked": "Вы отвязали свой профиль в Discord.",
@@ -48,5 +48,6 @@
     "discord_integration/unable_to_update_discord_bot_username": "Не удалось обновить никнейм бота в Discord.",
     "discord_integration/unable_to_update_discord_roles": "Не удалось обновить роли в Discord.",
     "discord_integration/unable_to_update_discord_username": "Не удалось обновить никнеймы в Discord.",
-    "discord_integration/discord_widget_error": "Произошла ошибка при Discord виджете: {{error}}."
+    "discord_integration/discord_widget_error": "Произошла ошибка при Discord виджете: {{error}}.",
+    "discord_integration/discord_id_required": "Введите ваш Дискорд Сервер ID."
 }

From ae61d1055321a293d9c82e93a0b4f01f426ce93c Mon Sep 17 00:00:00 2001
From: namelessmc-bot <76107159+namelessmc-bot@users.noreply.github.com>
Date: Sat, 4 Jun 2022 16:53:14 +0200
Subject: [PATCH 024/337] Translations update (#2815)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Supercrafter100 <admin@supercrafter100.com>
Co-authored-by: Marcos <marckos03br@gmail.com>
Co-authored-by: PadowYT2 <me@padow.ml>
Co-authored-by: PikaMug <pikamug@gmail.com>
Co-authored-by: Jonáš Loskot <fjuro@seznam.cz>
Co-authored-by: enno123 <admin@enno123.de>
---
 custom/languages/cs_CZ.json                   |  3 +-
 custom/languages/de_DE.json                   | 19 +++++---
 custom/languages/en_US.json                   | 44 ++++++++++++++++---
 custom/languages/es_ES.json                   | 22 +++++++---
 custom/languages/nl_NL.json                   | 24 +++++++---
 custom/languages/ru_RU.json                   |  5 ++-
 .../Discord Integration/language/cs_CZ.json   |  8 ++--
 .../Discord Integration/language/de_DE.json   |  8 ++--
 .../Discord Integration/language/en_US.json   |  8 ++--
 .../Discord Integration/language/es_ES.json   |  3 +-
 .../Discord Integration/language/nl_NL.json   |  8 ++--
 .../Discord Integration/language/ru_RU.json   | 10 +++--
 modules/Forum/language/en_US.json             |  9 +++-
 modules/Forum/language/nl_NL.json             | 38 +++++++++++++++-
 14 files changed, 163 insertions(+), 46 deletions(-)

diff --git a/custom/languages/cs_CZ.json b/custom/languages/cs_CZ.json
index afd75394e0..5ea78c2d91 100644
--- a/custom/languages/cs_CZ.json
+++ b/custom/languages/cs_CZ.json
@@ -1217,5 +1217,6 @@
     "admin/test_email_query": "Nedorazilo? Zkuste následující:",
     "admin/test_email_suggest_1": "Počkejte pár minut a zkontrolujte složku s nevyžádanou poštou.",
     "admin/test_email_suggest_2": "Aktualizujte záznamy DNS vašeho webu (zkontrolujte SPF a DKIM).",
-    "admin/test_email_suggest_3": "Nastavte server SMTP. {{docLinkStart}}Zjistit více »{{docLinkEnd}}"
+    "admin/test_email_suggest_3": "Nastavte server SMTP. {{docLinkStart}}Zjistit více »{{docLinkEnd}}",
+    "admin/debug_link_info": "Důležité - tento odkaz sdílejte pouze s lidmi, kterým důvěřujete!"
 }
diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index af35ebc1d9..df8c801402 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -107,7 +107,7 @@
     "admin/default_avatar": "Standard Avatar",
     "admin/default_group": "Ist diese Gruppe die Standard Gruppe (Für neue User)??",
     "admin/default_language": "Standardsprache",
-    "admin/default_language_help": "Benutzer können aus einer Liste ihre eigene Sprache auswählen.",
+    "admin/default_language_help": "Die Benutzer können aus allen installierten Sprachen wählen. {{docLinkStart}}Weiterlesen \"{{docLinkEnd}}",
     "admin/default_server": "Standardserver",
     "admin/default_template_set": "Die Vorlage {{template}} wurde als Standard gesetzt.",
     "admin/default_timezone": "Standard Zeitzone",
@@ -174,7 +174,7 @@
     "admin/enable_authme": "Aktiviere AuthMe Integration?",
     "admin/enable_debug_mode": "Aktiviere den Fehlerbenachrichtungs Modus?",
     "admin/enable_mailer": "Aktiviere PHPMailer?",
-    "admin/enable_mailer_help": "Aktiviere dies, wenn E-Mails standardmäßig nicht gesendet werden. Die Verwendung von PHPMailer erfordert, dass Du einen Dienst hast, der in der Lage ist, E-Mails an einen SMTP-Provider zu senden wie zum Beispiel Gmail oder GMX.",
+    "admin/enable_mailer_help": "Wenn diese Option aktiviert ist, werden E-Mails mit PHPMailer anstelle der Systemvorgabe gesendet. Dies kann bei der Zustellung helfen, erfordert aber die Konfiguration eines SMTP-Providers. {{docLinkStart}}Weiterlesen \"{{docLinkEnd}}",
     "admin/enable_maintenance_mode": "Wartungsmodus aktivieren?",
     "admin/enable_minecraft_integration": "Minecraft Integration aktivieren?",
     "admin/enable_nicknames_on_registration": "Nicknames für registrierte Benutzer?",
@@ -202,7 +202,7 @@
     "admin/find_modules": "Entdecke Module",
     "admin/find_templates": "Entdecke Vorlagen",
     "admin/force_https": "Erzwinge https?",
-    "admin/force_https_help": "Falls https aktiviert wird, werden alle Anfragen auf das https Protokoll umgeleitet. Bitte überprüfe ob dein SSL Zertifikat gültig und richtig eingerichtet worden ist.",
+    "admin/force_https_help": "Wenn diese Option aktiviert ist, werden alle Anfragen an deine Website auf https umgeleitet. Du musst ein gültiges SSL-Zertifikat aktiviert haben, damit dies funktioniert.",
     "admin/force_premium_accounts": "Premium-Minecraft-Konten erzwingen?",
     "admin/force_tfa": "Zwei-Faktor-Authentifizierung für Gruppenmitglieder erzwingen?",
     "admin/force_tfa_alert": "Für Deine Gruppe muss die Zwei-Faktor-Authentifizierung aktiviert sein.",
@@ -324,7 +324,7 @@
     "admin/navbar_icon": "Navbar Icon",
     "admin/navbar_icon_instructions": "Du kannst hier auch jedem Navigationsleistenelement ein Symbol hinzufügen, z. B. mithilfe von {{faLink}}, {{semLink}}.",
     "admin/navbar_order": "Navbar Ordnen",
-    "admin/navbar_order_instructions": "Du kannst jedem Artikel eine Zahl über 0 geben, um Artikel in der Navigationsleiste zu ordnen, wobei 1 der erste Artikel ist und höhere Zahlen danach.",
+    "admin/navbar_order_instructions": "Jedem Element kann eine positive Nummer zugewiesen werden, wobei die niedrigste Nummer zuerst in der Navigationsleiste erscheint und höhere Nummern danach folgen.",
     "admin/navigation": "Navigation",
     "admin/navigation_settings_updated_successfully": "Navigations Einstellungen wurden gespeichert.",
     "admin/negative": "Negativ",
@@ -555,7 +555,7 @@
     "admin/upgrade_php_version": "Bitte aktualisiere deine PHP-Version auf mindestens 7.4 - die nächste Nameless-Version wird die von dir verwendete Version nicht mehr unterstützen.",
     "admin/upload_new_image": "Neues Bild hochladen",
     "admin/use_friendly_urls": "Benutzerfreundliche URLs",
-    "admin/use_friendly_urls_help": "WICHTIG: Dein Server muss so konfiguriert sein, dass er die Verwendung von mod_rewrite und .htaccess-Dateien zulässt, damit dies funktioniert.",
+    "admin/use_friendly_urls_help": "Wenn diese Option aktiviert ist, werden sauberer aussehende Webadressen verwendet. Sie müssen die Verwendung von mod_rewrite und .htaccess-Dateien erlauben, damit dies funktioniert. {{docLinkStart}}Weiterlesen \"{{docLinkEnd}}",
     "admin/user": "Nutzer",
     "admin/user_deleted": "Benutzer wurde erfolgreich gelöscht.",
     "admin/user_management": "Benutzerverwaltung",
@@ -1211,5 +1211,12 @@
     "admin/group_name": "Gruppen Name",
     "admin/api_disabled": "API ist deaktiviert",
     "admin/page_url_contains_nameless_path": "Deine benutzerdefinierte Seite würde eine NamelessMC-Seite überschreiben.",
-    "user/no_providers_admin": "Es wurden noch keine OAuth-Anbieter von Website-Administratoren konfiguriert."
+    "user/no_providers_admin": "Es wurden noch keine OAuth-Anbieter von Website-Administratoren konfiguriert.",
+    "installer/database_configured": "Die Datenbank wurde konfiguriert.",
+    "installer/upgrade_error": "Während des Upgrades traten Fehler auf.",
+    "admin/test_email_query": "Du erreichst deinen Posteingang nicht? Versuche folgendes:",
+    "admin/test_email_suggest_1": "Warte ein paar Minuten und überprüfe deinen Spam-Ordner.",
+    "admin/test_email_suggest_2": "Aktualisiere die DNS-Einträge deiner Website (prüfe SPF und DKIM).",
+    "admin/test_email_suggest_3": "Einen SMTP-Server einrichten. {{docLinkStart}}Weiterlesen \"{{docLinkEnd}}",
+    "admin/debug_link_info": "Wichtig - teile diesen Link nur mit Personen, denen du vertraust!"
 }
diff --git a/custom/languages/en_US.json b/custom/languages/en_US.json
index 6734d46606..efb03e7ed6 100644
--- a/custom/languages/en_US.json
+++ b/custom/languages/en_US.json
@@ -118,7 +118,7 @@
     "admin/default_avatar": "Default Avatar",
     "admin/default_group": "Is the group the default group (for new users)?",
     "admin/default_language": "Default Language",
-    "admin/default_language_help": "Users will be able to choose from any installed languages.",
+    "admin/default_language_help": "Users will be able to choose from any installed languages. {{docLinkStart}}Read more »{{docLinkEnd}}",
     "admin/default_server": "Default Server",
     "admin/default_template_set": "Default template set to {{template}} successfully.",
     "admin/default_timezone": "Default Timezone",
@@ -185,7 +185,7 @@
     "admin/enable_authme": "Enable AuthMe integration?",
     "admin/enable_debug_mode": "Enable debug mode?",
     "admin/enable_mailer": "Enable PHPMailer?",
-    "admin/enable_mailer_help": "Enable this if emails aren't being sent by default. The use of PHPMailer requires you to have a service capable of sending emails, such as Gmail or an SMTP provider.",
+    "admin/enable_mailer_help": "If enabled, emails will be sent using PHPMailer instead of the system default. This may help with delivery, but requires you to configure an SMTP provider. {{docLinkStart}}Read more »{{docLinkEnd}}",
     "admin/enable_maintenance_mode": "Enable maintenance mode?",
     "admin/enable_minecraft_integration": "Enable Minecraft integration?",
     "admin/enable_nicknames_on_registration": "Enable nicknames for registering users?",
@@ -215,7 +215,7 @@
     "admin/find_modules": "Find Modules",
     "admin/find_templates": "Find Templates",
     "admin/force_https": "Force https?",
-    "admin/force_https_help": "If enabled, all requests to your website will be redirected to https. You must have a valid SSL certificate active for this to work correctly.",
+    "admin/force_https_help": "If enabled, all requests to your website will be redirected to https. You must have a valid SSL certificate active for this to work.",
     "admin/force_premium_accounts": "Force premium Minecraft accounts?",
     "admin/force_tfa": "Force Two Factor Authentication for group members?",
     "admin/force_tfa_alert": "Your group requires you to have Two Factor Authentication enabled.",
@@ -342,7 +342,7 @@
     "admin/navbar_icon": "Navbar Icon",
     "admin/navbar_icon_instructions": "You can also add an icon to each navbar item here, for example using {{faLink}}, {{semLink}}.",
     "admin/navbar_order": "Navbar Order",
-    "admin/navbar_order_instructions": "You can give each item a number above 0 to order items in the navbar, with 1 being the first item and higher numbers coming after it.",
+    "admin/navbar_order_instructions": "Each item can be assigned a positive number, where the lowest number will appear first in the navbar and higher numbers will come after it.",
     "admin/navigation": "Navigation",
     "admin/navigation_settings_updated_successfully": "Navigation settings updated successfully.",
     "admin/negative": "Negative",
@@ -598,7 +598,7 @@
     "admin/upgrade_php_version": "Please upgrade your PHP version to at least 7.4 - the next Nameless release will no longer support the version you are using.",
     "admin/upload_new_image": "Upload New Image",
     "admin/use_friendly_urls": "Friendly URLs",
-    "admin/use_friendly_urls_help": "IMPORTANT: Your server must be configured to allow the use of mod_rewrite and .htaccess files for this to work.",
+    "admin/use_friendly_urls_help": "If enabled, cleaner-looking web addresses will be used. You must allow the use of mod_rewrite and .htaccess files for this to work. {{docLinkStart}}Read more »{{docLinkEnd}}",
     "admin/user": "User",
     "admin/user_deleted": "User deleted successfully.",
     "admin/user_id": "User ID",
@@ -1186,5 +1186,37 @@
     "general/or": "OR",
     "user/nickname_maximum_20": "Your nickname must be a maximum of 20 characters.",
     "user/nickname_required": "A nickname is required.",
-    "user/nickname_minimum_3": "Your nickname must be a minimum of 3 characters."
+    "user/nickname_minimum_3": "Your nickname must be a minimum of 3 characters.",
+    "admin/debug_link_info": "Important - only share this link with people you trust!",
+    "installer/database_configured": "The database has been configured.",
+    "admin/page_url_contains_nameless_path": "Your custom page would overwrite a NamelessMC page.",
+    "admin/group_name": "Group Name",
+    "admin/home_custom_content": "Home Custom Content",
+    "admin/homepage_news": "News",
+    "admin/user_group_added_hook_info": "User Group Added",
+    "admin/test_email_query": "Not reaching your inbox? Try the following:",
+    "admin/test_email_suggest_1": "Wait a few minutes and check your Spam folder.",
+    "admin/test_email_suggest_2": "Update your site's DNS records (check SPF & DKIM).",
+    "admin/test_email_suggest_3": "Set up an SMTP server. {{docLinkStart}}Read more »{{docLinkEnd}}",
+    "admin/user_group_removed_hook_info": "User Group Removed",
+    "admin/updated": "Updated",
+    "general/auto_language": "Auto language",
+    "general/default": "Default",
+    "installer/upgrade_error": "There were errors encountered while upgrading.",
+    "general/violet": "Violet",
+    "general/purple": "Purple",
+    "admin/api_disabled": "API is disabled",
+    "general/teal": "Teal",
+    "general/blue": "Blue",
+    "general/pink": "Pink",
+    "general/orange": "Orange",
+    "general/yellow": "Yellow",
+    "general/olive": "Olive",
+    "general/green": "Green",
+    "general/brown": "Brown",
+    "general/grey": "Grey",
+    "admin/custom_content": "Custom Content",
+    "user/no_providers_admin": "No OAuth providers have been configured by site administrators yet.",
+    "general/red": "Red",
+    "admin/not_set": "Not set"
 }
diff --git a/custom/languages/es_ES.json b/custom/languages/es_ES.json
index 7df73dcf27..bb1aec710b 100644
--- a/custom/languages/es_ES.json
+++ b/custom/languages/es_ES.json
@@ -115,7 +115,7 @@
     "admin/default_avatar": "Avatar por defecto",
     "admin/default_group": "¿Es el grupo por defecto (para los nuevos usuarios)?",
     "admin/default_language": "Idioma por defecto",
-    "admin/default_language_help": "Los usuarios podrán elegir entre los idiomas instalados.",
+    "admin/default_language_help": "Los usuarios podrán elegir entre los idiomas instalados. {{docLinkStart}}Leer más »{{docLinkEnd}}",
     "admin/default_server": "Servidor por defecto",
     "admin/default_template_set": "Plantilla por defecto establecida en {{template}} con éxito.",
     "admin/default_timezone": "Zona horaria por defecto",
@@ -182,7 +182,7 @@
     "admin/enable_authme": "¿Activar la integración de AuthMe?",
     "admin/enable_debug_mode": "¿Activar el modo de depuración?",
     "admin/enable_mailer": "¿Activar PHPMailer?",
-    "admin/enable_mailer_help": "Habilite esto si los correos electrónicos no están siendo enviados por defecto. El uso de PHPMailer requiere tener un servicio capaz de enviar correos electrónicos, como Gmail o un proveedor SMTP.",
+    "admin/enable_mailer_help": "Si se activa, los correos electrónicos se enviarán utilizando PHPMailer en lugar del sistema por defecto. Esto puede ayudar a la entrega, pero requiere que se configure un proveedor SMTP. {{docLinkStart}}Leer más »{{docLinkEnd}}",
     "admin/enable_maintenance_mode": "¿Activar el modo de mantenimiento?",
     "admin/enable_minecraft_integration": "¿Permitir la integración de Minecraft?",
     "admin/enable_nicknames_on_registration": "¿Permitir apodos para el registro de usuarios?",
@@ -212,7 +212,7 @@
     "admin/find_modules": "Buscar módulos",
     "admin/find_templates": "Buscar plantillas",
     "admin/force_https": "¿Forzar https?",
-    "admin/force_https_help": "Si se activa, todas las peticiones a su sitio web serán redirigidas a https. Debe tener un certificado SSL válido activo para que esto funcione correctamente.",
+    "admin/force_https_help": "Si se activa, todas las peticiones a su sitio web serán redirigidas a https. Debe tener un certificado SSL válido activo para que esto funcione.",
     "admin/force_premium_accounts": "¿Forzar las cuentas premium de Minecraft?",
     "admin/force_tfa": "¿Forzar la autenticación de dos factores para los miembros del grupo?",
     "admin/force_tfa_alert": "Su grupo requiere que tenga activada la autenticación de dos factores.",
@@ -337,7 +337,7 @@
     "admin/navbar_icon": "Icono de la barra de navegación",
     "admin/navbar_icon_instructions": "Aquí también puedes añadir un icono a cada elemento de la barra de navegación, por ejemplo con {{faLink}}, {{semLink}}.",
     "admin/navbar_order": "Orden en la barra de navegación",
-    "admin/navbar_order_instructions": "Puede dar a cada elemento un número superior al 0 para ordenar los elementos en la barra de navegación, siendo el 1 el primer elemento y los números superiores los que vienen después.",
+    "admin/navbar_order_instructions": "A cada elemento se le puede asignar un número positivo, donde el número más bajo aparecerá primero en la barra de navegación y los números más altos vendrán después.",
     "admin/navigation": "Navegación",
     "admin/navigation_settings_updated_successfully": "La configuración de la navegación se ha actualizado correctamente.",
     "admin/negative": "Negativo",
@@ -583,7 +583,7 @@
     "admin/updated_user_languages": "Se han actualizado los idiomas de los usuarios.",
     "admin/upload_new_image": "Subir una nueva imagen",
     "admin/use_friendly_urls": "URLs amigables",
-    "admin/use_friendly_urls_help": "IMPORTANTE: Su servidor debe estar configurado para permitir el uso de archivos mod_rewrite y .htaccess para que esto funcione.",
+    "admin/use_friendly_urls_help": "Si se activa, se utilizarán direcciones web de aspecto más limpio. Debe permitir el uso de \"mod_rewrite\" y archivos \".htaccess\" para que esto funcione. {{docLinkStart}}Leer más »{{docLinkEnd}}",
     "admin/user": "Usuario",
     "admin/user_deleted": "Usuario eliminado con éxito.",
     "admin/user_id": "ID del usuario",
@@ -1208,5 +1208,15 @@
     "general/purple": "Morado",
     "general/pink": "Rosa",
     "general/brown": "Marrón",
-    "general/grey": "Gris"
+    "general/grey": "Gris",
+    "admin/page_url_contains_nameless_path": "Su página personalizada sobrescribiría una página de NamelessMC.",
+    "admin/debug_link_info": "Importante: ¡comparte este enlace sólo con personas de confianza!",
+    "admin/test_email_query": "¿No llega a su bandeja de entrada? Pruebe lo siguiente:",
+    "admin/test_email_suggest_1": "Espere unos minutos y revise su carpeta de \"Spam\".",
+    "admin/test_email_suggest_2": "Actualice los registros DNS de su sitio (compruebe SPF y DKIM).",
+    "admin/test_email_suggest_3": "Configurar un servidor SMTP. {{docLinkStart}}Leer más »{{docLinkEnd}}",
+    "admin/api_disabled": "La API está desactivada",
+    "installer/database_configured": "La base de datos ha sido configurada.",
+    "installer/upgrade_error": "Se han producido errores durante la actualización.",
+    "user/no_providers_admin": "Los administradores del sitio aún no han configurado ningún proveedor de OAuth."
 }
diff --git a/custom/languages/nl_NL.json b/custom/languages/nl_NL.json
index d9ff6a726e..c3a8c2d1b4 100644
--- a/custom/languages/nl_NL.json
+++ b/custom/languages/nl_NL.json
@@ -111,7 +111,7 @@
     "admin/default_avatar": "Standaard avatar",
     "admin/default_group": "Is de standaardgroep (voor nieuwe gebruikers)?",
     "admin/default_language": "Standaard taal",
-    "admin/default_language_help": "Gebruikers kunnen kiezen uit alle geinstalleerde talen.",
+    "admin/default_language_help": "Gebruikers kunnen kiezen uit alle geinstalleerde talen. {{docLinkStart}}Lees meer »{{docLinkEnd}}",
     "admin/default_server": "Standaard server",
     "admin/default_template_set": "Standaard sjabloon verzet naar {{template}} succesvol.",
     "admin/default_timezone": "Standaard tijdzone",
@@ -176,7 +176,7 @@
     "admin/enable_authme": "AuthMe integratie aanzetten?",
     "admin/enable_debug_mode": "Wil je debug modus inschakelen?",
     "admin/enable_mailer": "PHPMailer inschakelen?",
-    "admin/enable_mailer_help": "Zet dit aan als de emails standaard niet worden verzonden. Als je gebruik wilt maken van PHPMailer heb je een email dienst nodig waarmee je emails kan verzenden, zoals Gmail of een SMTP provider (Outlook/Hotmail).",
+    "admin/enable_mailer_help": "Als dit aanstaat, worden e-mails verzonden met PHPMailer in plaats van de standaard van het system. Dit zou kunnen helpen met het verzenden van e-mails maar vereist wel dat je een SMTP aanbieder configureert. {{docLinkStart}}Lees meer »{{docLinkEnd}}",
     "admin/enable_maintenance_mode": "Wil je onderhoud modus inschakelen?",
     "admin/enable_minecraft_integration": "Minecraft integratie inschakelen?",
     "admin/enable_nicknames_on_registration": "Bijnamen inschakelen bij het registreren van gebruikers?",
@@ -251,7 +251,7 @@
     "admin/hook_edited": "Webhook succesvol aangepast",
     "admin/hook_events": "Gebeurtenissen om deze webhook te activeren",
     "admin/hook_name": "Webhook Naam",
-    "admin/hook_select_info": "Alleen Webhooks met 'Nieuw onderwerp' als evenement worden getoond.",
+    "admin/hook_select_info": "Alleen Webhooks met 'Nieuw onderwerp' of 'Onderwerp reactie' als evenementen worden getoond.",
     "admin/hook_type": "Webhook-type",
     "admin/hook_url": "Webhook-URL",
     "admin/hooks": "Webhooks",
@@ -329,7 +329,7 @@
     "admin/navbar_icon": "Navbar Icoon",
     "admin/navbar_icon_instructions": "U kunt hier ook een pictogram aan elk item op de navigatiebalk toevoegen, bijvoorbeeld met behulp van {{faLink}}, {{semLink}}.",
     "admin/navbar_order": "Navbar ordening",
-    "admin/navbar_order_instructions": "Je kan elk item een nummer boven de 0 geven om items te ordenen in de navbar, met 1 de eerste en hogere nummers erna.",
+    "admin/navbar_order_instructions": "Je kan elk item een nummer boven de 0 geven om items te ordenen in de navbar, waar het laagste nummer eerst in de navbar zal komen en hogere nummers erna.",
     "admin/navigation": "Navigatie",
     "admin/navigation_settings_updated_successfully": "Navigatie-instellingen succesvol bijgewerkt.",
     "admin/negative": "Negatief",
@@ -571,7 +571,7 @@
     "admin/upgrade_php_version": "Upgrade alstublieft uw PHP versie naar tenminste 7.4 - de volgende Nameless release zal de versie die u gebruikt niet langer ondersteunen.",
     "admin/upload_new_image": "Upload nieuwe afbeelding",
     "admin/use_friendly_urls": "Vriendelijke URLs",
-    "admin/use_friendly_urls_help": "BELANGRIJK: Je webserver/webhosting moet geconfigureerd zijn om gebruik te maken van mod_rewrite en .htaccess vooraleer dit werkt.",
+    "admin/use_friendly_urls_help": "Als dit aanstaat, worden schoner lijkende web adressen gebruikt. Je moet het gebruik van mod_rewrite en .htaccess bestanden toelaten om dit te laten werken. {{docLinkStart}}Lees meer »{{docLinkEnd}}",
     "admin/user": "Gebruiker",
     "admin/user_deleted": "Gebruiker succesvol verwijderd.",
     "admin/user_id": "User ID",
@@ -1206,5 +1206,17 @@
     "general/purple": "Paars",
     "general/pink": "Roze",
     "general/brown": "Bruin",
-    "general/grey": "Grijs"
+    "general/grey": "Grijs",
+    "admin/home_custom_content": "Hoofd Aanpasbare Inhoud",
+    "installer/database_configured": "De database is geconfigureerd.",
+    "admin/page_url_contains_nameless_path": "Je aangepaste pagina zou een NamelessMC pagina overschrijven.",
+    "admin/api_disabled": "API staat uit",
+    "user/no_providers_admin": "Er zijn nog geen OAuth aanbieders geconfigureerd door de site administrators.",
+    "admin/debug_link_info": "Belangrijk - Deel deze link alleen met mensen die je vertrouwt!",
+    "admin/test_email_query": "Komt het niet in je inbox? Probeer het volgende:",
+    "admin/test_email_suggest_1": "Wacht een paar minuten en check je spam map.",
+    "admin/test_email_suggest_2": "Update je site zijn DNS records (check SPF & DKIM).",
+    "admin/test_email_suggest_3": "Configureer een SMTP server. {{docLinkStart}}Lees meer »{{docLinkEnd}}",
+    "installer/upgrade_error": "Er zijn fouten ontstaan tijdens het upgraden.",
+    "admin/custom_content": "Aangepaste Inhoud"
 }
diff --git a/custom/languages/ru_RU.json b/custom/languages/ru_RU.json
index 514af7e8cd..a71cc49002 100644
--- a/custom/languages/ru_RU.json
+++ b/custom/languages/ru_RU.json
@@ -1215,5 +1215,8 @@
     "admin/test_email_query": "Не получаете в ваших входящих? Попробуйте:",
     "admin/test_email_suggest_1": "Подождите несколько минут и проверьте вашу Спам папку.",
     "admin/test_email_suggest_2": "Обновите DNS рекорды вашего сайта (проверьте SPF & DKIM).",
-    "admin/test_email_suggest_3": "Настройте SMTP сервер. {{docLinkStart}}Прочитать больше »{{docLinkEnd}}"
+    "admin/test_email_suggest_3": "Настройте SMTP сервер. {{docLinkStart}}Прочитать больше »{{docLinkEnd}}",
+    "installer/database_configured": "Датабаза была настроена.",
+    "installer/upgrade_error": "Произошли ошибки при обновлении.",
+    "admin/debug_link_info": "Важно - только делитесь этой ссылкой с людьми которыми вы доверяете!"
 }
diff --git a/modules/Discord Integration/language/cs_CZ.json b/modules/Discord Integration/language/cs_CZ.json
index 34f83cde77..4793950d4a 100644
--- a/modules/Discord Integration/language/cs_CZ.json	
+++ b/modules/Discord Integration/language/cs_CZ.json	
@@ -14,8 +14,8 @@
     "discord_integration/discord_database_error": "Databáze Nameless Link momentálně není dostupná. Zkuste to prosím znovu za chvíli.",
     "discord_integration/discord_guild_id": "ID Discord serveru",
     "discord_integration/discord_id_help": "Pro informace, kde nalézt Discord ID, si přečtěte {{linkStart}}toto.{{linkEnd}}",
-    "discord_integration/discord_id_length": "Ujistěte se, že vaše Discord ID je dlouhé 18 znaků.",
-    "discord_integration/discord_id_numeric": "Ujistěte se, že vaše Discord ID obsahuje pouze čísla.",
+    "discord_integration/discord_id_length": "Ujistěte se, že ID vašeho Discord serveru je dlouhé 18 znaků.",
+    "discord_integration/discord_id_numeric": "Ujistěte se, že ID vašeho Discord serveru obsahuje pouze čísla.",
     "discord_integration/discord_id_set": "ID Discordu úspěšně nastaveno",
     "discord_integration/discord_id_taken": "Toto Discord ID je již zabráno.",
     "discord_integration/discord_id_unlinked": "Úspěšně jste odpojili své uživatelské ID.",
@@ -47,5 +47,7 @@
     "discord_integration/discord_bot_check_logs": "Zkuste se podívat po specifičtější chybě (pokud existuje) v Panel -> Zabezpečení -> Všechny protokoly.",
     "discord_integration/discord_bot_error_partsuccess": "Bot nemohl upravit jednu nebo více rolí kvůli nesprávné konfiguraci hierarchie na Discordu.",
     "discord_integration/discord_invite_info": "Pro pozvání bota Nameless Link na váš Discord server klikněte {{inviteLinkStart}}sem{{inviteLinkEnd}}. Poté spusťte příkaz {{command}} pro propojení bota s vaším webem. Můžete také {{selfHostLinkStart}}sami hostovat bota{{selfHostLinkEnd}}.",
-    "discord_integration/discord_widget_disabled": "U zadaného Discord serveru je zakázán widget. Běžte prosím do záložky 'Widget' v nastavení vašeho Discord serveru a ujistěte se, že je možnost povolena a že je ID správné."
+    "discord_integration/discord_widget_disabled": "U zadaného Discord serveru je zakázán widget. Běžte prosím do záložky 'Widget' v nastavení vašeho Discord serveru a ujistěte se, že je možnost povolena a že je ID správné.",
+    "discord_integration/discord_widget_error": "Při načítání Discord widgetu se vyskytla chyba: {{error}}.",
+    "discord_integration/discord_id_required": "Zadejte ID vašeho Discord serveru."
 }
diff --git a/modules/Discord Integration/language/de_DE.json b/modules/Discord Integration/language/de_DE.json
index e815327b4c..7c4af23e1b 100644
--- a/modules/Discord Integration/language/de_DE.json	
+++ b/modules/Discord Integration/language/de_DE.json	
@@ -12,8 +12,8 @@
     "discord_integration/discord_communication_error": "Bei der Kommunikation mit dem Discord Bot ist ein Fehler aufgetreten. Bitte stellen Sie sicher, dass der Bot ausgeführt wird und Ihre Bot-URL korrekt ist.",
     "discord_integration/discord_database_error": "Die Nameless Link-Datenbank ist derzeit nicht verfügbar. Bitte versuchen Sie es später noch einmal.",
     "discord_integration/discord_id_help": "Für Informationen darüber, wo man Discord-IDs findet, lies bitte {{linkStart}}hier.{{linkEnd}}",
-    "discord_integration/discord_id_length": "Bitte stellen Sie sicher, dass Ihre Discord ID 18 Zeichen lang ist.",
-    "discord_integration/discord_id_numeric": "Bitte stellen Sie sicher, dass Ihre Discord ID numerisch ist (nur Zahlen)..",
+    "discord_integration/discord_id_length": "Bitte stelle sicher, dass deine Discord Server ID 18 Zeichen lang ist.",
+    "discord_integration/discord_id_numeric": "Bitte stelle sicher, dass deine Discord Server ID numerisch ist (nur Zahlen)..",
     "discord_integration/discord_id_set": "Discord ID erfolgreich eingestellt",
     "discord_integration/discord_id_taken": "Diese Discord ID wurde bereits vergeben.",
     "discord_integration/discord_id_unlinked": "Die Verknüpfung Ihrer Discord-Benutzer-ID wurde erfolgreich aufgehoben.",
@@ -47,5 +47,7 @@
     "discord_integration/discord_guild_id": "Discord Server ID",
     "discord_integration/discord_id_confirm": "Bitte führe den Befehl \"/verify {{token}}\" in Discord aus, um die Verknüpfung deines Discord-Kontos abzuschließen.",
     "discord_integration/discord_invite_info": "Um den Nameless Link-Bot auf deinen Discord-Server einzuladen, klicke auf {{inviteLinkStart}}hier{{inviteLinkEnd}}. Führe dann den Befehl {{command}} aus, um den Bot mit deiner Website zu verbinden. Alternativ kannst du {{selfHostLinkStart}} den Bot auch selbst hosten{{selfHostLinkEnd}}.",
-    "discord_integration/discord_widget_theme": "Discord Widget Theme"
+    "discord_integration/discord_widget_theme": "Discord Widget Theme",
+    "discord_integration/discord_widget_error": "Beim Abrufen des Discord-Widgets ist ein Fehler aufgetreten: {{error}}.",
+    "discord_integration/discord_id_required": "Bitte gib deine Discord Server ID ein."
 }
diff --git a/modules/Discord Integration/language/en_US.json b/modules/Discord Integration/language/en_US.json
index 345ae86a24..3410a3de5b 100644
--- a/modules/Discord Integration/language/en_US.json	
+++ b/modules/Discord Integration/language/en_US.json	
@@ -17,8 +17,8 @@
     "discord_integration/discord_guild_id": "Discord Server ID",
     "discord_integration/discord_id_confirm": "Please run the command \"/verify {{token}}\" in Discord to finish linking your Discord account.",
     "discord_integration/discord_id_help": "For information on where to find Discord IDs, please read {{linkStart}}this.{{linkEnd}}",
-    "discord_integration/discord_id_length": "Please ensure your Discord ID is 18 characters long.",
-    "discord_integration/discord_id_numeric": "Please ensure your Discord ID is numeric (Numbers only).",
+    "discord_integration/discord_id_length": "Please ensure your Discord Server ID is 18 characters long.",
+    "discord_integration/discord_id_numeric": "Please ensure your Discord Server ID is numeric (Numbers only).",
     "discord_integration/discord_id_set": "Discord ID set successfully",
     "discord_integration/discord_id_taken": "That Discord User ID has already been taken.",
     "discord_integration/discord_id_unlinked": "Successfully unlinked your Discord User ID.",
@@ -47,5 +47,7 @@
     "discord_integration/unable_to_set_discord_id": "Unable to set Discord ID.",
     "discord_integration/unable_to_update_discord_bot_username": "Unable to update Discord bot username.",
     "discord_integration/unable_to_update_discord_roles": "Unable to update Discord roles list.",
-    "discord_integration/unable_to_update_discord_username": "Unable to update Discord username."
+    "discord_integration/unable_to_update_discord_username": "Unable to update Discord username.",
+    "discord_integration/discord_widget_error": "An error occurred when getting Discord widget: {{error}}.",
+    "discord_integration/discord_id_required": "Please enter your Discord Server ID."
 }
diff --git a/modules/Discord Integration/language/es_ES.json b/modules/Discord Integration/language/es_ES.json
index 4ec6a3034c..f6f7575e65 100644
--- a/modules/Discord Integration/language/es_ES.json	
+++ b/modules/Discord Integration/language/es_ES.json	
@@ -47,5 +47,6 @@
     "discord_integration/get_link_code": "Obtener código de enlace",
     "discord_integration/discord_invite_info": "Para invitar al bot Nameless Link a tu servidor de Discord, haz clic en {{inviteLinkStart}}aquí{{inviteLinkEnd}}. A continuación, ejecuta el comando {{command}} para enlazar el bot con tu sitio web. También puedes {{selfHostLinkStart}}alojar el bot tú mismo{{selfHostLinkEnd}}.",
     "discord_integration/discord_user_id": "ID de usuario de Discord",
-    "discord_integration/discord_widget_disabled": "El widget está desactivado para el servidor de Discord especificado. Ve a la pestaña \"Widget\" en la configuración de tu servidor de Discord y asegúrate de que el widget de Discord está activado y de que el ID es correcto."
+    "discord_integration/discord_widget_disabled": "El widget está desactivado para el servidor de Discord especificado. Ve a la pestaña \"Widget\" en la configuración de tu servidor de Discord y asegúrate de que el widget de Discord está activado y de que el ID es correcto.",
+    "discord_integration/discord_widget_error": "Se ha producido un error al obtener el widget de Discord: {{error}}."
 }
diff --git a/modules/Discord Integration/language/nl_NL.json b/modules/Discord Integration/language/nl_NL.json
index a9199125ae..77460db8bf 100644
--- a/modules/Discord Integration/language/nl_NL.json	
+++ b/modules/Discord Integration/language/nl_NL.json	
@@ -10,8 +10,8 @@
     "discord_integration/discord_communication_error": "Er was een fout in de communicatie met de Discord Bot. Zorg ervoor dat de bot werkt en dat uw Bot-URL correct is.",
     "discord_integration/discord_database_error": "De Nameless Link database is op dit moment offline. Probeer het later nog eens.",
     "discord_integration/discord_id_help": "Voor informatie over waar je de Discord IDs kunt vinden, lees alsjeblieft {{linkStart}}dit.{{linkEnd}}",
-    "discord_integration/discord_id_length": "Zorg ervoor dat uw Discord ID 18 karakters lang is.",
-    "discord_integration/discord_id_numeric": "Zorg ervoor dat uw Discord ID numeriek is (alleen cijfers).",
+    "discord_integration/discord_id_length": "Zorg ervoor dat uw Discord server ID 18 karakters lang is.",
+    "discord_integration/discord_id_numeric": "Zorg ervoor dat uw Discord server ID numeriek is (alleen cijfers).",
     "discord_integration/discord_id_set": "Discord ID met succes ingesteld",
     "discord_integration/discord_id_taken": "Die Discord Gebruikers-ID is al ingenomen.",
     "discord_integration/discord_id_unlinked": "Succesvol ontkoppeld van uw Discord Gebruikers-ID.",
@@ -47,5 +47,7 @@
     "discord_integration/unable_to_set_discord_bot_url": "Niet mogelijk om de Discord bot URL in te stellen",
     "discord_integration/unable_to_update_discord_roles": "Niet mogelijk om de Discord rollen lijst up te daten.",
     "discord_integration/unable_to_update_discord_username": "Niet in staat om de Discord gebruikersnaam aan te passen.",
-    "discord_integration/no_pending_verification_for_token": "Er zijn geen verificaties in afwachting onder de ingegeven token."
+    "discord_integration/no_pending_verification_for_token": "Er zijn geen verificaties in afwachting onder de ingegeven token.",
+    "discord_integration/discord_widget_error": "Er is een fout opgetreden tijdens het ophalen van de Discord widget: {{error}}.",
+    "discord_integration/discord_id_required": "Vul alsjeblieft je Discord server ID in."
 }
diff --git a/modules/Discord Integration/language/ru_RU.json b/modules/Discord Integration/language/ru_RU.json
index e93c62224a..91e346de2b 100644
--- a/modules/Discord Integration/language/ru_RU.json	
+++ b/modules/Discord Integration/language/ru_RU.json	
@@ -14,11 +14,11 @@
     "discord_integration/discord_bot_setup": "Бот настроен?",
     "discord_integration/discord_communication_error": "Произошла ошибка во время связи с Discord. Убедитесь что бот активен и URL страница бота корректна.",
     "discord_integration/discord_database_error": "База бота Nameless Link не работает в данный момент. Попробуйте в другой раз.",
-    "discord_integration/discord_guild_id": "ID сервера в Discord",
+    "discord_integration/discord_guild_id": "Discord Сервер ID",
     "discord_integration/discord_id_confirm": "Введите команду \"/verify {{token}}\" в Discord для завершения привязки.",
     "discord_integration/discord_id_help": "Чтобы найти ваш ID сервера в Discord, прочитайте это {{linkStart}}руководство{{linkEnd}}",
-    "discord_integration/discord_id_length": "Убедитесь что ваш ID длинее 18 символов.",
-    "discord_integration/discord_id_numeric": "Убедитесь что ваш ID состоит из цифр.",
+    "discord_integration/discord_id_length": "Убедитесь что ваш Discord Сервер ID длинее 18 символов.",
+    "discord_integration/discord_id_numeric": "Убедитесь что ваш Discord Сервер ID состоит из цифр.",
     "discord_integration/discord_id_set": "Discord ID установлен",
     "discord_integration/discord_id_taken": "Этот User ID в Discord уже занят.",
     "discord_integration/discord_id_unlinked": "Вы отвязали свой профиль в Discord.",
@@ -47,5 +47,7 @@
     "discord_integration/unable_to_set_discord_id": "Не удалось установить Discord ID.",
     "discord_integration/unable_to_update_discord_bot_username": "Не удалось обновить никнейм бота в Discord.",
     "discord_integration/unable_to_update_discord_roles": "Не удалось обновить роли в Discord.",
-    "discord_integration/unable_to_update_discord_username": "Не удалось обновить никнеймы в Discord."
+    "discord_integration/unable_to_update_discord_username": "Не удалось обновить никнеймы в Discord.",
+    "discord_integration/discord_widget_error": "Произошла ошибка при Discord виджете: {{error}}.",
+    "discord_integration/discord_id_required": "Введите ваш Дискорд Сервер ID."
 }
diff --git a/modules/Forum/language/en_US.json b/modules/Forum/language/en_US.json
index 5ec0a40880..e797dfa25b 100644
--- a/modules/Forum/language/en_US.json
+++ b/modules/Forum/language/en_US.json
@@ -186,5 +186,12 @@
     "forum/topic_id": "Topic ID",
     "forum/post_id": "Post ID",
     "forum/pre_post_create_hook_info": "Pre post create",
-    "forum/user_object": "User object"
+    "forum/user_object": "User object",
+    "forum/no_news": "There are no news posts.",
+    "forum/topic_reply": "Topic reply",
+    "forum/label_type_in_use": "Label type is being used, cannot be deleted.",
+    "forum/new_topic_reply_text": "Topic reply created in {{forum}} by {{author}}",
+    "forum/topic_author_uuid": "Topic author user ID",
+    "forum/topic_author_username": "Topic author username",
+    "forum/topic_author_nickname": "Topic author nickname"
 }
diff --git a/modules/Forum/language/nl_NL.json b/modules/Forum/language/nl_NL.json
index 0d232f05e3..a5ca958685 100644
--- a/modules/Forum/language/nl_NL.json
+++ b/modules/Forum/language/nl_NL.json
@@ -144,7 +144,7 @@
     "forum/forum_icon_maximum": "Het forum icoon mag maximaal 256 karakters lang zijn.",
     "forum/forum_search": "Forum Zoeken",
     "forum/forum_updated_successfully": "Forum succesvol geüpdatet.",
-    "forum/include_in_hook": "Betrek nieuwe berichten van dit forum in webhooks?",
+    "forum/include_in_hook": "Betrek evenementen van dit forum in webhooks?",
     "forum/invalid_search_query": "Vul alsjeblieft een zoekterm in tussen {{min}} en {{max}} karakters lang.",
     "forum/label": "Label",
     "forum/label_deleted_successfully": "Label succesvol verwijdert.",
@@ -159,5 +159,39 @@
     "forum/new_search": "Nieuwe zoekopdracht",
     "forum/new_topic_hook_info": "Nieuw onderwerp",
     "forum/new_topic_text": "Onderwerp gemaakt in {{forum}} door {{author}}",
-    "forum/new_reply_in_topic": "{{author}} Heeft gereageerd op onderwerp {{topic}}"
+    "forum/new_reply_in_topic": "{{author}} Heeft gereageerd op onderwerp {{topic}}",
+    "forum/search_again_in_x_seconds": "Wacht alstublieft {{count}} seconden voor opnieuw te zoeken.",
+    "forum/no_news": "Er zijn geen nieuws posts.",
+    "forum/not_following_any_topics": "Je volgt geen onderwerpen.",
+    "forum/now_following_topic": "Je volgt nu dit onderwerp, en zult meldingen krijgen van nieuwe reacties.",
+    "forum/post_id": "Post ID",
+    "forum/topic_reply": "Onderwerp reactie",
+    "forum/your_posts": "Jouw post aantal",
+    "forum/label_type_in_use": "Label type wordt gebruikt, kan niet worden verwijderd.",
+    "forum/new_topic_reply_text": "Onderwerp reactie gemaakt in {{forum}} door {{author}}",
+    "forum/no_longer_following_topic": "Je volgt dit onderwerp niet meer, en krijgt geen meldingen meer van nieuwe reacties.",
+    "forum/no_results_found": "Geen resultaten gevonden.",
+    "forum/posts_title": "Posts",
+    "forum/pre_post_create_hook_info": "Voor post aanmaak",
+    "forum/pre_post_edit_hook_info": "Voor post bewerking",
+    "forum/pre_topic_create_hook_info": "Voor reactie aanmaak",
+    "forum/pre_topic_edit_hook_info": "Voor reactie bewerking",
+    "forum/recent_posts": "Recente Posts",
+    "forum/recent_topics": "Recente onderwerpen",
+    "forum/redirect_forum": "Leid forum om?",
+    "forum/redirect_url": "Omleid URL",
+    "forum/search_results": "Zoekresultaten",
+    "forum/settings_updated_successfully": "Instellingen succesvol aangepast.",
+    "forum/started_by_x": "Gestart door {{author}}",
+    "forum/sticky_topics": "Plakkende Onderwerpen",
+    "forum/topic_id": "Onderwerp ID",
+    "forum/topic_placeholder": "Onderwerp placeholder",
+    "forum/topics_title": "Onderwerpen",
+    "forum/total_posts": "Totale post aantal",
+    "forum/topic_author_uuid": "Onderwerp auteur gebruikers ID",
+    "forum/topic_author_username": "Onderwerp auteur gebruikersnaam",
+    "forum/topic_author_nickname": "Topic auteur bijnaam",
+    "forum/unfollow": "Ontvolg",
+    "forum/unfollow_all_topics": "Ontvolg alle onderwerpen",
+    "forum/user_object": "Gebruikersobject"
 }

From 4115b65ce2a31fd49c80791c48a582d2a5f51c2b Mon Sep 17 00:00:00 2001
From: namelessmc-bot <76107159+namelessmc-bot@users.noreply.github.com>
Date: Sat, 4 Jun 2022 16:53:26 +0200
Subject: [PATCH 025/337] Translations update (#2821)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Supercrafter100 <admin@supercrafter100.com>
Co-authored-by: Marcos <marckos03br@gmail.com>
Co-authored-by: PadowYT2 <me@padow.ml>
Co-authored-by: PikaMug <pikamug@gmail.com>
Co-authored-by: Jonáš Loskot <fjuro@seznam.cz>
Co-authored-by: enno123 <admin@enno123.de>

From 84dc01c4b4f5753d4b953e469474d1890de31546 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Sat, 4 Jun 2022 09:24:26 -0600
Subject: [PATCH 026/337] Fix editing topic title

---
 custom/templates/DefaultRevamp/forum/forum_edit_post.tpl | 4 ++--
 modules/Forum/pages/forum/edit.php                       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/custom/templates/DefaultRevamp/forum/forum_edit_post.tpl b/custom/templates/DefaultRevamp/forum/forum_edit_post.tpl
index 548d53967f..981e69ca2e 100755
--- a/custom/templates/DefaultRevamp/forum/forum_edit_post.tpl
+++ b/custom/templates/DefaultRevamp/forum/forum_edit_post.tpl
@@ -27,7 +27,7 @@
                     {if isset($EDITING_TOPIC)}
                     <div class="field">
                         <label for="title">{$TOPIC_TITLE}</label>
-                        <input type="text" id="title" name="title" value="{$TOPIC_TITLE}">
+                        <input type="text" id="title" name="title" value="{$TOPIC_TITLE_VALUE}">
                     </div>
                     {if count($LABELS)}
                     <div class="inline fields labels">
@@ -57,4 +57,4 @@
     </div>
 </div>
 
-{include file='footer.tpl'}
\ No newline at end of file
+{include file='footer.tpl'}
diff --git a/modules/Forum/pages/forum/edit.php b/modules/Forum/pages/forum/edit.php
index c8482aa32f..d5d8d554cc 100644
--- a/modules/Forum/pages/forum/edit.php
+++ b/modules/Forum/pages/forum/edit.php
@@ -186,7 +186,7 @@
 if (isset($edit_title, $post_labels)) {
     $smarty->assign('EDITING_TOPIC', true);
 
-    $smarty->assign('TOPIC_TITLE', $post_title);
+    $smarty->assign('TOPIC_TITLE_VALUE', $post_title);
 
     // Topic labels
     $smarty->assign('LABELS_TEXT', $forum_language->get('forum', 'label'));

From d5cb2176ca0bfcbb757861c97b3121c589996626 Mon Sep 17 00:00:00 2001
From: Partydragen <adrian_kili@outlook.com>
Date: Sat, 4 Jun 2022 17:34:40 +0200
Subject: [PATCH 027/337] Last_online can be null

---
 core/classes/DTO/UserData.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/classes/DTO/UserData.php b/core/classes/DTO/UserData.php
index e76b2bc9a1..7e7b729a40 100644
--- a/core/classes/DTO/UserData.php
+++ b/core/classes/DTO/UserData.php
@@ -27,7 +27,7 @@ class UserData {
     public bool $gravatar;
     public bool $topic_updates;
     public bool $private_profile;
-    public int $last_online;
+    public ?int $last_online;
     public ?string $user_title;
     public ?int $theme_id;
     public ?int $language_id;

From 9a5e51f43e2fe36329eba2190be9f3758c6ba312 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Sat, 4 Jun 2022 09:42:30 -0600
Subject: [PATCH 028/337] Fix #2820

---
 modules/Core/module.php             |  2 +-
 modules/Core/pages/panel/update.php | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/Core/module.php b/modules/Core/module.php
index af4a585788..1f28f20b41 100644
--- a/modules/Core/module.php
+++ b/modules/Core/module.php
@@ -743,7 +743,7 @@ public function onPageLoad(User $user, Pages $pages, Cache $cache, Smarty $smart
 
         // Check for updates
         if ($user->isLoggedIn()) {
-            if ($user->hasPermission('admincp.update')) {
+            if ((defined('PANEL_PAGE') && PANEL_PAGE !== 'update') && $user->hasPermission('admincp.update')) {
                 $cache->setCache('update_check');
                 if ($cache->isCached('update_check')) {
                     $update_check = $cache->retrieve('update_check');
diff --git a/modules/Core/pages/panel/update.php b/modules/Core/pages/panel/update.php
index 65f22fe28d..5f8b835b52 100644
--- a/modules/Core/pages/panel/update.php
+++ b/modules/Core/pages/panel/update.php
@@ -57,6 +57,16 @@
 if (!is_string($update_check)) {
     if ($update_check->updateAvailable()) {
         $smarty->assign([
+            'NEW_UPDATE' => $update_check->isUrgent()
+                ? $language->get('admin', 'new_urgent_update_available')
+                : $language->get('admin', 'new_update_available'),
+            'NEW_UPDATE_URGENT' => $update_check->isUrgent(),
+            'CURRENT_VERSION' => $language->get('admin', 'current_version_x', [
+                'version' => Output::getClean(NAMELESS_VERSION)
+            ]),
+            'NEW_VERSION' => $language->get('admin', 'new_version_x', [
+                'version' => Output::getClean($update_check->version())
+            ]),
             'INSTRUCTIONS' => $language->get('admin', 'instructions'),
             'INSTRUCTIONS_VALUE' => Output::getDecoded($update_check->instructions()),
             'UPGRADE_LINK' => URL::build('/panel/upgrade'),

From cf25a43bc4a540ce8c53957a93ef9cff56e1bbb8 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Sat, 4 Jun 2022 09:43:51 -0600
Subject: [PATCH 029/337] Add back `DB::decrement(...)`

---
 core/classes/Database/DB.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/core/classes/Database/DB.php b/core/classes/Database/DB.php
index bbf7a2843e..7acb99b1b7 100644
--- a/core/classes/Database/DB.php
+++ b/core/classes/Database/DB.php
@@ -273,6 +273,20 @@ public function increment(string $table, int $id, string $field): bool {
         return !$this->query("UPDATE {$table} SET {$field} = {$field} + 1 WHERE id = ?", [$id])->error();
     }
 
+    /**
+     * Decrement a numeric column value by 1.
+     *
+     * @param string $table The table to use.
+     * @param int $id The id of the row to decrement a column in.
+     * @param string $field The field to increment.
+     * @return bool Whether an error occurred or not.
+     */
+    public function decrement(string $table, int $id, string $field): bool {
+        $table = $this->_prefix . $table;
+
+        return !$this->query("UPDATE {$table} SET {$field} = {$field} - 1 WHERE id = ?", [$id])->error();
+    }
+
     /**
      * Select rows from the database, ordering by a specific column and sort type.
      *

From 3407ca501cd2a78e3caa4825058a8fb0250c31f5 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Sat, 4 Jun 2022 21:51:05 +0200
Subject: [PATCH 030/337] add null checks

---
 core/classes/Templates/AssetResolver.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/classes/Templates/AssetResolver.php b/core/classes/Templates/AssetResolver.php
index fd4a72b56e..b94a3e558c 100644
--- a/core/classes/Templates/AssetResolver.php
+++ b/core/classes/Templates/AssetResolver.php
@@ -27,9 +27,17 @@ public function include($assets): void {
         }
 
         foreach ($assets as $asset) {
+            if ($asset == null) {
+                throw new InvalidArgumentException("Attempted to register null asset");
+            }
+
             $this->validateAsset($asset);
 
             $this->_assets[$asset] = parent::ASSET_TREE[$asset];
+
+            if ($this->_assets[$asset] == null) {
+                throw new InvalidArgumentException("Asset missing in asset tree");
+            }
         }
     }
 

From 2d345d47a6ba1fec6202537a107f0485c2f808e7 Mon Sep 17 00:00:00 2001
From: Partydragen <admin@partydragen.com>
Date: Sun, 5 Jun 2022 19:21:28 +0200
Subject: [PATCH 031/337] Banner image listing

Broke in https://github.com/NamelessMC/Nameless/commit/aaacf040ae69bcedb0e156f6cde69c2f1bef28da
---
 modules/Core/pages/panel/images.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/modules/Core/pages/panel/images.php b/modules/Core/pages/panel/images.php
index ec073647ce..c803524a17 100644
--- a/modules/Core/pages/panel/images.php
+++ b/modules/Core/pages/panel/images.php
@@ -138,6 +138,26 @@
 // Only display jpeg, png, jpg, gif
 $allowed_exts = ['gif', 'png', 'jpg', 'jpeg', 'ico'];
 
+$image_path = implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'uploads', 'template_banners']);
+$images = scandir($image_path);
+$template_banner_images = [];
+
+$n = 1;
+
+foreach ($images as $image) {
+    $ext = pathinfo($image, PATHINFO_EXTENSION);
+    if (!in_array($ext, $allowed_exts)) {
+        continue;
+    }
+    $template_banner_images[] = [
+        'src' => (defined('CONFIG_PATH') ? CONFIG_PATH : '') . '/uploads/template_banners/' . $image,
+        'value' => $image,
+        'selected' => ($banner_image == (defined('CONFIG_PATH') ? CONFIG_PATH : '') . '/uploads/template_banners/' . $image),
+        'n' => $n
+    ];
+    $n++;
+}
+
 $image_path = implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'uploads', 'logos']);
 $images = scandir($image_path);
 $logo_images = [];

From 6b6da8e398f6a5d500753b26f5d1ed3fa7db973e Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Sun, 5 Jun 2022 23:19:12 +0200
Subject: [PATCH 032/337] Remove unused isConnectionSSL

getProtocol() should be (and is) used instead
---
 core/classes/Core/Util.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/core/classes/Core/Util.php b/core/classes/Core/Util.php
index 97ec2784ee..000174944c 100644
--- a/core/classes/Core/Util.php
+++ b/core/classes/Core/Util.php
@@ -374,15 +374,6 @@ public static function getSelfURL(bool $show_protocol = true): string {
         return $url;
     }
 
-    /**
-     * Detect if the current connection is using SSL.
-     *
-     * @return bool Whether SSL is in use or not.
-     */
-    public static function isConnectionSSL(): bool {
-        return (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') || (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https');
-    }
-
     /**
      * URL-ify a string
      *

From e278348c871fd3684e741c4b66dc89338c7ad94b Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Sun, 5 Jun 2022 23:47:37 +0200
Subject: [PATCH 033/337] Fix CLI install error, there may not be any
 address/proto/port

this happened when a curl error occured during minecraft uuid request, resulting it getting the IP for logging
---
 core/classes/Core/Log.php                     |  6 ++---
 core/classes/Core/Util.php                    | 24 ++++++++++++-------
 modules/Core/pages/register.php               |  2 +-
 .../Discord Integration/classes/Discord.php   |  2 +-
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/core/classes/Core/Log.php b/core/classes/Core/Log.php
index 98de20a615..22a6a13c1f 100644
--- a/core/classes/Core/Log.php
+++ b/core/classes/Core/Log.php
@@ -206,16 +206,16 @@ public static function Action(string $path) {
      * @param string $action The action being logged
      * @param string $info Some more information about what the action is about
      * @param ?int $user The User ID who is doing the action
-     * @param ?string $ip The ip of the user. If not specified, it will try to get the IP from the currently logged in user.
      * @return bool Return true or false if inserted into the database.
      */
-    public function log(string $action, string $info = '', ?int $user = null, string $ip = null): bool {
+    public function log(string $action, string $info = '', ?int $user = null): bool {
         if ($user == null) {
             $userTemp = new User();
-            $ip = Util::getRemoteAddress();
             $user = ($userTemp->isLoggedIn() ? $userTemp->data()->id : 0);
         }
 
+        $ip = Util::getRemoteAddress();
+
         return $this->_db->insert('logs', [
             'time' => date('U'),
             'action' => $action,
diff --git a/core/classes/Core/Util.php b/core/classes/Core/Util.php
index 000174944c..08376a427d 100644
--- a/core/classes/Core/Util.php
+++ b/core/classes/Core/Util.php
@@ -226,9 +226,9 @@ private static function firstNonProxyAddress(array $addresses): string {
     /**
      * Get the client's true IP address, using proxy headers if necessary.
      *
-     * @return string Client IP address
+     * @return ?string Client IP address, or null if there is no remote address, for example in CLI environment
      */
-    public static function getRemoteAddress(): string {
+    public static function getRemoteAddress(): ?string {
         $headers = getallheaders();
 
         // Try the simple headers first that only contain an IP address
@@ -304,9 +304,9 @@ public static function getRemoteAddress(): string {
     /**
      * Get the protocol used by client's HTTP request, using proxy headers if necessary.
      *
-     * @return string 'http' if HTTP or 'https' if HTTPS
+     * @return ?string 'http' if HTTP or 'https' if HTTPS, or null when using the CLI
      */
-    public static function getProtocol(): string {
+    public static function getProtocol(): ?string {
         if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
             self::ensureTrustedProxy();
             $proto = $_SERVER['HTTP_X_FORWARDED_PROTO'];
@@ -316,15 +316,17 @@ public static function getProtocol(): string {
             return $proto;
         }
 
-        return (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off')
-            ? 'https'
-            : 'http';
+        if (isset($_SERVER['HTTPS'])) {
+            return $_SERVER['HTTPS'] !== 'off' ? 'https' : 'http';
+        }
+
+        return null;
     }
 
     /**
      * Get port used by client's HTTP request, using proxy headers if necessary.
      *
-     * @return int Port number
+     * @return ?int Port number, or null when using the CLI
      */
     public static function getPort(): int {
         if (isset($_SERVER['HTTP_X_FORWARDED_PORT'])) {
@@ -332,7 +334,11 @@ public static function getPort(): int {
             return (int) $_SERVER['HTTP_X_FORWARDED_PORT'];
         }
 
-        return (int) $_SERVER['SERVER_PORT'];
+        if (isset($_SERVER['SERVER_PORT'])) {
+            return (int) $_SERVER['SERVER_PORT'];
+        }
+
+        return null;
     }
 
     /**
diff --git a/modules/Core/pages/register.php b/modules/Core/pages/register.php
index eaf40226d5..3f8eaa4c3c 100644
--- a/modules/Core/pages/register.php
+++ b/modules/Core/pages/register.php
@@ -355,7 +355,7 @@
                             }
                         }
 
-                        Log::getInstance()->log(Log::Action('user/register'), '', $user_id, Util::getRemoteAddress());
+                        Log::getInstance()->log(Log::Action('user/register'), '', $user_id);
 
                         $default_language = new Language('core', DEFAULT_LANGUAGE);
                         EventHandler::executeEvent('registerUser', [
diff --git a/modules/Discord Integration/classes/Discord.php b/modules/Discord Integration/classes/Discord.php
index 009eed969d..8ff012e918 100644
--- a/modules/Discord Integration/classes/Discord.php	
+++ b/modules/Discord Integration/classes/Discord.php	
@@ -78,7 +78,7 @@ public static function updateDiscordRoles(User $user, array $added, array $remov
         $errors = self::parseErrors($result);
 
         foreach ($errors as $error) {
-            Log::getInstance()->log(Log::Action('discord/role_set'), $error, $user->data()->id, Util::getRemoteAddress());
+            Log::getInstance()->log(Log::Action('discord/role_set'), $error, $user->data()->id);
         }
 
         return false;

From 67090bdeb4b7b2e72929384191f144cafff708b7 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Sun, 5 Jun 2022 23:49:33 +0200
Subject: [PATCH 034/337] fix return type

---
 core/classes/Core/Util.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/classes/Core/Util.php b/core/classes/Core/Util.php
index 08376a427d..f2c40a066d 100644
--- a/core/classes/Core/Util.php
+++ b/core/classes/Core/Util.php
@@ -328,7 +328,7 @@ public static function getProtocol(): ?string {
      *
      * @return ?int Port number, or null when using the CLI
      */
-    public static function getPort(): int {
+    public static function getPort(): ?int {
         if (isset($_SERVER['HTTP_X_FORWARDED_PORT'])) {
             self::ensureTrustedProxy();
             return (int) $_SERVER['HTTP_X_FORWARDED_PORT'];

From 3ac1226c551c6bf7078b0c26e9579d16c02115da Mon Sep 17 00:00:00 2001
From: Partydragen <adrian_kili@outlook.com>
Date: Sun, 5 Jun 2022 23:57:06 +0200
Subject: [PATCH 035/337] Fix missing term

---
 custom/languages/en_UK.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/custom/languages/en_UK.json b/custom/languages/en_UK.json
index 29496157a0..9faefc913e 100644
--- a/custom/languages/en_UK.json
+++ b/custom/languages/en_UK.json
@@ -829,6 +829,7 @@
     "general/pink": "Pink",
     "general/brown": "Brown",
     "general/grey": "Grey",
+    "general/deleted_user": "Deleted User",
     "installer/back": "Back",
     "installer/cache_writable": "Cache Writable",
     "installer/character_set": "Character Set",
@@ -1219,4 +1220,4 @@
     "user/x_replies": "{{count}} replies",
     "user/you_have_been_banned": "You have been banned!",
     "user/you_have_received_a_warning": "You have received a warning!"
-}
\ No newline at end of file
+}

From dd51de48e8fd359ea369124ea6d155f01403ac5d Mon Sep 17 00:00:00 2001
From: Anton <wincraft251@googlemail.com>
Date: Sun, 5 Jun 2022 18:51:17 +0000
Subject: [PATCH 036/337] Translated using Weblate (German)

Currently translated at 100.0% (1220 of 1220 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/
---
 custom/languages/de_DE.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index df8c801402..5640c0a319 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -564,7 +564,7 @@
     "admin/users": "Benutzer",
     "admin/uuid": "UUID",
     "admin/uuid_max_32": "UUID muss zwischen 2 und 32 Zeichen lang sein.",
-    "admin/validate_hook_info": "Benutzer Verifizierung",
+    "admin/validate_hook_info": "Benutzerverifizierung",
     "admin/validate_user": "Benutzer bestätigen",
     "admin/validation_promote_group": "Verifiziert Gruppe",
     "admin/validation_promote_group_info": "Diese Gruppe erhält der Spieler, wenn er sich verifiziert hat.",
@@ -880,16 +880,16 @@
     "table/no_records": "Keine Eintragungen verfügbar",
     "table/nothing_found": "Keine Einträge gefunden",
     "table/page_x_of_y": "Zeige Seite _PAGE_ von _PAGES_",
-    "time/1_day": "1 Tag her",
-    "time/1_minute": "1 Minute her",
-    "time/_days": "{{count}} Tage her",
-    "time/_hours": "{{count}} Stunden her",
-    "time/_minutes": "{{count}} Minuten her",
-    "time/_months": "{{count}} Monate her",
+    "time/1_day": "Vor 1 Tag",
+    "time/1_minute": "Vor 1 Minute",
+    "time/_days": "Vor {{count}} Tagen",
+    "time/_hours": "Vor {{count}} Stunden",
+    "time/_minutes": "Vor {{count}} Minuten",
+    "time/_months": "Vor {{count}} Monaten",
     "time/about_1_hour": "über 1 Stunde her",
     "time/about_1_month": "über 1 Monat her",
     "time/about_1_year": "über 1 Jahr her",
-    "time/less_than_a_minute": "weniger als eine Minute her",
+    "time/less_than_a_minute": "vor weniger als einer Minute",
     "time/over_x_years": "über {{count}} Jahre her",
     "user/1_new_alert": "Du hast 1 neue Benachrichtigung",
     "user/1_new_message": "Du hast {{count}} neue Nachrichten",

From dba6584eeff4303d28ec05d37511575c1da10736 Mon Sep 17 00:00:00 2001
From: snake <admin@viasnake.com>
Date: Sun, 5 Jun 2022 20:24:52 +0000
Subject: [PATCH 037/337] Translated using Weblate (Japanese)

Currently translated at 95.5% (1166 of 1220 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/ja/
---
 custom/languages/ja_JP.json | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/custom/languages/ja_JP.json b/custom/languages/ja_JP.json
index 0852d63412..5535ded9ff 100644
--- a/custom/languages/ja_JP.json
+++ b/custom/languages/ja_JP.json
@@ -118,7 +118,7 @@
     "admin/default_avatar": "デフォルトアバター",
     "admin/default_group": "このグループは（新規ユーザーの）デフォルトグループですか？",
     "admin/default_language": "初期言語",
-    "admin/default_language_help": "初期言語に設定している言語が登録後最初の言語になりますが、各ユーザーは後でインストールされている言語から別の言語を選択できます。",
+    "admin/default_language_help": "ユーザーは、インストールされている言語から選択することができます。{{docLinkStart}}続きを読む »{{docLinkEnd}}",
     "admin/default_server": "初期サーバー",
     "admin/default_template_set": "{{template}} をデフォルトのテンプレートに設定しました。",
     "admin/default_timezone": "初期タイムゾーン",
@@ -185,7 +185,7 @@
     "admin/enable_authme": "AuthMe 連携を有効にしますか？",
     "admin/enable_debug_mode": "デバッグモードを有効にしますか？",
     "admin/enable_mailer": "PHPMailerを有効にしますか？",
-    "admin/enable_mailer_help": "php.iniで電子メール設定が完了していない場合こちらを使用できます。PHPMailerを使用するには、GmailやSMTPプロバイダなどの電子メールを送信できるプロバイダーサービスが必要です。",
+    "admin/enable_mailer_help": "有効にすると、システムのデフォルトではなくPHPMailerを使ってメールを送信するようになります。これはメール配信の助けになるかもしれませんが、SMTP プロバイダを設定する必要があります。{{docLinkStart}}続きを読む »{{docLinkEnd}}",
     "admin/enable_maintenance_mode": "メンテナンスモードを有効にしますか？",
     "admin/enable_minecraft_integration": "Minecraft連携を有効にしますか？",
     "admin/enable_nicknames_on_registration": "ユーザー登録時、Minecarft以外のユーザーネームの登録を許可しますか？",
@@ -215,7 +215,7 @@
     "admin/find_modules": "モジュール検索",
     "admin/find_templates": "テンプレートを探す",
     "admin/force_https": "httpsを強制させますか？",
-    "admin/force_https_help": "有効にするとhttpは自動でhttpsに置き換わります。有効にするには、必ず有効なサーバー証明書をサーバーに設定しておいてください。",
+    "admin/force_https_help": "有効にすると、ウェブサイトへの全てのリクエストはhttpsにリダイレクトされます。この機能を使用するには、有効なSSL証明書を設定している必要があります。",
     "admin/force_premium_accounts": "プレミアムMinecraftアカウントを強制しますか？",
     "admin/force_tfa": "グループメンバーに二要素認証を強制しますか？",
     "admin/force_tfa_alert": "あなたのグループでは、二要素認証を有効にする必要があります。",
@@ -342,7 +342,7 @@
     "admin/navbar_icon": "ナビゲーションバーアイコン",
     "admin/navbar_icon_instructions": "ナビゲーションバーアイコンは {{faLink}}, {{semLink}} を参照して使用したいアイコンのHTMLソースを貼り付けてください。",
     "admin/navbar_order": "ナビゲーションバー順番",
-    "admin/navbar_order_instructions": "ナビゲーションバー順番は、各メニューの順番を設定できます。一番最初は「1」、二番目以降はそれ以上の数字を設定することで順番を調節できます。",
+    "admin/navbar_order_instructions": "各項目には正の数を割り当てることができ、最も小さい番号がナビバーの最初に表示され、より大きい番号がその後に表示されます。",
     "admin/navigation": "ナビゲーション",
     "admin/navigation_settings_updated_successfully": "ナビゲーションバーの設定が正常に更新されました。",
     "admin/negative": "ネガティブ",
@@ -598,7 +598,7 @@
     "admin/upgrade_php_version": "PHPのバージョンを7.4以上にアップグレードしてください。次のNamelessのリリースでは、現在使用しているバージョンがサポートされなくなります。",
     "admin/upload_new_image": "画像アップロード",
     "admin/use_friendly_urls": "フレンドリーURL",
-    "admin/use_friendly_urls_help": "重要: サーバー設定にてmod_rewriteと.htaccessを使用できるように設定する必要があります。IISの場合はルートディレクトリのweb.config.exampleをweb.configに変更してください。",
+    "admin/use_friendly_urls_help": "有効にすると、より見た目の良いURLが使用されます。この機能を使用するためには、mod_rewriteと.htaccessファイルの使用を許可する必要があります。{{docLinkStart}}続きを読む »{{docLinkEnd}}",
     "admin/user": "ユーザー",
     "admin/user_deleted": "ユーザーは正常に削除されました。",
     "admin/user_id": "ユーザーID",
@@ -1165,5 +1165,10 @@
     "admin/integration_identifier_required": "{{integration}}の識別子は必須です。",
     "admin/is_verified": "検証が必要ですか？",
     "admin/link_account_success": "{{user}}は{{integration}}のアカウントと正常にリンクしました。",
-    "admin/manual_linking": "手動リンク"
+    "admin/manual_linking": "手動リンク",
+    "admin/verified": "検証",
+    "admin/test_email_query": "受信トレイに届きませんか？以下をお試しください:",
+    "admin/test_email_suggest_1": "数分待って、迷惑メールフォルダを確認してください。",
+    "admin/test_email_suggest_2": "ウェブサイトのDNSレコードを更新してください。（SPFとDKIMを確認）",
+    "admin/test_email_suggest_3": "SMTPサーバーを設定する。{{docLinkStart}}続きを読む »{{docLinkEnd}}"
 }

From fd563b78fa06357376031acda47f6a350104a648 Mon Sep 17 00:00:00 2001
From: Marcos <marckos03br@gmail.com>
Date: Sun, 5 Jun 2022 19:51:12 +0000
Subject: [PATCH 038/337] Translated using Weblate (Spanish)

Currently translated at 100.0% (51 of 51 strings)

Translation: NamelessMC/Website - Discord Integration
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-discord-integration/es/
---
 modules/Discord Integration/language/es_ES.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/Discord Integration/language/es_ES.json b/modules/Discord Integration/language/es_ES.json
index f6f7575e65..d39cc42c59 100644
--- a/modules/Discord Integration/language/es_ES.json	
+++ b/modules/Discord Integration/language/es_ES.json	
@@ -16,8 +16,8 @@
     "discord_integration/discord_database_error": "La base de datos de Nameless Link no funciona actualmente. Por favor, inténtelo más tarde.",
     "discord_integration/discord_guild_id": "ID del servidor de Discord",
     "discord_integration/discord_id_help": "Para obtener información sobre dónde encontrar IDs de Discord, por favor lea {{linkStart}}esto.{{linkEnd}}",
-    "discord_integration/discord_id_length": "Por favor, asegúrate de que la ID de Discord tiene 18 caracteres.",
-    "discord_integration/discord_id_numeric": "Por favor, asegúrese de que su ID de Discord es numérica (sólo números).",
+    "discord_integration/discord_id_length": "Por favor, asegúrate de que la ID del servidor de Discord tiene 18 caracteres.",
+    "discord_integration/discord_id_numeric": "Por favor, asegúrese de que su ID del servidor de Discord es numérica (sólo números).",
     "discord_integration/discord_id_set": "ID de Discord establecida con éxito",
     "discord_integration/discord_id_taken": "Esa ID de Discord ya ha sido tomada.",
     "discord_integration/discord_id_unlinked": "Se ha desvinculado con éxito su ID de usuario de Discord.",
@@ -48,5 +48,6 @@
     "discord_integration/discord_invite_info": "Para invitar al bot Nameless Link a tu servidor de Discord, haz clic en {{inviteLinkStart}}aquí{{inviteLinkEnd}}. A continuación, ejecuta el comando {{command}} para enlazar el bot con tu sitio web. También puedes {{selfHostLinkStart}}alojar el bot tú mismo{{selfHostLinkEnd}}.",
     "discord_integration/discord_user_id": "ID de usuario de Discord",
     "discord_integration/discord_widget_disabled": "El widget está desactivado para el servidor de Discord especificado. Ve a la pestaña \"Widget\" en la configuración de tu servidor de Discord y asegúrate de que el widget de Discord está activado y de que el ID es correcto.",
-    "discord_integration/discord_widget_error": "Se ha producido un error al obtener el widget de Discord: {{error}}."
+    "discord_integration/discord_widget_error": "Se ha producido un error al obtener el widget de Discord: {{error}}.",
+    "discord_integration/discord_id_required": "Por favor, introduce la ID del servidor de Discord."
 }

From 5b6f67d8784d6add4690a7f7a40e1db51304f853 Mon Sep 17 00:00:00 2001
From: Gabi <gfranco@nebula.cat>
Date: Sun, 5 Jun 2022 21:26:06 +0000
Subject: [PATCH 039/337] Translated using Weblate (Spanish (Latin America))

Currently translated at 9.0% (1 of 11 strings)

Translation: NamelessMC/Website - Cookie Consent
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/cookie-consent/es_419/
---
 modules/Cookie Consent/language/es_419.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/Cookie Consent/language/es_419.json b/modules/Cookie Consent/language/es_419.json
index 0967ef424b..eeea9031a1 100644
--- a/modules/Cookie Consent/language/es_419.json	
+++ b/modules/Cookie Consent/language/es_419.json	
@@ -1 +1,3 @@
-{}
+{
+    "cookie/configure_cookies": "Configurar cookies"
+}

From c966f50b4ce49ede3c8c0230e077df93c47ee3e8 Mon Sep 17 00:00:00 2001
From: Anton <wincraft251@googlemail.com>
Date: Sun, 5 Jun 2022 18:43:34 +0000
Subject: [PATCH 040/337] Translated using Weblate (German)

Currently translated at 100.0% (195 of 195 strings)

Translation: NamelessMC/Website - Forum
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-forum/de/
---
 modules/Forum/language/de_DE.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/Forum/language/de_DE.json b/modules/Forum/language/de_DE.json
index bc68e656b7..99a8d181fd 100644
--- a/modules/Forum/language/de_DE.json
+++ b/modules/Forum/language/de_DE.json
@@ -115,7 +115,7 @@
     "forum/no_topics": "Es wurden noch keine Themen erstellt.",
     "forum/no_topics_short": "Keine Themen",
     "forum/no_users_online": "Keine Benutzer online.",
-    "forum/not_following_any_topics": "Du folgst keine Themen.",
+    "forum/not_following_any_topics": "Du folgst keinen Themen.",
     "forum/now_following_topic": "Du folgst diesem Thema jetzt und wirst über neue Antworten informiert.",
     "forum/online_users": "Benutzer Online",
     "forum/overview": "Überblick",
@@ -157,7 +157,7 @@
     "forum/title_required": "Gib bitte einen Titel an",
     "forum/topic": "Thema",
     "forum/topic_locked": "Thema geschlossen",
-    "forum/topic_locked_notice": "Dieses Thema ist geschlossen, du bist trotzdem dazu berechtigt Beiträge erstellen.",
+    "forum/topic_locked_notice": "Dieses Thema ist geschlossen, du bist trotzdem dazu berechtigt Beiträge zu erstellen.",
     "forum/topic_stuck": "Thema wurde angeheftet.",
     "forum/topic_title": "Titel des Themas",
     "forum/topic_unstuck": "Thema wurde abgeheftet.",

From a81268efc1bb4b1dcdda0d0d6c0750256f8a6679 Mon Sep 17 00:00:00 2001
From: Kipper Chau <kipperthings@gmail.com>
Date: Sun, 5 Jun 2022 07:54:45 +0000
Subject: [PATCH 041/337] Translated using Weblate (Chinese (Traditional))

Currently translated at 80.0% (156 of 195 strings)

Translation: NamelessMC/Website - Forum
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-forum/zh_Hant/
---
 modules/Forum/language/zh_TW.json | 301 ++++++++++++++++--------------
 1 file changed, 157 insertions(+), 144 deletions(-)

diff --git a/modules/Forum/language/zh_TW.json b/modules/Forum/language/zh_TW.json
index 8e361845f4..7c925e5432 100644
--- a/modules/Forum/language/zh_TW.json
+++ b/modules/Forum/language/zh_TW.json
@@ -1,145 +1,158 @@
 {
-    "forum\/by": "by",
-    "forum\/can_create_topic": "可以建立主題?",
-    "forum\/can_edit_topic": "Can edit their topics?",
-    "forum\/can_moderate_forum": "可以審核論壇?",
-    "forum\/can_post_reply": "可以建立回覆?",
-    "forum\/can_view_forum": "可以查看論壇?",
-    "forum\/can_view_other_topics": "可以查看其他人的文章?",
-    "forum\/confirm_delete_post": "確認移除文章?",
-    "forum\/confirm_delete_short": "確認移除",
-    "forum\/confirm_delete_topic": "確認移除主題?",
-    "forum\/content_max_50000": "文章內容最高限制 50000 字元",
-    "forum\/content_min_2": "文章內容最低限制 2 字元",
-    "forum\/content_required": "請輸入文章內容",
-    "forum\/creating_forum": "建立新論壇",
-    "forum\/creating_label": "建立新標籤",
-    "forum\/creating_label_type": "建立新標籤類型",
-    "forum\/creating_topic_in_x": "在 {{forum}} 建立主題",
-    "forum\/delete_forum": "移除論壇",
-    "forum\/delete_topic": "移除主題",
-    "forum\/delete_topics_and_posts": "移除主題和文章",
-    "forum\/discussion": "討論串",
-    "forum\/display_topics_as_news": "顯示此主題的文章在首頁?",
-    "forum\/edit": "編輯",
-    "forum\/edit_post": "編輯文章",
-    "forum\/editing_label": "編輯標籤",
-    "forum\/editing_label_type": "編輯標籤類型",
-    "forum\/error_quoting_posts": "抱歉，引用文章時出了錯.",
-    "forum\/error_rating_post": "抱歉，文章發生錯誤.",
-    "forum\/forum": "論壇",
-    "forum\/forum_created_successfully": "論壇建立成功.",
-    "forum\/forum_description": "論壇說明",
-    "forum\/forum_description_maximum": "論壇說明最高限制 255 字元.",
-    "forum\/forum_description_minimum": "論壇說明最低限制 2 字元.",
-    "forum\/forum_index": "首頁",
-    "forum\/forum_layout": "論壇佈局",
-    "forum\/forum_name": "論壇名稱",
-    "forum\/forum_name_maximum": "論壇名稱最高限制 150 字元.",
-    "forum\/forum_name_minimum": "論壇名稱最低限制 2 字元.",
-    "forum\/forum_permissions": "論壇權限",
-    "forum\/forum_search": "論壇搜尋",
-    "forum\/forum_type": "論壇類型",
-    "forum\/forum_type_category": "類別",
-    "forum\/forum_type_forum": "論壇",
-    "forum\/forums": "論壇",
-    "forum\/group": "群組",
-    "forum\/guests": "遊客",
-    "forum\/has_no_parent": "沒有父論壇",
-    "forum\/in": "in",
-    "forum\/input_forum_description": "請輸入論壇說明.",
-    "forum\/input_forum_title": "P請輸入論壇標題.",
-    "forum\/insert_quotes": "Insert Quotes",
-    "forum\/invalid_action": "無效操作",
-    "forum\/invalid_search_query": "搜尋限制 3~128 字元.",
-    "forum\/label": "標籤",
-    "forum\/label_creation_error": "無法建立標籤. 請確認輸入的內容沒有超過 32 字元.",
-    "forum\/label_creation_success": "標籤建立成功.",
-    "forum\/label_edit_success": "標籤編輯成功.",
-    "forum\/label_forums": "標籤論壇",
-    "forum\/label_groups": "標籤群組",
-    "forum\/label_name": "標籤名稱",
-    "forum\/label_type": "標籤類型",
-    "forum\/label_type_creation_error": "無法建立標籤類型. 請確認輸入的內容沒有超過 32 字元，HTML沒有超過 1024 字元.",
-    "forum\/label_type_creation_success": "標籤類型建立成功.",
-    "forum\/label_type_edit_success": "標籤類型編輯成功.",
-    "forum\/label_type_html": "標籤類型HTML",
-    "forum\/label_type_html_help": "標籤必須包含 {x} 做為標籤的佔位符",
-    "forum\/label_type_name": "標籤類型名稱",
-    "forum\/label_types": "標籤類型",
-    "forum\/labels": "標籤",
-    "forum\/last_edited": "最後編輯: {{lastEditedAt}}",
-    "forum\/last_reply": "最後回覆",
-    "forum\/latest_announcements": "最新公告",
-    "forum\/latest_discussions": "最新的討論串",
-    "forum\/latest_discussions_view": "最新的討論統計圖",
-    "forum\/latest_posts": "最新文章",
-    "forum\/lock_topic": "鎖定主題",
-    "forum\/merge_instructions": "合併指令必須只能在一個論壇中. 如有必要請移動一整個線程.",
-    "forum\/merge_topic": "合併主題",
-    "forum\/merge_topics": "合併文章",
-    "forum\/mod_actions": "審核",
-    "forum\/move_topic": "移動主題",
-    "forum\/move_topic_to": "移動主題至:",
-    "forum\/move_topics_and_posts_to": "移動主題和文章到",
-    "forum\/new_forum": "<i class=\"fa fa-plus-circle\"><\/i> 新論壇",
-    "forum\/new_label": "<i class=\"fa fa-plus-circle\"><\/i> 新標籤",
-    "forum\/new_label_type": "<i class=\"fa fa-plus-circle\"><\/i> 新標籤類型",
-    "forum\/new_reply": "新回覆",
-    "forum\/new_search": "新搜尋",
-    "forum\/new_topic": "新主題",
-    "forum\/no_forums": "沒有論壇",
-    "forum\/no_label": "沒有標籤",
-    "forum\/no_label_types_defined": "無定義標籤類型.",
-    "forum\/no_labels_defined": "無定義標籤.",
-    "forum\/no_results_found": "找不到資料.",
-    "forum\/no_topics": "沒有主題被建立.",
-    "forum\/no_topics_short": "沒有主題",
-    "forum\/no_users_online": "沒有使用者在線上.",
-    "forum\/online_users": "線上使用者",
-    "forum\/overview": "總覽",
-    "forum\/parent_forum": "父論壇",
-    "forum\/parent_forum_x": "Parent Forum: {{forum}}",
-    "forum\/post_already_reported": "你已經回報過這篇文章!",
-    "forum\/post_edited_successfully": "文章編輯成功.",
-    "forum\/post_successful": "成功發文.",
-    "forum\/posts": "文章",
-    "forum\/quote": "引用",
-    "forum\/quoted_post": "文章已新增至引用.",
-    "forum\/quoting_posts": "插入引用..",
-    "forum\/re": "RE: ",
-    "forum\/read_full_post": "閱讀全部",
-    "forum\/registered_x": "Joined: {{registeredAt}}",
-    "forum\/removed_quoted_post": "文章已從引用中移除.",
-    "forum\/search_again_in_x_seconds": "請等待 {{count}} 秒後再次搜尋.",
-    "forum\/search_results": "搜尋結果",
-    "forum\/select_a_parent_forum": "選擇父論壇",
-    "forum\/share": "分享",
-    "forum\/share_facebook": "在 Facebook 上分享",
-    "forum\/share_twitter": "在 Twitter 上分享",
-    "forum\/spam_wait": "請等待 {{count}} 秒後再發言.",
-    "forum\/stats": "統計",
-    "forum\/stick_topic": "置頂主題",
-    "forum\/subforum": "子論壇",
-    "forum\/subforums": "子論壇",
-    "forum\/table_view": "統計圖",
-    "forum\/title_max_64": "主題標題最低限制 64 字元",
-    "forum\/title_min_2": "主題標題最低限制 2 字元",
-    "forum\/title_required": "請輸入主題標題",
-    "forum\/topic": "主題",
-    "forum\/topic_locked": "主題鎖定",
-    "forum\/topic_locked_notice": "主題已鎖定，但是你的權限可以建立回覆.",
-    "forum\/topic_stuck": "文章已被置頂.",
-    "forum\/topic_title": "主題標題",
-    "forum\/topic_unstuck": "文章已被取消置頂.",
-    "forum\/topics": "主題",
-    "forum\/unlock_topic": "解鎖主題",
-    "forum\/unstick_topic": "取消置頂主題",
-    "forum\/use_reactions": "使用回應?",
-    "forum\/user_no_posts": "使用者尚未在論壇發布貼文.",
-    "forum\/user_tag": "你被標註在一則文章中.",
-    "forum\/user_tag_info": "你已被標註在 {{author}} 的文章中.",
-    "forum\/views": "觀看數",
-    "forum\/x_posts": "{{count}} posts",
-    "forum\/x_topics": "{{count}} topics"
-}
\ No newline at end of file
+    "forum/by": "by",
+    "forum/can_create_topic": "可以建立主題?",
+    "forum/can_edit_topic": "Can edit their topics?",
+    "forum/can_moderate_forum": "可以審核論壇?",
+    "forum/can_post_reply": "可以建立回覆?",
+    "forum/can_view_forum": "可以查看論壇?",
+    "forum/can_view_other_topics": "可以查看其他人的文章?",
+    "forum/confirm_delete_post": "確認移除文章?",
+    "forum/confirm_delete_short": "確認移除",
+    "forum/confirm_delete_topic": "確認移除主題?",
+    "forum/content_max_50000": "文章內容最高限制 50000 字元",
+    "forum/content_min_2": "文章內容最低限制 2 字元",
+    "forum/content_required": "請輸入文章內容",
+    "forum/creating_forum": "建立新論壇",
+    "forum/creating_label": "建立新標籤",
+    "forum/creating_label_type": "建立新標籤類型",
+    "forum/creating_topic_in_x": "在 {{forum}} 建立主題",
+    "forum/delete_forum": "移除論壇",
+    "forum/delete_topic": "移除主題",
+    "forum/delete_topics_and_posts": "移除主題和文章",
+    "forum/discussion": "討論串",
+    "forum/display_topics_as_news": "顯示此主題的文章在首頁?",
+    "forum/edit": "編輯",
+    "forum/edit_post": "編輯文章",
+    "forum/editing_label": "編輯標籤",
+    "forum/editing_label_type": "編輯標籤類型",
+    "forum/error_quoting_posts": "抱歉，引用文章時出了錯.",
+    "forum/error_rating_post": "抱歉，文章發生錯誤.",
+    "forum/forum": "論壇",
+    "forum/forum_created_successfully": "論壇建立成功.",
+    "forum/forum_description": "論壇說明",
+    "forum/forum_description_maximum": "論壇說明最高限制 255 字元.",
+    "forum/forum_description_minimum": "論壇說明最低限制 2 字元.",
+    "forum/forum_index": "首頁",
+    "forum/forum_layout": "論壇佈局",
+    "forum/forum_name": "論壇名稱",
+    "forum/forum_name_maximum": "論壇名稱最高限制 150 字元.",
+    "forum/forum_name_minimum": "論壇名稱最低限制 2 字元.",
+    "forum/forum_permissions": "論壇權限",
+    "forum/forum_search": "論壇搜尋",
+    "forum/forum_type": "論壇類型",
+    "forum/forum_type_category": "類別",
+    "forum/forum_type_forum": "論壇",
+    "forum/forums": "論壇",
+    "forum/group": "群組",
+    "forum/guests": "遊客",
+    "forum/has_no_parent": "沒有父論壇",
+    "forum/in": "in",
+    "forum/input_forum_description": "請輸入論壇說明.",
+    "forum/input_forum_title": "P請輸入論壇標題.",
+    "forum/insert_quotes": "Insert Quotes",
+    "forum/invalid_action": "無效操作",
+    "forum/invalid_search_query": "搜尋限制 3~128 字元.",
+    "forum/label": "標籤",
+    "forum/label_creation_error": "無法建立標籤. 請確認輸入的內容沒有超過 32 字元.",
+    "forum/label_creation_success": "標籤建立成功.",
+    "forum/label_edit_success": "標籤編輯成功.",
+    "forum/label_forums": "標籤論壇",
+    "forum/label_groups": "標籤群組",
+    "forum/label_name": "標籤名稱",
+    "forum/label_type": "標籤類型",
+    "forum/label_type_creation_error": "無法建立標籤類型. 請確認輸入的內容沒有超過 32 字元，HTML沒有超過 1024 字元.",
+    "forum/label_type_creation_success": "標籤類型建立成功.",
+    "forum/label_type_edit_success": "標籤類型編輯成功.",
+    "forum/label_type_html": "標籤類型HTML",
+    "forum/label_type_html_help": "標籤必須包含 {x} 做為標籤的佔位符",
+    "forum/label_type_name": "標籤類型名稱",
+    "forum/label_types": "標籤類型",
+    "forum/labels": "標籤",
+    "forum/last_edited": "最後編輯: {{lastEditedAt}}",
+    "forum/last_reply": "最後回覆",
+    "forum/latest_announcements": "最新公告",
+    "forum/latest_discussions": "最新的討論串",
+    "forum/latest_discussions_view": "最新的討論統計圖",
+    "forum/latest_posts": "最新文章",
+    "forum/lock_topic": "鎖定主題",
+    "forum/merge_instructions": "合併指令必須只能在一個論壇中. 如有必要請移動一整個線程.",
+    "forum/merge_topic": "合併主題",
+    "forum/merge_topics": "合併文章",
+    "forum/mod_actions": "審核",
+    "forum/move_topic": "移動主題",
+    "forum/move_topic_to": "移動主題至:",
+    "forum/move_topics_and_posts_to": "移動主題和文章到",
+    "forum/new_forum": "<i class=\"fa fa-plus-circle\"></i> 新論壇",
+    "forum/new_label": "<i class=\"fa fa-plus-circle\"></i> 新標籤",
+    "forum/new_label_type": "<i class=\"fa fa-plus-circle\"></i> 新標籤類型",
+    "forum/new_reply": "新回覆",
+    "forum/new_search": "新搜尋",
+    "forum/new_topic": "新主題",
+    "forum/no_forums": "沒有論壇",
+    "forum/no_label": "沒有標籤",
+    "forum/no_label_types_defined": "無定義標籤類型.",
+    "forum/no_labels_defined": "無定義標籤.",
+    "forum/no_results_found": "找不到資料.",
+    "forum/no_topics": "沒有主題被建立.",
+    "forum/no_topics_short": "沒有主題",
+    "forum/no_users_online": "沒有使用者在線上.",
+    "forum/online_users": "線上使用者",
+    "forum/overview": "總覽",
+    "forum/parent_forum": "父論壇",
+    "forum/parent_forum_x": "Parent Forum: {{forum}}",
+    "forum/post_already_reported": "你已經回報過這篇文章!",
+    "forum/post_edited_successfully": "文章編輯成功.",
+    "forum/post_successful": "成功發文.",
+    "forum/posts": "文章",
+    "forum/quote": "引用",
+    "forum/quoted_post": "文章已新增至引用.",
+    "forum/quoting_posts": "插入引用..",
+    "forum/re": "RE: ",
+    "forum/read_full_post": "閱讀全部",
+    "forum/registered_x": "Joined: {{registeredAt}}",
+    "forum/removed_quoted_post": "文章已從引用中移除.",
+    "forum/search_again_in_x_seconds": "請等待 {{count}} 秒後再次搜尋.",
+    "forum/search_results": "搜尋結果",
+    "forum/select_a_parent_forum": "選擇父論壇",
+    "forum/share": "分享",
+    "forum/share_facebook": "在 Facebook 上分享",
+    "forum/share_twitter": "在 Twitter 上分享",
+    "forum/spam_wait": "請等待 {{count}} 秒後再發言.",
+    "forum/stats": "統計",
+    "forum/stick_topic": "置頂主題",
+    "forum/subforum": "子論壇",
+    "forum/subforums": "子論壇",
+    "forum/table_view": "統計圖",
+    "forum/title_max_64": "主題標題最低限制 64 字元",
+    "forum/title_min_2": "主題標題最低限制 2 字元",
+    "forum/title_required": "請輸入主題標題",
+    "forum/topic": "主題",
+    "forum/topic_locked": "主題鎖定",
+    "forum/topic_locked_notice": "主題已鎖定，但是你的權限可以建立回覆.",
+    "forum/topic_stuck": "文章已被置頂.",
+    "forum/topic_title": "主題標題",
+    "forum/topic_unstuck": "文章已被取消置頂.",
+    "forum/topics": "主題",
+    "forum/unlock_topic": "解鎖主題",
+    "forum/unstick_topic": "取消置頂主題",
+    "forum/use_reactions": "使用回應?",
+    "forum/user_no_posts": "使用者尚未在論壇發布貼文.",
+    "forum/user_tag": "你被標註在一則文章中.",
+    "forum/user_tag_info": "你已被標註在 {{author}} 的文章中.",
+    "forum/views": "觀看數",
+    "forum/x_posts": "{{count}} posts",
+    "forum/x_topics": "{{count}} topics",
+    "forum/all_topics_unfollowed": "所有主題已被取消訂閱。",
+    "forum/average_posts": "平均同戶貼文數",
+    "forum/default_labels": "預設標籤",
+    "forum/topic_reply": "回覆主題",
+    "forum/confirm_unfollow_all_topics": "是否確定取消訂閱所有標題?",
+    "forum/default_labels_info": "除非被在新增標題時被修改，這些會在論壇被安排到新的標題。同時Ctrl及按下按鈕以選擇多個選項",
+    "forum/follow": "追蹤",
+    "forum/following_topics": "已追蹤標題",
+    "forum/forum_deleted_successfully": "論壇已被刪除。",
+    "forum/forum_icon": "論壇圖案",
+    "forum/forum_icon_maximum": "論壇圖案必須為最多256字元數。",
+    "forum/forum_redirect_warning": "注意: 你準備離開此網頁! 是否確定要去 {{url}} ?",
+    "forum/forum_updated_successfully": "成功更新論壇。"
+}

From b471e8c9994bb3f8345c615994146d61205efa08 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Sun, 5 Jun 2022 23:12:55 -0600
Subject: [PATCH 042/337] Show error message during DB init if it does not
 succeed

---
 core/installation/steps/ajax_initialise.php         |  9 ++++++---
 core/installation/steps/database_initialization.php | 11 ++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/core/installation/steps/ajax_initialise.php b/core/installation/steps/ajax_initialise.php
index ce4fb93130..f9a301bf7b 100644
--- a/core/installation/steps/ajax_initialise.php
+++ b/core/installation/steps/ajax_initialise.php
@@ -7,12 +7,15 @@
             $redirect_url = (($_SESSION['action'] == 'install') ? '?step=site_configuration' : '?step=upgrade');
 
             $json = [
-                'message' => defined('DEBUGGING') && DEBUGGING ? $message : $language->get('installer', 'database_configured'),
-                'success' => $success,
+                'message' => $language->get('installer', 'database_configured'),
                 'redirect_url' => $redirect_url,
             ];
 
-            $_SESSION['database_initialized'] = true;
+            if (!str_contains($message, 'All Done')) {
+                $json['error'] = $message;
+            } else {
+                $_SESSION['database_initialized'] = true;
+            }
 
         } else {
             if ($_GET['initialise'] === 'site') {
diff --git a/core/installation/steps/database_initialization.php b/core/installation/steps/database_initialization.php
index b2c93ae262..ad44723105 100644
--- a/core/installation/steps/database_initialization.php
+++ b/core/installation/steps/database_initialization.php
@@ -15,13 +15,14 @@
                 if (response.success) {
                     window.location.replace(response.redirect_url);
                 } else {
-                    $("#info").html(response.message);
-                    if (response.redirect_url) {
-                        $("#continue-button").attr("href", response.redirect_url);
-                        $("#continue-button").removeClass("disabled");
-                    }
                     if (response.error) {
+                        $("#info").parent().attr("class", "ui red message");
+                        $("#info").html(response.error);
                         $("#continue-button").before("<button onclick=\"window.location.reload()\" class=\"ui small button\" id=\"reload-button\">' . $language->get('installer', 'reload') . '</button>");
+                    } else if (response.redirect_url) {
+                        $("#info").html(response.message);
+                        $("#continue-button").attr("href", response.redirect_url);
+                        $("#continue-button").removeClass("disabled");
                     }
                 }
             });

From 5683436a5eef0fd9a8015941697134721a905069 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Sun, 5 Jun 2022 23:17:54 -0600
Subject: [PATCH 043/337] Fix already installed check

---
 install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.php b/install.php
index e21ccf47f6..84b74e145c 100644
--- a/install.php
+++ b/install.php
@@ -43,7 +43,7 @@
 // Get installation path
 $install_path = substr(str_replace('\\', '/', substr(__DIR__, strlen($_SERVER['DOCUMENT_ROOT']))), 1);
 
-if (!isset($CONFIG['installed'])) {
+if (isset($GLOBALS['config']['core'])) {
     if (isset($_GET['language'])) {
         // Set language
         if (is_file('custom/languages/' . $_GET['language'] . '.json')) {

From 76ad8e83fd2b32cb6016a6036cc808b19bc1316e Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Sun, 5 Jun 2022 23:18:49 -0600
Subject: [PATCH 044/337] Fix already installed check

---
 install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.php b/install.php
index 84b74e145c..9e48defdab 100644
--- a/install.php
+++ b/install.php
@@ -43,7 +43,7 @@
 // Get installation path
 $install_path = substr(str_replace('\\', '/', substr(__DIR__, strlen($_SERVER['DOCUMENT_ROOT']))), 1);
 
-if (isset($GLOBALS['config']['core'])) {
+if (!isset($GLOBALS['config']['core'])) {
     if (isset($_GET['language'])) {
         // Set language
         if (is_file('custom/languages/' . $_GET['language'] . '.json')) {

From db77317b960aa1d7dfc0253788d2ed96ed788c90 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Sun, 5 Jun 2022 23:26:10 -0600
Subject: [PATCH 045/337] Fix already installed check (actually)

---
 core/installation/steps/finish.php | 2 +-
 install.php                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/installation/steps/finish.php b/core/installation/steps/finish.php
index 194da23803..018b009fac 100644
--- a/core/installation/steps/finish.php
+++ b/core/installation/steps/finish.php
@@ -9,7 +9,7 @@
     if (!is_writable('core/config.php')) {
         $error = $language->get('installer', 'config_not_writable');
     } else {
-        file_put_contents('core/config.php', PHP_EOL . '$CONFIG[\'installed\'] = true;', FILE_APPEND);
+        Config::set('core/installed', true);
     }
 
     unset($_SESSION['admin_setup'], $_SESSION['database_initialized'], $_SESSION['site_initialized']);
diff --git a/install.php b/install.php
index 9e48defdab..dc6eb1ad0f 100644
--- a/install.php
+++ b/install.php
@@ -43,7 +43,7 @@
 // Get installation path
 $install_path = substr(str_replace('\\', '/', substr(__DIR__, strlen($_SERVER['DOCUMENT_ROOT']))), 1);
 
-if (!isset($GLOBALS['config']['core'])) {
+if (!isset($GLOBALS['config']['core']['installed'])) {
     if (isset($_GET['language'])) {
         // Set language
         if (is_file('custom/languages/' . $_GET['language'] . '.json')) {

From 254202989b881cb64693059a9b5c24a6bf86d9c5 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Mon, 6 Jun 2022 13:52:47 +0200
Subject: [PATCH 046/337] Rename PHPMailer option to better explain what it
 does

---
 custom/languages/en_UK.json         | 2 +-
 modules/Core/pages/panel/emails.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/custom/languages/en_UK.json b/custom/languages/en_UK.json
index 9faefc913e..1f102d1b4c 100644
--- a/custom/languages/en_UK.json
+++ b/custom/languages/en_UK.json
@@ -194,7 +194,7 @@
     "admin/enable_api": "Enable API?",
     "admin/enable_authme": "Enable AuthMe integration?",
     "admin/enable_debug_mode": "Enable debug mode?",
-    "admin/enable_mailer": "Enable PHPMailer?",
+    "admin/use_external_mail_server": "Use external mail server",
     "admin/enable_mailer_help": "If enabled, emails will be sent using PHPMailer instead of the system default. This may help with delivery, but requires you to configure an SMTP provider. {{docLinkStart}}Read more »{{docLinkEnd}}",
     "admin/enable_maintenance_mode": "Enable maintenance mode?",
     "admin/enable_minecraft_integration": "Enable Minecraft integration?",
diff --git a/modules/Core/pages/panel/emails.php b/modules/Core/pages/panel/emails.php
index ca77a0c212..f4f59788c6 100644
--- a/modules/Core/pages/panel/emails.php
+++ b/modules/Core/pages/panel/emails.php
@@ -248,7 +248,7 @@
         'SEND_TEST_EMAIL_LINK' => URL::build('/panel/core/emails/', 'action=test'),
         'EMAIL_ERRORS' => $language->get('admin', 'email_errors'),
         'EMAIL_ERRORS_LINK' => URL::build('/panel/core/emails/errors'),
-        'ENABLE_MAILER' => $language->get('admin', 'enable_mailer'),
+        'ENABLE_MAILER' => $language->get('admin', 'use_external_mail_server'),
         'ENABLE_MAILER_VALUE' => Util::getSetting('phpmailer'),
         'INFO' => $language->get('general', 'info'),
         'ENABLE_MAILER_HELP' => $language->get('admin', 'enable_mailer_help', [

From 2a2c3ddda5e8217187a0163822d9cfa8736048a5 Mon Sep 17 00:00:00 2001
From: Partydragen <adrian_kili@outlook.com>
Date: Mon, 6 Jun 2022 19:57:45 +0200
Subject: [PATCH 047/337] Fix selected images

---
 modules/Core/pages/panel/images.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/Core/pages/panel/images.php b/modules/Core/pages/panel/images.php
index c803524a17..6acae755a4 100644
--- a/modules/Core/pages/panel/images.php
+++ b/modules/Core/pages/panel/images.php
@@ -104,6 +104,7 @@
 }
 
 // Get banner from cache
+$cache->setCache('backgroundcache');
 if (!$cache->isCached('banner_image')) {
     $cache->store('banner_image', (defined('CONFIG_PATH') ? CONFIG_PATH : '') . '/uploads/template_banners/homepage_bg_trimmed.jpg');
     $banner_image = (defined('CONFIG_PATH') ? CONFIG_PATH : '') . '/uploads/template_banners/homepage_bg_trimmed.jpg';

From 0aeea02a2b46315640914d8e88fa2ba996101598 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Mon, 6 Jun 2022 22:50:21 +0200
Subject: [PATCH 048/337] Remove email verification setting from API page

---
 custom/panel_templates/Default/core/api.tpl | 9 +--------
 modules/Core/pages/panel/api.php            | 6 ------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/custom/panel_templates/Default/core/api.tpl b/custom/panel_templates/Default/core/api.tpl
index 5f0d0af23b..fb671e0276 100644
--- a/custom/panel_templates/Default/core/api.tpl
+++ b/custom/panel_templates/Default/core/api.tpl
@@ -81,13 +81,6 @@
                                     <label class="custom-control-label" for="enable_api">{$ENABLE_API}</label>
                                 </div>
 
-                                <div class="form-group custom-control custom-switch">
-                                    <input name="verification" id="verification" type="checkbox"
-                                        class="custom-control-input" {if $EMAIL_VERIFICATION_VALUE eq 1} checked{/if} />
-                                    <label class="custom-control-label" for="verification"
-                                        style="margin-right:10px">{$EMAIL_VERIFICATION}</label>
-                                </div>
-
                                 <div class="form-group custom-control custom-switch">
                                     <input name="username_sync" id="username_sync" type="checkbox"
                                         class="custom-control-input" {if $USERNAME_SYNC_VALUE eq 1} checked{/if} />
@@ -177,4 +170,4 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/modules/Core/pages/panel/api.php b/modules/Core/pages/panel/api.php
index 02f22d635d..c8c372d613 100644
--- a/modules/Core/pages/panel/api.php
+++ b/modules/Core/pages/panel/api.php
@@ -60,10 +60,6 @@
                 ]
             );
 
-            // Update email verification
-            $verification = isset($_POST['verification']) && $_POST['verification'] == 'on' ? '1' : '0';
-            Util::setSetting('email_verification', $verification);
-
             // Update Username sync
             $username_sync = isset($_POST['username_sync']) && $_POST['username_sync'] == 'on' ? '1' : '0';
             Util::setSetting('username_sync', $username_sync);
@@ -240,8 +236,6 @@
             'API_URL_VALUE' => rtrim(Util::getSelfURL(), '/') . rtrim(URL::build('/api/v2/', '', 'non-friendly'), '/'),
             'ENABLE_API_FOR_URL' => $language->get('admin', 'api_disabled'),
             'COPY' => $language->get('admin', 'copy'),
-            'EMAIL_VERIFICATION' => $language->get('admin', 'email_verification'),
-            'EMAIL_VERIFICATION_VALUE' => Util::getSetting('email_verification') === '1',
             'USERNAME_SYNC' => $language->get('admin', 'enable_username_sync'),
             'USERNAME_SYNC_INFO' => $language->get('admin', 'enable_username_sync_info'),
             'USERNAME_SYNC_VALUE' => Util::getSetting('username_sync') === '1',

From ddaf1682882cd98ccb907874bb57296530c148fa Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Mon, 6 Jun 2022 22:53:01 +0200
Subject: [PATCH 049/337] Explain that username sync requires the in-game
 plugin

---
 custom/languages/en_UK.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/languages/en_UK.json b/custom/languages/en_UK.json
index 1f102d1b4c..c3498c7975 100644
--- a/custom/languages/en_UK.json
+++ b/custom/languages/en_UK.json
@@ -205,7 +205,7 @@
     "admin/enable_registration": "Enable registration?",
     "admin/enable_status_query": "Enable status query?",
     "admin/enable_username_sync": "Enable username sync?",
-    "admin/enable_username_sync_info": "If enabled, website usernames will be updated to match in-game usernames.",
+    "admin/enable_username_sync_info": "If enabled, website usernames will be updated to match in-game usernames. This happens when the in-game plugin sends a list of UUIDs and usernames, for online players, to the website.",
     "admin/enabled": "Enabled",
     "admin/enter_authme_db_details": "Please enter valid database details.",
     "admin/error_deleted_successfully": "The error has been deleted successfully.",

From 2d6befd1b94e1e1ffcb05eb9fc435b6186b83800 Mon Sep 17 00:00:00 2001
From: Bram Standaert <bram.standaert@gmail.com>
Date: Mon, 6 Jun 2022 10:53:35 +0000
Subject: [PATCH 050/337] Translated using Weblate (Dutch)

Currently translated at 99.9% (1220 of 1221 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/nl/
---
 custom/languages/nl_NL.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/languages/nl_NL.json b/custom/languages/nl_NL.json
index c3a8c2d1b4..7a2e52b035 100644
--- a/custom/languages/nl_NL.json
+++ b/custom/languages/nl_NL.json
@@ -743,7 +743,7 @@
     "installer/continue": "Doorgaan",
     "installer/convert": "Converteer",
     "installer/convert_message": "Tot slot, wil je data overzetten van een ander forum software?",
-    "installer/converter": "Converter",
+    "installer/converter": "Converteer",
     "installer/creating_admin_account": "Admin account maken",
     "installer/credits": "Credits",
     "installer/credits_message": "Een grote dank aan alle NamelessMC bijdragers sinds 2014: {{contribLinkStart}}NamelessMC contributors{{contribLinkEnd}}",

From 01b6ea6e9b98bb55598f84c9b6f8b11e4935e0af Mon Sep 17 00:00:00 2001
From: namelessmc-bot <rs.systems@derkad.es>
Date: Mon, 6 Jun 2022 11:52:56 +0000
Subject: [PATCH 051/337] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/
---
 custom/languages/cs_CZ.json  | 1 -
 custom/languages/de_DE.json  | 1 -
 custom/languages/en_US.json  | 1 -
 custom/languages/es_419.json | 1 -
 custom/languages/es_ES.json  | 1 -
 custom/languages/fr_FR.json  | 1 -
 custom/languages/it_IT.json  | 1 -
 custom/languages/ja_JP.json  | 1 -
 custom/languages/lt_LT.json  | 1 -
 custom/languages/nl_NL.json  | 1 -
 custom/languages/no_NO.json  | 1 -
 custom/languages/pl_PL.json  | 1 -
 custom/languages/pt_BR.json  | 1 -
 custom/languages/ro_RO.json  | 1 -
 custom/languages/ru_RU.json  | 1 -
 custom/languages/sk_SK.json  | 1 -
 custom/languages/sv_SE.json  | 1 -
 custom/languages/th_TH.json  | 1 -
 custom/languages/tr_TR.json  | 1 -
 custom/languages/uk_UA.json  | 1 -
 custom/languages/zh_CN.json  | 1 -
 custom/languages/zh_TW.json  | 1 -
 22 files changed, 22 deletions(-)

diff --git a/custom/languages/cs_CZ.json b/custom/languages/cs_CZ.json
index 5ea78c2d91..e0c7c7cc4b 100644
--- a/custom/languages/cs_CZ.json
+++ b/custom/languages/cs_CZ.json
@@ -181,7 +181,6 @@
     "admin/enable_api": "Povolit API?",
     "admin/enable_authme": "Povolit integraci AuthMe?",
     "admin/enable_debug_mode": "Povolit režim ladění?",
-    "admin/enable_mailer": "Povolit PHPMailer?",
     "admin/enable_mailer_help": "Pokud je povoleno, budou e-maily odesílány pomocí PHPMaileru místo výchozí služby systému. Může to pomoci s doručením, ale vyžaduje to nastavení poskytovatele SMTP. {{docLinkStart}}Zjistit více »{{docLinkEnd}}",
     "admin/enable_maintenance_mode": "Povolit režim údržby?",
     "admin/enable_minecraft_integration": "Povolit integraci Minecraftu?",
diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index 5640c0a319..18b9b35b67 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -173,7 +173,6 @@
     "admin/enable_api": "API aktivieren?",
     "admin/enable_authme": "Aktiviere AuthMe Integration?",
     "admin/enable_debug_mode": "Aktiviere den Fehlerbenachrichtungs Modus?",
-    "admin/enable_mailer": "Aktiviere PHPMailer?",
     "admin/enable_mailer_help": "Wenn diese Option aktiviert ist, werden E-Mails mit PHPMailer anstelle der Systemvorgabe gesendet. Dies kann bei der Zustellung helfen, erfordert aber die Konfiguration eines SMTP-Providers. {{docLinkStart}}Weiterlesen \"{{docLinkEnd}}",
     "admin/enable_maintenance_mode": "Wartungsmodus aktivieren?",
     "admin/enable_minecraft_integration": "Minecraft Integration aktivieren?",
diff --git a/custom/languages/en_US.json b/custom/languages/en_US.json
index efb03e7ed6..e1f001f4be 100644
--- a/custom/languages/en_US.json
+++ b/custom/languages/en_US.json
@@ -184,7 +184,6 @@
     "admin/enable_api": "Enable API?",
     "admin/enable_authme": "Enable AuthMe integration?",
     "admin/enable_debug_mode": "Enable debug mode?",
-    "admin/enable_mailer": "Enable PHPMailer?",
     "admin/enable_mailer_help": "If enabled, emails will be sent using PHPMailer instead of the system default. This may help with delivery, but requires you to configure an SMTP provider. {{docLinkStart}}Read more »{{docLinkEnd}}",
     "admin/enable_maintenance_mode": "Enable maintenance mode?",
     "admin/enable_minecraft_integration": "Enable Minecraft integration?",
diff --git a/custom/languages/es_419.json b/custom/languages/es_419.json
index 82164c30f2..bcc002240c 100644
--- a/custom/languages/es_419.json
+++ b/custom/languages/es_419.json
@@ -176,7 +176,6 @@
     "admin/enable_api": "¿Habilitar la API?",
     "admin/enable_authme": "¿Habilitar la integración con AuthMe?",
     "admin/enable_debug_mode": "¿Habilitar modo de depuración?",
-    "admin/enable_mailer": "¿Habilitar PHPMailer?",
     "admin/enable_mailer_help": "Habilite esto si los correos electrónicos no están siendo enviados por defecto. El uso de PHPMailer requiere tener un servicio capaz de enviar correos electrónicos, como Gmail o un proveedor SMTP.   ",
     "admin/enable_maintenance_mode": "¿Activar el modo de mantenimiento?",
     "admin/enable_minecraft_integration": "¿Permitir la integración de Minecraft?",
diff --git a/custom/languages/es_ES.json b/custom/languages/es_ES.json
index bb1aec710b..aae29e8d36 100644
--- a/custom/languages/es_ES.json
+++ b/custom/languages/es_ES.json
@@ -181,7 +181,6 @@
     "admin/enable_api": "¿Activar la API?",
     "admin/enable_authme": "¿Activar la integración de AuthMe?",
     "admin/enable_debug_mode": "¿Activar el modo de depuración?",
-    "admin/enable_mailer": "¿Activar PHPMailer?",
     "admin/enable_mailer_help": "Si se activa, los correos electrónicos se enviarán utilizando PHPMailer en lugar del sistema por defecto. Esto puede ayudar a la entrega, pero requiere que se configure un proveedor SMTP. {{docLinkStart}}Leer más »{{docLinkEnd}}",
     "admin/enable_maintenance_mode": "¿Activar el modo de mantenimiento?",
     "admin/enable_minecraft_integration": "¿Permitir la integración de Minecraft?",
diff --git a/custom/languages/fr_FR.json b/custom/languages/fr_FR.json
index eadb8ac48a..1b5904ef68 100644
--- a/custom/languages/fr_FR.json
+++ b/custom/languages/fr_FR.json
@@ -154,7 +154,6 @@
     "admin/enable_api": "Activer l'API ?",
     "admin/enable_authme": "Activer l’intégration AuthMe?",
     "admin/enable_debug_mode": "Activer le mode de débogage ?",
-    "admin/enable_mailer": "Activer PHPMailer ?",
     "admin/enable_mailer_help": "Activez ceci si les e-mails ne sont pas envoyés par défaut. L’utilisation de PHPMailer nécessite que vous ayez un service capable d’envoyer des courriels, comme Gmail ou un fournisseur SMTP.",
     "admin/enable_maintenance_mode": "Activer le mode de maintenance?",
     "admin/enable_minecraft_integration": "Activer l’intégration de Minecraft?",
diff --git a/custom/languages/it_IT.json b/custom/languages/it_IT.json
index 5bfc64f28c..ca2e0edd63 100644
--- a/custom/languages/it_IT.json
+++ b/custom/languages/it_IT.json
@@ -167,7 +167,6 @@
     "admin/enable_api": "Abilitare l'API?",
     "admin/enable_authme": "Abilitare l'integrazione con AuthMe?",
     "admin/enable_debug_mode": "Abilitare la modalità debug?",
-    "admin/enable_mailer": "Abilitare PHPMailer?",
     "admin/enable_mailer_help": "Abilitalo se le email non vengono inviate di default. L'uso di PHPMailer richiede che tu abbia un servizio capace di inviare email, come Gmail o un provider SMTP.",
     "admin/enable_maintenance_mode": "Abilita la modalità di manutenzione?",
     "admin/enable_minecraft_integration": "Abilitare l'integrazione con Minecraft?",
diff --git a/custom/languages/ja_JP.json b/custom/languages/ja_JP.json
index 5535ded9ff..8765d7370a 100644
--- a/custom/languages/ja_JP.json
+++ b/custom/languages/ja_JP.json
@@ -184,7 +184,6 @@
     "admin/enable_api": "APIを有効にしますか？",
     "admin/enable_authme": "AuthMe 連携を有効にしますか？",
     "admin/enable_debug_mode": "デバッグモードを有効にしますか？",
-    "admin/enable_mailer": "PHPMailerを有効にしますか？",
     "admin/enable_mailer_help": "有効にすると、システムのデフォルトではなくPHPMailerを使ってメールを送信するようになります。これはメール配信の助けになるかもしれませんが、SMTP プロバイダを設定する必要があります。{{docLinkStart}}続きを読む »{{docLinkEnd}}",
     "admin/enable_maintenance_mode": "メンテナンスモードを有効にしますか？",
     "admin/enable_minecraft_integration": "Minecraft連携を有効にしますか？",
diff --git a/custom/languages/lt_LT.json b/custom/languages/lt_LT.json
index 56b6642ac2..8bd3e4adc7 100644
--- a/custom/languages/lt_LT.json
+++ b/custom/languages/lt_LT.json
@@ -129,7 +129,6 @@
     "admin/enable_api": "Įjungti API?",
     "admin/enable_authme": "Įjungti AuthMe integraciją?",
     "admin/enable_debug_mode": "Įjungti derinimo režimą?",
-    "admin/enable_mailer": "Įjungti PHPMailer?",
     "admin/enable_mailer_help": "Įjunkite tai, jei el. Laiškai nebus siunčiami pagal numatytuosius nustatymus. Naudojant PHPMailer reikia turėti paslaugą, galinčią siųsti el. Laiškus, pvz., \"Gmail\" ar SMTP teikėją.",
     "admin/enable_maintenance_mode": "Įjungti priežiūros režimą?",
     "admin/enable_minecraft_integration": "Įjungti Minecraft integraciją?",
diff --git a/custom/languages/nl_NL.json b/custom/languages/nl_NL.json
index 7a2e52b035..6d86bc750a 100644
--- a/custom/languages/nl_NL.json
+++ b/custom/languages/nl_NL.json
@@ -175,7 +175,6 @@
     "admin/enable_api": "API aanzetten?",
     "admin/enable_authme": "AuthMe integratie aanzetten?",
     "admin/enable_debug_mode": "Wil je debug modus inschakelen?",
-    "admin/enable_mailer": "PHPMailer inschakelen?",
     "admin/enable_mailer_help": "Als dit aanstaat, worden e-mails verzonden met PHPMailer in plaats van de standaard van het system. Dit zou kunnen helpen met het verzenden van e-mails maar vereist wel dat je een SMTP aanbieder configureert. {{docLinkStart}}Lees meer »{{docLinkEnd}}",
     "admin/enable_maintenance_mode": "Wil je onderhoud modus inschakelen?",
     "admin/enable_minecraft_integration": "Minecraft integratie inschakelen?",
diff --git a/custom/languages/no_NO.json b/custom/languages/no_NO.json
index cab9aba81d..d157ff3d3c 100644
--- a/custom/languages/no_NO.json
+++ b/custom/languages/no_NO.json
@@ -167,7 +167,6 @@
     "admin/enable_api": "Aktiver API?",
     "admin/enable_authme": "Aktiver AuthMe-integrasjon",
     "admin/enable_debug_mode": "Tillatt feilsøkingsmodus?",
-    "admin/enable_mailer": "Aktiver PHPMailer?",
     "admin/enable_mailer_help": "Aktiver denne funksjonen hvis e-postene ikke blir sendt automatisk. Bruk av PHPMailer krever at du har tilgang til for eksempel Gmail eller en annen e-postleverandør som støtter SMTP.",
     "admin/enable_maintenance_mode": "Aktiver vedlikeholdsmodus?",
     "admin/enable_minecraft_integration": "Aktiver Minecraft-integrasjon",
diff --git a/custom/languages/pl_PL.json b/custom/languages/pl_PL.json
index a940788305..6067d66314 100644
--- a/custom/languages/pl_PL.json
+++ b/custom/languages/pl_PL.json
@@ -176,7 +176,6 @@
     "admin/enable_api": "Włączyć API?",
     "admin/enable_authme": "Włączyć integrację AuthMe?",
     "admin/enable_debug_mode": "Włączyć tryb debugowania?",
-    "admin/enable_mailer": "Użyć PHPMailera?",
     "admin/enable_mailer_help": "Włącz tą funkcję jeśli emaile nie są wysyłane przy domyślnej konfiguracji. Korzystanie z PHPMailer wymaga posiadania usługi umożliwiającej wysyłanie wiadomości e-mail, takich jak Gmail lub dostawca SMTP.",
     "admin/enable_maintenance_mode": "Włączyć tryb konserwacji?",
     "admin/enable_minecraft_integration": "Włączyć integrację minecraft?",
diff --git a/custom/languages/pt_BR.json b/custom/languages/pt_BR.json
index 642c14a869..19c15def13 100644
--- a/custom/languages/pt_BR.json
+++ b/custom/languages/pt_BR.json
@@ -180,7 +180,6 @@
     "admin/enable_api": "Ativar a API?",
     "admin/enable_authme": "Ativar a integração com o AuthMe?",
     "admin/enable_debug_mode": "Habilitar o modo de depuração?",
-    "admin/enable_mailer": "Ativar o PHPMailer?",
     "admin/enable_mailer_help": "Habilite isso se os emails não estiverem sendo enviados por padrão. O uso de PHPMailer exige que você tenha um serviço capaz de enviar emails, como o Gmail ou um provedor SMTP.",
     "admin/enable_maintenance_mode": "Habilitar modo de manutenção?",
     "admin/enable_minecraft_integration": "Ativar a integração do Minecraft?",
diff --git a/custom/languages/ro_RO.json b/custom/languages/ro_RO.json
index 8bb52654e9..aaac72913f 100644
--- a/custom/languages/ro_RO.json
+++ b/custom/languages/ro_RO.json
@@ -127,7 +127,6 @@
     "admin/enable_api": "Activare API?",
     "admin/enable_authme": "Activați integrarea AuthMe?",
     "admin/enable_debug_mode": "Activați modul de depanare?",
-    "admin/enable_mailer": "Activati PHPMailer?",
     "admin/enable_mailer_help": "Activați această opțiune dacă e-mailurile nu sunt trimise în mod implicit. Utilizarea programului PHPMailer necesită un serviciu care să poată trimite e-mailuri, cum ar fi Gmail sau un furnizor SMTP.",
     "admin/enable_maintenance_mode": "Activați modul de întreținere?",
     "admin/enable_minecraft_integration": "Activați integrarea Minecraft?",
diff --git a/custom/languages/ru_RU.json b/custom/languages/ru_RU.json
index a71cc49002..04a100bc87 100644
--- a/custom/languages/ru_RU.json
+++ b/custom/languages/ru_RU.json
@@ -184,7 +184,6 @@
     "admin/enable_api": "Включить API?",
     "admin/enable_authme": "Включить интеграцию с AuthMe?",
     "admin/enable_debug_mode": "Включить режим отладки?",
-    "admin/enable_mailer": "Включить PHPMailer?",
     "admin/enable_mailer_help": "Если включено, письма будут отправлены с помощью PHPMailer вместо системы по умолчанию. Это может помочь с отправкой, но требует вашу настройку SMTP провайдера. {{docLinkStart}}Прочитать больше »{{docLinkEnd}}",
     "admin/enable_maintenance_mode": "Включить режим обслуживания?",
     "admin/enable_minecraft_integration": "Включить интеграцию с Minecraft?",
diff --git a/custom/languages/sk_SK.json b/custom/languages/sk_SK.json
index 1aa1a50567..3d2951bf22 100644
--- a/custom/languages/sk_SK.json
+++ b/custom/languages/sk_SK.json
@@ -182,7 +182,6 @@
     "admin/enable_api": "Povoliť API?",
     "admin/enable_authme": "Povoliť AuthMe integráciu?",
     "admin/enable_debug_mode": "Povoliť debug mód?",
-    "admin/enable_mailer": "Povoliť PHPMailer?",
     "admin/enable_mailer_help": "Túto možnosť povoľte, ak sa emaily predvolene neposielajú. Používanie PHPMaileru vyžaduje, aby ste mali službu schopnú odosielať emaily, napríklad Gmail alebo SMTP poskytovateľ.",
     "admin/enable_maintenance_mode": "Povoliť režim údržby?",
     "admin/enable_minecraft_integration": "Povoliť Minecraft integráciu?",
diff --git a/custom/languages/sv_SE.json b/custom/languages/sv_SE.json
index 910632cdd1..363c82d053 100644
--- a/custom/languages/sv_SE.json
+++ b/custom/languages/sv_SE.json
@@ -166,7 +166,6 @@
     "admin/enable_api": "Aktivera API?",
     "admin/enable_authme": "Aktivera AuthMe integration?",
     "admin/enable_debug_mode": "Aktivera debug-läge?",
-    "admin/enable_mailer": "Aktivera PHPMailer?",
     "admin/enable_mailer_help": "Aktivera det här om e-postmeddelanden inte skickas som standard. Användningen av PHPMailer kräver att du har en tjänst som kan skicka e-postmeddelanden, till exempel Gmail eller en SMTP-leverantör.",
     "admin/enable_maintenance_mode": "Aktivera uppbyggnadsläge?",
     "admin/enable_minecraft_integration": "Aktivera Minecraft Integration?",
diff --git a/custom/languages/th_TH.json b/custom/languages/th_TH.json
index 70067ba589..f6025aa808 100644
--- a/custom/languages/th_TH.json
+++ b/custom/languages/th_TH.json
@@ -173,7 +173,6 @@
     "admin/enable_api": "เปิดใช้งาน API?",
     "admin/enable_authme": "เปิดใช้งาน AuthMe integration หรือไม่",
     "admin/enable_debug_mode": "เปิดใช้งานโหมดดีบักหรือไม่",
-    "admin/enable_mailer": "เปิดใช้งาน PHPMailer หรือไม่",
     "admin/enable_mailer_help": "เปิดใช้งานสิ่งนี้หากอีเมลไม่ได้ถูกส่งตามค่าเริ่มต้น การใช้ PHPMailer กําหนดให้คุณต้องมีบริการที่สามารถส่งอีเมลเช่น Gmail หรือผู้ให้บริการ SMTP",
     "admin/enable_maintenance_mode": "เปิดใช้งานโหมดปรับปรุงไหม",
     "admin/enable_minecraft_integration": "เปิดใช้งานการรวม Minecraft หริอไหม่",
diff --git a/custom/languages/tr_TR.json b/custom/languages/tr_TR.json
index 8d08c5bc06..ec1e69c2c6 100644
--- a/custom/languages/tr_TR.json
+++ b/custom/languages/tr_TR.json
@@ -135,7 +135,6 @@
     "admin/enable_api": "API etkinleştirilsin mi?",
     "admin/enable_authme": "AuthMe entegrasyonu etkinleştirilsin mi?",
     "admin/enable_debug_mode": "Hata ayıklama modu etkinleştirilsin mi?",
-    "admin/enable_mailer": "PHPMailer etkinleştirilsin mi?",
     "admin/enable_mailer_help": "Varsayılan olarak e-postalar gönderilmiyorsa bunu etkinleştirin. PHPMailer kullanımı için Gmail veya SMTP sağlayıcısı gibi e-posta gönderebilecek bir hizmetinizin olması gerekir.",
     "admin/enable_maintenance_mode": "Bakım modu etkinleştirilsin mi?",
     "admin/enable_minecraft_integration": "Minecraft entegrasyonu etkinleştirilsin mi?",
diff --git a/custom/languages/uk_UA.json b/custom/languages/uk_UA.json
index 9c02936a68..afcf39ce09 100644
--- a/custom/languages/uk_UA.json
+++ b/custom/languages/uk_UA.json
@@ -177,7 +177,6 @@
     "admin/enable_api": "Увімкнути API?",
     "admin/enable_authme": "Увімкнути інтеграцію із AuthMe?",
     "admin/enable_debug_mode": "Увімкнути режим відладки?",
-    "admin/enable_mailer": "Увімкнути PHPMailer?",
     "admin/enable_mailer_help": "Увімкніть цю функцію, якщо електронні листи не надсилаються за замовчуванням. Використання PHPMailer вимагає наявності служби, здатної надсилати електронні листи, наприклад, Gmail або SMTP-провайдера.",
     "admin/enable_maintenance_mode": "Увімкнути режим обслуговування?",
     "admin/enable_minecraft_integration": "Увімкнути інтеграцію з Minecraft?",
diff --git a/custom/languages/zh_CN.json b/custom/languages/zh_CN.json
index ff06f9997f..2736a69ebd 100644
--- a/custom/languages/zh_CN.json
+++ b/custom/languages/zh_CN.json
@@ -179,7 +179,6 @@
     "admin/enable_api": "是否启用 API?",
     "admin/enable_authme": "是否启用 AuthMe 集成?",
     "admin/enable_debug_mode": "是否启用调试模式?",
-    "admin/enable_mailer": "是否启用 PHPMailer?",
     "admin/enable_mailer_help": "如果默认情况下无法发送电子邮件，请启用此功能。使用 PHPMailer 要求您具有能够发送电子邮件的服务，例如 Gmail 或 SMTP 提供程序。",
     "admin/enable_maintenance_mode": "是否启用维护模式?",
     "admin/enable_minecraft_integration": "是否启用 Minecraft 集成?",
diff --git a/custom/languages/zh_TW.json b/custom/languages/zh_TW.json
index 81b0e51d5b..1f14677a66 100644
--- a/custom/languages/zh_TW.json
+++ b/custom/languages/zh_TW.json
@@ -81,7 +81,6 @@
     "admin/enable": "啟用",
     "admin/enable_authme": "啟用 AuthMe 連結?",
     "admin/enable_debug_mode": "啟用除錯模式?",
-    "admin/enable_mailer": "使用 PHPMailer?",
     "admin/enable_mailer_help": "如果電子郵件無法成功發送請啟用PHPMailer，將讓您可以正常地發送郵件，例如: Google的SMTP。",
     "admin/enable_maintenance_mode": "啟用維護模式?",
     "admin/enable_minecraft_integration": "啟用 Minecraft 連結?",

From 1263f10c3dad83bd046e1989d1e61c8403e93290 Mon Sep 17 00:00:00 2001
From: Supercrafter100 <admin@supercrafter100.com>
Date: Mon, 6 Jun 2022 16:34:58 +0000
Subject: [PATCH 052/337] Translated using Weblate (Dutch)

Currently translated at 100.0% (1221 of 1221 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/nl/
---
 custom/languages/nl_NL.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/custom/languages/nl_NL.json b/custom/languages/nl_NL.json
index 6d86bc750a..bb81fa8b90 100644
--- a/custom/languages/nl_NL.json
+++ b/custom/languages/nl_NL.json
@@ -1217,5 +1217,7 @@
     "admin/test_email_suggest_2": "Update je site zijn DNS records (check SPF & DKIM).",
     "admin/test_email_suggest_3": "Configureer een SMTP server. {{docLinkStart}}Lees meer »{{docLinkEnd}}",
     "installer/upgrade_error": "Er zijn fouten ontstaan tijdens het upgraden.",
-    "admin/custom_content": "Aangepaste Inhoud"
+    "admin/custom_content": "Aangepaste Inhoud",
+    "general/deleted_user": "Verwijderde gebruiker",
+    "admin/use_external_mail_server": "Gebruik externe mail server"
 }

From fddbe841fc24fd5be23f761eddcf1fa412d9e447 Mon Sep 17 00:00:00 2001
From: PadowYT2 <me@padow.ml>
Date: Mon, 6 Jun 2022 16:48:11 +0000
Subject: [PATCH 053/337] Translated using Weblate (Russian)

Currently translated at 100.0% (1221 of 1221 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/ru/
---
 custom/languages/ru_RU.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/custom/languages/ru_RU.json b/custom/languages/ru_RU.json
index 04a100bc87..6fb82772c4 100644
--- a/custom/languages/ru_RU.json
+++ b/custom/languages/ru_RU.json
@@ -1217,5 +1217,7 @@
     "admin/test_email_suggest_3": "Настройте SMTP сервер. {{docLinkStart}}Прочитать больше »{{docLinkEnd}}",
     "installer/database_configured": "Датабаза была настроена.",
     "installer/upgrade_error": "Произошли ошибки при обновлении.",
-    "admin/debug_link_info": "Важно - только делитесь этой ссылкой с людьми которыми вы доверяете!"
+    "admin/debug_link_info": "Важно - только делитесь этой ссылкой с людьми которыми вы доверяете!",
+    "general/deleted_user": "Удаленный Пользователь",
+    "admin/use_external_mail_server": "Использовать внешний почтовый сервер"
 }

From 4a7d3a6411afca213f78e27c3ca52cf134e20eb4 Mon Sep 17 00:00:00 2001
From: enno123 <admin@enno123.de>
Date: Mon, 6 Jun 2022 20:48:23 +0000
Subject: [PATCH 054/337] Translated using Weblate (German)

Currently translated at 100.0% (1221 of 1221 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/
---
 custom/languages/de_DE.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index 18b9b35b67..cb73df605c 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -1217,5 +1217,7 @@
     "admin/test_email_suggest_1": "Warte ein paar Minuten und überprüfe deinen Spam-Ordner.",
     "admin/test_email_suggest_2": "Aktualisiere die DNS-Einträge deiner Website (prüfe SPF und DKIM).",
     "admin/test_email_suggest_3": "Einen SMTP-Server einrichten. {{docLinkStart}}Weiterlesen \"{{docLinkEnd}}",
-    "admin/debug_link_info": "Wichtig - teile diesen Link nur mit Personen, denen du vertraust!"
+    "admin/debug_link_info": "Wichtig - teile diesen Link nur mit Personen, denen du vertraust!",
+    "general/deleted_user": "Gelöschte Benutzer",
+    "admin/use_external_mail_server": "Externen Mailserver verwenden"
 }

From 99d16db49d9d988c4492643573f8b93d8dc0338a Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Wed, 8 Jun 2022 09:38:44 +0200
Subject: [PATCH 055/337] Use Util::getProtocol, move autoload #2828

---
 core/init.php |  3 ---
 index.php     | 13 ++++++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/init.php b/core/init.php
index fdab433ad6..a0092b4901 100644
--- a/core/init.php
+++ b/core/init.php
@@ -9,9 +9,6 @@
  *  Initialisation file
  */
 
-require_once ROOT_PATH . '/vendor/autoload.php';
-require_once ROOT_PATH . '/core/includes/constants/autoload.php';
-
 // Nameless error handling
 set_exception_handler([ErrorHandler::class, 'catchException']);
 // catchError() used for throw_error or any exceptions which may be missed by catchException()
diff --git a/index.php b/index.php
index 5a5fed726f..b7c02a5934 100644
--- a/index.php
+++ b/index.php
@@ -29,6 +29,9 @@
     die('NamelessMC is not compatible with PHP versions older than 7.4');
 }
 
+// Start page load timer
+define('PAGE_START_TIME', microtime(true));
+
 if (!is_dir(__DIR__ . '/vendor') || !is_dir(__DIR__ . '/core/assets/vendor')) {
     die(
         "Your installation is missing the 'vendor' or 'core/assets/vendor' directory. These directories are included in
@@ -39,12 +42,12 @@
     );
 }
 
-// Start page load timer
-define('PAGE_START_TIME', microtime(true));
-
-// Definitions
 const PATH = '/';
 const ROOT_PATH = __DIR__;
+
+require_once __DIR__ . '/vendor/autoload.php';
+require_once __DIR__ . '/core/includes/constants/autoload.php';
+
 $page = 'Home';
 
 if (!ini_get('upload_tmp_dir')) {
@@ -53,7 +56,7 @@
     $tmp_dir = ini_get('upload_tmp_dir');
 }
 
-if ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') || (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https')) {
+if (Util::getProtocol() === 'https') {
     ini_set('session.cookie_secure', 'On');
 }
 

From 1e007bebe87b4a0aa20216b150b9e9b72add4ac0 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Wed, 8 Jun 2022 09:43:44 +0200
Subject: [PATCH 056/337] Don't check trusted proxy for protocol and port

Spoofing these values is not a security issue and the config is not available when getProtocol() is called during the installer
---
 core/classes/Core/Util.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/classes/Core/Util.php b/core/classes/Core/Util.php
index f2c40a066d..d0780e3e4b 100644
--- a/core/classes/Core/Util.php
+++ b/core/classes/Core/Util.php
@@ -308,7 +308,6 @@ public static function getRemoteAddress(): ?string {
      */
     public static function getProtocol(): ?string {
         if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
-            self::ensureTrustedProxy();
             $proto = $_SERVER['HTTP_X_FORWARDED_PROTO'];
             if ($proto !== 'http' && $proto !== 'https') {
                 die("Invalid X-Forwarded-Proto header, should be 'http' or 'https'.");
@@ -330,7 +329,6 @@ public static function getProtocol(): ?string {
      */
     public static function getPort(): ?int {
         if (isset($_SERVER['HTTP_X_FORWARDED_PORT'])) {
-            self::ensureTrustedProxy();
             return (int) $_SERVER['HTTP_X_FORWARDED_PORT'];
         }
 

From 632cd776b5291fbc1c292093c5807409d6f08b68 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Wed, 8 Jun 2022 22:04:58 -0600
Subject: [PATCH 057/337] Fix nullable username in user integrations table

---
 .../20220519041811_create_users_integrations_table.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/migrations/20220519041811_create_users_integrations_table.php b/core/migrations/20220519041811_create_users_integrations_table.php
index 56ffab996a..983e33b722 100644
--- a/core/migrations/20220519041811_create_users_integrations_table.php
+++ b/core/migrations/20220519041811_create_users_integrations_table.php
@@ -13,7 +13,7 @@ public function change(): void
             ->addColumn('user_id', 'integer', ['length' => 11])
             ->addColumn('integration_id', 'integer', ['length' => 11])
             ->addColumn('identifier', 'string', ['length' => 64, 'null' => true, 'default' => null])
-            ->addColumn('username', 'string', ['length' => 32])
+            ->addColumn('username', 'string', ['length' => 32, 'null' => true, 'default' => null])
             ->addColumn('verified', 'boolean', ['default' => false])
             ->addColumn('date', 'integer', ['length' => 11])
             ->addColumn('code', 'string', ['length' => 64, 'null' => true, 'default' => null])

From bf1c7f0a0cab3a13de6cb76629311edf0e9a2dc6 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Wed, 8 Jun 2022 22:08:57 -0600
Subject: [PATCH 058/337] Fix placeholder seeder

---
 scripts/seeder/MinecraftPlaceholderSeeder.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/seeder/MinecraftPlaceholderSeeder.php b/scripts/seeder/MinecraftPlaceholderSeeder.php
index 79524147f9..49f26bbc4f 100644
--- a/scripts/seeder/MinecraftPlaceholderSeeder.php
+++ b/scripts/seeder/MinecraftPlaceholderSeeder.php
@@ -7,7 +7,9 @@ class MinecraftPlaceholderSeeder extends Seeder {
     ];
 
     protected function run(DB $db, \Faker\Generator $faker): void {
-        Util::setSetting('placeholders', 1);
+        $db->query('UPDATE nl2_settings SET value = ? WHERE name = ?', [
+            1, 'placeholders',
+        ]);
 
         $servers = $db->get('mc_servers', ['id', '<>', 0])->results();
 

From 54b974714b41d5d2eb0956afc877ee3e148acf43 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Wed, 8 Jun 2022 22:20:20 -0600
Subject: [PATCH 059/337] Fix MariaDB version display (Closes #2834)

---
 modules/Core/pages/panel/index.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/Core/pages/panel/index.php b/modules/Core/pages/panel/index.php
index 65a80f879c..b2b43a4203 100644
--- a/modules/Core/pages/panel/index.php
+++ b/modules/Core/pages/panel/index.php
@@ -168,15 +168,14 @@
             $pdo_driver = 'MySQL';
         } else {
             $pdo_driver = 'MariaDB';
-            // MariaDB version strings are displayed as: "<replication version hack>-<major>.<minor>.<patch>-MariaDB",
+            // MariaDB version strings are displayed as: "<major>.<minor>.<patch>-MariaDB",
             // and we only want the version number.
-            // See: https://stackoverflow.com/a/56607492
-            $pdo_server_version = explode('-', $pdo_server_version)[1];
+            $pdo_server_version = explode('-', $pdo_server_version)[0];
         }
     }
 
-    if ($pdo_driver === 'MySQL' && version_compare($pdo_server_version, '5.7', '>=') ||
-        $pdo_driver === 'MariaDB' && version_compare($pdo_server_version, '10.3', '>=')) {
+    if (($pdo_driver === 'MySQL' && version_compare($pdo_server_version, '5.7', '>=')) ||
+        ($pdo_driver === 'MariaDB' && version_compare($pdo_server_version, '10.3', '>='))) {
         $compat_success[] = $pdo_driver . ' Server ' . $pdo_server_version;
     } else {
         $compat_errors[] = $pdo_driver . ' Server ' . $pdo_server_version;

From fed41416ef4785bdd42d3e3e79f6ba75ca84d5c8 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Wed, 8 Jun 2022 23:15:12 -0600
Subject: [PATCH 060/337] Fix install autoloader

---
 install.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/install.php b/install.php
index dc6eb1ad0f..3781b32c26 100644
--- a/install.php
+++ b/install.php
@@ -9,6 +9,8 @@
  *  Installer
  */
 
+require_once __DIR__ . '/vendor/autoload.php';
+
 // Definitions
 if (!defined('PATH')) {
     define('PATH', '/');

From 4be06eabe26bc1f7b9aeee72cf72d17a8ba567a4 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Thu, 9 Jun 2022 20:14:12 +0200
Subject: [PATCH 061/337] New API error for missing API key

This makes troubleshooting easier if a web server or proxy strips the Authorization header
---
 core/classes/Endpoints/KeyAuthEndpoint.php | 5 +++--
 modules/Core/classes/Misc/Nameless2API.php | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/classes/Endpoints/KeyAuthEndpoint.php b/core/classes/Endpoints/KeyAuthEndpoint.php
index 1e006788cf..09063cc287 100644
--- a/core/classes/Endpoints/KeyAuthEndpoint.php
+++ b/core/classes/Endpoints/KeyAuthEndpoint.php
@@ -19,14 +19,14 @@ final public function isAuthorised(Nameless2API $api): bool {
         $headers = getallheaders();
 
         if (!isset($headers['Authorization'])) {
-            return false;
+            $api->throwError(Nameless2API::ERROR_MISSING_API_KEY, $meta="Missing authorization header");
         }
 
         $exploded = explode(' ', trim($headers['Authorization']));
 
         if (count($exploded) !== 2 ||
             strcasecmp($exploded[0], 'Bearer') !== 0) {
-            return false;
+            $api->throwError(Nameless2API::ERROR_MISSING_API_KEY, $meta="Authorization header not in expected format");
         }
 
         $api_key = $exploded[1];
@@ -46,6 +46,7 @@ private function validateKey(Nameless2API $api, string $api_key): bool {
         if ($correct_key == null) {
             die('API key is null');
         }
+
         return hash_equals($api_key, $correct_key);
     }
 
diff --git a/modules/Core/classes/Misc/Nameless2API.php b/modules/Core/classes/Misc/Nameless2API.php
index c9be6a0cfb..0f1565f7d2 100644
--- a/modules/Core/classes/Misc/Nameless2API.php
+++ b/modules/Core/classes/Misc/Nameless2API.php
@@ -17,6 +17,7 @@ class Nameless2API {
     public const ERROR_UNKNOWN_ERROR = 'nameless:unknown_error';
     public const ERROR_NOT_AUTHORIZED = 'nameless:not_authorized';
     public const ERROR_INVALID_API_KEY = 'nameless:invalid_api_key';
+    public const ERROR_MISSING_API_KEY = 'nameless:missing_api_key';
     public const ERROR_INVALID_API_METHOD = 'nameless:invalid_api_method';
     public const ERROR_CANNOT_FIND_USER = 'nameless:cannot_find_user';
     public const ERROR_INVALID_POST_CONTENTS = 'nameless:invalid_post_contents';

From 0f01e8e94e6862b8b05f75a854f20ef031633a5e Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Thu, 9 Jun 2022 12:47:51 -0600
Subject: [PATCH 062/337] Make nullable username its own migration

---
 ...041811_create_users_integrations_table.php |  2 +-
 ...mn_nullable_on_user_integrations_table.php | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 core/migrations/20220609184529_make_username_column_nullable_on_user_integrations_table.php

diff --git a/core/migrations/20220519041811_create_users_integrations_table.php b/core/migrations/20220519041811_create_users_integrations_table.php
index 983e33b722..56ffab996a 100644
--- a/core/migrations/20220519041811_create_users_integrations_table.php
+++ b/core/migrations/20220519041811_create_users_integrations_table.php
@@ -13,7 +13,7 @@ public function change(): void
             ->addColumn('user_id', 'integer', ['length' => 11])
             ->addColumn('integration_id', 'integer', ['length' => 11])
             ->addColumn('identifier', 'string', ['length' => 64, 'null' => true, 'default' => null])
-            ->addColumn('username', 'string', ['length' => 32, 'null' => true, 'default' => null])
+            ->addColumn('username', 'string', ['length' => 32])
             ->addColumn('verified', 'boolean', ['default' => false])
             ->addColumn('date', 'integer', ['length' => 11])
             ->addColumn('code', 'string', ['length' => 64, 'null' => true, 'default' => null])
diff --git a/core/migrations/20220609184529_make_username_column_nullable_on_user_integrations_table.php b/core/migrations/20220609184529_make_username_column_nullable_on_user_integrations_table.php
new file mode 100644
index 0000000000..1f796c5a45
--- /dev/null
+++ b/core/migrations/20220609184529_make_username_column_nullable_on_user_integrations_table.php
@@ -0,0 +1,27 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class MakeUsernameColumnNullableOnUserIntegrationsTable extends AbstractMigration
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change(): void
+    {
+        $table = $this->table('nl2_users_integrations');
+
+        $table->changeColumn('username', 'string', ['length' => 32, 'null' => true, 'default' => null]);
+
+        $table->update();
+    }
+}

From 1cc52ce5344182da5a8e62ae7e62796e7bcfd94b Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Thu, 9 Jun 2022 12:48:30 -0600
Subject: [PATCH 063/337] Fix cli install `core/installed` value

---
 scripts/cli_install.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/cli_install.php b/scripts/cli_install.php
index 3192a5f565..d859b3bd09 100644
--- a/scripts/cli_install.php
+++ b/scripts/cli_install.php
@@ -202,6 +202,8 @@ function getEnvVar(string $name, string $fallback = null, array $valid_values =
 
 DatabaseInitialiser::runPostUser();
 
+Config::set('core/installed', true);
+
 print(PHP_EOL . '✅ Installation complete! (Took ' . round(microtime(true) - $start, 2) . ' seconds)' . PHP_EOL);
 print(PHP_EOL . '🖥  URL: http://' . $conf['core']['hostname'] . $conf['core']['path']);
 print(PHP_EOL . '🔑 Admin username: ' . $username);

From d5952736edeb4152ed99bf85ad56095c3bde6e00 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Thu, 9 Jun 2022 12:49:06 -0600
Subject: [PATCH 064/337] Revert Fix cli install `core/installed` value

---
 scripts/cli_install.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/cli_install.php b/scripts/cli_install.php
index d859b3bd09..3192a5f565 100644
--- a/scripts/cli_install.php
+++ b/scripts/cli_install.php
@@ -202,8 +202,6 @@ function getEnvVar(string $name, string $fallback = null, array $valid_values =
 
 DatabaseInitialiser::runPostUser();
 
-Config::set('core/installed', true);
-
 print(PHP_EOL . '✅ Installation complete! (Took ' . round(microtime(true) - $start, 2) . ' seconds)' . PHP_EOL);
 print(PHP_EOL . '🖥  URL: http://' . $conf['core']['hostname'] . $conf['core']['path']);
 print(PHP_EOL . '🔑 Admin username: ' . $username);

From d5f55bc2faab8ec4aa39398279970a9298b8cc78 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Thu, 9 Jun 2022 12:49:42 -0600
Subject: [PATCH 065/337] Style fixes

---
 core/classes/Endpoints/KeyAuthEndpoint.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/classes/Endpoints/KeyAuthEndpoint.php b/core/classes/Endpoints/KeyAuthEndpoint.php
index 09063cc287..d8eb9079d4 100644
--- a/core/classes/Endpoints/KeyAuthEndpoint.php
+++ b/core/classes/Endpoints/KeyAuthEndpoint.php
@@ -19,14 +19,14 @@ final public function isAuthorised(Nameless2API $api): bool {
         $headers = getallheaders();
 
         if (!isset($headers['Authorization'])) {
-            $api->throwError(Nameless2API::ERROR_MISSING_API_KEY, $meta="Missing authorization header");
+            $api->throwError(Nameless2API::ERROR_MISSING_API_KEY, 'Missing authorization header');
         }
 
         $exploded = explode(' ', trim($headers['Authorization']));
 
         if (count($exploded) !== 2 ||
             strcasecmp($exploded[0], 'Bearer') !== 0) {
-            $api->throwError(Nameless2API::ERROR_MISSING_API_KEY, $meta="Authorization header not in expected format");
+            $api->throwError(Nameless2API::ERROR_MISSING_API_KEY, 'Authorization header not in expected format');
         }
 
         $api_key = $exploded[1];

From 1234ad0ee0bbdb7458e7237b3171ba73f2edad4f Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Thu, 9 Jun 2022 13:00:48 -0600
Subject: [PATCH 066/337] Fix `OAuth` class name being overridden

Some systems have this ext installed by default, which clashes with the name: https://www.php.net/manual/en/class.oauth.php
---
 .../Misc/{OAuth.php => NamelessOAuth.php}        |  2 +-
 modules/Core/module.php                          |  4 ++--
 modules/Core/pages/login.php                     |  4 ++--
 modules/Core/pages/oauth.php                     | 16 ++++++++--------
 modules/Core/pages/panel/registration.php        | 16 ++++++++--------
 modules/Core/pages/panel/users_oauth.php         |  6 +++---
 modules/Core/pages/register.php                  |  6 +++---
 modules/Core/pages/user/oauth.php                |  6 +++---
 8 files changed, 30 insertions(+), 30 deletions(-)
 rename core/classes/Misc/{OAuth.php => NamelessOAuth.php} (99%)

diff --git a/core/classes/Misc/OAuth.php b/core/classes/Misc/NamelessOAuth.php
similarity index 99%
rename from core/classes/Misc/OAuth.php
rename to core/classes/Misc/NamelessOAuth.php
index 1c11c35f31..72c1231ce2 100644
--- a/core/classes/Misc/OAuth.php
+++ b/core/classes/Misc/NamelessOAuth.php
@@ -10,7 +10,7 @@
  * @version 2.0.0-pr13
  * @license MIT
  */
-class OAuth extends Instanceable {
+class NamelessOAuth extends Instanceable {
 
     private array $_providers = [];
     private array $_provider_instances = [];
diff --git a/modules/Core/module.php b/modules/Core/module.php
index 1f28f20b41..49690511ff 100644
--- a/modules/Core/module.php
+++ b/modules/Core/module.php
@@ -442,14 +442,14 @@ public function __construct(Language $language, Pages $pages, User $user, Naviga
         );
 
         // TODO: should this be in the Discord Integration module?
-        OAuth::getInstance()->registerProvider('discord', [
+        NamelessOAuth::getInstance()->registerProvider('discord', [
             'class' => \Wohali\OAuth2\Client\Provider\Discord::class,
             'user_id_name' => 'id',
             'scope_id_name' => 'identify',
             'icon' => 'fab fa-discord',
         ]);
 
-        OAuth::getInstance()->registerProvider('google', [
+        NamelessOAuth::getInstance()->registerProvider('google', [
             'class' => \League\OAuth2\Client\Provider\Google::class,
             'user_id_name' => 'sub',
             'scope_id_name' => 'openid',
diff --git a/modules/Core/pages/login.php b/modules/Core/pages/login.php
index 0490f83160..ea6588e982 100644
--- a/modules/Core/pages/login.php
+++ b/modules/Core/pages/login.php
@@ -289,8 +289,8 @@
     'ERROR_TITLE' => $language->get('general', 'error'),
     'ERROR' => ($return_error ?? []),
     'NOT_REGISTERED_YET' => $language->get('general', 'not_registered_yet'),
-    'OAUTH_AVAILABLE' => OAuth::getInstance()->isAvailable(),
-    'OAUTH_PROVIDERS' => OAuth::getInstance()->getProvidersAvailable(),
+    'OAUTH_AVAILABLE' => NamelessOAuth::getInstance()->isAvailable(),
+    'OAUTH_PROVIDERS' => NamelessOAuth::getInstance()->getProvidersAvailable(),
 ]);
 
 if (Session::exists('oauth_error')) {
diff --git a/modules/Core/pages/oauth.php b/modules/Core/pages/oauth.php
index 92d709fec2..974b212457 100644
--- a/modules/Core/pages/oauth.php
+++ b/modules/Core/pages/oauth.php
@@ -1,7 +1,7 @@
 <?php
 
 if (!isset($_GET['provider'], $_GET['code'])) {
-    if (!array_key_exists($_GET['provider'], OAuth::getInstance()->getProvidersAvailable())) {
+    if (!array_key_exists($_GET['provider'], NamelessOAuth::getInstance()->getProvidersAvailable())) {
         throw new RuntimeException("Invalid provider {$_GET['provider']}");
     }
 }
@@ -11,16 +11,16 @@
 }
 
 $provider_name = $_GET['provider'];
-$provider = OAuth::getInstance()->getProviderInstance($provider_name);
+$provider = NamelessOAuth::getInstance()->getProviderInstance($provider_name);
 $token = $provider->getAccessToken('authorization_code', [
     'code' => $_GET['code']
 ]);
 $oauth_user = $provider->getResourceOwner($token)->toArray();
-$provider_id = $oauth_user[OAuth::getInstance()->getUserIdName($provider_name)];
+$provider_id = $oauth_user[NamelessOAuth::getInstance()->getUserIdName($provider_name)];
 
 // register
 if (Session::get('oauth_method') === 'register') {
-    if (OAuth::getInstance()->userExistsByProviderId($provider_name, $provider_id)) {
+    if (NamelessOAuth::getInstance()->userExistsByProviderId($provider_name, $provider_id)) {
         Session::flash('oauth_error', $language->get('user', 'oauth_already_linked', ['provider' => ucfirst($provider_name)]));
         Redirect::to(URL::build('/register'));
     }
@@ -37,13 +37,13 @@
 
 // login
 if (Session::get('oauth_method') === 'login') {
-    if (!OAuth::getInstance()->userExistsByProviderId($provider_name, $provider_id)) {
+    if (!NamelessOAuth::getInstance()->userExistsByProviderId($provider_name, $provider_id)) {
         Session::flash('oauth_error', $language->get('user', 'no_user_found_with_provider', ['provider' => ucfirst($provider_name)]));
         Redirect::to(URL::build('/login'));
     }
 
     if ((new User())->login(
-        OAuth::getInstance()->getUserIdFromProviderId($provider_name, $provider_id),
+        NamelessOAuth::getInstance()->getUserIdFromProviderId($provider_name, $provider_id),
         '', true, 'oauth'
     )) {
         Log::getInstance()->log(Log::Action('user/login'));
@@ -62,12 +62,12 @@
 
 // link
 if (Session::get('oauth_method') === 'link') {
-    if (OAuth::getInstance()->userExistsByProviderId($provider_name, $provider_id)) {
+    if (NamelessOAuth::getInstance()->userExistsByProviderId($provider_name, $provider_id)) {
         Session::flash('oauth_error', $language->get('user', 'oauth_already_linked', ['provider' => ucfirst($provider_name)]));
         Redirect::to(URL::build('/user/oauth'));
     }
 
-    OAuth::getInstance()->saveUserProvider(
+    NamelessOAuth::getInstance()->saveUserProvider(
         $user->data()->id,
         $provider_name,
         $provider_id,
diff --git a/modules/Core/pages/panel/registration.php b/modules/Core/pages/panel/registration.php
index f8124bf88e..2f6b022910 100644
--- a/modules/Core/pages/panel/registration.php
+++ b/modules/Core/pages/panel/registration.php
@@ -38,16 +38,16 @@
 
             if (Input::get('action') == 'oauth') {
 
-                foreach (array_keys(OAuth::getInstance()->getProviders()) as $provider_name) {
+                foreach (array_keys(NamelessOAuth::getInstance()->getProviders()) as $provider_name) {
                     $client_id = Input::get("client-id-{$provider_name}");
                     $client_secret = Input::get("client-secret-{$provider_name}");
                     if ($client_id && $client_secret) {
-                        OAuth::getInstance()->setEnabled($provider_name, Input::get("enable-{$provider_name}") == 'on' ? 1 : 0);
+                        NamelessOAuth::getInstance()->setEnabled($provider_name, Input::get("enable-{$provider_name}") == 'on' ? 1 : 0);
                     } else {
-                        OAuth::getInstance()->setEnabled($provider_name, 0);
+                        NamelessOAuth::getInstance()->setEnabled($provider_name, 0);
                     }
 
-                    OAuth::getInstance()->setCredentials($provider_name, $client_id, $client_secret);
+                    NamelessOAuth::getInstance()->setCredentials($provider_name, $client_id, $client_secret);
                 }
 
             } else {
@@ -158,11 +158,11 @@
 }
 
 $oauth_provider_data = [];
-foreach (OAuth::getInstance()->getProviders() as $provider_name => $provider_data) {
-    [$client_id, $client_secret] = OAuth::getInstance()->getCredentials($provider_name);
+foreach (NamelessOAuth::getInstance()->getProviders() as $provider_name => $provider_data) {
+    [$client_id, $client_secret] = NamelessOAuth::getInstance()->getCredentials($provider_name);
     $oauth_provider_data[$provider_name] = [
-        'enabled' => OAuth::getInstance()->isEnabled($provider_name),
-        'setup' => OAuth::getInstance()->isSetup($provider_name),
+        'enabled' => NamelessOAuth::getInstance()->isEnabled($provider_name),
+        'setup' => NamelessOAuth::getInstance()->isSetup($provider_name),
         'icon' => $provider_data['icon'],
         'client_id' => $client_id,
         'client_secret' => $client_secret,
diff --git a/modules/Core/pages/panel/users_oauth.php b/modules/Core/pages/panel/users_oauth.php
index ce8928f51e..86820a8246 100644
--- a/modules/Core/pages/panel/users_oauth.php
+++ b/modules/Core/pages/panel/users_oauth.php
@@ -26,7 +26,7 @@
         if (Token::check(Input::get('token'))) {
             if (isset($_POST['provider_name'], $_POST['user_id'])) {
 
-                OAuth::getInstance()->unlinkProviderForUser($_POST['user_id'], $_POST['provider_name']);
+                NamelessOAuth::getInstance()->unlinkProviderForUser($_POST['user_id'], $_POST['provider_name']);
 
                 Session::flash('oauth_success', $language->get('admin', 'unlink_account_success', ['provider' => ucfirst($_POST['provider_name'])]));
             }
@@ -45,8 +45,8 @@
 }
 $user_query = $view_user->data();
 
-$oauth_providers = OAuth::getInstance()->getProvidersAvailable();
-$user_oauth_providers = OAuth::getInstance()->getAllProvidersForUser($user_query->id);
+$oauth_providers = NamelessOAuth::getInstance()->getProvidersAvailable();
+$user_oauth_providers = NamelessOAuth::getInstance()->getAllProvidersForUser($user_query->id);
 
 $user_providers_template = [];
 foreach ($user_oauth_providers as $user_provider) {
diff --git a/modules/Core/pages/register.php b/modules/Core/pages/register.php
index 3f8eaa4c3c..5402dc2b42 100644
--- a/modules/Core/pages/register.php
+++ b/modules/Core/pages/register.php
@@ -334,7 +334,7 @@
 
                         if (Session::exists('oauth_register_data')) {
                             $data = json_decode(Session::get('oauth_register_data'), true);
-                            OAuth::getInstance()->saveUserProvider(
+                            NamelessOAuth::getInstance()->saveUserProvider(
                                 $user_id,
                                 $data['provider'],
                                 $data['id'],
@@ -476,8 +476,8 @@
     'ERROR_TITLE' => $language->get('general', 'error'),
     'OR' => $language->get('general', 'or'),
     'OAUTH_FLOW' => $oauth_flow,
-    'OAUTH_AVAILABLE' => OAuth::getInstance()->isAvailable(),
-    'OAUTH_PROVIDERS' => OAuth::getInstance()->getProvidersAvailable(),
+    'OAUTH_AVAILABLE' => NamelessOAuth::getInstance()->isAvailable(),
+    'OAUTH_PROVIDERS' => NamelessOAuth::getInstance()->getProvidersAvailable(),
 ]);
 
 if ($captcha) {
diff --git a/modules/Core/pages/user/oauth.php b/modules/Core/pages/user/oauth.php
index 733ce14bf2..918b852691 100644
--- a/modules/Core/pages/user/oauth.php
+++ b/modules/Core/pages/user/oauth.php
@@ -25,7 +25,7 @@
         $provider_name = Input::get('provider');
 
         if (Input::get('action') === 'unlink') {
-            OAuth::getInstance()->unlinkProviderForUser($user->data()->id, $provider_name);
+            NamelessOAuth::getInstance()->unlinkProviderForUser($user->data()->id, $provider_name);
             Session::flash('oauth_success', $language->get('user', 'oauth_unlinked'));
         }
     } else {
@@ -36,8 +36,8 @@
 
 Session::put('oauth_method', 'link');
 
-$providers = OAuth::getInstance()->getProvidersAvailable();
-$user_providers = OAuth::getInstance()->getAllProvidersForUser($user->data()->id);
+$providers = NamelessOAuth::getInstance()->getProvidersAvailable();
+$user_providers = NamelessOAuth::getInstance()->getAllProvidersForUser($user->data()->id);
 
 $user_providers_template = [];
 foreach ($user_providers as $user_provider) {

From 4235f6ab6519e60408d2834bec9e3c755c561ed0 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Fri, 10 Jun 2022 10:43:13 +0200
Subject: [PATCH 067/337] Set CGIPassAuth On

---
 .htaccess | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.htaccess b/.htaccess
index f0e2447a10..9b77365958 100644
--- a/.htaccess
+++ b/.htaccess
@@ -29,3 +29,6 @@
   <files "*.tpl">
     Deny from all
   </files>
+
+  # Prevent Apache from removing the Authorization header, we need to check it for the API.
+  CGIPassAuth On

From f0869338da89be8b5d8ae9408b9d0e23872aee50 Mon Sep 17 00:00:00 2001
From: Partydragen <admin@partydragen.com>
Date: Fri, 10 Jun 2022 18:31:42 +0200
Subject: [PATCH 068/337] Fix fatal error for deleted users in logs

---
 modules/Core/pages/panel/security.php | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/modules/Core/pages/panel/security.php b/modules/Core/pages/panel/security.php
index 26efe18b2a..b04f0a5bb9 100644
--- a/modules/Core/pages/panel/security.php
+++ b/modules/Core/pages/panel/security.php
@@ -89,7 +89,9 @@
 
                 $rows[] = [
                     0 => [
-                        'content' => '<a style="' . $target_user->getGroupStyle() . '" href="' . URL::build('/panel/user/' . urlencode($log->user_id . '-' . $target_user->getDisplayname(true))) . '">' . Output::getClean($target_user->getDisplayname()) . '</a>'
+                        'content' => $target_user->exists()
+                            ? '<a style="' . $target_user->getGroupStyle() . '" href="' . URL::build('/panel/user/' . urlencode($log->user_id . '-' . $target_user->getDisplayname(true))) . '">' . Output::getClean($target_user->getDisplayname()) . '</a>'
+                            : $language->get('general', 'deleted_user')
                     ],
                     1 => [
                         'content' => '<a href="' . URL::build('/panel/users/ip_lookup/', 'ip=' . Output::getClean($log->ip)) . '">' . Output::getClean($log->ip) . '</a>'
@@ -125,7 +127,9 @@
 
                 $rows[] = [
                     0 => [
-                        'content' => '<a style="' . $target_user->getGroupStyle() . '" href="' . URL::build('/panel/user/' . urlencode($log->user_id . '-' . $target_user->getDisplayname(true))) . '">' . Output::getClean($target_user->getDisplayname()) . '</a>'
+                        'content' => $target_user->exists()
+                            ? '<a style="' . $target_user->getGroupStyle() . '" href="' . URL::build('/panel/user/' . urlencode($log->user_id . '-' . $target_user->getDisplayname(true))) . '">' . Output::getClean($target_user->getDisplayname()) . '</a>'
+                            : $language->get('general', 'deleted_user')
                     ],
                     1 => [
                         'content' => '<a href="' . URL::build('/panel/users/ip_lookup/', 'ip=' . urlencode($log->ip)) . '">' . Output::getClean($log->ip) . '</a>'
@@ -163,7 +167,9 @@
 
                 $rows[] = [
                     0 => [
-                        'content' => '<a style="' . $target_user->getGroupStyle() . '" href="' . URL::build('/panel/user/' . urlencode($log->user_id . '-' . $target_user->getDisplayname(true))) . '">' . Output::getClean($target_user->getDisplayname()) . '</a>'
+                        'content' => $target_user->exists()
+                            ? '<a style="' . $target_user->getGroupStyle() . '" href="' . URL::build('/panel/user/' . urlencode($log->user_id . '-' . $target_user->getDisplayname(true))) . '">' . Output::getClean($target_user->getDisplayname()) . '</a>'
+                            : $language->get('general', 'deleted_user')
                     ],
                     1 => [
                         'content' => '<a href="' . URL::build('/panel/users/ip_lookup/', 'ip=' . urlencode($log->ip)) . '">' . Output::getClean($log->ip) . '</a>'
@@ -211,7 +217,9 @@
 
                 $rows[] = [
                     0 => [
-                        'content' => '<a style="' . $target_user->getGroupStyle() . '" href="' . URL::build('/panel/user/' . urlencode($log->user_id . '-' . $target_user->getDisplayname(true))) . '">' . Output::getClean($target_user->getDisplayname()) . '</a>'
+                        'content' => $target_user->exists()
+                            ? '<a style="' . $target_user->getGroupStyle() . '" href="' . URL::build('/panel/user/' . urlencode($log->user_id . '-' . $target_user->getDisplayname(true))) . '">' . Output::getClean($target_user->getDisplayname()) . '</a>'
+                            : $language->get('general', 'deleted_user')
                     ],
                     1 => [
                         'content' => date(DATE_FORMAT, $log->time),
@@ -259,7 +267,8 @@
                     0 => [
                         'content' => $log->user_id == 0
                             ? $language->get('general', 'none')
-                            : '<a style="' . $target_user->getGroupStyle() . '" href="' . URL::build('/panel/user/' . urlencode($log->user_id . '-' . $target_user->getDisplayname(true))) . '">' . Output::getClean($target_user->getDisplayname()) . '</a>'
+                            : ($target_user->exists() ? '<a style="' . $target_user->getGroupStyle() . '" href="' . URL::build('/panel/user/' . urlencode($log->user_id . '-' . $target_user->getDisplayname(true))) . '">' . Output::getClean($target_user->getDisplayname()) . '</a>'
+                            : $language->get('general', 'deleted_user'))
                     ],
                     1 => [
                         'content' => '<a href="' . URL::build('/panel/users/ip_lookup/', 'ip=' . urlencode($log->ip)) . '">' . Output::getClean($log->ip) . '</a>'

From 082d2c5ab1e430e31c7164e61d5d90d32371203b Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Fri, 10 Jun 2022 18:41:09 -0600
Subject: [PATCH 069/337] New contributing doc & notes about versioning

---
 CONTRIBUTING.md | 57 +++++++++++++++++++++++++++++++++++++++++++++++++
 CONTRIBUTORS.md | 30 --------------------------
 README.md       | 33 +---------------------------
 3 files changed, 58 insertions(+), 62 deletions(-)
 create mode 100644 CONTRIBUTING.md
 delete mode 100644 CONTRIBUTORS.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000000..0cdf4aa64a
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,57 @@
+# Contributing
+We welcome all contributions of code and translations. Please feel free to fork the repository on GitHub and create any pull requests!
+
+Document in progress!
+
+## Tips
+Here are some things you should know when contributing:
+- We generally keep a todo list in the Milestones tab of the Issues page.
+- We use Composer to manage dependencies. Before you can install the dependencies, you need to install Composer on your local computer. Installation instructions are [here](https://getcomposer.org/doc/00-intro.md).
+    - To install the Composer packages we depend on, run the following command in the root directory of the NamelessMC repository:
+        ```console
+        composer install --dev
+        ```
+        - This could take up to about a minute depending on your internet connection.
+- You can use the CLI (command line) install script to reset your development environment in less than 5 seconds!
+    - Run the following command when in the root directory:
+        ```console
+        php scripts/cli_install.php --iSwearIKnowWhatImDoing --reinstall
+        ```
+- To populate the database with some fake data, you can use the seeder.
+    - Run the following command when in the root directory:
+        ```console
+        php scripts/seeder/db_seeder.php wipe
+        ```
+        - This will wipe the database and populate it with lots of fake users, forums, and much, much more.
+        - *Note: Login to the admin account with `admin@localhost` and `password` after running the seeder*
+- To make changes to the database schema (add, modify or remove a table), please create a new migration with Phinx:
+    - Run the following command when in the root directory:
+        ```console
+        vendor/bin/phinx create MigrationNameInCamelCase -c core/migrations/phinx.php
+        ```
+    - This will create a new migration file in the `./core/migrations` directory, where you can use the Phinx table builder to make your changes.
+      Please try to stick with the conventions of pre-existing migrations.
+    - To execute the migration, run the following command:
+      ```console
+      vendor/bin/phinx migrate -c core/migrations/phinx.php
+      ```
+      
+## Versioning
+As of NamelessMC 2.0.0 (to be released at time of writing), we use a unique versioning system.
+Similar to [semver](https://semver.org), we follow the `major.minor.patch` versioning pattern, however there are a few things to note:
+- The `major` version is pinned at `2` for the time being.
+- The `minor` version is only changed when *breaking changes are made*. These include:
+  - Changes that require modules to update
+  - Changes that require templates to update
+  - Changes that require updates to the Nameless-Link Discord bot
+  - Changes that require updates to the debug.namelessmc.com repo
+  - **If the minor version is bumped, we will inform users about which of the above aspects were affected.**
+- The `patch` version will change for any releases which do not include breaking changes, in our case this will generally mean a bug fix release.
+
+Examples:
+- `2.0.1`
+  - A bug fix release. Fully backwards compatible with `2.0.0` modules, templates & other integrations.
+- `2.1.0`
+  - A "major" release. Modules and/or templates and/or other integrations will need to be updated to support this release.
+- `2.1.4`
+    - A bug fix release. Fully backwards compatible with `2.1.0` modules, templates & other integrations, but not compatible with (at least 1) `2.0.0` integration
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
deleted file mode 100644
index e45c33a776..0000000000
--- a/CONTRIBUTORS.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# NamelessMC v2 Contributors
-
-Please feel free to update this list along with any pull requests.
-
-A full list of contributors for v2 can be found [here](https://github.com/NamelessMC/Nameless/graphs/contributors).
-
-### v1
-Unfortunately it's only possible to view contributors for the default branch. For the previous version v1.x.x, contributors can be found in the [v1 readme](https://github.com/NamelessMC/Nameless/blob/master/README.md).
-
-### Translations
-- Chinese: [ahdg](https://github.com/ahdg6), [Hi_Michael](https://github.com/haer0248)
-- Czech: Ethxrnity, [LukarioJapans](https://github.com/LucarioJapans), [Nekomitsuki](https://github.com/Nekomitsuki), [Renzotom](https://github.com/Renzotom), [Volgeop](https://github.com/Volgeop), Zemos
-- Danish: Codiaz
-- Dutch: [Akela](https://github.com/Akelah), [Derkades](https://github.com/Derkades), [Jesse Geerts](https://github.com/jesseke55), [Rody Molenaar](https://github.com/rodymolenaar), [Sander Lambrechts](https://github.com/TheSander562), [smessie](https://github.com/smessie)
-- English UK (default)
-- English US (default)
-- German: [BattleDev](https://github.com/BinFlauschigDEV), [BukkitTNT](https://github.com/BukkitTNT), [H4nSolo](https://github.com/H4nSolo)
-- Greek: [ArisC](https://github.com/Ar1sC)
-- Italian: [alsoGAMER](https://github.com/alsoGAMER)
-- Japanese: [Mari0914](https://github.com/Mari0914), [SimplyRin](https://www.simplyrin.net), [snake](https://viasnake.com)
-- Lithuanian: [Govindas](https://github.com/Govindass), [Justas](https://github.com/madebyjustas)
-- Norwegian: [HeyImSushii](https://github.com/HeyImSushii), [Maiu](https://github.com/Maiu15), [OscarWoHA](https://github.com/OscarWoHA)
-- Polish: brzezinsky, Cubixor, [kacperleague9](https://github.com/kacperleague9)
-- Portuguese: [dasilvaj4](https://github.com/dasilvaj4), [Douglas Teles](https://github.com/dgateles)
-- Romanian: [BaxAndrei](https://github.com/baxandrei)
-- Slovak: [RobiNN1](https://github.com/RobiNN1)
-- Spanish: [Ariuw](https://github.com/Ariuw), [iMaykolRD_](https://namelessmc.com/profile/iMaykolRD_/), TheSuperSkills, [zJerino](https://namelessmc.com/profile/zJerino/)
-- Swedish: [IsS127](https://github.com/IsS127), [ItsLynix](https://github.com/ItsLynix)
-- Turkish: xOrcun
-- French: [WhiteSkyAngel](https://github.com/WhiteSkyAngel)
diff --git a/README.md b/README.md
index f070847bde..bcfe04743e 100644
--- a/README.md
+++ b/README.md
@@ -70,38 +70,7 @@ If you would like to assist with the NamelessMC development by translating to yo
 ![Translation progress](https://translate.namelessmc.com/widgets/namelessmc/-/nameless/multi-auto.svg)
 
 ## Contributing
-We welcome all contributions of code and translations. Please feel free to fork the repository on GitHub and create any pull requests!
-Here are some things you should know when contributing:
-- We generally keep a todo list in the Milestones tab of the Issues page.
-- We use Composer to manage dependencies. Before you can install the dependencies, you need to install Composer on your local computer. Installation instructions are [here](https://getcomposer.org/doc/00-intro.md).
-  - To install the Composer packages we depend on, run the following command in the root directory of the NamelessMC repository:
-      ```console
-      composer install --dev
-      ```
-    - This could take up to about a minute depending on your internet connection.
-- You can use the CLI (command line) install script to reset your development environment in less than 5 seconds!
-  - Run the following command when in the root directory:
-      ```console
-      php scripts/cli_install.php --iSwearIKnowWhatImDoing --reinstall
-      ```
-- To populate the database with some fake data, you can use the seeder.
-  - Run the following command when in the root directory:
-      ```console
-      php scripts/seeder/db_seeder.php wipe
-      ```
-    - This will wipe the database and populate it with lots of fake users, forums, and much, much more.
-    - *Note: Login to the admin account with `admin@localhost` and `password` after running the seeder*
-- To make changes to the database schema (add, modify or remove a table), please create a new migration with Phinx:
-  - Run the following command when in the root directory:
-      ```console
-      vendor/bin/phinx create MigrationNameInCamelCase -c core/migrations/phinx.php
-      ```
-  - This will create a new migration file in the `./core/migrations` directory, where you can use the Phinx table builder to make your changes.
-    Please try to stick with the conventions of pre-existing migrations.
-  - To execute the migration, run the following command:
-    ```console
-    vendor/bin/phinx migrate -c core/migrations/phinx.php
-    ```
+Please see the contributing document for information on how to contribute to NamelessMC.
 
 ## Special Thanks
 - All NamelessMC [contributors](https://github.com/NamelessMC/Nameless/graphs/contributors).

From c4130972b487762c55d6fbe2644df91790dd0726 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Fri, 10 Jun 2022 18:58:36 -0600
Subject: [PATCH 070/337] Fix #2843

---
 core/classes/Database/DB.php        |  11 +
 core/classes/Misc/UpgradeScript.php |  25 +-
 core/includes/updates/200-pr12.php  | 367 ----------------------------
 core/includes/updates/200-pr13.php  |  18 ++
 4 files changed, 44 insertions(+), 377 deletions(-)
 delete mode 100644 core/includes/updates/200-pr12.php
 create mode 100644 core/includes/updates/200-pr13.php

diff --git a/core/classes/Database/DB.php b/core/classes/Database/DB.php
index 7acb99b1b7..add027c852 100644
--- a/core/classes/Database/DB.php
+++ b/core/classes/Database/DB.php
@@ -13,6 +13,7 @@ class DB {
     private static ?DB $_instance = null;
 
     private string $_prefix;
+    private string $_database;
     private ?string $_force_charset;
     protected PDO $_pdo;
     private PDOStatement $_statement;
@@ -25,6 +26,7 @@ private function __construct(string $host, string $database, string $username, s
         try {
             $this->_force_charset = $force_charset;
             $this->_prefix = $prefix;
+            $this->_database = $database;
 
             $connection_string = 'mysql:host=' . $host . ';port=' . $port . ';dbname=' . $database;
             if ($force_charset) {
@@ -55,6 +57,15 @@ public function getPDO(): PDO {
         return $this->_pdo;
     }
 
+    /**
+     * Get the database name this instance is connected to.
+     *
+     * @return string Database name.
+     */
+    public function getDatabase(): string {
+        return $this->_database;
+    }
+
     /**
      * Get the first row of the result.
      *
diff --git a/core/classes/Misc/UpgradeScript.php b/core/classes/Misc/UpgradeScript.php
index 0f535c8550..75bec1fa7c 100644
--- a/core/classes/Misc/UpgradeScript.php
+++ b/core/classes/Misc/UpgradeScript.php
@@ -38,6 +38,16 @@ public static function get(string $current_version): ?UpgradeScript {
      */
     abstract public function run(): void;
 
+    /**
+     * Logs a message to the screen and the warning-log.log file.
+     *
+     * @param string $message Message to log
+     */
+    protected function log(string $message): void {
+        echo $message . '<br/>';
+        ErrorHandler::logWarning('UPGRADING EXCEPTION: ' . $exception->getMessage());
+    }
+
     /**
      * Run a single database query
      *
@@ -62,8 +72,7 @@ protected function databaseQueries(array $queries): array {
                 $results[] = $query(DB::getInstance());
             } catch (Exception $exception) {
                 $results[] = null;
-                ErrorHandler::logWarning('UPGRADING EXCEPTION: ' . $exception->getMessage());
-                echo $exception->getMessage() . '<br />';
+                $this->log($exception->getMessage());
             }
         }
 
@@ -100,8 +109,7 @@ protected function deleteFilesInPath(string $path, array $files, bool $recursive
                 }
 
             } else {
-                ErrorHandler::logWarning('UPGRADING EXCEPTION: ' . "'$newFile' does not exist, cannot delete. <br />");
-                echo "'$newFile' does not exist, cannot delete. <br />";
+                $this->log("'$newFile' does not exist, cannot delete.");
             }
 
         }
@@ -116,20 +124,17 @@ protected function deleteFiles($paths): void {
         foreach ((array) $paths as $path) {
             $path = ROOT_PATH . '/' . $path;
             if (!file_exists($path)) {
-                ErrorHandler::logWarning('UPGRADING EXCEPTION: ' . "'$path' does not exist, cannot delete. <br />");
-                echo "'$path' does not exist, cannot delete. <br />";
+                $this->log("'$path' does not exist, cannot delete.");
                 continue;
             }
 
             if (!is_writable($path)) {
-                ErrorHandler::logWarning('UPGRADING EXCEPTION: ' . "'$path' is not writable, cannot delete. <br />");
-                echo "'$path' is not writable, cannot delete. <br />";
+                $this->log("'$path' is not writable, cannot delete.");
                 return;
             }
 
             if (is_dir($path) && !rmdir($path)) {
-                ErrorHandler::logWarning('UPGRADING EXCEPTION: ' . "Could not delete '$path', is it empty? <br />");
-                echo "Could not delete '$path', is it empty? <br />";
+                $this->log("Could not delete '$path', is it empty?");
             }
 
             unlink($path);
diff --git a/core/includes/updates/200-pr12.php b/core/includes/updates/200-pr12.php
deleted file mode 100644
index f36c75bd73..0000000000
--- a/core/includes/updates/200-pr12.php
+++ /dev/null
@@ -1,367 +0,0 @@
-<?php
-
-class Pre13 extends UpgradeScript {
-
-    public function run(): void {
-        $this->databaseQuery(function (DB $db) {
-            // Disable all modules and templates & reset defaults
-            $db->query("UPDATE `nl2_modules` SET `enabled` = 0 WHERE `name` NOT IN ('Core', 'Forum')");
-            $this->_cache->setCache('modulescache');
-            $this->_cache->eraseAll();
-            $arr = [
-                ['name' => 'Core', 'priority' => 1]
-            ];
-            if ($db->query("SELECT enabled FROM nl2_modules WHERE name = 'Forum' AND enabled = 1")->count() > 0) {
-                $arr[] = ['name' => 'Forum', 'priority' => 2];
-            }
-            $this->_cache->store('enabled_modules', $arr);
-            $this->_cache->store('module_core', true);
-
-            $db->query("UPDATE `nl2_templates` SET `enabled` = 0 WHERE `name` <> 'DefaultRevamp'");
-            $db->query("UPDATE `nl2_templates` SET `enabled` = 1, `is_default`  = 1 WHERE `name` = 'DefaultRevamp'");
-            $db->query("UPDATE `nl2_panel_templates` SET `enabled` = 0 WHERE `name` <> 'Default'");
-            $db->query("UPDATE `nl2_panel_templates` SET `enabled` = 1, `is_default`  = 1 WHERE `name` = 'Default'");
-            $this->_cache->setCache('templatecache');
-            $this->_cache->eraseAll();
-        });
-
-        // Default night mode to null instead of 0
-        $this->databaseQuery(function (DB $db) {
-            $db->query('ALTER TABLE nl2_users MODIFY night_mode tinyint(1) DEFAULT NULL NULL');
-        });
-
-        // Default log table user IP to null
-        $this->databaseQuery(function (DB $db) {
-            $db->query('ALTER TABLE nl2_logs MODIFY ip varchar(128) DEFAULT NULL NULL');
-        });
-
-        // Cookie policy
-        $this->databaseQuery(function (DB $db) {
-            if (!$db->query('SELECT `id` FROM nl2_privacy_terms WHERE `name` = ?', ['cookies'])->count()) {
-                $db->insert('privacy_terms', array(
-                    'name' => 'cookies',
-                    'value' => '<span style="font-size:18px"><strong>What are cookies?</strong></span><br />Cookies are small files which are stored on your device by a website, unique to your web browser. The web browser will send these files to the website each time it communicates with the website.<br />Cookies are used by this website for a variety of reasons which are outlined below.<br /><br /><strong>Necessary cookies</strong><br />Necessary cookies are required for this website to function. These are used by the website to maintain your session, allowing for you to submit any forms, log into the website amongst other essential behaviour. It is not possible to disable these within the website, however you can disable cookies altogether via your browser.<br /><br /><strong>Functional cookies</strong><br />Functional cookies allow for the website to work as you choose. For example, enabling the &quot;Remember Me&quot; option as you log in will create a functional cookie to automatically log you in on future visits.<br /><br /><strong>Analytical cookies</strong><br />Analytical cookies allow both this website, and any third party services used by this website, to collect non-personally identifiable data about the user. This allows us (the website staff) to continue to improve the user experience and understand how the website is used.<br /><br />Further information about cookies can be found online, including the <a rel="nofollow noopener" target="_blank" href="https://ico.org.uk/your-data-matters/online/cookies/">ICO&#39;s website</a> which contains useful links to further documentation about configuring your browser.<br /><br /><span style="font-size:18px"><strong>Configuring cookie use</strong></span><br />By default, only necessary cookies are used by this website. However, some website functionality may be unavailable until the use of cookies has been opted into.<br />You can opt into, or continue to disallow, the use of cookies using the cookie notice popup on this website. If you would like to update your preference, the cookie notice popup can be re-enabled by clicking the button below.'
-                ));
-            }
-        });
-
-        $this->databaseQuery(function (DB $db) {
-            // make the name column in nl2_settings table unique
-            // first remove duplicates
-            $to_delete = $db->query('SELECT s.id FROM nl2_settings s
-                WHERE s.name IN (SELECT name FROM nl2_settings GROUP BY name HAVING count(*) > 1)
-                AND id <> (SELECT MIN(id) FROM nl2_settings WHERE name = s.name)
-            ');
-
-            if ($to_delete->count()) {
-                $items = '(';
-                foreach ($to_delete->results() as $item) {
-                    $items .= ((int)$item->id) . ',';
-                }
-                $items = rtrim($items, ',') . ')';
-
-                $db->query('DELETE FROM nl2_settings WHERE id IN ' . $items);
-            }
-
-            // now add unique constraint
-            $db->query('ALTER TABLE nl2_settings ADD CONSTRAINT UNIQUE(`name`)');
-        });
-
-        // delete old "version" row
-        $this->databaseQuery(function (DB $db) {
-            Util::setSetting('version', null);
-        });
-
-        // oauth
-        $this->databaseQuery(function (DB $db) {
-            $db->createTable('oauth', "
-                                        `provider` varchar(256) NOT NULL,
-                                        `enabled` tinyint(1) NOT NULL DEFAULT '0',
-                                        `client_id` varchar(256) DEFAULT NULL,
-                                        `client_secret` varchar(256) DEFAULT NULL,
-                                        PRIMARY KEY (`provider`),
-                                        UNIQUE KEY `id` (`provider`)");
-            $db->createTable('oauth_users', "
-                                      `user_id` int NOT NULL,
-                                      `provider` varchar(256) NOT NULL,
-                                      `provider_id` varchar(256) NOT NULL,
-                                      PRIMARY KEY (`user_id`,`provider`,`provider_id`),
-                                      UNIQUE KEY `user_id` (`user_id`,`provider`,`provider_id`)");
-        });
-
-        // User integrations
-        $this->databaseQueries([
-            function (DB $db) {
-                $db->createTable('integrations', " `id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(32) NOT NULL, `enabled` tinyint(1) NOT NULL DEFAULT '1', `can_unlink` tinyint(1) NOT NULL DEFAULT '1', `required` tinyint(1) NOT NULL DEFAULT '0', `order` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`id`)");
-                $db->createTable('users_integrations', " `id` int(11) NOT NULL AUTO_INCREMENT, `integration_id` int(11) NOT NULL, `user_id` int(11) NOT NULL, `identifier` varchar(64) DEFAULT NULL, `username` varchar(32) DEFAULT NULL, `verified` tinyint(1) NOT NULL DEFAULT '0', `date` int(11) NOT NULL, `code` varchar(64) DEFAULT NULL, `show_publicly` tinyint(1) NOT NULL DEFAULT '1', `last_sync` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`id`)");
-            },
-            function (DB $db) {
-                $db->insert('integrations', [
-                    'name' => 'Minecraft',
-                    'enabled' => true,
-                    'can_unlink' => false,
-                    'required' => false,
-                ]);
-
-                $db->insert('integrations', [
-                    'name' => 'Discord',
-                    'enabled' => true,
-                    'can_unlink' => true,
-                    'required' => false
-                ]);
-            }
-        ]);
-
-        $this->databaseQuery(
-            function (DB $db) {
-                $db->query('ALTER TABLE `nl2_users_integrations` ADD INDEX `nl2_users_integrations_idx_integration_id` (`integration_id`)');
-                $db->query('ALTER TABLE `nl2_users_integrations` ADD INDEX `nl2_users_integrations_idx_user_id` (`user_id`)');
-            }
-        );
-
-        // Convert users integrations
-        $this->databaseQuery(function (DB $db) {
-            $users = $db->query('SELECT id, username, uuid, discord_id, discord_username, joined FROM nl2_users')->results();
-            $query = 'INSERT INTO nl2_users_integrations (integration_id, user_id, identifier, username, verified, date) VALUES ';
-            foreach ($users as $item) {
-                $inserts = [];
-
-                if (!empty($item->uuid) && $item->uuid != 'none') {
-                    $inserts[] = '(1,' . $item->id . ',\'' . $item->uuid . '\',\'' . $item->username . '\',1,' . $item->joined . '),';
-                }
-
-                if ($item->discord_id != null && $item->discord_username != null && $item->discord_id != 010) {
-                    $inserts[] = '(2,' . $item->id . ',\'' . $item->discord_id . '\',\'' . $item->discord_username . '\',1,' . $item->joined . '),';
-                }
-
-                $query .= implode('', $inserts);
-            }
-            $db->query(rtrim($query, ','));
-
-            // Only delete after successful conversion
-            $db->query('ALTER TABLE `nl2_users` DROP COLUMN `uuid`;');
-            $db->query('ALTER TABLE `nl2_users` DROP COLUMN `discord_id`;');
-            $db->query('ALTER TABLE `nl2_users` DROP COLUMN `discord_username`;');
-        });
-
-        // Add bedrock to nl2_mc_servers table
-        $this->databaseQuery(function (DB $db) {
-            $db->query('ALTER TABLE `nl2_mc_servers` ADD `bedrock` tinyint(1) NOT NULL DEFAULT \'0\'');
-        });
-
-        // Increase length of name column
-        $this->databaseQuery(function (DB $db) {
-            $db->query('ALTER TABLE nl2_mc_servers MODIFY `name` VARCHAR(128) NOT NULL');
-        });
-
-        // add unique constraint to modules table
-        $this->databaseQuery(function (DB $db) {
-            $db->query('ALTER TABLE nl2_modules ADD UNIQUE (`name`)');
-        });
-
-        // Increase length of reset_code column
-        $this->databaseQuery(function (DB $db) {
-            $db->query('ALTER TABLE nl2_users MODIFY `reset_code` VARCHAR(64) NOT NULL');
-        });
-
-        // delete language cache since it will contain the old language names and not the short codes
-        $this->_cache->setCache('languagecache');
-        $this->_cache->eraseAll();
-
-        // add short code column to languages table
-        $this->databaseQuery(function (DB $db) {
-            $db->query('ALTER TABLE nl2_languages ADD `short_code` VARCHAR(64) NOT NULL');
-
-            $languages = $db->query('SELECT * FROM nl2_languages')->results();
-            $converted_languages = [];
-            foreach (Language::LANGUAGES as $short_code => $meta) {
-                $key = array_search(str_replace(' ', '', $meta['name']), array_column($languages, 'name'));
-
-                if ($key !== false) {
-                    $db->update('languages', $languages[$key]->id, [
-                        'name' => $meta['name'],
-                        'short_code' => $short_code
-                    ]);
-
-                    $converted_languages[] = $languages[$key]->id;
-                } else {
-                    $db->insert('languages', [
-                        'name' => $meta['name'],
-                        'short_code' => $short_code
-                    ]);
-
-                    $converted_languages[] = $db->lastId();
-                }
-            }
-
-            $db->query('DELETE FROM nl2_languages WHERE `short_code` IS NULL');
-
-            $default_language = $db->query('SELECT id, short_code FROM nl2_languages WHERE `is_default` = 1');
-
-            if (!$default_language->count()) {
-                // Default to 1 (EnglishUK)
-                $default_language = 1;
-                $default_short_code = 'en_UK';
-                $db->query('UPDATE nl2_languages SET `is_default` = 1 WHERE `id` = 1');
-            } else {
-                $default_language = $default_language->first()->id;
-                $default_short_code = $default_language->short_code;
-            }
-
-            $this->_cache->store('language', $default_short_code);
-
-            $db->query('UPDATE nl2_users SET `language_id` = ? WHERE `language_id` NOT IN (' . implode(', ', $converted_languages) . ')', [$default_language]);
-        });
-
-        // add updated column to users profile fields
-        $this->databaseQuery(function (DB $db) {
-            $db->addColumn('users_profile_fields', 'updated', 'int(11)');
-        });
-
-        // update settings from true/false to 1/0
-        $settings = ['displaynames', 'recaptcha', 'recaptcha_login', 'version_update', 'maintenance'];
-        foreach ($settings as $setting) {
-            $value = Util::getSetting($setting);
-            if ($value === 'true' || $value === '1') {
-                Util::setSetting($setting, '1');
-            } else {
-                Util::setSetting($setting, '0');
-            }
-        }
-
-        // add captcha default
-        if (Util::getSetting('recaptcha_type') == null) {
-            Util::getSetting('recaptcha_type', 'Recaptcha3');
-        }
-
-        // delete old class files
-        $this->deleteFiles([
-            'core/classes/Alert.php',
-            'core/classes/Announcements.php',
-            'core/classes/AvatarSource.php',
-            'core/classes/Cache.php',
-            'core/classes/CaptchaBase.php',
-            'core/classes/CollectionItemBase.php',
-            'core/classes/CollectionManager.php',
-            'core/classes/Config.php',
-            'core/classes/Configuration.php',
-            'core/classes/Cookie.php',
-            'core/classes/DB.php',
-            'core/classes/DB_Custom.php',
-            'core/classes/Discord.php',
-            'core/classes/Email.php',
-            'core/classes/EndpointBase.php',
-            'core/classes/Endpoints.php',
-            'core/classes/ErrorHandler.php',
-            'core/classes/ExternalMCQuery.php',
-            'core/classes/Hash.php',
-            'core/classes/HookHandler.php',
-            'core/classes/Input.php',
-            'core/classes/Language.php',
-            'core/classes/Log.php',
-            'core/classes/MCAssoc.php',
-            'core/classes/MCQuery.php',
-            'core/classes/MentionsParser.php',
-            'core/classes/MinecraftBanner.php',
-            'core/classes/MinecraftPing.php',
-            'core/classes/Module.php',
-            'core/classes/Navigation.php',
-            'core/classes/Output.php',
-            'core/classes/Pages.php',
-            'core/classes/Paginator.php',
-            'core/classes/PermissionHandler.php',
-            'core/classes/Placeholders.php',
-            'core/classes/Queries.php',
-            'core/classes/Redirect.php',
-            'core/classes/Report.php',
-            'core/classes/ServerBanner.php',
-            'core/classes/Session.php',
-            'core/classes/TemplateBase.php',
-            'core/classes/Timeago.php',
-            'core/classes/Token.php',
-            'core/classes/URL.php',
-            'core/classes/User.php',
-            'core/classes/Util.php',
-            'core/classes/Validate.php',
-            'core/classes/WidgetBase.php',
-            'core/classes/Widgets.php',
-            'modules/Core/classes/Core_Sitemap.php',
-            'modules/Core/classes/CrafatarAvatarSource.php',
-            'modules/Core/classes/CraftheadAvatarSource.php',
-            'modules/Core/classes/CravatarAvatarSource.php',
-            'modules/Core/classes/MCHeadsAvatarSource.php',
-            'modules/Core/classes/MinotarAvatarSource.php',
-            'modules/Core/classes/NamelessMCAvatarSource.php',
-            'modules/Core/classes/Recaptcha2.php',
-            'modules/Core/classes/Recaptcha3.php',
-            'modules/Core/classes/VisageAvatarSource.php',
-            'modules/Core/classes/hCaptcha.php',
-            'modules/Core/includes/endpoints/discord/SetDiscordRolesEndpoint.php',
-            'modules/Core/includes/endpoints/discord/SubmitDiscordRoleListEndpoint.php',
-            'modules/Core/includes/endpoints/discord/UpdateDiscordBotSettingsEndpoint.php',
-            'modules/Core/includes/endpoints/discord/UpdateDiscordUsernames.php',
-            'modules/Core/includes/endpoints/discord/VerifyDiscordEndpoint.php',
-            'modules/Core/includes/endpoints/ListGroupsEndpoint.php',
-            'modules/Core/includes/endpoints/VerifyMinecraftEndpoint.php',
-        ]);
-
-        // delete old home type cache & update new cache
-        $this->_cache->setCache('portal_cache');
-        $portal = $this->_cache->retrieve('portal');
-        $this->_cache->eraseAll();
-        $this->databaseQuery(function (DB $db) use ($portal) {
-            Util::setSetting('portal', null);
-            Util::setSetting('home_type', $portal ? 'portal' : 'news');
-        });
-
-        // add existing migrations to phinxlog table, so it doesn't try to run them again
-        $migrations = [];
-        $migrations_dir = ROOT_PATH . '/core/migrations';
-        $files = scandir($migrations_dir);
-        foreach ($files as $file) {
-            if ($file === 'phinx.php' || str_starts_with($file, '.')) {
-                continue;
-            }
-            $file = explode('.', $file)[0];
-            [$time, $name] =  explode('_', $file, 2);
-            $name_parts = explode('_', $name);
-            // join name parts with upper case
-            $name = implode('', array_map('ucfirst', $name_parts));
-            $epoch = time();
-            $dt = new DateTime("@$epoch");
-            $migrations[] = [
-                'version' => $time,
-                'name' => $name,
-                'start_time' => $dt->format('Y-m-d H:i:s'),
-                'end_time' => $dt->format('Y-m-d H:i:s'),
-                'breakpoint' => 0,
-            ];
-        }
-
-        $this->databaseQuery(function (DB $db) use ($migrations) {
-            $db->query("CREATE TABLE IF NOT EXISTS `nl2_phinxlog` (
-                `version` bigint NOT NULL,
-                `migration_name` varchar(100) NULL DEFAULT NULL,
-                `start_time` timestamp NULL DEFAULT NULL,
-                `end_time` timestamp NULL DEFAULT NULL,
-                `breakpoint` tinyint(1) NOT NULL DEFAULT '0',
-                PRIMARY KEY (`version`)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci");
-            $db->query("TRUNCATE TABLE `nl2_phinxlog`");
-
-            foreach ($migrations as $migration) {
-                $db->query("INSERT INTO nl2_phinxlog (`version`, `migration_name`, `start_time`, `end_time`, `breakpoint`) VALUES (?, ?, ?, ?, ?)", [
-                    $migration['version'],
-                    $migration['name'],
-                    $migration['start_time'],
-                    $migration['end_time'],
-                    $migration['breakpoint'],
-                ]);
-            }
-        });
-
-        $this->setVersion('2.0.0-pr13');
-    }
-}
-
-return new Pre13();
diff --git a/core/includes/updates/200-pr13.php b/core/includes/updates/200-pr13.php
new file mode 100644
index 0000000000..83a1d1985b
--- /dev/null
+++ b/core/includes/updates/200-pr13.php
@@ -0,0 +1,18 @@
+<?php
+
+class Nameless200 extends UpgradeScript {
+
+    public function run(): void {
+        $db = DB::getInstance();
+
+        try {
+            $db->query('ALTER TABLE nl2_groups DROP COLUMN group_html_lg;');
+        } catch (PDOException $e) {
+            if (!str_contains($e->getMessage(), 'check that column/key exists')) {
+                $this->log($e->getMessage());
+            }
+        }
+
+        $this->setVersion('2.0.0');
+    }
+}

From b47135214d63dd41069ffd34b72c5ecc16b6dd69 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Fri, 10 Jun 2022 22:12:31 -0600
Subject: [PATCH 071/337] Fix MCAssoc client js path

---
 core/classes/Templates/AssetTree.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/classes/Templates/AssetTree.php b/core/classes/Templates/AssetTree.php
index 85f4beaeb4..8ef1e95c94 100644
--- a/core/classes/Templates/AssetTree.php
+++ b/core/classes/Templates/AssetTree.php
@@ -191,7 +191,7 @@ class AssetTree {
         ],
         self::MCASSOC_CLIENT => [
             'js' => [
-                'js/mcassoc-client.js',
+                'js/mcassoc_client.js',
             ],
         ],
         self::MOMENT => [

From f547b1d80990b4d9f879d90c203eca40fee75646 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Fri, 10 Jun 2022 22:24:18 -0600
Subject: [PATCH 072/337] Fix #2796

---
 modules/Core/pages/panel/users_edit.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/Core/pages/panel/users_edit.php b/modules/Core/pages/panel/users_edit.php
index 4bfb91a989..57ea7c9ad0 100644
--- a/modules/Core/pages/panel/users_edit.php
+++ b/modules/Core/pages/panel/users_edit.php
@@ -170,6 +170,7 @@
                         'theme_id' => $new_template
                     ]);
 
+                    $group_sync_log = [];
                     if ($view_user->data()->id != $user->data()->id || $user->hasPermission('admincp.groups.self')) {
                         if ($view_user->data()->id == 1 || (isset($_POST['groups']) && count($_POST['groups']))) {
                             $modified = [];
@@ -192,7 +193,7 @@
                             }
 
                             // Dispatch the modified groups
-                            GroupSyncManager::getInstance()->broadcastChange(
+                            $group_sync_log = GroupSyncManager::getInstance()->broadcastChange(
                                 $view_user,
                                 NamelessMCGroupSyncInjector::class,
                                 $modified
@@ -200,6 +201,16 @@
                         }
                     }
 
+                    if (!count($group_sync_log)) {
+                        // TODO: more "dynamic" since we should not assume they don't have other group sync injectors installed by a module
+                        $rules = DB::getInstance()->query(
+                            'SELECT COUNT(*) AS count FROM nl2_group_sync WHERE website_group_id IN (' . implode(', ', $modified) . ') AND discord_role_id IS NOT NULL;'
+                        )->first()->count;
+                        if ($rules > 0) {
+                            Session::flash('edit_user_warnings', 'Group sync rules are setup but no changes were reported. This could indicate a misconfiguration.');
+                        }
+                    }
+
                     Session::flash('edit_user_success', $language->get('admin', 'user_updated_successfully'));
                     Redirect::to(URL::build('/panel/users/edit/', 'id=' . urlencode($user_query->id)));
                 } catch (Exception $e) {
@@ -240,7 +251,7 @@
 }
 
 if (Session::exists('edit_user_warnings')) {
-    $warnings = Session::flash('edit_user_warnings');
+    $warnings = [Session::flash('edit_user_warnings')];
 }
 
 if (isset($success)) {

From 35dff72296594f022e190577fbf079a29040d0f8 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Fri, 10 Jun 2022 22:37:20 -0600
Subject: [PATCH 073/337] Add method to execute a DB query within a MySQL
 transaction (See: #2812)

---
 core/classes/Database/DB.php | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/core/classes/Database/DB.php b/core/classes/Database/DB.php
index add027c852..ee48bd3fe8 100644
--- a/core/classes/Database/DB.php
+++ b/core/classes/Database/DB.php
@@ -13,7 +13,6 @@ class DB {
     private static ?DB $_instance = null;
 
     private string $_prefix;
-    private string $_database;
     private ?string $_force_charset;
     protected PDO $_pdo;
     private PDOStatement $_statement;
@@ -26,7 +25,6 @@ private function __construct(string $host, string $database, string $username, s
         try {
             $this->_force_charset = $force_charset;
             $this->_prefix = $prefix;
-            $this->_database = $database;
 
             $connection_string = 'mysql:host=' . $host . ';port=' . $port . ';dbname=' . $database;
             if ($force_charset) {
@@ -58,12 +56,27 @@ public function getPDO(): PDO {
     }
 
     /**
-     * Get the database name this instance is connected to.
+     * Execute a database query within a MySQL transaction, and get the results of the query, if any.
      *
-     * @return string Database name.
+     * @param Closure(DB): mixed $closure The closure to pass this instance to and execute within a transaction context.
+     * @return mixed The results of the query, null if none.
      */
-    public function getDatabase(): string {
-        return $this->_database;
+    public function transaction(Closure $closure) {
+        $result = null;
+
+        try {
+            $this->_pdo->beginTransaction();
+
+            $result = $closure($this);
+
+            $this->_pdo->commit();
+        } catch (Exception $exception) {
+            if ($this->_pdo->inTransaction()) {
+                $this->_pdo->rollBack();
+            }
+        }
+
+        return $result;
     }
 
     /**

From 6dda4dba80de37d9646f4e3ffc2151a8aa93415c Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Fri, 10 Jun 2022 23:15:05 -0600
Subject: [PATCH 074/337] Send data about OAuth providers to debug link

---
 core/classes/Misc/NamelessOAuth.php |  5 +++--
 modules/Core/module.php             |  5 ++---
 modules/Core/queries/debug_link.php | 15 +++++++++++++++
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/core/classes/Misc/NamelessOAuth.php b/core/classes/Misc/NamelessOAuth.php
index 72c1231ce2..e005f14e22 100644
--- a/core/classes/Misc/NamelessOAuth.php
+++ b/core/classes/Misc/NamelessOAuth.php
@@ -25,10 +25,11 @@ public function __construct() {
      * Add an OAuth provider to the system.
      *
      * @param string $name The name of the provider (Discord, Google, etc).
+     * @param string $module Name of the module which registered this provider.
      * @param array $data Metadata about the provider: class, user_id_name, scope_id_name, icon
      */
-    public function registerProvider(string $name, array $data): void {
-        $this->_providers[$name] = $data;
+    public function registerProvider(string $name, string $module, array $data): void {
+        $this->_providers[$name] = array_merge(['module' => $module], $data);
     }
 
     /**
diff --git a/modules/Core/module.php b/modules/Core/module.php
index 49690511ff..7ee36fe88b 100644
--- a/modules/Core/module.php
+++ b/modules/Core/module.php
@@ -441,15 +441,14 @@ public function __construct(Language $language, Pages $pages, User $user, Naviga
             ]
         );
 
-        // TODO: should this be in the Discord Integration module?
-        NamelessOAuth::getInstance()->registerProvider('discord', [
+        NamelessOAuth::getInstance()->registerProvider('discord', 'Core', [
             'class' => \Wohali\OAuth2\Client\Provider\Discord::class,
             'user_id_name' => 'id',
             'scope_id_name' => 'identify',
             'icon' => 'fab fa-discord',
         ]);
 
-        NamelessOAuth::getInstance()->registerProvider('google', [
+        NamelessOAuth::getInstance()->registerProvider('google', 'Core', [
             'class' => \League\OAuth2\Client\Provider\Google::class,
             'user_id_name' => 'sub',
             'scope_id_name' => 'openid',
diff --git a/modules/Core/queries/debug_link.php b/modules/Core/queries/debug_link.php
index bf7eab0309..8c654e36db 100755
--- a/modules/Core/queries/debug_link.php
+++ b/modules/Core/queries/debug_link.php
@@ -150,6 +150,20 @@
     ];
 }
 
+$oauth_providers = [];
+$providers_available = array_keys(NamelessOAuth::getInstance()->getProvidersAvailable());
+foreach (NamelessOAuth::getInstance()->getProviders() as $provider_name => $data) {
+    $oauth_providers[$provider_name] = [
+        'provider_name' => $provider_name,
+        'module' => $data['module'],
+        'class' => $data['class'],
+        'user_id_name' => $data['user_id_name'],
+        'scope_id_name' => $data['scope_id_name'],
+        'enabled' => in_array($provider_name, $providers_available),
+        'client_id' => NamelessOAuth::getInstance()->getCredentials($provider_name)[0],
+    ];
+}
+
 $namelessmc_version = Util::getSetting('nameless_version');
 
 $uuid = DB::getInstance()->query('SELECT identifier FROM nl2_users_integrations INNER JOIN nl2_integrations on integration_id=nl2_integrations.id WHERE name = \'Minecraft\' AND user_id = ?;', [$user->data()->id]);
@@ -204,6 +218,7 @@
             'panel' => $namelessmc_panel_templates,
         ],
         'integrations' => $integrations,
+        'oauth_providers' => $oauth_providers,
     ],
     'logs' => [
         'fatal' => $logs['fatal'],

From 21825f657a84bb2184866aa8addbf1060783c724 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Sat, 11 Jun 2022 13:00:55 +0200
Subject: [PATCH 075/337] Assume server is not a bedrock server if not
 specified

---
 core/classes/Minecraft/MCQuery.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/classes/Minecraft/MCQuery.php b/core/classes/Minecraft/MCQuery.php
index 091119099a..498ddaa921 100644
--- a/core/classes/Minecraft/MCQuery.php
+++ b/core/classes/Minecraft/MCQuery.php
@@ -303,7 +303,9 @@ public static function multiQuery(array $servers, string $type, Language $langua
                     continue;
                 }
 
-                $query = ExternalMCQuery::query($query_ip[0], ($query_ip[1] ?? ($server['bedrock'] ? 19132 : 25565)), $server['bedrock']);
+                $is_bedrock = isset($server['bedrock']) && $server['bedrock'] === true;
+
+                $query = ExternalMCQuery::query($query_ip[0], ($query_ip[1] ?? ($is_bedrock ? 19132 : 25565)), $is_bedrock);
 
                 if ($query !== false && !$query->error && isset($query->response)) {
                     if ($accumulate === false) {

From a30c3f829e1238fab22d1d91bc1c022e21289270 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Sat, 11 Jun 2022 13:05:02 +0200
Subject: [PATCH 076/337] Never return null protocol, fix #2846

---
 core/classes/Core/Util.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/core/classes/Core/Util.php b/core/classes/Core/Util.php
index d0780e3e4b..ec4146ffcb 100644
--- a/core/classes/Core/Util.php
+++ b/core/classes/Core/Util.php
@@ -304,9 +304,9 @@ public static function getRemoteAddress(): ?string {
     /**
      * Get the protocol used by client's HTTP request, using proxy headers if necessary.
      *
-     * @return ?string 'http' if HTTP or 'https' if HTTPS, or null when using the CLI
+     * @return string 'http' if HTTP or 'https' if HTTPS. If the protocol is not known, for example when using the CLI, 'http' is always returned.
      */
-    public static function getProtocol(): ?string {
+    public static function getProtocol(): string {
         if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
             $proto = $_SERVER['HTTP_X_FORWARDED_PROTO'];
             if ($proto !== 'http' && $proto !== 'https') {
@@ -319,7 +319,7 @@ public static function getProtocol(): ?string {
             return $_SERVER['HTTPS'] !== 'off' ? 'https' : 'http';
         }
 
-        return null;
+        return 'http';
     }
 
     /**
@@ -353,9 +353,6 @@ public static function getSelfURL(bool $show_protocol = true): string {
             $hostname = $_SERVER['SERVER_NAME'];
         }
 
-        // https and www checks
-        $protocol = self::getProtocol() . '://';
-
         $url = $hostname;
 
         if (defined('FORCE_WWW') && FORCE_WWW && !str_contains($hostname, 'www')) {
@@ -363,10 +360,11 @@ public static function getSelfURL(bool $show_protocol = true): string {
         }
 
         if ($show_protocol) {
-            $url = $protocol . $url;
+            $protocol = self::getProtocol()
+            $url = $protocol . '://' . $url;
             $port = self::getPort();
             // Add port if it is non-standard for the current protocol
-            if (!(($port === 80 && $protocol === 'http://') || ($port === 443 && $protocol === 'https://'))) {
+            if (!(($port === 80 && $protocol === 'http') || ($port === 443 && $protocol === 'https'))) {
                 $url .= ':' . $port;
             }
         }

From c3173ee26f5cd666bb6b94ad8ee01921bf73f822 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Sat, 11 Jun 2022 13:08:17 +0200
Subject: [PATCH 077/337] Fix syntax error

---
 core/classes/Core/Util.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/classes/Core/Util.php b/core/classes/Core/Util.php
index ec4146ffcb..54e979969c 100644
--- a/core/classes/Core/Util.php
+++ b/core/classes/Core/Util.php
@@ -360,7 +360,7 @@ public static function getSelfURL(bool $show_protocol = true): string {
         }
 
         if ($show_protocol) {
-            $protocol = self::getProtocol()
+            $protocol = self::getProtocol();
             $url = $protocol . '://' . $url;
             $port = self::getPort();
             // Add port if it is non-standard for the current protocol

From 1cdebe48c830c644e057d65f5cc1180b640fb679 Mon Sep 17 00:00:00 2001
From: Partydragen <admin@partydragen.com>
Date: Sat, 11 Jun 2022 17:05:14 +0200
Subject: [PATCH 078/337] Set active provider before validation checks

---
 modules/Core/pages/panel/registration.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/Core/pages/panel/registration.php b/modules/Core/pages/panel/registration.php
index 2f6b022910..9dfd9d0485 100644
--- a/modules/Core/pages/panel/registration.php
+++ b/modules/Core/pages/panel/registration.php
@@ -62,6 +62,7 @@
 
                 // Validate captcha key and secret key
                 if (!empty(Input::get('recaptcha_key')) || !empty(Input::get('recaptcha_secret')) || Input::get('enable_recaptcha') == 1 || Input::get('enable_recaptcha_login') == 1) {
+                    $provider = CaptchaBase::setActiveProvider(Input::get('captcha_type'));
                     $provider = CaptchaBase::getActiveProvider();
                     if ($provider->validateSecret(Input::get('recaptcha_secret')) == false || $provider->validateKey(Input::get('recaptcha')) == false) {
                         $errors[] = $language->get('admin', 'invalid_recaptcha_settings', [

From 3221cdec415404fdfdf83851e2d3d68eebe39c55 Mon Sep 17 00:00:00 2001
From: Partydragen <admin@partydragen.com>
Date: Sat, 11 Jun 2022 17:10:28 +0200
Subject: [PATCH 079/337] Fix phpstan

---
 modules/Core/pages/panel/registration.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/Core/pages/panel/registration.php b/modules/Core/pages/panel/registration.php
index 9dfd9d0485..15db580514 100644
--- a/modules/Core/pages/panel/registration.php
+++ b/modules/Core/pages/panel/registration.php
@@ -62,7 +62,8 @@
 
                 // Validate captcha key and secret key
                 if (!empty(Input::get('recaptcha_key')) || !empty(Input::get('recaptcha_secret')) || Input::get('enable_recaptcha') == 1 || Input::get('enable_recaptcha_login') == 1) {
-                    $provider = CaptchaBase::setActiveProvider(Input::get('captcha_type'));
+                    CaptchaBase::setActiveProvider(Input::get('captcha_type'));
+
                     $provider = CaptchaBase::getActiveProvider();
                     if ($provider->validateSecret(Input::get('recaptcha_secret')) == false || $provider->validateKey(Input::get('recaptcha')) == false) {
                         $errors[] = $language->get('admin', 'invalid_recaptcha_settings', [

From a0a8df5612dcbdacbde95af591708194fec23655 Mon Sep 17 00:00:00 2001
From: Supercrafter100 <58982133+supercrafter100@users.noreply.github.com>
Date: Sat, 11 Jun 2022 18:30:42 +0200
Subject: [PATCH 080/337] Update hCaptcha.php (#2849)

---
 modules/Core/classes/Captcha/hCaptcha.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/modules/Core/classes/Captcha/hCaptcha.php b/modules/Core/classes/Captcha/hCaptcha.php
index f5353d3f0b..c64900d6ac 100755
--- a/modules/Core/classes/Captcha/hCaptcha.php
+++ b/modules/Core/classes/Captcha/hCaptcha.php
@@ -33,12 +33,7 @@ public function validateSecret(string $_secret) : bool {
     }
 
     public function validateKey(string $key) : bool {
-        $url = 'https://api.hcaptcha.com/checksiteconfig?sitekey=' . $key;
-        $client = HttpClient::get($url);
-        if ($client->hasError()) {
-            return false;
-        }
-        return $client->json(true)['pass'] == true;
+        return true; // hCaptcha changed their validation so this is a temporary fix
     }
 
     public function getHtml(): string {

From 95dd115e17a6c902bfeca9b86dd18b50a50065f0 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Sat, 11 Jun 2022 20:58:44 +0200
Subject: [PATCH 081/337] Workaround for broken determineOrder() for empty
 arrays

---
 core/classes/Core/Util.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/classes/Core/Util.php b/core/classes/Core/Util.php
index 54e979969c..7428ecb52e 100644
--- a/core/classes/Core/Util.php
+++ b/core/classes/Core/Util.php
@@ -723,6 +723,10 @@ public static function readFileEnd(string $file_path, int $max_bytes = 100_000):
      * @return array Ordered items
      */
     public static function determineOrder(array $items): array {
+        if (empty($items)) {
+            return $items;
+        }
+
         $order = [array_shift($items)['name']];
 
         foreach ($items as $item) {

From d98c9657dc126739d26652966b26f17bf84472dd Mon Sep 17 00:00:00 2001
From: Partydragen <adrian_kili@outlook.com>
Date: Sat, 11 Jun 2022 22:41:04 +0200
Subject: [PATCH 082/337] Make transform public

---
 core/classes/Endpoints/ManagesTransformers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/classes/Endpoints/ManagesTransformers.php b/core/classes/Endpoints/ManagesTransformers.php
index d27a5a9194..b863edee50 100644
--- a/core/classes/Endpoints/ManagesTransformers.php
+++ b/core/classes/Endpoints/ManagesTransformers.php
@@ -67,7 +67,7 @@ public static function registerTransformer(string $type, string $module, Closure
      * @param string $value The value to convert.
      * @return mixed The converted value.
      */
-    private static function transform(Nameless2API $api, string $type, string $value) {
+    public static function transform(Nameless2API $api, string $type, string $value) {
         if (array_key_exists($type, self::$_transformers)) {
             return self::$_transformers[$type]['transformer']($api, $value);
         }

From a01120d1fe1919e9f90ff5401460905d46b0b192 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Sat, 11 Jun 2022 22:16:59 -0600
Subject: [PATCH 083/337] Use migration to drop group_html_lg column

---
 core/includes/updates/200-pr13.php            | 10 -------
 ...p_group_html_lg_column_on_groups_table.php | 28 +++++++++++++++++++
 2 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 core/migrations/20220612041555_drop_group_html_lg_column_on_groups_table.php

diff --git a/core/includes/updates/200-pr13.php b/core/includes/updates/200-pr13.php
index 83a1d1985b..8c852dac48 100644
--- a/core/includes/updates/200-pr13.php
+++ b/core/includes/updates/200-pr13.php
@@ -3,16 +3,6 @@
 class Nameless200 extends UpgradeScript {
 
     public function run(): void {
-        $db = DB::getInstance();
-
-        try {
-            $db->query('ALTER TABLE nl2_groups DROP COLUMN group_html_lg;');
-        } catch (PDOException $e) {
-            if (!str_contains($e->getMessage(), 'check that column/key exists')) {
-                $this->log($e->getMessage());
-            }
-        }
-
         $this->setVersion('2.0.0');
     }
 }
diff --git a/core/migrations/20220612041555_drop_group_html_lg_column_on_groups_table.php b/core/migrations/20220612041555_drop_group_html_lg_column_on_groups_table.php
new file mode 100644
index 0000000000..c8bac648a9
--- /dev/null
+++ b/core/migrations/20220612041555_drop_group_html_lg_column_on_groups_table.php
@@ -0,0 +1,28 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class DropGroupHtmlLgColumnOnGroupsTable extends AbstractMigration
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change(): void
+    {
+        $table = $this->table('nl2_groups');
+
+        if ($table->hasColumn('group_html_lg')) {
+            $table->removeColumn('group_html_lg');
+            $table->update();
+        }
+    }
+}

From 5a9b32ccbc6dab202e537d0c4a6e4b8fe0a0f937 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Sat, 11 Jun 2022 22:37:16 -0600
Subject: [PATCH 084/337] Fix #2785

---
 custom/templates/DefaultRevamp/widgets/statistics.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/custom/templates/DefaultRevamp/widgets/statistics.tpl b/custom/templates/DefaultRevamp/widgets/statistics.tpl
index f7498e9fdb..132b5a3e5f 100755
--- a/custom/templates/DefaultRevamp/widgets/statistics.tpl
+++ b/custom/templates/DefaultRevamp/widgets/statistics.tpl
@@ -17,7 +17,7 @@
                     <span class="text">{$USERS_REGISTERED}</span>
                     <div class="description right floated"><b>{$USERS_REGISTERED_VALUE}</b></div>
                 </div>
-                <div class="item">
+                <div class="item" style="display: flex;">
                     <span class="text">{$LATEST_MEMBER}</span>
                     <div class="description right floated">
                         <a href="{$LATEST_MEMBER_VALUE.profile}" data-poload="{$USER_INFO_URL}{$LATEST_MEMBER_VALUE.id}"
@@ -27,4 +27,4 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>

From d3de874575293b6ee2991050d8d9539e66983de4 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Sun, 12 Jun 2022 14:01:39 +0200
Subject: [PATCH 085/337] don't require tps, it's not used anyway

---
 modules/Core/includes/endpoints/ServerInfoEndpoint.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/Core/includes/endpoints/ServerInfoEndpoint.php b/modules/Core/includes/endpoints/ServerInfoEndpoint.php
index d7b1af70be..22880fad2c 100644
--- a/modules/Core/includes/endpoints/ServerInfoEndpoint.php
+++ b/modules/Core/includes/endpoints/ServerInfoEndpoint.php
@@ -10,7 +10,7 @@ public function __construct() {
     }
 
     public function execute(Nameless2API $api): void {
-        $api->validateParams($_POST, ['server-id', 'max-memory', 'free-memory', 'allocated-memory', 'tps']);
+        $api->validateParams($_POST, ['server-id', 'max-memory', 'free-memory', 'allocated-memory']);
         if (!isset($_POST['players'])) {
             $api->throwError(Nameless2API::ERROR_INVALID_POST_CONTENTS, 'players');
         }

From 1642b9107b44da736d7e655f191f9bdbed0e81b8 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Sun, 12 Jun 2022 22:30:37 +0200
Subject: [PATCH 086/337] Verify that the provided converter exists

---
 core/installation/steps/conversion_perform.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/installation/steps/conversion_perform.php b/core/installation/steps/conversion_perform.php
index 371990ca92..e9191fbc51 100644
--- a/core/installation/steps/conversion_perform.php
+++ b/core/installation/steps/conversion_perform.php
@@ -69,7 +69,16 @@
                         $password,
                         Input::get('db_port')
                     );
-                    require_once(ROOT_PATH . '/custom/converters/' . $_POST['converter'] . '/converter.php');
+
+                    $converter_dir = ROOT_PATH . '/custom/converters/' . $_POST['converter'];
+
+                    $converter_dirs = glob(ROOT_PATH . '/custom/converters/*', GLOB_ONLYDIR);
+
+                    if (!in_array($converter_dir, $converter_dirs)) {
+                        throw new InvalidArgumentException("Invalid converter");
+                    }
+
+                    require_once($converter_dir . '/converter.php');
 
                     if (!isset($error)) {
                         Redirect::to('?step=finish');

From 7f6fc69c3eedf49cc2eefd394cc139bb0497944f Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Sun, 12 Jun 2022 23:12:21 +0200
Subject: [PATCH 087/337] Bring back trusted proxies, somewhat securly

Ideal situation: Completely deny ALL requests with a proxy header if no trusted proxies are configured. Force proper configuration.

After Samerton's change just before pr13: If not configured (there is no warning), anyone can bypass IP checks, like for IP bans. Just to be clear: this affects EVERYONE, not just people with or without a proxy.

Situation now: If not configured, only the actual client address is trusted, not any header. This means users are not able to bypass IP bans, but if an admin bans a user, if that site uses a proxy, and if trusted proxies is not configured, they wil ban the proxy, meaning all users will be ip-banned. A warning is displayed in StaffCP if trusted proxies is not configured.
---
 core/classes/Core/Util.php                    | 61 ++++++++-----------
 core/includes/updates/200-pr13.php            | 12 ++++
 .../steps/database_configuration.php          |  2 +-
 custom/languages/en_UK.json                   |  2 +
 modules/Core/pages/panel/index.php            |  9 +++
 scripts/cli_install.php                       |  2 +-
 6 files changed, 52 insertions(+), 36 deletions(-)

diff --git a/core/classes/Core/Util.php b/core/classes/Core/Util.php
index 7428ecb52e..4ca0a6dd24 100644
--- a/core/classes/Core/Util.php
+++ b/core/classes/Core/Util.php
@@ -130,55 +130,51 @@ public static function isExternalURL(string $url): bool {
         return !(str_replace('www.', '', rtrim(self::getSelfURL(false), '/')) == str_replace('www.', '', $parsed['host']));
     }
 
+    public static function isTrustedProxiesConfigured() {
+        $config_proxies = Config::get('core/trustedProxies');
+        $env_proxies = getenv('NAMELESS_TRUSTED_PROXIES');
+        return $config_proxies !== false && $config_proxies !== null && is_array($config_proxies)
+                || $env_proxies !== false;
+    }
+
     /**
      * @return array List of trusted proxy networks according to config file and environment
      */
     public static function getTrustedProxies(): array {
-        $trustedProxies = [];
+        $trusted_proxies = [];
 
         // Add trusted proxies from config file
-        $configProxies = Config::get('core/trustedProxies');
-        if ($configProxies !== false) {
-            if (!is_array($configProxies)) {
+        $config_proxies = Config::get('core/trustedProxies');
+        if ($config_proxies !== false && $config_proxies !== null) {
+            if (!is_array($config_proxies)) {
                 die('Trusted proxies should be an array');
             }
-            $trustedProxies = array_merge($trustedProxies, $configProxies);
+            $trusted_proxies = array_merge($trusted_proxies, $config_proxies);
         }
 
         // Add trusted proxies from environment variable (comma-separated string)
-        $envProxies = getenv('NAMELESS_TRUSTED_PROXIES');
-        if ($envProxies !== false) {
-            $envProxiesArray = explode(',', $envProxies);
-            $trustedProxies = array_merge($trustedProxies, $envProxiesArray);
+        $env_proxies = getenv('NAMELESS_TRUSTED_PROXIES');
+        if ($env_proxies !== false && $env_proxies !== 'none') {
+            $env_proxies_array = explode(',', $env_proxies);
+            $trusted_proxies = array_merge($trusted_proxies, $env_proxies_array);
         }
 
-        return $trustedProxies;
+        return $trusted_proxies;
     }
 
     /**
-     * Checks whether the client making the request is a trusted proxy. If not,
-     * abruptly aborts the request using die().
+     * Checks whether the client making the request is a trusted proxy.
      */
-    private static function ensureTrustedProxy(): void {
-        $trustedProxies = self::getTrustedProxies();
-
-        if (count($trustedProxies) === 0) {
-            ErrorHandler::logWarning('Received proxy header but no trusted proxies are configured. Please see https://docs.namelessmc.com/trusted-proxies for more information.');
-            return;
-        }
-
-        $trusted = false;
+    private static function isTrustedProxy(): bool {
+        $trusted_proxies = self::getTrustedProxies();
 
-        foreach ($trustedProxies as $trustedProxy) {
+        foreach ($trusted_proxies as $trustedProxy) {
             if (IpUtils::checkIp($_SERVER['REMOTE_ADDR'], $trustedProxy)) {
-                $trusted = true;
-                break;
+                return true;
             }
         }
 
-        if (!$trusted) {
-            die('Received proxy header from untrusted remote address: ' . $_SERVER['REMOTE_ADDR']);
-        }
+        return false;
     }
 
     /**
@@ -229,19 +225,21 @@ private static function firstNonProxyAddress(array $addresses): string {
      * @return ?string Client IP address, or null if there is no remote address, for example in CLI environment
      */
     public static function getRemoteAddress(): ?string {
+        if (!self::isTrustedProxy()) {
+            return $_SERVER['REMOTE_ADDR'];
+        }
+
         $headers = getallheaders();
 
         // Try the simple headers first that only contain an IP address
 
         // Non standard header that only contains the origin address
         if (isset($headers['X-Real-Ip'])) {
-            self::ensureTrustedProxy();
             return $headers['X-Real-Ip'];
         }
 
         // Non standard header sent by CloudFlare that only contains the origin address
         if (isset($headers['Cf-Connecting-Ip'])) {
-            self::ensureTrustedProxy();
             return $headers['Cf-Connecting-Ip'];
         }
 
@@ -263,8 +261,6 @@ public static function getRemoteAddress(): ?string {
         */
 
         if (isset($headers['X-Forwarded-For'])) {
-            self::ensureTrustedProxy();
-
             $addresses = [];
             foreach (explode(',', $headers['X-Forwarded-For']) as $part) {
                 $addresses[] = trim($part);
@@ -274,8 +270,6 @@ public static function getRemoteAddress(): ?string {
         }
 
         if (isset($headers['Forwarded'])) {
-            self::ensureTrustedProxy();
-
             $addresses = [];
             foreach (explode(',', $headers['Forwarded']) as $part1) {
                 // Extract the optional 'for=<address>' bit
@@ -297,7 +291,6 @@ public static function getRemoteAddress(): ?string {
             }
         }
 
-        // No supported proxy headers in use
         return $_SERVER['REMOTE_ADDR'];
     }
 
diff --git a/core/includes/updates/200-pr13.php b/core/includes/updates/200-pr13.php
index 8c852dac48..92dba53523 100644
--- a/core/includes/updates/200-pr13.php
+++ b/core/includes/updates/200-pr13.php
@@ -3,6 +3,18 @@
 class Nameless200 extends UpgradeScript {
 
     public function run(): void {
+        $trusted_proxies = Config::get('core/trustedProxies');
+        // If trusted proxies is an empty array
+        if ($trusted_proxies !== null &&
+            is_countable($trusted_proxies) &&
+            count($trusted_proxies) == 0) {
+
+            // The core/trustedProxies option was mistakenly set during the installer for pr13. If we decide to
+            // allow not configuring it, at least it must be in an "unconfigured" state by default so StaffCP
+            // can display a warning until it is explicitly set to an empty or non-empty array by the user.
+            Config::set('core/trustedProxies', null);
+        }
+
         $this->setVersion('2.0.0');
     }
 }
diff --git a/core/installation/steps/database_configuration.php b/core/installation/steps/database_configuration.php
index 88593a140f..95fa98925a 100644
--- a/core/installation/steps/database_configuration.php
+++ b/core/installation/steps/database_configuration.php
@@ -80,7 +80,7 @@
                         'force_www' => false,
                         'captcha' => false,
                         'date_format' => 'd M Y, H:i',
-                        'trustedProxies' => [],
+                        'trustedProxies' => null,
                     ],
                 ];
 
diff --git a/custom/languages/en_UK.json b/custom/languages/en_UK.json
index c3498c7975..aa90dfb67c 100644
--- a/custom/languages/en_UK.json
+++ b/custom/languages/en_UK.json
@@ -679,6 +679,8 @@
     "admin/x_directory_not_writable": "The {{directory}} directory is not writable!",
     "admin/youtube_url": "Youtube URL",
     "admin/api_disabled": "API is disabled",
+    "admin/trusted_proxies_configured": "Trusted proxies",
+    "admin/trusted_proxies_not_configured": "{{linkStart}}Trusted proxies{{linkEnd}} are not configured, IP bans may not work properly.",
     "api/account_validated": "Account validated successfully",
     "api/finish_registration_email": "Please check your emails to complete registration.",
     "api/finish_registration_link": "Please click on the following link to complete registration:",
diff --git a/modules/Core/pages/panel/index.php b/modules/Core/pages/panel/index.php
index b2b43a4203..f5d499cea0 100644
--- a/modules/Core/pages/panel/index.php
+++ b/modules/Core/pages/panel/index.php
@@ -198,6 +198,15 @@
         $compat_success[] = $language->get('installer', 'template_cache_writable');
     }
 
+    if (Util::isTrustedProxiesConfigured()) {
+        $compat_success[] = $language->get('admin', 'trusted_proxies_configured');
+    } else {
+        $compat_errors[] = $language->get('admin', 'trusted_proxies_not_configured', [
+            'linkStart' => '<a href="https://docs.namelessmc.com/trusted-proxies">',
+            'linkEnd' => '</a>',
+        ]);
+    }
+
     $smarty->assign([
         'SERVER_COMPATIBILITY' => $language->get('admin', 'server_compatibility'),
         'COMPAT_SUCCESS' => $compat_success,
diff --git a/scripts/cli_install.php b/scripts/cli_install.php
index 3192a5f565..f8d96731d0 100644
--- a/scripts/cli_install.php
+++ b/scripts/cli_install.php
@@ -116,7 +116,7 @@ function getEnvVar(string $name, string $fallback = null, array $valid_values =
         'force_www' => false,
         'captcha' => false,
         'date_format' => 'd M Y, H:i',
-        'trustedProxies' => [],
+        'trustedProxies' => null,
     ],
 ];
 

From ada40cd5a5dd566a65bea02331bbab144d3da3a9 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Sun, 12 Jun 2022 16:00:27 -0600
Subject: [PATCH 088/337] Fix PhinxAdapter error

---
 core/classes/Database/PhinxAdapter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/classes/Database/PhinxAdapter.php b/core/classes/Database/PhinxAdapter.php
index 13b4d14842..5b7b8ca421 100644
--- a/core/classes/Database/PhinxAdapter.php
+++ b/core/classes/Database/PhinxAdapter.php
@@ -18,7 +18,7 @@ public static function ensureUpToDate(): void {
 
         // Likely a pull from the repo dev branch or migrations
         // weren't run during an upgrade script.
-        if (($diff = abs($migration_files - $migration_database_entries)) > 0) {
+        if (($diff = $migration_files - $migration_database_entries) > 0) {
             throw new RuntimeException("There are {$diff} database migrations pending.");
         }
 

From 3b1bfa654a5101fac9817f8707e664cc370243d2 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Sun, 12 Jun 2022 16:08:59 -0600
Subject: [PATCH 089/337] Fix TinyMCE to not have to rely on dark mode constant

---
 core/classes/Core/Input.php                            | 10 +++++++++-
 custom/templates/DefaultRevamp/template.php            |  1 -
 .../DefaultRevamp/template_settings/settings.php       |  5 -----
 modules/Core/module.php                                |  4 ----
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/core/classes/Core/Input.php b/core/classes/Core/Input.php
index 7656b6c08c..738240eb2b 100644
--- a/core/classes/Core/Input.php
+++ b/core/classes/Core/Input.php
@@ -57,7 +57,15 @@ public static function get(string $item) {
      * @param bool $mentions Whether to enable mention autocompletion/parsing or not.
      */
     public static function createTinyEditor(Language $language, string $name, ?string $content = null, bool $mentions = false): string {
-        $skin = defined('TEMPLATE_TINY_EDITOR_DARKMODE') ? 'oxide-dark' : 'oxide';
+        if (
+            (defined('DARK_MODE') && DARK_MODE) ||
+            (Cookie::exists('nmc_panel_theme') && Cookie::get('nmc_panel_theme') === 'dark')
+        ) {
+            $skin = 'oxide-dark';
+        } else {
+            $skin = 'oxide';
+        }
+
         $js = '';
 
         if ($mentions) {
diff --git a/custom/templates/DefaultRevamp/template.php b/custom/templates/DefaultRevamp/template.php
index f5c7440c06..bbf33a24c4 100755
--- a/custom/templates/DefaultRevamp/template.php
+++ b/custom/templates/DefaultRevamp/template.php
@@ -61,7 +61,6 @@ public function __construct($cache, $smarty, $language, $user, $pages) {
 
         if (defined('DARK_MODE') && DARK_MODE == '1') {
             $smartyDarkMode = true;
-            define('TEMPLATE_TINY_EDITOR_DARKMODE', true);
         }
 
         if ($cache->isCached('navbarColour')) {
diff --git a/custom/templates/DefaultRevamp/template_settings/settings.php b/custom/templates/DefaultRevamp/template_settings/settings.php
index aca1cb8387..34b87b807d 100644
--- a/custom/templates/DefaultRevamp/template_settings/settings.php
+++ b/custom/templates/DefaultRevamp/template_settings/settings.php
@@ -117,11 +117,6 @@
     AssetTree::TINYMCE,
 ]);
 
-// We have to define this here because this is run before Module::onPageLoad, so it hasn't been defined yet
-if (Cookie::exists('nmc_panel_theme') && Cookie::get('nmc_panel_theme') === 'dark') {
-    define('TEMPLATE_TINY_EDITOR_DARKMODE', true);
-}
-
 $current_template->addJSScript(Input::createTinyEditor($language, 'inputHomeCustomContent', Util::getSetting('home_custom_content')));
 
 $smarty->assign([
diff --git a/modules/Core/module.php b/modules/Core/module.php
index 7ee36fe88b..2982d6e88e 100644
--- a/modules/Core/module.php
+++ b/modules/Core/module.php
@@ -1532,10 +1532,6 @@ public function onPageLoad(User $user, Pages $pages, Cache $cache, Smarty $smart
             if ($user->hasPermission('modcp.reports')) {
                 self::addUserAction($language->get('moderator', 'reports'), URL::build('/panel/users/reports/', 'uid={id}'));
             }
-
-            if (Cookie::exists('nmc_panel_theme') && Cookie::get('nmc_panel_theme') === 'dark') {
-                define('TEMPLATE_TINY_EDITOR_DARKMODE', true);
-            }
         }
 
         require_once(ROOT_PATH . '/modules/Core/hooks/DeleteUserHook.php');

From bf23040247e2580aba69dac698d4a807a7a758c5 Mon Sep 17 00:00:00 2001
From: PadowYT2 <me@padow.ru>
Date: Mon, 13 Jun 2022 10:15:20 +0800
Subject: [PATCH 090/337] Dark/light mode for Captcha (#2852)

Co-authored-by: Tadhg Boyle <tadhgsmboyle@gmail.com>
---
 modules/Core/classes/Captcha/Recaptcha2.php | 6 +++++-
 modules/Core/classes/Captcha/hCaptcha.php   | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/Core/classes/Captcha/Recaptcha2.php b/modules/Core/classes/Captcha/Recaptcha2.php
index 36e681b24c..25f70dedf9 100755
--- a/modules/Core/classes/Captcha/Recaptcha2.php
+++ b/modules/Core/classes/Captcha/Recaptcha2.php
@@ -44,7 +44,11 @@ public function validateKey(string $key) : bool {
     }
 
     public function getHtml(): string {
-        return '<div class="g-recaptcha" data-sitekey="' . $this->getPublicKey() . '"></div>';
+        if (defined('DARK_MODE') && DARK_MODE == 1) {
+            return '<div class="g-recaptcha" data-sitekey="' . $this->getPublicKey() . '" data-theme="dark"></div>';
+        } else {
+            return '<div class="g-recaptcha" data-sitekey="' . $this->getPublicKey() . '"></div>';
+        }
     }
 
     public function getJavascriptSource(): string {
diff --git a/modules/Core/classes/Captcha/hCaptcha.php b/modules/Core/classes/Captcha/hCaptcha.php
index c64900d6ac..37c5f82fcb 100755
--- a/modules/Core/classes/Captcha/hCaptcha.php
+++ b/modules/Core/classes/Captcha/hCaptcha.php
@@ -37,7 +37,11 @@ public function validateKey(string $key) : bool {
     }
 
     public function getHtml(): string {
-        return '<div class="h-captcha" data-sitekey="' . $this->getPublicKey() . '"></div>';
+        if (defined('DARK_MODE') && DARK_MODE == 1) {
+            return '<div class="h-captcha" data-sitekey="' . $this->getPublicKey() . '" data-theme="dark"></div>';
+        } else {
+            return '<div class="h-captcha" data-sitekey="' . $this->getPublicKey() . '"></div>';
+        }
     }
 
     public function getJavascriptSource(): string {

From 4d16d3f555f1d783910498487405898f8fe743f5 Mon Sep 17 00:00:00 2001
From: Robin <robin+git@rkslot.nl>
Date: Mon, 13 Jun 2022 02:21:21 +0000
Subject: [PATCH 091/337] Rewrite configuration file operations (#2850)

Co-authored-by: Tadhg Boyle <tadhgsmboyle@gmail.com>
---
 core/classes/Core/Config.php                  | 131 ++++++++++--------
 core/classes/Core/URL.php                     |  25 ++--
 core/classes/Database/DB.php                  |  31 ++---
 core/classes/Database/DatabaseInitialiser.php |  15 +-
 core/classes/Database/QueryRecorder.php       |   2 +-
 core/classes/Misc/DebugBarHelper.php          |   2 +-
 core/classes/Misc/ErrorHandler.php            |   6 +-
 core/includes/updates/200-pr13.php            |  12 ++
 core/init.php                                 |  32 +++--
 core/installation/steps/ajax_initialise.php   |   2 +-
 .../installation/steps/conversion_perform.php |  35 +----
 .../steps/database_configuration.php          | 119 ++++++----------
 core/installation/steps/finish.php            |   7 +-
 .../steps/requirements_validation.php         |  13 +-
 core/installation/steps/upgrade.php           |  14 +-
 custom/languages/en_UK.json                   |   3 +-
 index.php                                     |  12 +-
 install.php                                   |  27 ++--
 modules/Core/pages/panel/general_settings.php |  11 --
 modules/Core/pages/panel/registration.php     |  11 --
 modules/Core/queries/debug_link.php           |   4 +-
 modules/Core/widgets/ServerStatusWidget.php   |  22 +--
 scripts/cli_install.php                       |  26 ++--
 scripts/seeder/db_seeder.php                  |  10 +-
 24 files changed, 261 insertions(+), 311 deletions(-)

diff --git a/core/classes/Core/Config.php b/core/classes/Core/Config.php
index 2f805d2994..a4fc9a8b52 100644
--- a/core/classes/Core/Config.php
+++ b/core/classes/Core/Config.php
@@ -4,40 +4,84 @@
  *
  * @package NamelessMC\Core
  * @author Samerton
- * @version 2.0.0-pr8
+ * @version 2.0.0
  * @license MIT
  */
 class Config {
 
+    private static ?array $_config_cache = null;
+
+    /**
+     * @return bool Whether config file exists
+     */
+    public static function exists(): bool {
+        return file_exists(ROOT_PATH . '/core/config.php');
+    }
+
+    /**
+     * Read `core/config.php` file and load into cache
+     *
+     * @return array The entire config array
+     */
+    public static function all(): array {
+        if (self::$_config_cache !== null) {
+            return self::$_config_cache;
+        }
+
+        if (!self::exists()) {
+            throw new RuntimeException('Config file does not exist');
+        }
+
+        require(ROOT_PATH . '/core/config.php');
+
+        /** @phpstan-ignore-next-line  */
+        if (!isset($conf) || !is_array($conf)) {
+            throw new RuntimeException('Config file is invalid');
+        }
+
+        /** @phpstan-ignore-next-line  */
+        return self::$_config_cache = $conf;
+    }
+
+    /**
+     * Overwrite new `core/config.php` file.
+     *
+     * @param array $config New config array to store.
+     */
+    public static function write(array $config): void {
+        $contents = '<?php' . PHP_EOL . '$conf = ' . var_export($config, true) . ';';
+        if (file_put_contents(ROOT_PATH . '/core/config.php', $contents) === false) {
+            throw new RuntimeException('Failed to write to config file');
+        }
+        if (function_exists('opcache_invalidate')) {
+            opcache_invalidate(ROOT_PATH . '/core/config.php', true);
+        }
+        self::$_config_cache = $config;
+    }
+
     /**
      * Get a config value from `core/config.php` file.
      *
-     * @param string|null $path `/` seperated path of key to get from config file.
+     * @param string $path `/` seperated path of key to get from config file.
      * @return false|mixed Returns false if key doesn't exist, otherwise returns the value.
      *
      * @throws RuntimeException If the config file is not found.
      */
-    public static function get(string $path = null) {
-        if ($path) {
-            if (!isset($GLOBALS['config'])) {
-                throw new RuntimeException('Config unavailable. Please refresh the page.');
-            }
+    public static function get(string $path) {
+        $config = self::all();
 
-            $config = $GLOBALS['config'];
+        $path = explode('/', $path);
 
-            $path = explode('/', $path);
-
-            foreach ($path as $bit) {
-                if (isset($config[$bit])) {
-                    $config = $config[$bit];
-                } else {
-                    $not_matched = true;
-                }
+        foreach ($path as $bit) {
+            if (isset($config[$bit])) {
+                $config = $config[$bit];
+            } else {
+                $not_matched = true;
             }
+        }
 
-            if (!isset($not_matched)) {
-                return $config;
-            }
+        if (!isset($not_matched)) {
+            return $config;
         }
 
         return false;
@@ -49,42 +93,22 @@ public static function get(string $path = null) {
      * @param string $key `/` seperated path of key to set.
      * @param mixed $value Value to set under $key.
      */
-    public static function set(string $key, $value): bool {
-        if (!file_exists(ROOT_PATH . '/core/config.php')) {
-            fopen(ROOT_PATH . '/core/config.php', 'wb');
-        }
-
-        require(ROOT_PATH . '/core/config.php');
-
-        /** @phpstan-ignore-next-line  */
-        if (!isset($conf) || !is_array($conf)) {
-            $conf = [];
-        }
+    public static function set(string $key, $value): void {
+        $config = self::all();
 
         $path = explode('/', $key);
 
         if (!is_array($path)) {
-            $conf[$key] = $value;
+            $config[$key] = $value;
         } else {
-            $loc = &$conf;
+            $loc = &$config;
             foreach ($path as $step) {
                 $loc = &$loc[$step];
             }
             $loc = $value;
         }
 
-        return static::write($conf);
-    }
-
-    /**
-     * Overwrite new `core/config.php` file.
-     *
-     * @param array $config New config array to store.
-     */
-    public static function write(array $config): bool {
-        $file = fopen(ROOT_PATH . '/core/config.php', 'wab+');
-        fwrite($file, '<?php' . PHP_EOL . '$conf = ' . var_export($config, true) . ';' . PHP_EOL . '$CONFIG[\'installed\'] = true;');
-        return fclose($file);
+        static::write($config);
     }
 
     /**
@@ -92,25 +116,16 @@ public static function write(array $config): bool {
      *
      * @param array $values Array of key/value pairs
      */
-    public static function setMultiple(array $values): bool {
-        if (!file_exists(ROOT_PATH . '/core/config.php')) {
-            fopen(ROOT_PATH . '/core/config.php', 'wb');
-        }
-
-        require(ROOT_PATH . '/core/config.php');
-
-        /** @phpstan-ignore-next-line  */
-        if (!isset($conf) || !is_array($conf)) {
-            $conf = [];
-        }
+    public static function setMultiple(array $values): void {
+        $config = self::all();
 
         foreach ($values as $key => $value) {
             $path = explode('/', $key);
 
             if (!is_array($path)) {
-                $conf[$key] = $value;
+                $config[$key] = $value;
             } else {
-                $loc = &$conf;
+                $loc = &$config;
                 foreach ($path as $step) {
                     $loc = &$loc[$step];
                 }
@@ -118,6 +133,6 @@ public static function setMultiple(array $values): bool {
             }
         }
 
-        return static::write($conf);
+        static::write($config);
     }
 }
diff --git a/core/classes/Core/URL.php b/core/classes/Core/URL.php
index f068fb93fa..6a5246e196 100644
--- a/core/classes/Core/URL.php
+++ b/core/classes/Core/URL.php
@@ -19,25 +19,30 @@ class URL {
      * @return string Assembled URL, false on failure.
      */
     public static function build(string $url, string $params = '', ?string $force = null): string {
-        if (is_null($force)) {
-            if ((defined('FRIENDLY_URLS') && FRIENDLY_URLS == true) || (!defined('FRIENDLY_URLS') && Config::get('core/friendly') == true)) {
-                // Friendly URLs are enabled
-                return self::buildFriendly($url, $params);
-            }
+        if ($force === 'friendly') {
+            return self::buildFriendly($url, $params);
+        }
 
-            // Friendly URLs are disabled, we need to change it
+        if ($force === 'non-friendly') {
             return self::buildNonFriendly($url, $params);
         }
 
-        if ($force === 'friendly') {
+        // Use non-friendly URLs if NamelessMC is not installed yet
+        if (!Config::exists()) {
             return self::buildFriendly($url, $params);
         }
 
-        if ($force === 'non-friendly') {
-            return self::buildNonFriendly($url, $params);
+        if (!is_null($force)) {
+            throw new InvalidArgumentException('Invalid force string: ' . $force);
+        }
+
+        if ((defined('FRIENDLY_URLS') && FRIENDLY_URLS == true) || (!defined('FRIENDLY_URLS') && Config::get('core/friendly') == true)) {
+            // Friendly URLs are enabled
+            return self::buildFriendly($url, $params);
         }
 
-        throw new InvalidArgumentException('Invalid force string: ' . $force);
+        // Friendly URLs are disabled, we need to change it
+        return self::buildNonFriendly($url, $params);
     }
 
     /**
diff --git a/core/classes/Database/DB.php b/core/classes/Database/DB.php
index ee48bd3fe8..f98733bb68 100644
--- a/core/classes/Database/DB.php
+++ b/core/classes/Database/DB.php
@@ -22,26 +22,21 @@ class DB {
     protected QueryRecorder $_query_recorder;
 
     private function __construct(string $host, string $database, string $username, string $password, int $port, ?string $force_charset, string $prefix) {
-        try {
-            $this->_force_charset = $force_charset;
-            $this->_prefix = $prefix;
+        $this->_force_charset = $force_charset;
+        $this->_prefix = $prefix;
 
-            $connection_string = 'mysql:host=' . $host . ';port=' . $port . ';dbname=' . $database;
-            if ($force_charset) {
-                $connection_string .= ';charset=' . $force_charset;
-            }
-            $this->_pdo = new PDO(
-                $connection_string,
-                $username,
-                $password,
-                [
-                    PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
-                ]
-            );
-
-        } catch (PDOException $e) {
-            die("<strong>Error:<br /></strong><div class=\"alert alert-danger\">" . $e->getMessage() . '</div>Please check your database connection settings.');
+        $connection_string = 'mysql:host=' . $host . ';port=' . $port . ';dbname=' . $database;
+        if ($force_charset) {
+            $connection_string .= ';charset=' . $force_charset;
         }
+        $this->_pdo = new PDO(
+            $connection_string,
+            $username,
+            $password,
+            [
+                PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
+            ]
+        );
 
         $this->_query_recorder = QueryRecorder::getInstance();
     }
diff --git a/core/classes/Database/DatabaseInitialiser.php b/core/classes/Database/DatabaseInitialiser.php
index f32920be6a..2e68c64069 100644
--- a/core/classes/Database/DatabaseInitialiser.php
+++ b/core/classes/Database/DatabaseInitialiser.php
@@ -4,16 +4,14 @@ class DatabaseInitialiser {
 
     private DB $_db;
     private Cache $_cache;
-    private array $_config;
 
-    private function __construct(array $config = []) {
+    private function __construct() {
         $this->_db = DB::getInstance();
         $this->_cache = new Cache();
-        $this->_config = $config;
     }
 
-    public static function runPreUser(array $config) {
-        $instance = new self($config);
+    public static function runPreUser() {
+        $instance = new self();
         $instance->initialiseGroups();
         $instance->initialiseLanguages();
         $instance->initialiseModules();
@@ -247,9 +245,10 @@ private function initialiseTemplates(): void {
         ]);
         $this->_cache->store('panel_default', 'Default');
 
-
-        $config_path = $this->_config['core']['path'];
-        $config_path = ($config_path ? '/' . trim($config_path, '/') : '');
+        $config_path = Config::get('core/path');
+        if (!empty($config_path)) {
+            $config_path = '/' . trim($config_path, '/');
+        }
 
         $this->_cache->setCache('backgroundcache');
         $this->_cache->store('banner_image', $config_path . '/uploads/template_banners/homepage_bg_trimmed.jpg');
diff --git a/core/classes/Database/QueryRecorder.php b/core/classes/Database/QueryRecorder.php
index 5c501fd7cc..ceb8437c6f 100644
--- a/core/classes/Database/QueryRecorder.php
+++ b/core/classes/Database/QueryRecorder.php
@@ -10,7 +10,7 @@
  */
 class QueryRecorder extends Instanceable {
 
-    private array $_query_stack;
+    private array $_query_stack = [];
     private int $_query_stack_num = 1;
 
     /**
diff --git a/core/classes/Misc/DebugBarHelper.php b/core/classes/Misc/DebugBarHelper.php
index bf8c0c5e5a..2806cadd34 100644
--- a/core/classes/Misc/DebugBarHelper.php
+++ b/core/classes/Misc/DebugBarHelper.php
@@ -31,7 +31,7 @@ public function enable(Smarty $smarty): void {
         $debugbar->addCollector(new RequestDataCollector());
 
         $configCollector = new ConfigCollector();
-        $configCollector->setData(array_filter($GLOBALS['config'], static function ($key) {
+        $configCollector->setData(array_filter(Config::all(), static function ($key) {
             return $key !== 'mysql';
         }, ARRAY_FILTER_USE_KEY));
         $debugbar->addCollector($configCollector);
diff --git a/core/classes/Misc/ErrorHandler.php b/core/classes/Misc/ErrorHandler.php
index 85139c193e..30021208d5 100644
--- a/core/classes/Misc/ErrorHandler.php
+++ b/core/classes/Misc/ErrorHandler.php
@@ -110,14 +110,14 @@ public static function catchException(?Throwable $exception, ?string $error_stri
             $language = new Language('core', 'en_UK');
         }
 
-        $detailed_error = defined('DEBUGGING');
-        $can_generate_debug = defined('DEBUGGING');
+        $detailed_error = defined('DEBUGGING') && DEBUGGING;
+        $can_generate_debug = defined('DEBUGGING') && DEBUGGING;
 
         try {
             $user = new User();
             $detailed_error |= $user->isLoggedIn() && $user->hasPermission('admincp.errors');
             $can_generate_debug |= $user->hasPermission('admincp.core.debugging');
-        } catch (Error $ignored) {
+        } catch (Exception $ignored) {
             // Getting user info might fail, for example if the website isn't
             // installed yet. Assume the user does not have permission.
         }
diff --git a/core/includes/updates/200-pr13.php b/core/includes/updates/200-pr13.php
index 92dba53523..9afbec0c02 100644
--- a/core/includes/updates/200-pr13.php
+++ b/core/includes/updates/200-pr13.php
@@ -15,6 +15,18 @@ public function run(): void {
             Config::set('core/trustedProxies', null);
         }
 
+        $trusted_proxies = Config::get('core/trustedProxies');
+        // If trusted proxies is an empty array
+        if ($trusted_proxies !== null &&
+            is_countable($trusted_proxies) &&
+            count($trusted_proxies) == 0) {
+
+            // The core/trustedProxies option was mistakenly set during the installer for pr13. If we decide to
+            // allow not configuring it, at least it must be in an "unconfigured" state by default so StaffCP
+            // can display a warning until it is explicitly set to an empty or non-empty array by the user.
+            Config::set('core/trustedProxies', null);
+        }
+
         $this->setVersion('2.0.0');
     }
 }
diff --git a/core/init.php b/core/init.php
index a0092b4901..072e8ba6d5 100644
--- a/core/init.php
+++ b/core/init.php
@@ -22,11 +22,22 @@
     die('$page variable is unset. Cannot continue.');
 }
 
-if (!file_exists(ROOT_PATH . '/core/config.php')) {
-    if (is_writable(ROOT_PATH . '/core')) {
-        fopen(ROOT_PATH . '/core/config.php', 'w');
-    } else {
-        die('Your <strong>/core</strong> directory is not writable, please check your file permissions.');
+// All paths should be writable, but recursively checking everything would take too much time.
+// Only check the most important paths.
+$writable_check_paths = [
+    ROOT_PATH,
+    ROOT_PATH . '/cache',
+    ROOT_PATH . '/cache/logs',
+    ROOT_PATH . '/cache/sitemaps',
+    ROOT_PATH . '/cache/templates_c',
+    ROOT_PATH . '/uploads',
+    ROOT_PATH . '/core/email.php'
+];
+
+foreach ($writable_check_paths as $path) {
+    if (is_dir($path) && !is_writable($path)) {
+        die('<p>Your website directory or a subdirectory is not writable. Please ensure all files and directories are owned by
+        the correct user.</p><p><strong>Example</strong> command to change owner recursively: <code>sudo chown -R www-data: ' . Output::getClean(ROOT_PATH) . '</code></p>');
     }
 }
 
@@ -38,15 +49,8 @@
     }
 }
 
-// Require config
-require(ROOT_PATH . '/core/config.php');
-
-if (isset($conf) && is_array($conf)) {
-    $GLOBALS['config'] = $conf;
-} else {
-    if (!isset($GLOBALS['config'])) {
-        $page = 'install';
-    }
+if (!Config::exists()) {
+    $page = 'install';
 }
 
 // If we're accessing the upgrade script don't initialise further
diff --git a/core/installation/steps/ajax_initialise.php b/core/installation/steps/ajax_initialise.php
index f9a301bf7b..87c91afc9f 100644
--- a/core/installation/steps/ajax_initialise.php
+++ b/core/installation/steps/ajax_initialise.php
@@ -19,7 +19,7 @@
 
         } else {
             if ($_GET['initialise'] === 'site') {
-                DatabaseInitialiser::runPreUser($conf);
+                DatabaseInitialiser::runPreUser();
 
                 $json = [
                     'success' => true,
diff --git a/core/installation/steps/conversion_perform.php b/core/installation/steps/conversion_perform.php
index e9191fbc51..5007af2632 100644
--- a/core/installation/steps/conversion_perform.php
+++ b/core/installation/steps/conversion_perform.php
@@ -36,37 +36,17 @@
         ]);
 
         if (!$validation->passed()) {
-
             $error = $language->get('installer', 'database_error');
-
         } else {
-
-            $db_address = $_POST['db_address'];
-            $db_port = $_POST['db_port'];
-            $db_username = $_POST['db_username'];
-            $db_password = ((isset($_POST['db_password']) && !empty($_POST['db_password'])) ? str_replace('\'', '\\\'', $_POST['db_password']) : '');
-            $db_name = $_POST['db_name'];
-
-            $mysqli = new mysqli($db_address, $db_username, $db_password, $db_name, $db_port);
-            if ($mysqli->connect_errno) {
-
-                $error = $mysqli->connect_errno . ' - ' . $mysqli->connect_error;
-
+            if (!isset($_POST['converter']) || !in_array($_POST['converter'], $converters)) {
+                $error = $language->get('installer', 'unable_to_load_converter');
             } else {
-
-                $mysqli->close();
-
-                if (!isset($_POST['converter']) || !in_array($_POST['converter'], $converters)) {
-
-                    $error = $language->get('installer', 'unable_to_load_converter');
-
-                } else {
-
+                try {
                     $conn = DB::getCustomInstance(
                         Input::get('db_address'),
                         Input::get('db_name'),
                         Input::get('db_username'),
-                        $password,
+                        Input::get('db_password'),
                         Input::get('db_port')
                     );
 
@@ -83,15 +63,12 @@
                     if (!isset($error)) {
                         Redirect::to('?step=finish');
                     }
-
+                } catch (PDOException $e) {
+                    $error = $language->get('installer', 'database_connection_failed', ['message' => $e->getMessage()]);
                 }
-
             }
-
         }
-
     }
-
 }
 
 ?>
diff --git a/core/installation/steps/database_configuration.php b/core/installation/steps/database_configuration.php
index 95fa98925a..8064be13f7 100644
--- a/core/installation/steps/database_configuration.php
+++ b/core/installation/steps/database_configuration.php
@@ -29,92 +29,61 @@
         $error = $language->get('installer', 'database_error');
 
     } else {
-
         $db_address = $_POST['db_address'];
         $db_port = $_POST['db_port'];
         $db_username = $_POST['db_username'];
         $db_password = ((isset($_POST['db_password']) && !empty($_POST['db_password'])) ? str_replace('\'', '\\\'', $_POST['db_password']) : '');
         $db_name = $_POST['db_name'];
-
-        $charset = ($_POST['charset'] == 'latin1') ? 'latin1' : 'utf8mb4';
+        $db_charset = ($_POST['charset'] == 'latin1') ? 'latin1' : 'utf8mb4';
 
         try {
-            $mysqli = new mysqli($db_address, $db_username, $db_password, $db_name, $db_port);
+            // This throws a PDOException if the connection fails
+            DB::getCustomInstance($db_address, $db_name, $db_username, $db_password, $db_port, $force_charset=$db_charset);
+
+            $conf = [
+                'mysql' => [
+                    'host' => $db_address,
+                    'port' => $db_port,
+                    'username' => $db_username,
+                    'password' => $db_password,
+                    'db' => $db_name,
+                    'charset' => $charset,
+                    'initialise_charset' => true,
+                ],
+                'remember' => [
+                    'cookie_name' => 'nl2',
+                    'cookie_expiry' => 604800,
+                ],
+                'session' => [
+                    'session_name' => '2user',
+                    'admin_name' => '2admin',
+                    'token_name' => '2token',
+                ],
+                'core' => [
+                    'hostname' => $_SESSION['hostname'],
+                    'path' => $_SESSION['install_path'],
+                    'friendly' => $_SESSION['friendly_urls'] === 'true',
+                    'force_https' => false,
+                    'force_www' => false,
+                    'captcha' => false,
+                    'date_format' => 'd M Y, H:i',
+                    'trustedProxies' => null,
+                ],
+            ];
+
+            try {
+                Config::write($conf);
+                $_SESSION['charset'] = $charset;
+                Redirect::to('?step=database_initialization');
+            } catch (RuntimeException $e) {
+                $error = $language->get('installer', 'config_write_failed', ['message' => $e->getMessage()]);
+            }
+        } catch (PDOException $e) {
+            $error = $language->get('installer', 'database_connection_failed', ['message' => $e->getMessage()]);
         } catch (Exception $e) {
             $error = $e->getMessage();
         }
-
-        if (!$error) {
-            if ($mysqli->connect_errno) {
-
-                $error = $mysqli->connect_errno . ' - ' . $mysqli->connect_error;
-
-            } else {
-
-                $mysqli->close();
-
-                $conf = [
-                    'mysql' => [
-                        'host' => $db_address,
-                        'port' => $db_port,
-                        'username' => $db_username,
-                        'password' => $db_password,
-                        'db' => $db_name,
-                        'charset' => $charset,
-                        'initialise_charset' => true,
-                    ],
-                    'remember' => [
-                        'cookie_name' => 'nl2',
-                        'cookie_expiry' => 604800,
-                    ],
-                    'session' => [
-                        'session_name' => '2user',
-                        'admin_name' => '2admin',
-                        'token_name' => '2token',
-                    ],
-                    'core' => [
-                        'hostname' => $_SESSION['hostname'],
-                        'path' => $_SESSION['install_path'],
-                        'friendly' => $_SESSION['friendly_urls'] == 'true',
-                        'force_https' => false,
-                        'force_www' => false,
-                        'captcha' => false,
-                        'date_format' => 'd M Y, H:i',
-                        'trustedProxies' => null,
-                    ],
-                ];
-
-                try {
-
-                    if (!is_writable(ROOT_PATH . '/core/config.php')) {
-
-                        $error = $language->get('installer', 'config_not_writable');
-
-                    } else {
-
-                        $config_content = '<?php' . PHP_EOL . '$conf = ' . var_export($conf, true) . ';';
-                        file_put_contents(ROOT_PATH . '/core/config.php', $config_content);
-
-                        $_SESSION['charset'] = $charset;
-
-						// Ensure file save has concluded
-						sleep(1);
-
-                        Redirect::to('?step=database_initialization');
-                    }
-
-                } catch (Exception $e) {
-
-                    $error = $e->getMessage();
-
-                }
-
-            }
-
-        }
-
     }
-
 }
 
 ?>
diff --git a/core/installation/steps/finish.php b/core/installation/steps/finish.php
index 018b009fac..44f37e17f0 100644
--- a/core/installation/steps/finish.php
+++ b/core/installation/steps/finish.php
@@ -5,12 +5,7 @@
 }
 
 try {
-
-    if (!is_writable('core/config.php')) {
-        $error = $language->get('installer', 'config_not_writable');
-    } else {
-        Config::set('core/installed', true);
-    }
+    Config::set('core/installed', true);
 
     unset($_SESSION['admin_setup'], $_SESSION['database_initialized'], $_SESSION['site_initialized']);
 
diff --git a/core/installation/steps/requirements_validation.php b/core/installation/steps/requirements_validation.php
index 1ff55976e2..68aa03972e 100644
--- a/core/installation/steps/requirements_validation.php
+++ b/core/installation/steps/requirements_validation.php
@@ -23,19 +23,14 @@
                 validate_requirement('PHP PDO', extension_loaded('PDO'));
                 validate_requirement('PHP XML', extension_loaded('xml'));
                 validate_requirement('PHP MBString', extension_loaded('mbstring'));
-                validate_requirement('PHP GD', extension_loaded('gd'));
-                validate_requirement('PHP cURL', function_exists('curl_version'));
-                validate_requirement('PHP Exif', function_exists('exif_imagetype'));
-                validate_requirement('PHP JSON', function_exists('json_decode'));
                 ?>
             </div>
             <div class="sixteen wide mobile eight wide tablet eight wide computer column">
                 <?php
-                validate_requirement('Core Writable <span class="ui basic label">/core</span>', is_writable('core'));
-                validate_requirement('Core Config Writable <span class="ui basic label">/core/config.php</span>', is_writable('core/config.php'));
-                validate_requirement('Core Email Writable <span class="ui basic label">/core/email.php</span>', is_writable('core/email.php'));
-                validate_requirement('Cache Writable <span class="ui basic label">/cache</span>', is_writable('cache'));
-                validate_requirement('Template Cache Writable <span class="ui basic label">/cache/templates_c</span>', is_writable('cache/templates_c'));
+                validate_requirement('PHP GD', extension_loaded('gd'));
+                validate_requirement('PHP cURL', function_exists('curl_version'));
+                validate_requirement('PHP Exif', function_exists('exif_imagetype'));
+                validate_requirement('PHP JSON', function_exists('json_decode'));
                 ?>
             </div>
         </div>
diff --git a/core/installation/steps/upgrade.php b/core/installation/steps/upgrade.php
index 6ed6a81518..fe93afbca7 100644
--- a/core/installation/steps/upgrade.php
+++ b/core/installation/steps/upgrade.php
@@ -42,13 +42,11 @@
         $db_password = ((isset($_POST['db_password']) && !empty($_POST['db_password'])) ? $_POST['db_password'] : '');
         $db_name = $_POST['db_name'];
 
-        $mysqli = new mysqli($db_address, $db_username, $db_password, $db_name, $db_port);
-        if ($mysqli->connect_errno) {
-
-            $error = $mysqli->connect_errno . ' - ' . $mysqli->connect_error;
-
-        } else {
+        try {
+            // Check database details
+            DB::getCustomInstance($db_address, $db_name, $db_username, $db_password, $db_port);
 
+            // Database connection successful
             $_SESSION['db_address'] = $db_address;
             $_SESSION['db_port'] = $db_port;
             $_SESSION['db_username'] = $db_username;
@@ -56,10 +54,10 @@
             $_SESSION['db_name'] = $db_name;
 
             Redirect::to('?step=upgrade_perform');
+        } catch (PDOException $e) {
+            $error = $language->get('installer', 'database_connection_failed', ['message' => $e->getMessage()]);
         }
-
     }
-
 }
 
 ?>
diff --git a/custom/languages/en_UK.json b/custom/languages/en_UK.json
index aa90dfb67c..31681def7b 100644
--- a/custom/languages/en_UK.json
+++ b/custom/languages/en_UK.json
@@ -835,7 +835,8 @@
     "installer/back": "Back",
     "installer/cache_writable": "Cache Writable",
     "installer/character_set": "Character Set",
-    "installer/config_not_writable": "The config file is not writable.",
+    "installer/config_write_failed": "Failed to write to config file: {{message}}",
+    "installer/database_connection_failed": "Failed to connect to the database:<br>{{message}}",
     "installer/config_writable": "core\/config.php Writable",
     "installer/configuration": "Configuration",
     "installer/configuration_error": "Please input a valid site name between 1 and 32 characters long, and valid email addresses between 4 and 64 characters long.",
diff --git a/index.php b/index.php
index b7c02a5934..82c4e882ca 100644
--- a/index.php
+++ b/index.php
@@ -48,6 +48,14 @@
 require_once __DIR__ . '/vendor/autoload.php';
 require_once __DIR__ . '/core/includes/constants/autoload.php';
 
+if (!Config::exists()) {
+    if (is_file(ROOT_PATH . '/install.php')) {
+        Redirect::to('install.php');
+    } else {
+        die('Config does not exist, but neither does the installer');
+    }
+}
+
 $page = 'Home';
 
 if (!ini_get('upload_tmp_dir')) {
@@ -76,10 +84,6 @@
 // Start initialising the page
 require(ROOT_PATH . '/core/init.php');
 
-if (!isset($GLOBALS['config']['core']) && is_file(ROOT_PATH . '/install.php')) {
-    Redirect::to('install.php');
-}
-
 // Get page to load from URL
 if (!isset($_GET['route']) || $_GET['route'] == '/') {
     if (((!isset($_GET['route']) || ($_GET['route'] != '/')) && count($directories) > 1)) {
diff --git a/install.php b/install.php
index 3781b32c26..d5f2217443 100644
--- a/install.php
+++ b/install.php
@@ -11,6 +11,10 @@
 
 require_once __DIR__ . '/vendor/autoload.php';
 
+if (getenv('NAMELESS_DEBUGGING') || isset($_SERVER['NAMELESS_DEBUGGING'])) {
+    define('DEBUGGING', 1);
+}
+
 // Definitions
 if (!defined('PATH')) {
     define('PATH', '/');
@@ -45,16 +49,17 @@
 // Get installation path
 $install_path = substr(str_replace('\\', '/', substr(__DIR__, strlen($_SERVER['DOCUMENT_ROOT']))), 1);
 
-if (!isset($GLOBALS['config']['core']['installed'])) {
-    if (isset($_GET['language'])) {
-        // Set language
-        if (is_file('custom/languages/' . $_GET['language'] . '.json')) {
-            $_SESSION['installer_language'] = $_GET['language'];
-            die('OK');
-        }
-        die($_GET['language'] . ' is not a valid language');
-    }
-    require(ROOT_PATH . '/core/installation/installer.php');
-} else {
+if (Config::exists() && Config::get('core/installed') === true) {
     require(ROOT_PATH . '/core/installation/already_installed.php');
+    return;
+}
+
+if (isset($_GET['language'])) {
+    // Set language
+    if (is_file('custom/languages/' . $_GET['language'] . '.json')) {
+        $_SESSION['installer_language'] = $_GET['language'];
+        die('OK');
+    }
+    die($_GET['language'] . ' is not a valid language');
 }
+require(ROOT_PATH . '/core/installation/installer.php');
diff --git a/modules/Core/pages/panel/general_settings.php b/modules/Core/pages/panel/general_settings.php
index 24953b097b..98d02a1235 100644
--- a/modules/Core/pages/panel/general_settings.php
+++ b/modules/Core/pages/panel/general_settings.php
@@ -148,17 +148,6 @@
 
             // Update config
             if (is_writable(ROOT_PATH . '/' . implode(DIRECTORY_SEPARATOR, ['core', 'config.php']))) {
-                // Require config
-                if (isset($path) && file_exists($path . 'core/config.php')) {
-                    $loadedConfig = json_decode(file_get_contents($path . 'core/config.php'), true);
-                } else {
-                    $loadedConfig = json_decode(file_get_contents(ROOT_PATH . '/core/config.php'), true);
-                }
-
-                if (is_array($loadedConfig)) {
-                    $GLOBALS['config'] = $loadedConfig;
-                }
-
                 Config::setMultiple([
                     'core/friendly' => $friendly,
                     'core/force_https' => $https,
diff --git a/modules/Core/pages/panel/registration.php b/modules/Core/pages/panel/registration.php
index 15db580514..3b00c448af 100644
--- a/modules/Core/pages/panel/registration.php
+++ b/modules/Core/pages/panel/registration.php
@@ -87,17 +87,6 @@
                     // Config value
                     if (Input::get('enable_recaptcha') == 1 || Input::get('enable_recaptcha_login') == 1) {
                         if (is_writable(ROOT_PATH . '/' . implode(DIRECTORY_SEPARATOR, ['core', 'config.php']))) {
-                            // Require config
-                            if (isset($path) && file_exists($path . 'core/config.php')) {
-                                $loadedConfig = json_decode(file_get_contents($path . 'core/config.php'), true);
-                            } else {
-                                $loadedConfig = json_decode(file_get_contents(ROOT_PATH . '/core/config.php'), true);
-                            }
-
-                            if (is_array($loadedConfig)) {
-                                $GLOBALS['config'] = $loadedConfig;
-                            }
-
                             Config::set('core/captcha', true);
                         } else {
                             $errors = [$language->get('admin', 'config_not_writable')];
diff --git a/modules/Core/queries/debug_link.php b/modules/Core/queries/debug_link.php
index 8c654e36db..d49492b27a 100755
--- a/modules/Core/queries/debug_link.php
+++ b/modules/Core/queries/debug_link.php
@@ -207,8 +207,8 @@
         'groups' => $groups,
         'config' => [
             'core' => array_filter(
-                $GLOBALS['config']['core'],
-                static fn(string $key) => $key != 'hostname' && $key != 'trustedProxies',
+                Config::get('core'),
+                static fn(string $key) => $key !== 'hostname' && $key !== 'trustedProxies',
                 ARRAY_FILTER_USE_KEY
             ),
         ],
diff --git a/modules/Core/widgets/ServerStatusWidget.php b/modules/Core/widgets/ServerStatusWidget.php
index a857cae20b..013b846e4c 100644
--- a/modules/Core/widgets/ServerStatusWidget.php
+++ b/modules/Core/widgets/ServerStatusWidget.php
@@ -46,18 +46,20 @@ public function initialise(): void {
             $server = $server[0];
 
             if ($server != null) {
-                $server_array = HttpClient::get(rtrim(Util::getSelfURL(), '/') . URL::build('/queries/server/', 'id=' . $server->id))->json(true);
-
-                foreach ($server_array as $key => $value) {
-                    // we have to NOT escape the player list or the formatted player list. luckily these are the only arrays
-                    if (is_array($value)) {
-                        $server_array[$key] = $value;
-                    } else {
-                        $server_array[$key] = Output::getClean($value);
+                $server_array_request = HttpClient::get(rtrim(Util::getSelfURL(), '/') . URL::build('/queries/server/', 'id=' . $server->id));
+                if (!$server_array_request->hasError()) {
+                    $server_array = $server_array_request->json(true);
+                    foreach ($server_array as $key => $value) {
+                        // we have to NOT escape the player list or the formatted player list. luckily these are the only arrays
+                        if (is_array($value)) {
+                            $server_array[$key] = $value;
+                        } else {
+                            $server_array[$key] = Output::getClean($value);
+                        }
                     }
+                    $server_array['name'] = $server->name;
+                    $server_array['join_at'] = $server->ip;
                 }
-                $server_array['name'] = $server->name;
-                $server_array['join_at'] = $server->ip;
 
                 $this->_cache->store('server_status', $server_array, 120);
             }
diff --git a/scripts/cli_install.php b/scripts/cli_install.php
index f8d96731d0..7aaf8c6d05 100644
--- a/scripts/cli_install.php
+++ b/scripts/cli_install.php
@@ -87,7 +87,10 @@ function getEnvVar(string $name, string $fallback = null, array $valid_values =
     }
 }
 
-const ROOT_PATH = __DIR__ . '..';
+const ROOT_PATH = __DIR__ . '/..';
+
+print('♻️  Registering autoloader...' . PHP_EOL);
+require './vendor/autoload.php';
 
 print('✍️  Creating new config.php file...' . PHP_EOL);
 $conf = [
@@ -111,7 +114,7 @@ function getEnvVar(string $name, string $fallback = null, array $valid_values =
     'core' => [
         'hostname' => getEnvVar('NAMELESS_HOSTNAME', 'localhost'),
         'path' => getEnvVar('NAMELESS_PATH', ''),
-        'friendly' => getEnvVar('NAMELESS_FRIENDLY_URLS', 'false') === 'true' ? true : false,
+        'friendly' => getEnvVar('NAMELESS_FRIENDLY_URLS', 'false') === 'true',
         'force_https' => false,
         'force_www' => false,
         'captcha' => false,
@@ -120,14 +123,7 @@ function getEnvVar(string $name, string $fallback = null, array $valid_values =
     ],
 ];
 
-file_put_contents(
-    './core/config.php',
-    '<?php' . PHP_EOL . '$conf = ' . var_export($conf, true) . ';'
-);
-$GLOBALS['config'] = $conf;
-
-print('♻️  Registering autoloader...' . PHP_EOL);
-require './vendor/autoload.php';
+Config::write($conf);
 
 if ($reinstall) {
     print('🗑️  Deleting old database...' . PHP_EOL);
@@ -144,13 +140,19 @@ function getEnvVar(string $name, string $fallback = null, array $valid_values =
 }
 
 print('✍️  Creating tables...' . PHP_EOL);
-PhinxAdapter::migrate();
+
+$message = PhinxAdapter::migrate();
+
+if (!str_contains($message, 'All Done')) {
+    print($message);
+    exit(1);
+}
 
 Session::put('default_language', getEnvVar('NAMELESS_DEFAULT_LANGUAGE', 'en_UK'));
 
 print('✍️  Inserting default data to database...' . PHP_EOL);
 
-DatabaseInitialiser::runPreUser($conf);
+DatabaseInitialiser::runPreUser();
 
 Util::setSetting('sitename', getEnvVar('NAMELESS_SITE_NAME'));
 Util::setSetting('incoming_email', getEnvVar('NAMELESS_SITE_CONTACT_EMAIL'));
diff --git a/scripts/seeder/db_seeder.php b/scripts/seeder/db_seeder.php
index 11115e8805..509864371d 100644
--- a/scripts/seeder/db_seeder.php
+++ b/scripts/seeder/db_seeder.php
@@ -3,8 +3,8 @@
     die('This script must be run from the command line.');
 }
 
+define('ROOT_PATH', __DIR__ . '/../..');
 require 'vendor/autoload.php';
-require 'core/config.php';
 
 $classes = [
     'Seeder.php',
@@ -32,13 +32,7 @@
 
 $faker = Faker\Factory::create();
 
-$db = DB::getCustomInstance(
-    $conf['mysql']['host'],
-    $conf['mysql']['db'],
-    $conf['mysql']['username'],
-    $conf['mysql']['password'],
-    3306
-);
+$db = DB::getInstance();
 
 $wipe = false;
 if (isset($argv[1]) && $argv[1] === 'wipe') {

From 7af74c1c88b0de1a0c3154defa461ffeed3a6ccb Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Sun, 12 Jun 2022 20:22:53 -0600
Subject: [PATCH 092/337] Fix legacy install check

---
 install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.php b/install.php
index d5f2217443..a774656119 100644
--- a/install.php
+++ b/install.php
@@ -49,7 +49,7 @@
 // Get installation path
 $install_path = substr(str_replace('\\', '/', substr(__DIR__, strlen($_SERVER['DOCUMENT_ROOT']))), 1);
 
-if (Config::exists() && Config::get('core/installed') === true) {
+if (isset($CONFIG['installed']) || (Config::exists() && Config::get('core/installed') === true)) {
     require(ROOT_PATH . '/core/installation/already_installed.php');
     return;
 }

From 3df85ce05ae4317642993366636374c54175c867 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Sun, 12 Jun 2022 20:35:45 -0600
Subject: [PATCH 093/337] Swap Config class to prefer paths seperated by `.`

---
 core/classes/Core/Config.php                  | 31 ++++++++++++++++---
 core/classes/Core/Token.php                   |  6 ++--
 core/classes/Core/URL.php                     |  2 +-
 core/classes/Core/User.php                    |  8 ++---
 core/classes/Core/Util.php                    | 14 +++++----
 core/classes/Core/Validate.php                |  2 +-
 core/classes/Database/DB.php                  | 14 ++++-----
 core/classes/Database/DatabaseInitialiser.php |  2 +-
 core/classes/Misc/CaptchaBase.php             |  2 +-
 core/includes/updates/200-pr13.php            |  9 ++----
 core/init.php                                 | 18 +++++------
 install.php                                   |  2 +-
 modules/Core/pages/panel/general_settings.php |  2 +-
 13 files changed, 66 insertions(+), 46 deletions(-)

diff --git a/core/classes/Core/Config.php b/core/classes/Core/Config.php
index a4fc9a8b52..6745ab7787 100644
--- a/core/classes/Core/Config.php
+++ b/core/classes/Core/Config.php
@@ -62,7 +62,7 @@ public static function write(array $config): void {
     /**
      * Get a config value from `core/config.php` file.
      *
-     * @param string $path `/` seperated path of key to get from config file.
+     * @param string $path `.` seperated path of key to get from config file.
      * @return false|mixed Returns false if key doesn't exist, otherwise returns the value.
      *
      * @throws RuntimeException If the config file is not found.
@@ -70,7 +70,7 @@ public static function write(array $config): void {
     public static function get(string $path) {
         $config = self::all();
 
-        $path = explode('/', $path);
+        $path = self::parsePath($path);
 
         foreach ($path as $bit) {
             if (isset($config[$bit])) {
@@ -90,13 +90,13 @@ public static function get(string $path) {
     /**
      * Write a value to `core/config.php` file.
      *
-     * @param string $key `/` seperated path of key to set.
+     * @param string $key `.` seperated path of key to set.
      * @param mixed $value Value to set under $key.
      */
     public static function set(string $key, $value): void {
         $config = self::all();
 
-        $path = explode('/', $key);
+        $path = self::parsePath($key);
 
         if (!is_array($path)) {
             $config[$key] = $value;
@@ -120,7 +120,7 @@ public static function setMultiple(array $values): void {
         $config = self::all();
 
         foreach ($values as $key => $value) {
-            $path = explode('/', $key);
+            $path = self::parsePath($key);
 
             if (!is_array($path)) {
                 $config[$key] = $value;
@@ -135,4 +135,25 @@ public static function setMultiple(array $values): void {
 
         static::write($config);
     }
+
+    /**
+     * Parse a string path to an array of config paths.
+     * Will log a warning if a legacy path (using `/` is used).
+     *
+     * @param string $path Path to parse.
+     * @return string|array Path split into sections or plain string if no section seperator was found.
+     */
+    private static function parsePath(string $path) {
+        if (str_contains($path, '.')) {
+            return explode('.', $path);
+        }
+
+        // TODO: Remove for 2.1.0
+        if (str_contains($path, '/')) {
+            ErrorHandler::logWarning("Legacy config path: {$path}. Please use periods to seperate paths.");
+            return explode('/', $path);
+        }
+
+        return $path;
+    }
 }
diff --git a/core/classes/Core/Token.php b/core/classes/Core/Token.php
index 72ab8a3c2d..44e9350334 100644
--- a/core/classes/Core/Token.php
+++ b/core/classes/Core/Token.php
@@ -15,7 +15,7 @@ class Token {
      * @return string current form token.
      */
     public static function get(): string {
-        $tokenName = Config::get('session/token_name');
+        $tokenName = Config::get('session.token_name');
 
         // Return if it already exists
         if (Session::exists($tokenName)) {
@@ -33,7 +33,7 @@ public static function get(): string {
      */
     public static function generate(): void {
         // Generate random token using md5
-        Session::put(Config::get('session/token_name'), md5(uniqid('', true)));
+        Session::put(Config::get('session.token_name'), md5(uniqid('', true)));
     }
 
     /**
@@ -49,7 +49,7 @@ public static function check(string $token = null): bool {
             $token = Input::get('token');
         }
 
-        $tokenName = Config::get('session/token_name');
+        $tokenName = Config::get('session.token_name');
 
         // Check the token matches
         return Session::exists($tokenName) && $token === Session::get($tokenName);
diff --git a/core/classes/Core/URL.php b/core/classes/Core/URL.php
index 6a5246e196..ffbc93ecf4 100644
--- a/core/classes/Core/URL.php
+++ b/core/classes/Core/URL.php
@@ -36,7 +36,7 @@ public static function build(string $url, string $params = '', ?string $force =
             throw new InvalidArgumentException('Invalid force string: ' . $force);
         }
 
-        if ((defined('FRIENDLY_URLS') && FRIENDLY_URLS == true) || (!defined('FRIENDLY_URLS') && Config::get('core/friendly') == true)) {
+        if ((defined('FRIENDLY_URLS') && FRIENDLY_URLS == true) || (!defined('FRIENDLY_URLS') && Config::get('core.friendly') == true)) {
             // Friendly URLs are enabled
             return self::buildFriendly($url, $params);
         }
diff --git a/core/classes/Core/User.php b/core/classes/Core/User.php
index eeda404d02..7af63b4a2f 100644
--- a/core/classes/Core/User.php
+++ b/core/classes/Core/User.php
@@ -67,9 +67,9 @@ class User {
 
     public function __construct(string $user = null, string $field = 'id') {
         $this->_db = DB::getInstance();
-        $this->_sessionName = Config::get('session/session_name');
-        $this->_cookieName = Config::get('remember/cookie_name');
-        $this->_admSessionName = Config::get('session/admin_name');
+        $this->_sessionName = Config::get('session.session_name');
+        $this->_cookieName = Config::get('remember.cookie_name');
+        $this->_admSessionName = Config::get('session.admin_name');
 
         if ($user === null) {
             if (Session::exists($this->_sessionName)) {
@@ -327,7 +327,7 @@ private function _commonLogin(?string $username, ?string $password, bool $rememb
                     $hash = $hashCheck->first()->hash;
                 }
 
-                $expiry = $is_admin ? 3600 : Config::get('remember/cookie_expiry');
+                $expiry = $is_admin ? 3600 : Config::get('remember.cookie_expiry');
                 $cookieName = $is_admin ? ($this->_cookieName . '_adm') : $this->_cookieName;
                 Cookie::put($cookieName, $hash, $expiry, Util::getProtocol() === 'https', true);
             }
diff --git a/core/classes/Core/Util.php b/core/classes/Core/Util.php
index 4ca0a6dd24..eaa69e2b45 100644
--- a/core/classes/Core/Util.php
+++ b/core/classes/Core/Util.php
@@ -130,11 +130,13 @@ public static function isExternalURL(string $url): bool {
         return !(str_replace('www.', '', rtrim(self::getSelfURL(false), '/')) == str_replace('www.', '', $parsed['host']));
     }
 
-    public static function isTrustedProxiesConfigured() {
-        $config_proxies = Config::get('core/trustedProxies');
+    public static function isTrustedProxiesConfigured(): bool {
+        $config_proxies = Config::get('core.trustedProxies');
         $env_proxies = getenv('NAMELESS_TRUSTED_PROXIES');
-        return $config_proxies !== false && $config_proxies !== null && is_array($config_proxies)
-                || $env_proxies !== false;
+        return $config_proxies !== false
+            && $config_proxies !== null
+            && is_array($config_proxies)
+            || $env_proxies !== false;
     }
 
     /**
@@ -144,7 +146,7 @@ public static function getTrustedProxies(): array {
         $trusted_proxies = [];
 
         // Add trusted proxies from config file
-        $config_proxies = Config::get('core/trustedProxies');
+        $config_proxies = Config::get('core.trustedProxies');
         if ($config_proxies !== false && $config_proxies !== null) {
             if (!is_array($config_proxies)) {
                 die('Trusted proxies should be an array');
@@ -340,7 +342,7 @@ public static function getPort(): ?int {
      * @return string Compiled URL.
      */
     public static function getSelfURL(bool $show_protocol = true): string {
-        $hostname = Config::get('core/hostname');
+        $hostname = Config::get('core.hostname');
 
         if (!$hostname) {
             $hostname = $_SERVER['SERVER_NAME'];
diff --git a/core/classes/Core/Validate.php b/core/classes/Core/Validate.php
index 217590fad5..c3cfe34cf7 100644
--- a/core/classes/Core/Validate.php
+++ b/core/classes/Core/Validate.php
@@ -95,7 +95,7 @@ class Validate {
     private function __construct() {
         // Connect to database for rules which need DB access
         try {
-            $host = Config::get('mysql/host');
+            $host = Config::get('mysql.host');
         } catch (Exception $e) {
             $host = null;
         }
diff --git a/core/classes/Database/DB.php b/core/classes/Database/DB.php
index f98733bb68..2916745800 100644
--- a/core/classes/Database/DB.php
+++ b/core/classes/Database/DB.php
@@ -482,18 +482,18 @@ public static function getInstance(): DB {
             return self::$_instance;
         }
 
-        if (Config::get('mysql/initialise_charset')) {
-            $force_charset = Config::get('mysql/charset') ?: 'utf8mb4';
+        if (Config::get('mysql.initialise_charset')) {
+            $force_charset = Config::get('mysql.charset') ?: 'utf8mb4';
         } else {
             $force_charset = null;
         }
 
         self::$_instance = self::getCustomInstance(
-            Config::get('mysql/host'),
-            Config::get('mysql/db'),
-            Config::get('mysql/username'),
-            Config::get('mysql/password'),
-            Config::get('mysql/port'),
+            Config::get('mysql.host'),
+            Config::get('mysql.db'),
+            Config::get('mysql.username'),
+            Config::get('mysql.password'),
+            Config::get('mysql.port'),
             $force_charset
         );
 
diff --git a/core/classes/Database/DatabaseInitialiser.php b/core/classes/Database/DatabaseInitialiser.php
index 2e68c64069..134a6cd697 100644
--- a/core/classes/Database/DatabaseInitialiser.php
+++ b/core/classes/Database/DatabaseInitialiser.php
@@ -245,7 +245,7 @@ private function initialiseTemplates(): void {
         ]);
         $this->_cache->store('panel_default', 'Default');
 
-        $config_path = Config::get('core/path');
+        $config_path = Config::get('core.path');
         if (!empty($config_path)) {
             $config_path = '/' . trim($config_path, '/');
         }
diff --git a/core/classes/Misc/CaptchaBase.php b/core/classes/Misc/CaptchaBase.php
index 33cb3a89fa..517bfd7c4f 100644
--- a/core/classes/Misc/CaptchaBase.php
+++ b/core/classes/Misc/CaptchaBase.php
@@ -77,7 +77,7 @@ public static function getAllProviders(): iterable {
      * @return bool Whether captcha is enabled or not
      */
     public static function isCaptchaEnabled(string $key = 'recaptcha'): bool {
-        if (!Config::get('core/captcha')) {
+        if (!Config::get('core.captcha')) {
             return false;
         }
 
diff --git a/core/includes/updates/200-pr13.php b/core/includes/updates/200-pr13.php
index 9afbec0c02..4653872a1f 100644
--- a/core/includes/updates/200-pr13.php
+++ b/core/includes/updates/200-pr13.php
@@ -3,7 +3,7 @@
 class Nameless200 extends UpgradeScript {
 
     public function run(): void {
-        $trusted_proxies = Config::get('core/trustedProxies');
+        $trusted_proxies = Config::get('core.trustedProxies');
         // If trusted proxies is an empty array
         if ($trusted_proxies !== null &&
             is_countable($trusted_proxies) &&
@@ -15,12 +15,9 @@ public function run(): void {
             Config::set('core/trustedProxies', null);
         }
 
-        $trusted_proxies = Config::get('core/trustedProxies');
+        $trusted_proxies = Config::get('core.trustedProxies');
         // If trusted proxies is an empty array
-        if ($trusted_proxies !== null &&
-            is_countable($trusted_proxies) &&
-            count($trusted_proxies) == 0) {
-
+        if (is_countable($trusted_proxies) && count($trusted_proxies) === 0) {
             // The core/trustedProxies option was mistakenly set during the installer for pr13. If we decide to
             // allow not configuring it, at least it must be in an "unconfigured" state by default so StaffCP
             // can display a warning until it is explicitly set to an empty or non-empty array by the user.
diff --git a/core/init.php b/core/init.php
index 072e8ba6d5..a8cca532d2 100644
--- a/core/init.php
+++ b/core/init.php
@@ -66,16 +66,16 @@
      */
 
     // Friendly URLs?
-    define('FRIENDLY_URLS', Config::get('core/friendly') == 'true');
+    define('FRIENDLY_URLS', Config::get('core.friendly') == 'true');
 
     // Set up cache
     $cache = new Cache(['name' => 'nameless', 'extension' => '.cache', 'path' => ROOT_PATH . '/cache/']);
 
     // Force https/www?
-    if (Config::get('core/force_https')) {
+    if (Config::get('core.force_https')) {
         define('FORCE_SSL', true);
     }
-    if (Config::get('core/force_www')) {
+    if (Config::get('core.force_www')) {
         define('FORCE_WWW', true);
     }
 
@@ -121,13 +121,13 @@
     define('NAMELESS_VERSION', Util::getSetting('nameless_version'));
 
     // Set the date format
-    define('DATE_FORMAT', Config::get('core/date_format') ?: 'd M Y, H:i');
+    define('DATE_FORMAT', Config::get('core.date_format') ?: 'd M Y, H:i');
 
     // User initialisation
     $user = new User();
     // Do they need logging in (checked remember me)?
-    if (Cookie::exists(Config::get('remember/cookie_name')) && !Session::exists(Config::get('session/session_name'))) {
-        $hash = Cookie::get(Config::get('remember/cookie_name'));
+    if (Cookie::exists(Config::get('remember.cookie_name')) && !Session::exists(Config::get('session.session_name'))) {
+        $hash = Cookie::get(Config::get('remember.cookie_name'));
         $hashCheck = DB::getInstance()->get('users_session', ['hash', $hash]);
 
         if ($hashCheck->count()) {
@@ -144,16 +144,16 @@
 
         $directories = array_values($directories);
 
-        $config_path = Config::get('core/path');
+        $config_path = Config::get('core.path');
 
         if (!empty($config_path)) {
-            $config_path = explode('/', Config::get('core/path'));
+            $config_path = explode('/', Config::get('core.path'));
 
             for ($i = 0, $iMax = count($config_path); $i < $iMax; $i++) {
                 unset($directories[$i]);
             }
 
-            define('CONFIG_PATH', '/' . Config::get('core/path'));
+            define('CONFIG_PATH', '/' . Config::get('core.path'));
 
             $directories = array_values($directories);
         }
diff --git a/install.php b/install.php
index a774656119..79c98d6ccd 100644
--- a/install.php
+++ b/install.php
@@ -49,7 +49,7 @@
 // Get installation path
 $install_path = substr(str_replace('\\', '/', substr(__DIR__, strlen($_SERVER['DOCUMENT_ROOT']))), 1);
 
-if (isset($CONFIG['installed']) || (Config::exists() && Config::get('core/installed') === true)) {
+if (isset($CONFIG['installed']) || (Config::exists() && Config::get('core.installed') === true)) {
     require(ROOT_PATH . '/core/installation/already_installed.php');
     return;
 }
diff --git a/modules/Core/pages/panel/general_settings.php b/modules/Core/pages/panel/general_settings.php
index 98d02a1235..5e1adb67c7 100644
--- a/modules/Core/pages/panel/general_settings.php
+++ b/modules/Core/pages/panel/general_settings.php
@@ -265,7 +265,7 @@
     'HOMEPAGE_CUSTOM' => $language->get('admin', 'custom_content'),
     'HOMEPAGE_VALUE' => Util::getSetting('home_type'),
     'USE_FRIENDLY_URLS' => $language->get('admin', 'use_friendly_urls'),
-    'USE_FRIENDLY_URLS_VALUE' => Config::get('core/friendly'),
+    'USE_FRIENDLY_URLS_VALUE' => Config::get('core.friendly'),
     'USE_FRIENDLY_URLS_HELP' => $language->get('admin', 'use_friendly_urls_help', [
         'docLinkStart' => "<a href='https://docs.namelessmc.com/friendly-urls' target='_blank'>",
         'docLinkEnd' => '</a>'

From a839f78b05a061a3b56486bf86fd55c52b244a57 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Sun, 12 Jun 2022 20:39:39 -0600
Subject: [PATCH 094/337] Misc

---
 core/classes/Core/Util.php | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/core/classes/Core/Util.php b/core/classes/Core/Util.php
index eaa69e2b45..77ddb1ff09 100644
--- a/core/classes/Core/Util.php
+++ b/core/classes/Core/Util.php
@@ -130,12 +130,16 @@ public static function isExternalURL(string $url): bool {
         return !(str_replace('www.', '', rtrim(self::getSelfURL(false), '/')) == str_replace('www.', '', $parsed['host']));
     }
 
+    /**
+     * Determine whether the trusted proxies config option is set to a valid value or not.
+     *
+     * @return bool Whether the trusted proxies option is configured or not
+     */
     public static function isTrustedProxiesConfigured(): bool {
         $config_proxies = Config::get('core.trustedProxies');
         $env_proxies = getenv('NAMELESS_TRUSTED_PROXIES');
-        return $config_proxies !== false
-            && $config_proxies !== null
-            && is_array($config_proxies)
+        return ($config_proxies !== false
+            && is_array($config_proxies))
             || $env_proxies !== false;
     }
 
@@ -387,11 +391,6 @@ public static function stringToURL(string $string = null): string {
         return '';
     }
 
-    /*
-    *  The truncate function is taken from CakePHP, license MIT
-    *  https://github.com/cakephp/cakephp/blob/master/LICENSE
-    */
-
     /**
      * Truncates text.
      *
@@ -403,13 +402,13 @@ public static function stringToURL(string $string = null): string {
      * - `ending` Will be used as Ending and appended to the trimmed string
      * - `exact` If false, $text will not be cut mid-word
      * - `html` If true, HTML tags would be handled correctly
+     * @link http://book.cakephp.org/view/1469/Text#truncate-1625
+     * @link https://github.com/cakephp/cakephp/blob/master/LICENSE
      *
      * @param string $text String to truncate.
      * @param int $length Length of returned string, including ellipsis.
      * @param array $options An array of html attributes and options.
      * @return string Trimmed string.
-     * @access public
-     * @link http://book.cakephp.org/view/1469/Text#truncate-1625
      */
     public static function truncate(string $text, int $length = 750, array $options = []): string {
         $default = [
@@ -593,18 +592,14 @@ public static function getSetting(string $setting, ?string $fallback = null, ?st
             }
         }
 
-        if (isset(self::$_cached_settings[$setting])) {
-            return self::$_cached_settings[$setting];
-        } else {
-            return null;
-        }
+        return self::$_cached_settings[$setting] ?? null;
     }
 
     /**
      * Modify a setting in the database table `nl2_settings`.
      *
      * @param string $setting Setting name.
-     * @param string $new_value New setting value, or null to delete
+     * @param string|null $new_value New setting value, or null to delete
      * @param ?string $module Alphanumeric (no spaces!) module name to use as a settings table prefix. For example,
      *                        specify 'store' to use the 'nl2_store_settings' table. Null to use the standard
      *                        nl2_settings table.
@@ -697,7 +692,7 @@ public static function bold(string $text): string {
      * @return string Read string
      */
     public static function readFileEnd(string $file_path, int $max_bytes = 100_000): string {
-        $fp = fopen($file_path, 'r');
+        $fp = fopen($file_path, 'rb');
         $size = filesize($file_path);
         $start = max([$size - $max_bytes, 0]);
         fseek($fp, $start);

From 6266a806962416b9f93b446d6f89a5bacf89ac38 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Sun, 12 Jun 2022 20:54:30 -0600
Subject: [PATCH 095/337] Create `Redirect::back()` method

---
 core/classes/Core/Redirect.php    | 17 +++++++++++++++++
 modules/Core/pages/login.php      |  2 +-
 modules/Core/pages/oauth.php      |  2 +-
 modules/Core/pages/panel/auth.php |  2 +-
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/core/classes/Core/Redirect.php b/core/classes/Core/Redirect.php
index 466c617e2b..6614bbaf7e 100644
--- a/core/classes/Core/Redirect.php
+++ b/core/classes/Core/Redirect.php
@@ -25,4 +25,21 @@ public static function to(string $location): void {
         }
         die();
     }
+
+    /**
+     * Attempt to redirect the user to the previous page.
+     *
+     * @return never
+     */
+    public static function back(): void {
+        if (isset($_SESSION['last_page'])) {
+            self::to($_SESSION['last_page']);
+        }
+
+        if (isset($_SESSION['HTTP_REFERER'])) {
+            self::to($_SESSION['HTTP_REFERER']);
+        }
+
+        self::to(URL::build('/'));
+    }
 }
diff --git a/modules/Core/pages/login.php b/modules/Core/pages/login.php
index ea6588e982..784d4fd9c7 100644
--- a/modules/Core/pages/login.php
+++ b/modules/Core/pages/login.php
@@ -234,7 +234,7 @@
 
                             // Redirect to a certain page?
                             if (isset($_SESSION['last_page']) && substr($_SESSION['last_page'], -1) != '=') {
-                                Redirect::to($_SESSION['last_page']);
+                                Redirect::back();
                             } else {
                                 Session::flash('home', $language->get('user', 'successful_login'));
                                 Redirect::to(URL::build('/'));
diff --git a/modules/Core/pages/oauth.php b/modules/Core/pages/oauth.php
index 974b212457..bc4d66b8b8 100644
--- a/modules/Core/pages/oauth.php
+++ b/modules/Core/pages/oauth.php
@@ -51,7 +51,7 @@
         Session::delete('oauth_method');
 
         if (isset($_SESSION['last_page']) && substr($_SESSION['last_page'], -1) != '=') {
-            Redirect::to($_SESSION['last_page']);
+            Redirect::back();
         }
 
         Redirect::to(URL::build('/'));
diff --git a/modules/Core/pages/panel/auth.php b/modules/Core/pages/panel/auth.php
index b8dcc52062..0018bda4f4 100644
--- a/modules/Core/pages/panel/auth.php
+++ b/modules/Core/pages/panel/auth.php
@@ -92,7 +92,7 @@
 
                 // Redirect to a certain page?
                 if (isset($_SESSION['last_page']) && substr($_SESSION['last_page'], -1) != '=') {
-                    Redirect::to($_SESSION['last_page']);
+                    Redirect::back();
                 } else {
                     Redirect::to(URL::build('/panel'));
                 }

From 476b8df406da7eb32d46a8dfd21e8ae6903c703b Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Sun, 12 Jun 2022 21:10:14 -0600
Subject: [PATCH 096/337] Cleanup upgrade script

---
 core/classes/Misc/UpgradeScript.php |  2 +-
 core/includes/updates/200-pr13.php  | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/core/classes/Misc/UpgradeScript.php b/core/classes/Misc/UpgradeScript.php
index 75bec1fa7c..28d1459af5 100644
--- a/core/classes/Misc/UpgradeScript.php
+++ b/core/classes/Misc/UpgradeScript.php
@@ -144,7 +144,7 @@ protected function deleteFiles($paths): void {
     /**
      * Execute any pending database migrations.
      */
-    protected function migrateDb(): void {
+    protected function runMigrations(): void {
         PhinxAdapter::migrate();
     }
 
diff --git a/core/includes/updates/200-pr13.php b/core/includes/updates/200-pr13.php
index 4653872a1f..ddd0327b57 100644
--- a/core/includes/updates/200-pr13.php
+++ b/core/includes/updates/200-pr13.php
@@ -1,14 +1,11 @@
 <?php
 
-class Nameless200 extends UpgradeScript {
+return new class extends UpgradeScript {
 
     public function run(): void {
         $trusted_proxies = Config::get('core.trustedProxies');
         // If trusted proxies is an empty array
-        if ($trusted_proxies !== null &&
-            is_countable($trusted_proxies) &&
-            count($trusted_proxies) == 0) {
-
+        if (is_countable($trusted_proxies) && count($trusted_proxies) === 0) {
             // The core/trustedProxies option was mistakenly set during the installer for pr13. If we decide to
             // allow not configuring it, at least it must be in an "unconfigured" state by default so StaffCP
             // can display a warning until it is explicitly set to an empty or non-empty array by the user.
@@ -24,6 +21,8 @@ public function run(): void {
             Config::set('core/trustedProxies', null);
         }
 
+        $this->runMigrations();
+
         $this->setVersion('2.0.0');
     }
-}
+};

From 1419cdeddfb5d24750418d587d7b83d88849def1 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Sun, 12 Jun 2022 21:21:07 -0600
Subject: [PATCH 097/337] Use config class in Phinx config, fix `Config::get()`

---
 core/classes/Core/Config.php |  8 ++++++--
 core/migrations/phinx.php    | 13 ++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/core/classes/Core/Config.php b/core/classes/Core/Config.php
index 6745ab7787..138a1beed0 100644
--- a/core/classes/Core/Config.php
+++ b/core/classes/Core/Config.php
@@ -70,9 +70,13 @@ public static function write(array $config): void {
     public static function get(string $path) {
         $config = self::all();
 
-        $path = self::parsePath($path);
+        $parsed_path = self::parsePath($path);
 
-        foreach ($path as $bit) {
+        if (!is_array($parsed_path)) {
+            return $config[$parsed_path] ?? false;
+        }
+
+        foreach ($parsed_path as $bit) {
             if (isset($config[$bit])) {
                 $config = $config[$bit];
             } else {
diff --git a/core/migrations/phinx.php b/core/migrations/phinx.php
index 4cbb09acf6..24c33c53a0 100644
--- a/core/migrations/phinx.php
+++ b/core/migrations/phinx.php
@@ -1,7 +1,6 @@
 <?php
 
-require __DIR__ . '/../config.php';
-$conf = $conf['mysql'];
+$config = Config::get('mysql');
 
 return [
     'paths' => [
@@ -10,11 +9,11 @@
     'environments' => [
         'nameless' => [
             'adapter' => 'mysql',
-            'host' => $conf['host'],
-            'name' => $conf['db'],
-            'user' => $conf['username'],
-            'pass' => $conf['password'],
-            'port' => $conf['port'],
+            'host' => $config['host'],
+            'name' => $config['db'],
+            'user' => $config['username'],
+            'pass' => $config['password'],
+            'port' => $config['port'],
             'charset' => 'utf8mb4',
             'collation' => 'utf8mb4_unicode_ci',
             'default_migration_table' => 'nl2_phinxlog',

From 2796bc5d6482578c377a5b11f73d829dfcdc4432 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Mon, 13 Jun 2022 11:47:49 +0200
Subject: [PATCH 098/337] Check for https port 80 misconfiguration

---
 custom/languages/en_UK.json        | 1 +
 modules/Core/pages/panel/index.php | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/custom/languages/en_UK.json b/custom/languages/en_UK.json
index 31681def7b..51114af390 100644
--- a/custom/languages/en_UK.json
+++ b/custom/languages/en_UK.json
@@ -681,6 +681,7 @@
     "admin/api_disabled": "API is disabled",
     "admin/trusted_proxies_configured": "Trusted proxies",
     "admin/trusted_proxies_not_configured": "{{linkStart}}Trusted proxies{{linkEnd}} are not configured, IP bans may not work properly.",
+    "admin/https_port_80": "You appear as if you are using HTTPS on port 80, which is almost definitely not true. If you use CloudFlare, make sure to set TLS encryption mode to Full (strict). If you run your own proxy, please configure it to send the X-Forwarded-Port header.",
     "api/account_validated": "Account validated successfully",
     "api/finish_registration_email": "Please check your emails to complete registration.",
     "api/finish_registration_link": "Please click on the following link to complete registration:",
diff --git a/modules/Core/pages/panel/index.php b/modules/Core/pages/panel/index.php
index f5d499cea0..05feb1752b 100644
--- a/modules/Core/pages/panel/index.php
+++ b/modules/Core/pages/panel/index.php
@@ -207,6 +207,10 @@
         ]);
     }
 
+    if (Util::getPort() === 80 && Util::getProtocol() === 'https') {
+        $compat_errors[] = $language->get('admin', 'https_port_80');
+    }
+
     $smarty->assign([
         'SERVER_COMPATIBILITY' => $language->get('admin', 'server_compatibility'),
         'COMPAT_SUCCESS' => $compat_success,

From 313cfd1a1eda4e134f6c169cbd2a5ea403f8bf0b Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Mon, 13 Jun 2022 11:50:27 +0200
Subject: [PATCH 099/337] Remove permissions checks

The page won't load if permissions are wrong because of a die() earlier, so there's no point in checking permissions here.
---
 modules/Core/pages/panel/index.php | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/modules/Core/pages/panel/index.php b/modules/Core/pages/panel/index.php
index 05feb1752b..305f1a8aab 100644
--- a/modules/Core/pages/panel/index.php
+++ b/modules/Core/pages/panel/index.php
@@ -181,23 +181,6 @@
         $compat_errors[] = $pdo_driver . ' Server ' . $pdo_server_version;
     }
 
-    // Permissions
-    if (!is_writable(ROOT_PATH . '/core/config.php')) {
-        $compat_errors[] = $language->get('installer', 'config_writable');
-    } else {
-        $compat_success[] = $language->get('installer', 'config_writable');
-    }
-    if (!is_writable(ROOT_PATH . '/cache')) {
-        $compat_errors[] = $language->get('installer', 'cache_writable');
-    } else {
-        $compat_success[] = $language->get('installer', 'cache_writable');
-    }
-    if (!is_writable(ROOT_PATH . '/cache/templates_c')) {
-        $compat_errors[] = $language->get('installer', 'template_cache_writable');
-    } else {
-        $compat_success[] = $language->get('installer', 'template_cache_writable');
-    }
-
     if (Util::isTrustedProxiesConfigured()) {
         $compat_success[] = $language->get('admin', 'trusted_proxies_configured');
     } else {

From 5073aeb42ac5ef18f3b70368a10998f2e009a290 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Mon, 13 Jun 2022 11:57:02 +0200
Subject: [PATCH 100/337] Warnings for versions that still work but are quite
 old

---
 custom/panel_templates/Default/index.tpl |  7 +++++++
 modules/Core/pages/panel/index.php       | 13 ++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/custom/panel_templates/Default/index.tpl b/custom/panel_templates/Default/index.tpl
index 4cbd45e66b..86e1996e7b 100644
--- a/custom/panel_templates/Default/index.tpl
+++ b/custom/panel_templates/Default/index.tpl
@@ -118,6 +118,13 @@
                                     <i class="fas fa-check-circle text-success"></i> {$item}
                                     <br />
                                     {/foreach}
+                                    {if count($COMPAT_WARNINGS)}
+                                    <hr />
+                                    {foreach from=$COMPAT_WARNINGS item=item}
+                                    <i class="fas fa-check-circle text-warning"></i> {$item}
+                                    <br />
+                                    {/foreach}
+                                    {/if}
                                     {if count($COMPAT_ERRORS)}
                                     <hr />
                                     {foreach from=$COMPAT_ERRORS item=item}
diff --git a/modules/Core/pages/panel/index.php b/modules/Core/pages/panel/index.php
index 305f1a8aab..50cc6c74ad 100644
--- a/modules/Core/pages/panel/index.php
+++ b/modules/Core/pages/panel/index.php
@@ -113,10 +113,13 @@
 // Compatibility
 if ($user->hasPermission('admincp.core.debugging')) {
     $compat_success = [];
+    $compat_warnings = [];
     $compat_errors = [];
 
     if (PHP_VERSION_ID < 70400) {
         $compat_errors[] = 'PHP ' . PHP_VERSION;
+    } else if (PHP_VERSION_ID < 80000) {
+        $compat_warnings[] = 'PHP ' . PHP_VERSION;
     } else {
         $compat_success[] = 'PHP ' . PHP_VERSION;
     }
@@ -174,9 +177,12 @@
         }
     }
 
-    if (($pdo_driver === 'MySQL' && version_compare($pdo_server_version, '5.7', '>=')) ||
-        ($pdo_driver === 'MariaDB' && version_compare($pdo_server_version, '10.3', '>='))) {
+    if (($pdo_driver === 'MySQL' && version_compare($pdo_server_version, '8.0', '>=')) ||
+        ($pdo_driver === 'MariaDB' && version_compare($pdo_server_version, '10.5', '>='))) {
         $compat_success[] = $pdo_driver . ' Server ' . $pdo_server_version;
+    } else if (($pdo_driver === 'MySQL' && version_compare($pdo_server_version, '5.7', '>=')) ||
+        ($pdo_driver === 'MariaDB' && version_compare($pdo_server_version, '10.3', '>='))) {
+        $compat_warnings[] = $pdo_driver . ' Server ' . $pdo_server_version;
     } else {
         $compat_errors[] = $pdo_driver . ' Server ' . $pdo_server_version;
     }
@@ -197,7 +203,8 @@
     $smarty->assign([
         'SERVER_COMPATIBILITY' => $language->get('admin', 'server_compatibility'),
         'COMPAT_SUCCESS' => $compat_success,
-        'COMPAT_ERRORS' => $compat_errors
+        'COMPAT_WARNINGS' => $compat_warnings,
+        'COMPAT_ERRORS' => $compat_errors,
     ]);
 }
 

From 06dd7935d206123b3cd84bd102be4697e48e4380 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Mon, 13 Jun 2022 15:12:36 +0200
Subject: [PATCH 101/337] Fix {{minPassword}}, also replace other hardcoded
 numbers

---
 .../steps/admin_account_setup.php             | 31 ++++++++++++++-----
 custom/languages/en_UK.json                   |  4 +--
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/core/installation/steps/admin_account_setup.php b/core/installation/steps/admin_account_setup.php
index 78e6ec60a4..68a7832ec9 100644
--- a/core/installation/steps/admin_account_setup.php
+++ b/core/installation/steps/admin_account_setup.php
@@ -12,22 +12,29 @@ function display_error(string $message) {
 }
 
 if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+    $username_min = 3;
+    $username_max = 20;
+    $email_min = 4;
+    $email_max = 64;
+    $password_min = 6;
+    $password_max = 30;
+
     $validation = Validate::check($_POST, [
         'username' => [
             Validate::REQUIRED => true,
-            Validate::MIN => 3,
-            Validate::MAX => 20,
+            Validate::MIN => $username_min,
+            Validate::MAX => $username_max,
         ],
         'email' => [
             Validate::REQUIRED => true,
-            Validate::MIN => 4,
-            Validate::MAX => 64,
+            Validate::MIN => $email_min,
+            Validate::MAX => $email_max,
             Validate::EMAIL => true,
         ],
         'password' => [
             Validate::REQUIRED => true,
-            Validate::MIN => 6,
-            Validate::MAX => 30,
+            Validate::MIN => $password_min,
+            Validate::MAX => $password_max,
         ],
         'password_again' => [
             Validate::REQUIRED => true,
@@ -40,9 +47,17 @@ function display_error(string $message) {
             if (strpos($item, 'is required') !== false) {
                 display_error($language->get('installer', 'input_required'));
             } else if (strpos($item, 'minimum') !== false) {
-                display_error($language->get('installer', 'input_minimum'));
+                display_error($language->get('installer', 'input_minimum', [
+                    'minUsername' => $username_min,
+                    'minEmail' => $email_min,
+                    'minPassword' => $password_min,
+                ]));
             } else if (strpos($item, 'maximum') !== false) {
-                display_error($language->get('installer', 'input_maximum'));
+                display_error($language->get('installer', 'input_maximum', [
+                    'maxUsername' => $username_max,
+                    'maxEmail' => $email_max,
+                    'maxPassword' => $password_max,
+                ]));
             } else if (strpos($item, 'must match') !== false) {
                 display_error($language->get('installer', 'passwords_must_match'));
             } else if (strpos($item, 'not a valid email') !== false) {
diff --git a/custom/languages/en_UK.json b/custom/languages/en_UK.json
index 51114af390..6b39e1db83 100644
--- a/custom/languages/en_UK.json
+++ b/custom/languages/en_UK.json
@@ -873,8 +873,8 @@
     "installer/host_help": "The hostname is the base URL for your website. Do not include the subfolders from the Installation Path field, or http(s):\/\/ here!",
     "installer/hostname_error": "Please enter a valid hostname without http:\/\/ or https:\/\/",
     "installer/initialising_database_and_cache": "Initialising database and cache, please wait...",
-    "installer/input_maximum": "Please ensure your username is a maximum of 20 characters, and your email address and password are a maximum of 64 characters.",
-    "installer/input_minimum": "Please ensure your username is a minimum of 3 characters, your email address is a minimum of 4 characters, and your password is a minimum of {{minPassword}} characters.",
+    "installer/input_maximum": "Please ensure your username is a maximum of {{maxUsername}} characters, your email address is a maximum of {{maxEmail}} characters, and your password ia a maximum of {{maxPassword}} characters.",
+    "installer/input_minimum": "Please ensure your username is a minimum of {{minUsername}} characters, your email address is a minimum of {{minEmail}} characters, and your password is a minimum of {{minPassword}} characters.",
     "installer/input_required": "Please input a valid username, email address and password.",
     "installer/input_v1_details": "Please input the database details for your Nameless version 1 installation.",
     "installer/install": "Install",

From 67ff00f7b56a1edf2d33ffab3e15dd3b1c5fd942 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Mon, 13 Jun 2022 17:40:51 +0200
Subject: [PATCH 102/337] Add warning when debugging is enabled

In case someone enables it at some point but forgets to disable it on a public site
---
 custom/languages/en_UK.json        | 1 +
 modules/Core/pages/panel/index.php | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/custom/languages/en_UK.json b/custom/languages/en_UK.json
index 6b39e1db83..5f5de75884 100644
--- a/custom/languages/en_UK.json
+++ b/custom/languages/en_UK.json
@@ -682,6 +682,7 @@
     "admin/trusted_proxies_configured": "Trusted proxies",
     "admin/trusted_proxies_not_configured": "{{linkStart}}Trusted proxies{{linkEnd}} are not configured, IP bans may not work properly.",
     "admin/https_port_80": "You appear as if you are using HTTPS on port 80, which is almost definitely not true. If you use CloudFlare, make sure to set TLS encryption mode to Full (strict). If you run your own proxy, please configure it to send the X-Forwarded-Port header.",
+    "admin/debugging_enabled": "Debugging is enabled, sensitive information may be exposed to unauthorized visitors. Debugging should only be used for development, not on public sites.",
     "api/account_validated": "Account validated successfully",
     "api/finish_registration_email": "Please check your emails to complete registration.",
     "api/finish_registration_link": "Please click on the following link to complete registration:",
diff --git a/modules/Core/pages/panel/index.php b/modules/Core/pages/panel/index.php
index 50cc6c74ad..3d80b13813 100644
--- a/modules/Core/pages/panel/index.php
+++ b/modules/Core/pages/panel/index.php
@@ -200,6 +200,10 @@
         $compat_errors[] = $language->get('admin', 'https_port_80');
     }
 
+    if (defined('DEBUGGING') && DEBUGGING) {
+        $compat_errors[] = $language->get('admin', 'debugging_enabled');
+    }
+
     $smarty->assign([
         'SERVER_COMPATIBILITY' => $language->get('admin', 'server_compatibility'),
         'COMPAT_SUCCESS' => $compat_success,

From e5f28b3c27f2b0140cc11d934495e496ff3bffad Mon Sep 17 00:00:00 2001
From: Partydragen <adrian_kili@outlook.com>
Date: Mon, 13 Jun 2022 18:53:55 +0200
Subject: [PATCH 103/337] Re-add maintenance mode enabled message

---
 custom/templates/DefaultRevamp/navbar.tpl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/custom/templates/DefaultRevamp/navbar.tpl b/custom/templates/DefaultRevamp/navbar.tpl
index b89a771911..0afd7f2d67 100755
--- a/custom/templates/DefaultRevamp/navbar.tpl
+++ b/custom/templates/DefaultRevamp/navbar.tpl
@@ -179,4 +179,11 @@
                 <div class="ui message">
                     {$MUST_VALIDATE_ACCOUNT}
                 </div>
-                {/if}
\ No newline at end of file
+                {/if}
+
+                {if isset($MAINTENANCE_ENABLED)}
+                <div class="ui warning message">
+                    <i class="close icon"></i>
+                    {$MAINTENANCE_ENABLED}
+                </div>
+                {/if}

From 61273704b1a8ba218dd20cf8535a26723aa5b553 Mon Sep 17 00:00:00 2001
From: Partydragen <adrian_kili@outlook.com>
Date: Mon, 13 Jun 2022 19:14:02 +0200
Subject: [PATCH 104/337] Unauthorized to unauthorised

---
 custom/languages/en_UK.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/languages/en_UK.json b/custom/languages/en_UK.json
index 5f5de75884..424a24dcec 100644
--- a/custom/languages/en_UK.json
+++ b/custom/languages/en_UK.json
@@ -682,7 +682,7 @@
     "admin/trusted_proxies_configured": "Trusted proxies",
     "admin/trusted_proxies_not_configured": "{{linkStart}}Trusted proxies{{linkEnd}} are not configured, IP bans may not work properly.",
     "admin/https_port_80": "You appear as if you are using HTTPS on port 80, which is almost definitely not true. If you use CloudFlare, make sure to set TLS encryption mode to Full (strict). If you run your own proxy, please configure it to send the X-Forwarded-Port header.",
-    "admin/debugging_enabled": "Debugging is enabled, sensitive information may be exposed to unauthorized visitors. Debugging should only be used for development, not on public sites.",
+    "admin/debugging_enabled": "Debugging is enabled, sensitive information may be exposed to unauthorised visitors. Debugging should only be used for development, not on public sites.",
     "api/account_validated": "Account validated successfully",
     "api/finish_registration_email": "Please check your emails to complete registration.",
     "api/finish_registration_link": "Please click on the following link to complete registration:",

From e1255e07a6b2a21bd33556de5f81971eb7776876 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Mon, 13 Jun 2022 22:02:59 -0600
Subject: [PATCH 105/337] Add deprecation notices for 2.1.0

---
 core/classes/Core/Hash.php        |  2 +-
 core/classes/Core/Pages.php       |  2 +-
 core/classes/Core/Paginator.php   |  2 +-
 core/classes/Core/User.php        |  2 +-
 core/classes/Database/DB.php      | 74 +++++++++++++++----------------
 core/classes/Database/Queries.php | 24 +++++-----
 6 files changed, 51 insertions(+), 55 deletions(-)

diff --git a/core/classes/Core/Hash.php b/core/classes/Core/Hash.php
index ef10578730..e0809a77d9 100644
--- a/core/classes/Core/Hash.php
+++ b/core/classes/Core/Hash.php
@@ -13,7 +13,7 @@ class Hash {
      * Generate a unique hash.
      *
      * @return string Generated hash.
-     * @deprecated Use SecureRandom::alphanumeric() instead which is in a more appropriately named class
+     * @deprecated Use SecureRandom::alphanumeric() instead which is in a more appropriately named class. Will be removed in 2.1.0
      * @throws Exception If an appropriate source of randomness cannot be found.
      */
     public static function unique(): string {
diff --git a/core/classes/Core/Pages.php b/core/classes/Core/Pages.php
index ca4799e127..584c06ba16 100644
--- a/core/classes/Core/Pages.php
+++ b/core/classes/Core/Pages.php
@@ -152,7 +152,7 @@ public function getPageByURL(string $url): ?array {
 
     /**
      * Get the page details the user currently viewing.
-     * @deprecated  Not used internally.
+     * @deprecated  Not used internally. Will be removed in 2.1.0
      *
      * @return array Details of current page.
      */
diff --git a/core/classes/Core/Paginator.php b/core/classes/Core/Paginator.php
index 51b57db9dc..8dffb1dbf5 100644
--- a/core/classes/Core/Paginator.php
+++ b/core/classes/Core/Paginator.php
@@ -181,7 +181,7 @@ public function generate(int $links, string $href = '?'): string {
 
     /**
      * Set values of instance variables, alternative function (as they are set in getLimited()).
-     * @deprecated Not used internally.
+     * @deprecated Not used internally. Will be removed in 2.1.0
      *
      * @param int $total
      * @param int $limit
diff --git a/core/classes/Core/User.php b/core/classes/Core/User.php
index 7af63b4a2f..336161975b 100644
--- a/core/classes/Core/User.php
+++ b/core/classes/Core/User.php
@@ -201,7 +201,7 @@ public function data(): ?UserData {
     }
 
     /**
-     * @deprecated Use getGroupStyle instead
+     * @deprecated Use getGroupStyle instead.  Will be removed in 2.1.0
      */
     public function getGroupClass(): string {
         return $this->getGroupStyle();
diff --git a/core/classes/Database/DB.php b/core/classes/Database/DB.php
index 2916745800..e47196b8dd 100644
--- a/core/classes/Database/DB.php
+++ b/core/classes/Database/DB.php
@@ -3,7 +3,6 @@
  * Creates a singleton connection to the database with credentials from the config file.
  *
  * @package NamelessMC\Database
- * @see InteractsWithDatabase
  * @author Samerton
  * @version 2.0.0-pr13
  * @license MIT
@@ -41,6 +40,39 @@ private function __construct(string $host, string $database, string $username, s
         $this->_query_recorder = QueryRecorder::getInstance();
     }
 
+    public static function getCustomInstance(
+        string $host,
+        string $database,
+        string $username,
+        string $password,
+        int $port = 3306,
+        ?string $force_charset = null,
+        string $prefix = 'nl2_'
+    ): DB {
+        return new DB($host, $database, $username, $password, $port, $force_charset, $prefix);
+    }
+
+    public static function getInstance(): DB {
+        if (self::$_instance) {
+            return self::$_instance;
+        }
+
+        if (Config::get('mysql.initialise_charset')) {
+            $force_charset = Config::get('mysql.charset') ?: 'utf8mb4';
+        } else {
+            $force_charset = null;
+        }
+
+        return self::$_instance = self::getCustomInstance(
+            Config::get('mysql.host'),
+            Config::get('mysql.db'),
+            Config::get('mysql.username'),
+            Config::get('mysql.password'),
+            Config::get('mysql.port'),
+            $force_charset
+        );
+    }
+
     /**
      * Get the underlying PDO instance.
      *
@@ -183,7 +215,7 @@ public function query(string $sql, array $params = [], int $fetch_method = PDO::
     }
 
     /**
-     * @deprecated Use query() instead
+     * @deprecated Use query() instead. Will be removed in 2.1.0
      * @return static
      */
     public function selectQuery(string $sql, array $params = [], int $fetch_method = PDO::FETCH_OBJ) {
@@ -191,7 +223,7 @@ public function selectQuery(string $sql, array $params = [], int $fetch_method =
     }
 
     /**
-     * @deprecated Use query() instead
+     * @deprecated Use query() instead. Will be removed in 2.1.0
      * @return static
      */
     public function createQuery(string $sql, array $params = []) {
@@ -464,40 +496,4 @@ private function makeWhere(array $clauses): array {
 
         return [$where, $params];
     }
-
-    public static function getCustomInstance(
-        string $host,
-        string $database,
-        string $username,
-        string $password,
-        int $port = 3306,
-        ?string $force_charset = null,
-        string $prefix = 'nl2_'
-    ): DB {
-        return new DB($host, $database, $username, $password, $port, $force_charset, $prefix);
-    }
-
-    public static function getInstance(): DB {
-        if (self::$_instance) {
-            return self::$_instance;
-        }
-
-        if (Config::get('mysql.initialise_charset')) {
-            $force_charset = Config::get('mysql.charset') ?: 'utf8mb4';
-        } else {
-            $force_charset = null;
-        }
-
-        self::$_instance = self::getCustomInstance(
-            Config::get('mysql.host'),
-            Config::get('mysql.db'),
-            Config::get('mysql.username'),
-            Config::get('mysql.password'),
-            Config::get('mysql.port'),
-            $force_charset
-        );
-
-        return self::$_instance;
-    }
-
 }
diff --git a/core/classes/Database/Queries.php b/core/classes/Database/Queries.php
index 3c5c3189b3..2fe207ae3e 100644
--- a/core/classes/Database/Queries.php
+++ b/core/classes/Database/Queries.php
@@ -21,7 +21,7 @@ private function warnDeprecated() {
     }
 
     /**
-     * @deprecated Use DB::getInstance()->get(...)->results() with identical parameters instead
+     * @deprecated Use DB::getInstance()->get(...)->results() with identical parameters instead. Will be removed in 2.1.0
      *
      * find and replace
      * from: \$queries->getWhere\((.*)\)
@@ -33,7 +33,7 @@ public function getWhere(string $table, array $where): array {
     }
 
     /**
-     * @deprecated Use DB::getInstance()->orderAll(...)->results() with identical parameters instead.
+     * @deprecated Use DB::getInstance()->orderAll(...)->results() with identical parameters instead. Will be removed in 2.1.0
      *
      * find and replace
      * from: \$queries->orderAll\((.*)\)
@@ -45,7 +45,7 @@ public function orderAll(string $table, string $order, string $sort = null): arr
     }
 
     /**
-     * @deprecated Use DB::getInstance()->orderWhere(...)->results() with identical parameters instead
+     * @deprecated Use DB::getInstance()->orderWhere(...)->results() with identical parameters instead.  Will be removed in 2.1.0
      *
      * find and replace
      * from: \$queries->orderWhere\((.*)\)
@@ -57,7 +57,7 @@ public function orderWhere(string $table, string $where, string $order, string $
     }
 
     /**
-     * @deprecated Use DB::getInstance()->update(...) with identical parameters instead
+     * @deprecated Use DB::getInstance()->update(...) with identical parameters instead. Will be removed in 2.1.0
      *
      * find and replace
      * from: \$queries->update\((.*)\)
@@ -71,7 +71,7 @@ public function update(string $table, $where, array $fields = []): void {
     }
 
     /**
-     * @deprecated Use DB::getInstance()->insert(...) with identical parameters instead
+     * @deprecated Use DB::getInstance()->insert(...) with identical parameters instead. Will be removed in 2.1.0
      *
      * find and replace
      * from: \$queries->create\((.*)\)
@@ -85,7 +85,7 @@ public function create(string $table, array $fields = []): void {
     }
 
     /**
-     * @deprecated Use DB::getInstance()->delete(...) with identical parameters instead
+     * @deprecated Use DB::getInstance()->delete(...) with identical parameters instead. Will be removed in 2.1.0
      *
      * find and replace
      * from: \$queries->delete\((.*)\)
@@ -99,7 +99,7 @@ public function delete(string $table, array $where): void {
     }
 
     /**
-     * @deprecated Use DB::getInstance()->increment(...) with identical parameters instead
+     * @deprecated Use DB::getInstance()->increment(...) with identical parameters instead. Will be removed in 2.1.0
      *
      * find and replace
      * from: \$queries->increment\((.*)\)
@@ -113,7 +113,7 @@ public function increment(string $table, int $id, string $field): void {
     }
 
     /**
-     * @deprecated Use DB::getInstance()->createTable(...) with identical parameters instead
+     * @deprecated Use DB::getInstance()->createTable(...) with identical parameters instead. Will be removed in 2.1.0
      *
      * find and replace
      * from: \$queries->createTable\((.*)\)
@@ -129,7 +129,7 @@ public function createTable(string $table, string $columns): void {
     /**
      * Get the last inserted ID
      *
-     * @deprecated Use DB::getInstance()->lastId() instead
+     * @deprecated Use DB::getInstance()->lastId() instead. Will be removed in 2.1.0
      * find and replace
      * from: \$queries->getLastId\(\)
      * to:   DB::getInstance()->lastId()
@@ -142,7 +142,7 @@ public function getLastId() {
     }
 
     /**
-     * @deprecated Use DB::getInstance()->addColumn() with identical parameters instead
+     * @deprecated Use DB::getInstance()->addColumn() with identical parameters instead. Will be removed in 2.1.0
      *
      * find and replace
      * from: \$queries->addColumn\((.*)\)
@@ -156,7 +156,7 @@ public function addColumn(string $table, string $column, string $attributes): vo
     }
 
     /**
-     * @deprecated Use DB::getInstance()->showTables() with identical parameters instead
+     * @deprecated Use DB::getInstance()->showTables() with identical parameters instead. Will be removed in 2.1.0
      *
      * find and replace
      * from: \$queries->tableExists\((.*)\)
@@ -168,7 +168,7 @@ public function tableExists(string $table) {
     }
 
     /**
-     * @deprecated Seems to be unused
+     * Used in upgrade scripts to add permissions to a group. For example, if a new staffcp page has been added.
      */
     public function addPermissionGroup(int $group_id, string $permission): void {
         $group = Group::find($group_id);

From 307096fb54b3e46176819d03ed00278f8655c089 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Mon, 13 Jun 2022 22:24:43 -0600
Subject: [PATCH 106/337] Create and utilize `HttpUtils` class

---
 core/classes/Core/Log.php                     |   2 +-
 core/classes/Core/User.php                    |   2 +-
 core/classes/Core/Util.php                    | 185 +---------------
 core/classes/Misc/ErrorHandler.php            |   2 +-
 core/classes/Misc/HttpUtils.php               | 206 ++++++++++++++++++
 core/init.php                                 |   6 +-
 .../steps/admin_account_setup.php             |   2 +-
 core/integration/run_mcassoc.php              |   2 +-
 index.php                                     |   2 +-
 modules/Core/pages/authme_connector.php       |   2 +-
 modules/Core/pages/panel/auth.php             |   2 +-
 modules/Core/pages/panel/index.php            |   4 +-
 modules/Core/pages/register.php               |   2 +-
 modules/Core/queries/debug_link.php           |   2 +-
 14 files changed, 233 insertions(+), 188 deletions(-)
 create mode 100644 core/classes/Misc/HttpUtils.php

diff --git a/core/classes/Core/Log.php b/core/classes/Core/Log.php
index 22a6a13c1f..b44aa20780 100644
--- a/core/classes/Core/Log.php
+++ b/core/classes/Core/Log.php
@@ -214,7 +214,7 @@ public function log(string $action, string $info = '', ?int $user = null): bool
             $user = ($userTemp->isLoggedIn() ? $userTemp->data()->id : 0);
         }
 
-        $ip = Util::getRemoteAddress();
+        $ip = HttpUtils::getRemoteAddress();
 
         return $this->_db->insert('logs', [
             'time' => date('U'),
diff --git a/core/classes/Core/User.php b/core/classes/Core/User.php
index 336161975b..39f61001bb 100644
--- a/core/classes/Core/User.php
+++ b/core/classes/Core/User.php
@@ -329,7 +329,7 @@ private function _commonLogin(?string $username, ?string $password, bool $rememb
 
                 $expiry = $is_admin ? 3600 : Config::get('remember.cookie_expiry');
                 $cookieName = $is_admin ? ($this->_cookieName . '_adm') : $this->_cookieName;
-                Cookie::put($cookieName, $hash, $expiry, Util::getProtocol() === 'https', true);
+                Cookie::put($cookieName, $hash, $expiry, HttpUtils::getProtocol() === 'https', true);
             }
 
             return true;
diff --git a/core/classes/Core/Util.php b/core/classes/Core/Util.php
index 77ddb1ff09..8127912ac2 100644
--- a/core/classes/Core/Util.php
+++ b/core/classes/Core/Util.php
@@ -1,7 +1,6 @@
 <?php
 
 use Astrotomic\Twemoji\Twemoji;
-use Symfony\Component\HttpFoundation\IpUtils;
 
 /**
  * Contains misc utility methods.
@@ -133,209 +132,49 @@ public static function isExternalURL(string $url): bool {
     /**
      * Determine whether the trusted proxies config option is set to a valid value or not.
      *
+     * @deprecated Use `HttpUtils::isTrustedProxiesConfigured`. Will be removed in 2.1.0
      * @return bool Whether the trusted proxies option is configured or not
      */
     public static function isTrustedProxiesConfigured(): bool {
-        $config_proxies = Config::get('core.trustedProxies');
-        $env_proxies = getenv('NAMELESS_TRUSTED_PROXIES');
-        return ($config_proxies !== false
-            && is_array($config_proxies))
-            || $env_proxies !== false;
+        return HttpUtils::isTrustedProxiesConfigured();
     }
 
     /**
+     * @deprecated Use `HttpUtils::getTrustedProxies`. Will be removed in 2.1.0
      * @return array List of trusted proxy networks according to config file and environment
      */
     public static function getTrustedProxies(): array {
-        $trusted_proxies = [];
-
-        // Add trusted proxies from config file
-        $config_proxies = Config::get('core.trustedProxies');
-        if ($config_proxies !== false && $config_proxies !== null) {
-            if (!is_array($config_proxies)) {
-                die('Trusted proxies should be an array');
-            }
-            $trusted_proxies = array_merge($trusted_proxies, $config_proxies);
-        }
-
-        // Add trusted proxies from environment variable (comma-separated string)
-        $env_proxies = getenv('NAMELESS_TRUSTED_PROXIES');
-        if ($env_proxies !== false && $env_proxies !== 'none') {
-            $env_proxies_array = explode(',', $env_proxies);
-            $trusted_proxies = array_merge($trusted_proxies, $env_proxies_array);
-        }
-
-        return $trusted_proxies;
-    }
-
-    /**
-     * Checks whether the client making the request is a trusted proxy.
-     */
-    private static function isTrustedProxy(): bool {
-        $trusted_proxies = self::getTrustedProxies();
-
-        foreach ($trusted_proxies as $trustedProxy) {
-            if (IpUtils::checkIp($_SERVER['REMOTE_ADDR'], $trustedProxy)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Extract trustworthy address from a list of addresses provided by the Forwarded or X-Forwarded-For header.
-     * @return string Address that may be used for security purposes
-     */
-    private static function firstNonProxyAddress(array $addresses): string {
-        if (count($addresses) === 0) {
-            throw new InvalidArgumentException('Addresses must not be empty');
-        }
-
-        $trusted_proxies = self::getTrustedProxies();
-
-        /*
-        https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-For#parsing
-
-        > When choosing the first trustworthy X-Forwarded-For client IP address, additional configuration is required.
-        >
-        > The IPs or IP ranges of the trusted reverse proxies are configured. The X-Forwarded-For IP list is searched
-        > from the rightmost, skipping all addresses that are on the trusted proxy list. The first non-matching
-        > address is the target address.
-        >
-        > The first trustworthy X-Forwarded-For IP address may belong to an untrusted intermediate proxy rather than
-        > the actual client computer, but it is the only IP suitable for security uses.
-        */
-
-        for ($i = count($addresses) - 1; $i >= 0; $i--) {
-            $address = $addresses[$i];
-
-            foreach ($trusted_proxies as $trusted_proxy) {
-                if (IpUtils::checkIp($address, $trusted_proxy)) {
-                    // This address is trusted, move one left
-                    continue 2;
-                }
-            }
-
-            // Address is not trusted, this is the client IP we should use
-            return $address;
-        }
-
-        // All addresses are in a trusted network, use leftmost address
-        return $addresses[0];
+        return HttpUtils::getTrustedProxies();
     }
 
     /**
      * Get the client's true IP address, using proxy headers if necessary.
      *
+     * @deprecated Use `HttpUtils::getRemoteAddress`. Will be removed in 2.1.0
      * @return ?string Client IP address, or null if there is no remote address, for example in CLI environment
      */
     public static function getRemoteAddress(): ?string {
-        if (!self::isTrustedProxy()) {
-            return $_SERVER['REMOTE_ADDR'];
-        }
-
-        $headers = getallheaders();
-
-        // Try the simple headers first that only contain an IP address
-
-        // Non standard header that only contains the origin address
-        if (isset($headers['X-Real-Ip'])) {
-            return $headers['X-Real-Ip'];
-        }
-
-        // Non standard header sent by CloudFlare that only contains the origin address
-        if (isset($headers['Cf-Connecting-Ip'])) {
-            return $headers['Cf-Connecting-Ip'];
-        }
-
-        /*
-        Now the more complicated (X-)Forwarded(-For) headers.
-
-        Quote from MDN https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-For#parsing:
-        > There may be multiple X-Forwarded-For headers present in a request (per RFC 2616). The IP addresses in
-        > these headers must be treated as a single list, starting with the first IP address of the first header
-        > and continuing to the last IP address of the last header.
-        > It is insufficient to use only one of multiple X-Forwarded-For headers.
-
-        Unfortunately, we cannot follow this advice since PHP only seems to return the last header. However, since
-        supposedly the addresses should be read from right to left, only using the last header is not insecure, while
-        the using the first header would be.
-        In case of a weirdly behaving proxy that sends an additional Forwarded header instead of appending to an
-        existing one, the worst that would happen is an IP ban affecting the proxy (every user). Under no
-        circumstance would a user be able to spoof their address.
-        */
-
-        if (isset($headers['X-Forwarded-For'])) {
-            $addresses = [];
-            foreach (explode(',', $headers['X-Forwarded-For']) as $part) {
-                $addresses[] = trim($part);
-            }
-
-            return self::firstNonProxyAddress($addresses);
-        }
-
-        if (isset($headers['Forwarded'])) {
-            $addresses = [];
-            foreach (explode(',', $headers['Forwarded']) as $part1) {
-                // Extract the optional 'for=<address>' bit
-                foreach (explode(';', trim($part1)) as $part2) {
-                    $part2 = explode('=', $part2);
-                    if (count($part2) != 2) {
-                        die("Invalid Forwarded header");
-                    }
-
-                    if ($part2[0] === 'for') {
-                        $addresses[] = trim($part2[1]);
-                        break;
-                    }
-                }
-            }
-
-            if (count($addresses) > 0) {
-                return self::firstNonProxyAddress($addresses);
-            }
-        }
-
-        return $_SERVER['REMOTE_ADDR'];
+        return HttpUtils::getRemoteAddress();
     }
 
     /**
      * Get the protocol used by client's HTTP request, using proxy headers if necessary.
      *
+     * @deprecated Use `HttpUtils::getProtocol`. Will be removed in 2.1.0
      * @return string 'http' if HTTP or 'https' if HTTPS. If the protocol is not known, for example when using the CLI, 'http' is always returned.
      */
     public static function getProtocol(): string {
-        if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
-            $proto = $_SERVER['HTTP_X_FORWARDED_PROTO'];
-            if ($proto !== 'http' && $proto !== 'https') {
-                die("Invalid X-Forwarded-Proto header, should be 'http' or 'https'.");
-            }
-            return $proto;
-        }
-
-        if (isset($_SERVER['HTTPS'])) {
-            return $_SERVER['HTTPS'] !== 'off' ? 'https' : 'http';
-        }
-
-        return 'http';
+        return HttpUtils::getProtocol();
     }
 
     /**
      * Get port used by client's HTTP request, using proxy headers if necessary.
      *
+     * @deprecated Use `HttpUtils::getPort`. Will be removed in 2.1.0
      * @return ?int Port number, or null when using the CLI
      */
     public static function getPort(): ?int {
-        if (isset($_SERVER['HTTP_X_FORWARDED_PORT'])) {
-            return (int) $_SERVER['HTTP_X_FORWARDED_PORT'];
-        }
-
-        if (isset($_SERVER['SERVER_PORT'])) {
-            return (int) $_SERVER['SERVER_PORT'];
-        }
-
-        return null;
+        return HttpUtils::getPort();
     }
 
     /**
@@ -359,9 +198,9 @@ public static function getSelfURL(bool $show_protocol = true): string {
         }
 
         if ($show_protocol) {
-            $protocol = self::getProtocol();
+            $protocol = HttpUtils::getProtocol();
             $url = $protocol . '://' . $url;
-            $port = self::getPort();
+            $port = HttpUtils::getPort();
             // Add port if it is non-standard for the current protocol
             if (!(($port === 80 && $protocol === 'http') || ($port === 443 && $protocol === 'https'))) {
                 $url .= ':' . $port;
diff --git a/core/classes/Misc/ErrorHandler.php b/core/classes/Misc/ErrorHandler.php
index 30021208d5..1473158023 100644
--- a/core/classes/Misc/ErrorHandler.php
+++ b/core/classes/Misc/ErrorHandler.php
@@ -158,7 +158,7 @@ public static function catchException(?Throwable $exception, ?string $error_stri
             'DEBUG_LINK_URL' => URL::build('/queries/debug_link'),
             // TODO: should we skip the 2 frames that are from the "new User()" above?
             'ERROR_SQL_STACK' => QueryRecorder::getInstance()->getSqlStack(),
-            'CURRENT_URL' => Util::getProtocol() . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'],
+            'CURRENT_URL' => HttpUtils::getProtocol() . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'],
             'FRAMES' => $frames,
             'SKIP_FRAMES' => $skip_frames,
             'BACK' => $language->get('general', 'back'),
diff --git a/core/classes/Misc/HttpUtils.php b/core/classes/Misc/HttpUtils.php
new file mode 100644
index 0000000000..f1ce6404cb
--- /dev/null
+++ b/core/classes/Misc/HttpUtils.php
@@ -0,0 +1,206 @@
+<?php
+
+use Symfony\Component\HttpFoundation\IpUtils;
+
+class HttpUtils {
+
+    /**
+     * Get the client's true IP address, using proxy headers if necessary.
+     *
+     * @return ?string Client IP address, or null if there is no remote address, for example in CLI environment
+     */
+    public static function getRemoteAddress(): ?string {
+        if (!self::isTrustedProxy()) {
+            return $_SERVER['REMOTE_ADDR'];
+        }
+
+        $headers = getallheaders();
+
+        // Try the simple headers first that only contain an IP address...
+
+        // Non-standard header that only contains the origin address
+        if (isset($headers['X-Real-Ip'])) {
+            return $headers['X-Real-Ip'];
+        }
+
+        // Non-standard header sent by CloudFlare that only contains the origin address
+        if (isset($headers['Cf-Connecting-Ip'])) {
+            return $headers['Cf-Connecting-Ip'];
+        }
+
+        // Now the more complicated (X-)Forwarded(-For) headers.
+        // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-For#parsing:
+        // > There may be multiple X-Forwarded-For headers present in a request (per RFC 2616). The IP addresses in
+        // > these headers must be treated as a single list, starting with the first IP address of the first header
+        // > and continuing to the last IP address of the last header.
+        // > It is insufficient to use only one of multiple X-Forwarded-For headers.
+        //
+        // Unfortunately, we cannot follow this advice since PHP only seems to return the last header. However, since
+        // supposedly the addresses should be read from right to left, only using the last header is not insecure, while
+        // the using the first header would be.
+        // In case of a weirdly behaving proxy that sends an additional Forwarded header instead of appending to an
+        // existing one, the worst that would happen is an IP ban affecting the proxy (every user). Under no
+        // circumstance would a user be able to spoof their address.
+        if (isset($headers['X-Forwarded-For'])) {
+            $addresses = [];
+            foreach (explode(',', $headers['X-Forwarded-For']) as $part) {
+                $addresses[] = trim($part);
+            }
+
+            return self::firstNonProxyAddress($addresses);
+        }
+
+        if (isset($headers['Forwarded'])) {
+            $addresses = [];
+            foreach (explode(',', $headers['Forwarded']) as $part1) {
+                // Extract the optional 'for=<address>' bit
+                foreach (explode(';', trim($part1)) as $part2) {
+                    $part2 = explode('=', $part2);
+                    if (count($part2) != 2) {
+                        die("Invalid Forwarded header");
+                    }
+
+                    if ($part2[0] === 'for') {
+                        $addresses[] = trim($part2[1]);
+                        break;
+                    }
+                }
+            }
+
+            if (count($addresses) > 0) {
+                return self::firstNonProxyAddress($addresses);
+            }
+        }
+
+        return $_SERVER['REMOTE_ADDR'];
+    }
+
+    /**
+     * Get the protocol used by client's HTTP request, using proxy headers if necessary.
+     *
+     * @return string 'http' if HTTP or 'https' if HTTPS. If the protocol is not known, for example when using the CLI, 'http' is always returned.
+     */
+    public static function getProtocol(): string {
+        if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
+            $proto = $_SERVER['HTTP_X_FORWARDED_PROTO'];
+            if ($proto !== 'http' && $proto !== 'https') {
+                die("Invalid X-Forwarded-Proto header, should be 'http' or 'https'.");
+            }
+            return $proto;
+        }
+
+        if (isset($_SERVER['HTTPS'])) {
+            return $_SERVER['HTTPS'] !== 'off' ? 'https' : 'http';
+        }
+
+        return 'http';
+    }
+
+    /**
+     * Get port used by client's HTTP request, using proxy headers if necessary.
+     *
+     * @return ?int Port number, or null when using the CLI
+     */
+    public static function getPort(): ?int {
+        if (isset($_SERVER['HTTP_X_FORWARDED_PORT'])) {
+            return (int) $_SERVER['HTTP_X_FORWARDED_PORT'];
+        }
+
+        if (isset($_SERVER['SERVER_PORT'])) {
+            return (int) $_SERVER['SERVER_PORT'];
+        }
+
+        return null;
+    }
+
+    /**
+     * Determine whether the trusted proxies config option is set to a valid value or not.
+     *
+     * @return bool Whether the trusted proxies option is configured or not
+     */
+    public static function isTrustedProxiesConfigured(): bool {
+        $config_proxies = Config::get('core.trustedProxies');
+        $env_proxies = getenv('NAMELESS_TRUSTED_PROXIES');
+        return ($config_proxies !== false && is_array($config_proxies)) || $env_proxies !== false;
+    }
+
+    /**
+     * @return array List of trusted proxy networks according to config file and environment
+     */
+    public static function getTrustedProxies(): array {
+        $trusted_proxies = [];
+
+        // Add trusted proxies from config file
+        $config_proxies = Config::get('core.trustedProxies');
+        if ($config_proxies !== false && $config_proxies !== null) {
+            if (!is_array($config_proxies)) {
+                die('Trusted proxies should be an array');
+            }
+            $trusted_proxies = array_merge($trusted_proxies, $config_proxies);
+        }
+
+        // Add trusted proxies from environment variable (comma-separated string)
+        $env_proxies = getenv('NAMELESS_TRUSTED_PROXIES');
+        if ($env_proxies !== false && $env_proxies !== 'none') {
+            $env_proxies_array = explode(',', $env_proxies);
+            $trusted_proxies = array_merge($trusted_proxies, $env_proxies_array);
+        }
+
+        return $trusted_proxies;
+    }
+
+    /**
+     * Checks whether the client making the request is a trusted proxy.
+     *
+     * @return bool Whether the client is a trusted proxy or not.
+     */
+    private static function isTrustedProxy(): bool {
+        $trusted_proxies = self::getTrustedProxies();
+
+        foreach ($trusted_proxies as $trustedProxy) {
+            if (IpUtils::checkIp($_SERVER['REMOTE_ADDR'], $trustedProxy)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Extract trustworthy address from a list of addresses provided by the Forwarded or X-Forwarded-For header.
+     *
+     * @return string Address that may be used for security purposes
+     */
+    private static function firstNonProxyAddress(array $addresses): string {
+        if (count($addresses) === 0) {
+            throw new InvalidArgumentException('Addresses must not be empty');
+        }
+
+        $trusted_proxies = self::getTrustedProxies();
+
+        // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-For#parsing
+        // > When choosing the first trustworthy X-Forwarded-For client IP address, additional configuration is required.
+        // > The IPs or IP ranges of the trusted reverse proxies are configured. The X-Forwarded-For IP list is searched
+        // > from the rightmost, skipping all addresses that are on the trusted proxy list. The first non-matching
+        // > address is the target address.
+        // > The first trustworthy X-Forwarded-For IP address may belong to an untrusted intermediate proxy rather than
+        // > the actual client computer, but it is the only IP suitable for security uses.
+        for ($i = count($addresses) - 1; $i >= 0; $i--) {
+            $address = $addresses[$i];
+
+            foreach ($trusted_proxies as $trusted_proxy) {
+                if (IpUtils::checkIp($address, $trusted_proxy)) {
+                    // This address is trusted, move one left
+                    continue 2;
+                }
+            }
+
+            // Address is not trusted, this is the client IP we should use
+            return $address;
+        }
+
+        // All addresses are in a trusted network, use leftmost address
+        return $addresses[0];
+    }
+
+}
diff --git a/core/init.php b/core/init.php
index a8cca532d2..ef4308fa18 100644
--- a/core/init.php
+++ b/core/init.php
@@ -79,7 +79,7 @@
         define('FORCE_WWW', true);
     }
 
-    if (defined('FORCE_SSL') && Util::getProtocol() === 'http') {
+    if (defined('FORCE_SSL') && HttpUtils::getProtocol() === 'http') {
         if (defined('FORCE_WWW') && !str_contains($_SERVER['HTTP_HOST'], 'www.')) {
             header('Location: https://www.' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
             die();
@@ -90,7 +90,7 @@
     }
 
     if (defined('FORCE_WWW') && !str_contains($_SERVER['HTTP_HOST'], 'www.')) {
-        header('Location: ' . Util::getProtocol() . '://www.' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+        header('Location: ' . HttpUtils::getProtocol() . '://www.' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
     }
 
     // Ensure database is up-to-date
@@ -496,7 +496,7 @@
     EventHandler::registerWebhooks($hook_array);
 
     // Get IP
-    $ip = Util::getRemoteAddress();
+    $ip = HttpUtils::getRemoteAddress();
 
     // Perform tasks if the user is logged in
     if ($user->isLoggedIn()) {
diff --git a/core/installation/steps/admin_account_setup.php b/core/installation/steps/admin_account_setup.php
index 68a7832ec9..8bd9d13ed4 100644
--- a/core/installation/steps/admin_account_setup.php
+++ b/core/installation/steps/admin_account_setup.php
@@ -72,7 +72,7 @@ function display_error(string $message) {
         try {
             $default_language = DB::getInstance()->get('languages', ['is_default', true])->results();
 
-            $ip = Util::getRemoteAddress();
+            $ip = HttpUtils::getRemoteAddress();
 
             $user->create([
                 'username' => Input::get('username'),
diff --git a/core/integration/run_mcassoc.php b/core/integration/run_mcassoc.php
index 964698d975..dae1531663 100644
--- a/core/integration/run_mcassoc.php
+++ b/core/integration/run_mcassoc.php
@@ -93,7 +93,7 @@
                 $password = $_SESSION['password'];
 
                 // Get IP
-                $ip = Util::getRemoteAddress();
+                $ip = HttpUtils::getRemoteAddress();
 
                 $user->create([
                     'username' => $username,
diff --git a/index.php b/index.php
index 82c4e882ca..1b1af95de8 100644
--- a/index.php
+++ b/index.php
@@ -64,7 +64,7 @@
     $tmp_dir = ini_get('upload_tmp_dir');
 }
 
-if (Util::getProtocol() === 'https') {
+if (HttpUtils::getProtocol() === 'https') {
     ini_set('session.cookie_secure', 'On');
 }
 
diff --git a/modules/Core/pages/authme_connector.php b/modules/Core/pages/authme_connector.php
index df16647897..02d306f71a 100644
--- a/modules/Core/pages/authme_connector.php
+++ b/modules/Core/pages/authme_connector.php
@@ -84,7 +84,7 @@
                     $language_id = $language_id[0]->id;
                 }
 
-                $ip = Util::getRemoteAddress();
+                $ip = HttpUtils::getRemoteAddress();
                 if (filter_var($ip, FILTER_VALIDATE_IP)) {
                     // Valid IP
                 } else {
diff --git a/modules/Core/pages/panel/auth.php b/modules/Core/pages/panel/auth.php
index 0018bda4f4..6f55eca86e 100644
--- a/modules/Core/pages/panel/auth.php
+++ b/modules/Core/pages/panel/auth.php
@@ -85,7 +85,7 @@
 
             if ($login) {
                 // Get IP
-                $ip = Util::getRemoteAddress();
+                $ip = HttpUtils::getRemoteAddress();
 
                 // Create log
                 Log::getInstance()->log(Log::Action('admin/login'));
diff --git a/modules/Core/pages/panel/index.php b/modules/Core/pages/panel/index.php
index 3d80b13813..93d6feee22 100644
--- a/modules/Core/pages/panel/index.php
+++ b/modules/Core/pages/panel/index.php
@@ -187,7 +187,7 @@
         $compat_errors[] = $pdo_driver . ' Server ' . $pdo_server_version;
     }
 
-    if (Util::isTrustedProxiesConfigured()) {
+    if (HttpUtils::isTrustedProxiesConfigured()) {
         $compat_success[] = $language->get('admin', 'trusted_proxies_configured');
     } else {
         $compat_errors[] = $language->get('admin', 'trusted_proxies_not_configured', [
@@ -196,7 +196,7 @@
         ]);
     }
 
-    if (Util::getPort() === 80 && Util::getProtocol() === 'https') {
+    if (HttpUtils::getPort() === 80 && HttpUtils::getProtocol() === 'https') {
         $compat_errors[] = $language->get('admin', 'https_port_80');
     }
 
diff --git a/modules/Core/pages/register.php b/modules/Core/pages/register.php
index 5402dc2b42..69f4be4b30 100644
--- a/modules/Core/pages/register.php
+++ b/modules/Core/pages/register.php
@@ -267,7 +267,7 @@
                         // Disabled
                         $user = new User();
 
-                        $ip = Util::getRemoteAddress();
+                        $ip = HttpUtils::getRemoteAddress();
                         if (!filter_var($ip, FILTER_VALIDATE_IP)) {
                             // TODO: Invalid IP, do something
                         }
diff --git a/modules/Core/queries/debug_link.php b/modules/Core/queries/debug_link.php
index d49492b27a..47f2caf2e1 100755
--- a/modules/Core/queries/debug_link.php
+++ b/modules/Core/queries/debug_link.php
@@ -202,7 +202,7 @@
                 'hooks' => $webhooks,
                 'forum_hooks' => $forum_hooks,
             ],
-            'trusted_proxies' => Util::getTrustedProxies(),
+            'trusted_proxies' => HttpUtils::getTrustedProxies(),
         ],
         'groups' => $groups,
         'config' => [

From 6352c474629e81c597f6242b29c6e30f1ffd4f65 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Mon, 13 Jun 2022 22:28:37 -0600
Subject: [PATCH 107/337] Remove some deprecations + add notice about
 deprecations

---
 CONTRIBUTING.md                                   | 11 +++++++++--
 core/classes/DTO/Announcement.php                 |  2 +-
 modules/Forum/pages/forum/view_topic.php          |  2 +-
 scripts/seeder/MinecraftPlaceholderDataSeeder.php |  2 +-
 scripts/seeder/UserSeeder.php                     |  6 +++---
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0cdf4aa64a..03842339a8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -39,11 +39,13 @@ Here are some things you should know when contributing:
 ## Versioning
 As of NamelessMC 2.0.0 (to be released at time of writing), we use a unique versioning system.
 Similar to [semver](https://semver.org), we follow the `major.minor.patch` versioning pattern, however there are a few things to note:
-- The `major` version is pinned at `2` for the time being.
-- The `minor` version is only changed when *breaking changes are made*. These include:
+- We use the naming `constant.major.patch` compared to semver.
+- The `constant` version is pinned at `2` for the time being.
+- The `major` version is only changed when *breaking changes are made*. These include:
   - Changes that require modules to update
   - Changes that require templates to update
   - Changes that require updates to the Nameless-Link Discord bot
+  - Changes that require updates to the Nameless-Link Discord bot
   - Changes that require updates to the debug.namelessmc.com repo
   - **If the minor version is bumped, we will inform users about which of the above aspects were affected.**
 - The `patch` version will change for any releases which do not include breaking changes, in our case this will generally mean a bug fix release.
@@ -55,3 +57,8 @@ Examples:
   - A "major" release. Modules and/or templates and/or other integrations will need to be updated to support this release.
 - `2.1.4`
     - A bug fix release. Fully backwards compatible with `2.1.0` modules, templates & other integrations, but not compatible with (at least 1) `2.0.0` integration
+
+Deprecations rule of thumb:
+- We might deprecate methods, classes or constants within a minor release.
+- These will get tagged with `@deprecated` and will be announced.
+- When something is marked as deprecated, it will not be removed until at least the next major release.
diff --git a/core/classes/DTO/Announcement.php b/core/classes/DTO/Announcement.php
index fb39d95acd..4010359229 100644
--- a/core/classes/DTO/Announcement.php
+++ b/core/classes/DTO/Announcement.php
@@ -27,7 +27,7 @@ public function __construct(object $row) {
     }
 
     public static function find(int $id): ?Announcement {
-        $row = DB::getInstance()->selectQuery('SELECT * FROM nl2_custom_announcements WHERE id = ?', [$id])->results();
+        $row = DB::getInstance()->query('SELECT * FROM nl2_custom_announcements WHERE id = ?', [$id])->results();
         return $row
             ? new Announcement($row[0])
             : null;
diff --git a/modules/Forum/pages/forum/view_topic.php b/modules/Forum/pages/forum/view_topic.php
index 15ccf6877b..e81357fb49 100644
--- a/modules/Forum/pages/forum/view_topic.php
+++ b/modules/Forum/pages/forum/view_topic.php
@@ -815,7 +815,7 @@
     'INSERT_QUOTES' => $forum_language->get('forum', 'insert_quotes'),
     'FORUM_TITLE' => Output::getClean($forum_parent[0]->forum_title),
     'STARTED_BY' => $forum_language->get('forum', 'started_by_x', [
-        'author' => '<a href="' . $topic_user->getProfileURL() . '" style="' . $topic_user->getGroupClass() . '">' . $topic_user->getDisplayname() . '</a>',
+        'author' => '<a href="' . $topic_user->getProfileURL() . '" style="' . $topic_user->getGroupStyle() . '">' . $topic_user->getDisplayname() . '</a>',
     ]),
     'SUCCESS' => $language->get('general', 'success'),
     'ERROR' => $language->get('general', 'error')
diff --git a/scripts/seeder/MinecraftPlaceholderDataSeeder.php b/scripts/seeder/MinecraftPlaceholderDataSeeder.php
index 89789a95a0..780e3ae131 100644
--- a/scripts/seeder/MinecraftPlaceholderDataSeeder.php
+++ b/scripts/seeder/MinecraftPlaceholderDataSeeder.php
@@ -17,7 +17,7 @@ protected function run(DB $db, \Faker\Generator $faker): void {
             $user = $faker->randomElement($users);
 
             if (!array_key_exists($user->id, $user_uuids)) {
-                $uuid = hex2bin($db->selectQuery('SELECT identifier FROM nl2_users_integrations WHERE user_id = ?', [$user->id])->first()->identifier);
+                $uuid = hex2bin($db->query('SELECT identifier FROM nl2_users_integrations WHERE user_id = ?', [$user->id])->first()->identifier);
                 $user_uuids[$user->id] = $uuid;
             } else {
                 $uuid = $user_uuids[$user->id];
diff --git a/scripts/seeder/UserSeeder.php b/scripts/seeder/UserSeeder.php
index 662254facd..4eb770a543 100644
--- a/scripts/seeder/UserSeeder.php
+++ b/scripts/seeder/UserSeeder.php
@@ -24,13 +24,13 @@ public function run(DB $db, \Faker\Generator $faker): void {
             'language_id' => $db->get('languages', ['is_default', '=', 1])->first()->id,
         ]);
         $user_id = $db->lastId();
-        $db->createQuery('INSERT INTO `nl2_users_groups` (`user_id`, `group_id`, `received`, `expire`) VALUES (?, ?, ?, ?)', [
+        $db->query('INSERT INTO `nl2_users_groups` (`user_id`, `group_id`, `received`, `expire`) VALUES (?, ?, ?, ?)', [
             1,
             2,
             date('U'),
             0,
         ]);
-        $db->createQuery(
+        $db->query(
             'INSERT INTO nl2_users_integrations (user_id, integration_id, identifier, username, verified, date, code) VALUES (?, ?, ?, ?, ?, ?, ?)', [
                 $user_id,
                 1,
@@ -87,7 +87,7 @@ public function run(DB $db, \Faker\Generator $faker): void {
                 ]);
             }
 
-            $db->createQuery(
+            $db->query(
                 'INSERT INTO nl2_users_integrations (user_id, integration_id, identifier, username, verified, date, code) VALUES (?, ?, ?, ?, ?, ?, ?)', [
                     $user_id,
                     1,

From 5e07ac2d70b96e695a579f928abedab59b780da2 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Mon, 13 Jun 2022 22:44:01 -0600
Subject: [PATCH 108/337] Create and utilize `Text` class, add deprecation
 warnings

---
 core/classes/Avatars/AvatarSource.php         |   4 +-
 core/classes/Core/URL.php                     |  74 +++++++-
 core/classes/Core/Util.php                    | 156 ++---------------
 core/classes/Integrations/IntegrationUser.php |   6 +-
 core/classes/Misc/HttpUtils.php               |   8 +
 core/classes/Misc/NamelessOAuth.php           |   2 +-
 core/classes/Misc/Report.php                  |   2 +-
 core/classes/Misc/Text.php                    | 162 ++++++++++++++++++
 core/init.php                                 |   4 +-
 core/integration/run_mcassoc.php              |   2 +-
 custom/templates/DefaultRevamp/template.php   |   2 +-
 modules/Core/hooks/ContentHook.php            |   4 +-
 modules/Core/includes/emails/register.php     |   2 +-
 .../endpoints/GetNotificationsEndpoint.php    |   4 +-
 .../includes/endpoints/ListUsersEndpoint.php  |   2 +-
 .../includes/endpoints/RegisterEndpoint.php   |   6 +-
 modules/Core/pages/complete_signup.php        |   2 +-
 modules/Core/pages/custom.php                 |   2 +-
 modules/Core/pages/forgot_password.php        |   2 +-
 modules/Core/pages/panel/api.php              |   2 +-
 modules/Core/pages/panel/emails.php           |   2 +-
 modules/Core/pages/panel/emails_errors.php    |   2 +-
 modules/Core/pages/panel/images.php           |  14 +-
 modules/Core/pages/panel/index.php            |   2 +-
 .../pages/panel/minecraft_server_banners.php  |   2 +-
 modules/Core/pages/panel/modules.php          |   6 +-
 modules/Core/pages/panel/pages.php            |   2 +-
 modules/Core/pages/panel/panel_templates.php  |   2 +-
 modules/Core/pages/panel/registration.php     |   2 +-
 modules/Core/pages/panel/seo.php              |  10 +-
 modules/Core/pages/panel/templates.php        |  16 +-
 modules/Core/pages/panel/users_ip_lookup.php  |   4 +-
 modules/Core/pages/panel/users_oauth.php      |   2 +-
 modules/Core/pages/panel/widgets.php          |   4 +-
 modules/Core/pages/register.php               |   2 +-
 modules/Core/pages/validate.php               |   2 +-
 modules/Core/widgets/ProfilePostsWidget.php   |   2 +-
 modules/Core/widgets/ServerStatusWidget.php   |   2 +-
 modules/Forum/classes/Forum.php               |   2 +-
 modules/Forum/classes/Forum_Sitemap.php       |   4 +-
 modules/Forum/pages/forum/index.php           |   2 +-
 modules/Forum/pages/forum/new_topic.php       |   2 +-
 modules/Forum/pages/forum/view_forum.php      |   2 +-
 modules/Forum/pages/forum/view_topic.php      |  10 +-
 44 files changed, 330 insertions(+), 218 deletions(-)
 create mode 100644 core/classes/Misc/Text.php

diff --git a/core/classes/Avatars/AvatarSource.php b/core/classes/Avatars/AvatarSource.php
index 7e752952fb..9463650a0c 100644
--- a/core/classes/Avatars/AvatarSource.php
+++ b/core/classes/Avatars/AvatarSource.php
@@ -57,7 +57,7 @@ public static function getAvatarFromUserData(object $data, bool $allow_gifs = fa
                 foreach ($exts as $ext) {
                     if (file_exists(ROOT_PATH . '/uploads/avatars/' . $data->id . '.' . $ext)) {
                         // We don't check the validity here since we know the file exists for sure
-                        return ($full ? rtrim(Util::getSelfURL(), '/') : '') . ((defined('CONFIG_PATH')) ? CONFIG_PATH . '/' : '/') . 'uploads/avatars/' . $data->id . '.' . $ext . '?v=' . urlencode($data->avatar_updated);
+                        return ($full ? rtrim(URL::getSelfURL(), '/') : '') . ((defined('CONFIG_PATH')) ? CONFIG_PATH . '/' : '/') . 'uploads/avatars/' . $data->id . '.' . $ext . '?v=' . urlencode($data->avatar_updated);
                     }
                 }
             }
@@ -67,7 +67,7 @@ public static function getAvatarFromUserData(object $data, bool $allow_gifs = fa
         if (defined('DEFAULT_AVATAR_TYPE') && DEFAULT_AVATAR_TYPE == 'custom' && DEFAULT_AVATAR_IMAGE !== '') {
             if (file_exists(ROOT_PATH . '/uploads/avatars/defaults/' . DEFAULT_AVATAR_IMAGE)) {
                 // We don't check the validity here since we know the file exists for sure
-                return ($full ? rtrim(Util::getSelfURL(), '/') : '') . ((defined('CONFIG_PATH')) ? CONFIG_PATH . '/' : '/') . 'uploads/avatars/defaults/' . DEFAULT_AVATAR_IMAGE;
+                return ($full ? rtrim(URL::getSelfURL(), '/') : '') . ((defined('CONFIG_PATH')) ? CONFIG_PATH . '/' : '/') . 'uploads/avatars/defaults/' . DEFAULT_AVATAR_IMAGE;
             }
         }
 
diff --git a/core/classes/Core/URL.php b/core/classes/Core/URL.php
index ffbc93ecf4..1ca2f201dd 100644
--- a/core/classes/Core/URL.php
+++ b/core/classes/Core/URL.php
@@ -4,7 +4,7 @@
  *
  * @package NamelessMC\Core
  * @author Samerton
- * @version 2.0.0-pr8
+ * @version 2.0.0
  * @license MIT
  */
 class URL {
@@ -15,7 +15,6 @@ class URL {
      * @param string $url Contains the URL which will be formatted.
      * @param string $params Contains string with URL parameters.
      * @param ?string $force Determines whether to force a URL type (optional, can be either "friendly" or "non-friendly").
-     *
      * @return string Assembled URL, false on failure.
      */
     public static function build(string $url, string $params = '', ?string $force = null): string {
@@ -77,4 +76,75 @@ private static function buildNonFriendly(string $url, string $params): string {
 
         return (defined('CONFIG_PATH') ? CONFIG_PATH : '') . '/index.php?route=' . $url . ((substr($url, -1) == '/') ? '' : '/');
     }
+
+    /**
+     * Get the server name.
+     *
+     * @param bool $show_protocol Whether to show http(s) at front or not.
+     * @return string Compiled URL.
+     */
+    public static function getSelfURL(bool $show_protocol = true): string {
+        $hostname = Config::get('core.hostname');
+
+        if (!$hostname) {
+            $hostname = $_SERVER['SERVER_NAME'];
+        }
+
+        $url = $hostname;
+
+        if (defined('FORCE_WWW') && FORCE_WWW && !str_contains($hostname, 'www')) {
+            $url = 'www.' . $url;
+        }
+
+        if ($show_protocol) {
+            $protocol = HttpUtils::getProtocol();
+            $url = $protocol . '://' . $url;
+            $port = HttpUtils::getPort();
+            // Add port if it is non-standard for the current protocol
+            if (!(($port === 80 && $protocol === 'http') || ($port === 443 && $protocol === 'https'))) {
+                $url .= ':' . $port;
+            }
+        }
+
+        if (substr($url, -1) !== '/') {
+            $url .= '/';
+        }
+
+        return $url;
+    }
+
+    /**
+     * Is a URL internal or external? Accepts full URL and also just a path.
+     *
+     * @param string $url URL/path to check.
+     *
+     * @return bool Whether URL is external or not.
+     */
+    public static function isExternalURL(string $url): bool {
+        if ($url[0] == '/' && $url[1] != '/') {
+            return false;
+        }
+
+        $parsed = parse_url($url);
+
+        return !(str_replace('www.', '', rtrim(self::getSelfURL(false), '/')) == str_replace('www.', '', $parsed['host']));
+    }
+
+    /**
+     * Add target and rel attributes to external links only.
+     * From https://stackoverflow.com/a/53461987
+     *
+     * @param string $data Data to replace.
+     * @return string Replaced string.
+     */
+    public static function replaceAnchorsWithText(string $data): string {
+        return preg_replace_callback('/]*href=["|\']([^"|\']*)["|\'][^>]*>([^<]*)<\/a>/i', static function ($m): string {
+            if (!str_contains($m[1], self::getSelfURL())) {
+                return '<a href="' . $m[1] . '" rel="nofollow noopener" target="_blank">' . $m[2] . '</a>';
+            }
+
+            return '<a href="' . $m[1] . '" target="_blank">' . $m[2] . '</a>';
+        }, $data);
+    }
+
 }
diff --git a/core/classes/Core/Util.php b/core/classes/Core/Util.php
index 8127912ac2..b75f130ab7 100644
--- a/core/classes/Core/Util.php
+++ b/core/classes/Core/Util.php
@@ -115,18 +115,12 @@ public static function listTimezones(): array {
     /**
      * Is a URL internal or external? Accepts full URL and also just a path.
      *
+     * @deprecated Use `URL::isExternalURL` instead. Will be removed in 2.1.0
      * @param string $url URL/path to check.
-     *
      * @return bool Whether URL is external or not.
      */
     public static function isExternalURL(string $url): bool {
-        if ($url[0] == '/' && $url[1] != '/') {
-            return false;
-        }
-
-        $parsed = parse_url($url);
-
-        return !(str_replace('www.', '', rtrim(self::getSelfURL(false), '/')) == str_replace('www.', '', $parsed['host']));
+        return URL::isExternalURL($url);
     }
 
     /**
@@ -180,54 +174,23 @@ public static function getPort(): ?int {
     /**
      * Get the server name.
      *
+     * @deprecated Use `URL::getSelfURL` instead. Will be removed in 2.1.0
      * @param bool $show_protocol Whether to show http(s) at front or not.
-     *
      * @return string Compiled URL.
      */
     public static function getSelfURL(bool $show_protocol = true): string {
-        $hostname = Config::get('core.hostname');
-
-        if (!$hostname) {
-            $hostname = $_SERVER['SERVER_NAME'];
-        }
-
-        $url = $hostname;
-
-        if (defined('FORCE_WWW') && FORCE_WWW && !str_contains($hostname, 'www')) {
-            $url = 'www.' . $url;
-        }
-
-        if ($show_protocol) {
-            $protocol = HttpUtils::getProtocol();
-            $url = $protocol . '://' . $url;
-            $port = HttpUtils::getPort();
-            // Add port if it is non-standard for the current protocol
-            if (!(($port === 80 && $protocol === 'http') || ($port === 443 && $protocol === 'https'))) {
-                $url .= ':' . $port;
-            }
-        }
-
-        if (substr($url, -1) !== '/') {
-            $url .= '/';
-        }
-
-        return $url;
+        return URL::getSelfURL($show_protocol);
     }
 
     /**
      * URL-ify a string
      *
+     * @deprecated Use `Text::urlSafe` instead. Will be removed in 2.1.0
      * @param string|null $string $string String to URLify
-     *
      * @return string Url-ified string. (I dont know what this means)
      */
     public static function stringToURL(string $string = null): string {
-        if ($string) {
-            $string = preg_replace('/[^A-Za-z0-9 ]/', '', $string);
-            return Output::getClean(strtolower(urlencode(str_replace(' ', '-', $string))));
-        }
-
-        return '';
+        return Text::urlSafe($string);
     }
 
     /**
@@ -244,98 +207,14 @@ public static function stringToURL(string $string = null): string {
      * @link http://book.cakephp.org/view/1469/Text#truncate-1625
      * @link https://github.com/cakephp/cakephp/blob/master/LICENSE
      *
+     * @deprecated Use `Text::truncate` instead. Will be removed in 2.1.0
      * @param string $text String to truncate.
      * @param int $length Length of returned string, including ellipsis.
      * @param array $options An array of html attributes and options.
      * @return string Trimmed string.
      */
     public static function truncate(string $text, int $length = 750, array $options = []): string {
-        $default = [
-            'ending' => '...', 'exact' => true, 'html' => false
-        ];
-        $options = array_merge($default, $options);
-        extract($options);
-
-        if ($html) {
-            if (mb_strlen(preg_replace('/<.*?>/', '', $text)) <= $length) {
-                return $text;
-            }
-            $totalLength = mb_strlen(strip_tags($ending));
-            $openTags = [];
-            $truncate = '';
-
-            preg_match_all('/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER);
-            foreach ($tags as $tag) {
-                if (!preg_match('/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/s', $tag[2])) {
-                    if (preg_match('/<[\w]+[^>]*>/s', $tag[0])) {
-                        array_unshift($openTags, $tag[2]);
-                    } else {
-                        if (preg_match('/<\/([\w]+)[^>]*>/s', $tag[0], $closeTag)) {
-                            $pos = array_search($closeTag[1], $openTags);
-                            if ($pos !== false) {
-                                array_splice($openTags, $pos, 1);
-                            }
-                        }
-                    }
-                }
-                $truncate .= $tag[1];
-
-                $contentLength = mb_strlen(preg_replace('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i', ' ', $tag[3]));
-                if ($contentLength + $totalLength > $length) {
-                    $left = $length - $totalLength;
-                    $entitiesLength = 0;
-                    if (preg_match_all('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i', $tag[3], $entities, PREG_OFFSET_CAPTURE)) {
-                        foreach ($entities[0] as $entity) {
-                            if ($entity[1] + 1 - $entitiesLength <= $left) {
-                                $left--;
-                                $entitiesLength += mb_strlen($entity[0]);
-                            } else {
-                                break;
-                            }
-                        }
-                    }
-
-                    $truncate .= mb_substr($tag[3], 0, $left + $entitiesLength);
-                    break;
-                }
-
-                $truncate .= $tag[3];
-                $totalLength += $contentLength;
-                if ($totalLength >= $length) {
-                    break;
-                }
-            }
-        } else {
-            if (mb_strlen($text) <= $length) {
-                return $text;
-            }
-
-            $truncate = mb_substr($text, 0, $length - mb_strlen($ending));
-        }
-        if (!$exact) {
-            $spacepos = mb_strrpos($truncate, ' ');
-            if ($html) {
-                $bits = mb_substr($truncate, $spacepos);
-                preg_match_all('/<\/([a-z]+)>/', $bits, $droppedTags, PREG_SET_ORDER);
-                if (!empty($droppedTags)) {
-                    foreach ($droppedTags as $closingTag) {
-                        if (!in_array($closingTag[1], $openTags)) {
-                            array_unshift($openTags, $closingTag[1]);
-                        }
-                    }
-                }
-            }
-            $truncate = mb_substr($truncate, 0, $spacepos);
-        }
-        $truncate .= $ending;
-
-        if ($html) {
-            foreach ($openTags as $tag) {
-                $truncate .= '</' . $tag . '>';
-            }
-        }
-
-        return $truncate;
+        return Text::truncate($text, $length, $options);
     }
 
     /**
@@ -396,17 +275,12 @@ public static function getLatestNews(): string {
      * Add target and rel attributes to external links only.
      * From https://stackoverflow.com/a/53461987
      *
+     * @deprecated Use `URL::replaceAnchorsWithText`. Will be removed in 2.1.0
      * @param string $data Data to replace.
      * @return string Replaced string.
      */
     public static function replaceAnchorsWithText(string $data): string {
-        return preg_replace_callback('/]*href=["|\']([^"|\']*)["|\'][^>]*>([^<]*)<\/a>/i', static function ($m): string {
-            if (!str_contains($m[1], self::getSelfURL())) {
-                return '<a href="' . $m[1] . '" rel="nofollow noopener" target="_blank">' . $m[2] . '</a>';
-            }
-
-            return '<a href="' . $m[1] . '" target="_blank">' . $m[2] . '</a>';
-        }, $data);
+        return URL::replaceAnchorsWithText($data);
     }
 
     /**
@@ -502,26 +376,24 @@ public static function isModuleEnabled(string $name): bool {
     /**
      * Replace native emojis with their Twemoji equivalent.
      *
+     * @deprecated Use `Text::renderEmojis` instead. Will be removed in 2.1.0
      * @param string $text Text to parse
      * @return string Text with emojis replaced with URLs to their Twemoji equivalent.
      */
     public static function renderEmojis(string $text): string {
-        return Twemoji::text($text)->toHtml(null, [
-            'width' => 20,
-            'height' => 20,
-            'style' => 'vertical-align: middle;'
-        ]);
+        return Text::renderEmojis($text);
     }
 
     /**
      * Wrap text in HTML `<strong>` tags. Used for when variables in translations are bolded,
      * since we want as little HTML in the translation strings as possible.
      *
+     * @deprecated Use `Text::bold` instead. Will be removed in 2.1.0
      * @param string $text Text to wrap
      * @return string Text wrapped in `<strong>` tags
      */
     public static function bold(string $text): string {
-        return '<strong>' . $text . '</strong>';
+        return Text::bold($text);
     }
 
     /**
diff --git a/core/classes/Integrations/IntegrationUser.php b/core/classes/Integrations/IntegrationUser.php
index c0d920d63c..9b2f38f9e4 100644
--- a/core/classes/Integrations/IntegrationUser.php
+++ b/core/classes/Integrations/IntegrationUser.php
@@ -122,7 +122,7 @@ public function linkIntegration(User $user, ?string $identifier, ?string $userna
                 'integration' => $this->_integration->getName(),
             ]),
             'avatar_url' => $user->getAvatar(128, true),
-            'url' => Util::getSelfURL() . ltrim($user->getProfileURL(), '/'),
+            'url' => URL::getSelfURL() . ltrim($user->getProfileURL(), '/'),
             'integration_user' => [
                 'identifier' => $identifier,
                 'username' => $username,
@@ -153,7 +153,7 @@ public function verifyIntegration(): void {
                 'integration' => $this->_integration->getName(),
             ]),
             'avatar_url' => $user->getAvatar(128, true),
-            'url' => Util::getSelfURL() . ltrim($user->getProfileURL(), '/'),
+            'url' => URL::getSelfURL() . ltrim($user->getProfileURL(), '/'),
             'integration_user' => [
                 'identifier' => $this->data()->identifier,
                 'username' => $this->data()->username,
@@ -184,7 +184,7 @@ public function unlinkIntegration(): void {
                 'integration' => $this->_integration->getName(),
             ]),
             'avatar_url' => $user->getAvatar(128, true),
-            'url' => Util::getSelfURL() . ltrim($user->getProfileURL(), '/'),
+            'url' => URL::getSelfURL() . ltrim($user->getProfileURL(), '/'),
             'integration_user' => [
                 'identifier' => $this->data()->identifier,
                 'username' => $this->data()->username,
diff --git a/core/classes/Misc/HttpUtils.php b/core/classes/Misc/HttpUtils.php
index f1ce6404cb..d7a55c32bd 100644
--- a/core/classes/Misc/HttpUtils.php
+++ b/core/classes/Misc/HttpUtils.php
@@ -2,6 +2,14 @@
 
 use Symfony\Component\HttpFoundation\IpUtils;
 
+/**
+ * Helps with common HTTP related tasks.
+ *
+ * @package NamelessMC\Misc
+ * @author Derkades
+ * @version 2.0.0
+ * @license MIT
+ */
 class HttpUtils {
 
     /**
diff --git a/core/classes/Misc/NamelessOAuth.php b/core/classes/Misc/NamelessOAuth.php
index e005f14e22..a39e852235 100644
--- a/core/classes/Misc/NamelessOAuth.php
+++ b/core/classes/Misc/NamelessOAuth.php
@@ -91,7 +91,7 @@ public function getProvidersAvailable(): array {
      */
     public function getProviderInstance(string $provider): AbstractProvider {
         [$clientId, $clientSecret] = $this->getCredentials($provider);
-        $url = rtrim(Util::getSelfURL(), '/') . URL::build('/oauth', "provider=" . urlencode($provider), 'non-friendly');
+        $url = rtrim(URL::getSelfURL(), '/') . URL::build('/oauth', "provider=" . urlencode($provider), 'non-friendly');
         $options = [
             'clientId' => $clientId,
             'clientSecret' => $clientSecret,
diff --git a/core/classes/Misc/Report.php b/core/classes/Misc/Report.php
index 16a7eed032..f5857860cd 100644
--- a/core/classes/Misc/Report.php
+++ b/core/classes/Misc/Report.php
@@ -59,7 +59,7 @@ public static function create(Language $language, User $user_reporting, User $re
             'content_full' => $data['report_reason'],
             'avatar_url' => $data['reported_id'] == 0 ? null : ($data['reported_uuid'] !== null ? AvatarSource::getAvatarFromUUID($data['reported_uuid']) : $reported_user->getAvatar()),
             'title' => $language->get('general', 'view_report'),
-            'url' => rtrim(Util::getSelfURL(), '/') . URL::build('/panel/users/reports/', 'id=' . $id)
+            'url' => rtrim(URL::getSelfURL(), '/') . URL::build('/panel/users/reports/', 'id=' . $id)
         ]);
     }
 }
diff --git a/core/classes/Misc/Text.php b/core/classes/Misc/Text.php
new file mode 100644
index 0000000000..0db2507d50
--- /dev/null
+++ b/core/classes/Misc/Text.php
@@ -0,0 +1,162 @@
+<?php
+
+use Astrotomic\Twemoji\Twemoji;
+
+/**
+ * Helps with common text related tasks.
+ *
+ * @package NamelessMC\Misc
+ * @author Aberdeener
+ * @version 2.0.0
+ * @license MIT
+ */
+class Text {
+
+    /**
+     * Truncates text.
+     *
+     * Cuts a string to the length of $length and replaces the last characters
+     * with the ending if the text is longer than length.
+     *
+     * ### Options:
+     *
+     * - `ending` Will be used as Ending and appended to the trimmed string
+     * - `exact` If false, $text will not be cut mid-word
+     * - `html` If true, HTML tags would be handled correctly
+     * @link http://book.cakephp.org/view/1469/Text#truncate-1625
+     * @link https://github.com/cakephp/cakephp/blob/master/LICENSE
+     *
+     * @param string $text String to truncate.
+     * @param int $length Length of returned string, including ellipsis.
+     * @param array $options An array of html attributes and options.
+     * @return string Trimmed string.
+     */
+    public static function truncate(string $text, int $length = 750, array $options = []): string {
+        $default = [
+            'ending' => '...', 'exact' => true, 'html' => false
+        ];
+        $options = array_merge($default, $options);
+        extract($options);
+
+        if ($html) {
+            if (mb_strlen(preg_replace('/<.*?>/', '', $text)) <= $length) {
+                return $text;
+            }
+            $totalLength = mb_strlen(strip_tags($ending));
+            $openTags = [];
+            $truncate = '';
+
+            preg_match_all('/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER);
+            foreach ($tags as $tag) {
+                if (!preg_match('/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/s', $tag[2])) {
+                    if (preg_match('/<[\w]+[^>]*>/s', $tag[0])) {
+                        array_unshift($openTags, $tag[2]);
+                    } else {
+                        if (preg_match('/<\/([\w]+)[^>]*>/s', $tag[0], $closeTag)) {
+                            $pos = array_search($closeTag[1], $openTags);
+                            if ($pos !== false) {
+                                array_splice($openTags, $pos, 1);
+                            }
+                        }
+                    }
+                }
+                $truncate .= $tag[1];
+
+                $contentLength = mb_strlen(preg_replace('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i', ' ', $tag[3]));
+                if ($contentLength + $totalLength > $length) {
+                    $left = $length - $totalLength;
+                    $entitiesLength = 0;
+                    if (preg_match_all('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i', $tag[3], $entities, PREG_OFFSET_CAPTURE)) {
+                        foreach ($entities[0] as $entity) {
+                            if ($entity[1] + 1 - $entitiesLength <= $left) {
+                                $left--;
+                                $entitiesLength += mb_strlen($entity[0]);
+                            } else {
+                                break;
+                            }
+                        }
+                    }
+
+                    $truncate .= mb_substr($tag[3], 0, $left + $entitiesLength);
+                    break;
+                }
+
+                $truncate .= $tag[3];
+                $totalLength += $contentLength;
+                if ($totalLength >= $length) {
+                    break;
+                }
+            }
+        } else {
+            if (mb_strlen($text) <= $length) {
+                return $text;
+            }
+
+            $truncate = mb_substr($text, 0, $length - mb_strlen($ending));
+        }
+        if (!$exact) {
+            $spacepos = mb_strrpos($truncate, ' ');
+            if ($html) {
+                $bits = mb_substr($truncate, $spacepos);
+                preg_match_all('/<\/([a-z]+)>/', $bits, $droppedTags, PREG_SET_ORDER);
+                if (!empty($droppedTags)) {
+                    foreach ($droppedTags as $closingTag) {
+                        if (!in_array($closingTag[1], $openTags)) {
+                            array_unshift($openTags, $closingTag[1]);
+                        }
+                    }
+                }
+            }
+            $truncate = mb_substr($truncate, 0, $spacepos);
+        }
+        $truncate .= $ending;
+
+        if ($html) {
+            foreach ($openTags as $tag) {
+                $truncate .= '</' . $tag . '>';
+            }
+        }
+
+        return $truncate;
+    }
+
+    /**
+     * URL-ify a string
+     *
+     * @param string|null $string $string String to URLify
+     * @return string Url-ified string. (I dont know what this means)
+     */
+    public static function urlSafe(string $string = null): string {
+        if ($string) {
+            $string = preg_replace('/[^A-Za-z0-9 ]/', '', $string);
+            return Output::getClean(strtolower(urlencode(str_replace(' ', '-', $string))));
+        }
+
+        return '';
+    }
+
+    /**
+     * Wrap text in HTML `<strong>` tags. Used for when variables in translations are bolded,
+     * since we want as little HTML in the translation strings as possible.
+     *
+     * @param string $text Text to wrap
+     * @return string Text wrapped in `<strong>` tags
+     */
+    public static function bold(string $text): string {
+        return '<strong>' . $text . '</strong>';
+    }
+
+    /**
+     * Replace native emojis with their Twemoji equivalent.
+     *
+     * @param string $text Text to parse
+     * @return string Text with emojis replaced with URLs to their Twemoji equivalent.
+     */
+    public static function renderEmojis(string $text): string {
+        return Twemoji::text($text)->toHtml(null, [
+            'width' => 20,
+            'height' => 20,
+            'style' => 'vertical-align: middle;'
+        ]);
+    }
+}
diff --git a/core/init.php b/core/init.php
index ef4308fa18..370910b328 100644
--- a/core/init.php
+++ b/core/init.php
@@ -316,8 +316,8 @@
     // Basic Smarty variables
     $smarty->assign([
         'CONFIG_PATH' => defined('CONFIG_PATH') ? CONFIG_PATH . '/' : '/',
-        'OG_URL' => Output::getClean(rtrim(Util::getSelfURL(), '/') . $_SERVER['REQUEST_URI']),
-        'OG_IMAGE' => Output::getClean(rtrim(Util::getSelfURL(), '/') . '/core/assets/img/site_image.png'),
+        'OG_URL' => Output::getClean(rtrim(URL::getSelfURL(), '/') . $_SERVER['REQUEST_URI']),
+        'OG_IMAGE' => Output::getClean(rtrim(URL::getSelfURL(), '/') . '/core/assets/img/site_image.png'),
         'SITE_NAME' => Output::getClean(SITE_NAME),
         'SITE_HOME' => URL::build('/'),
         'USER_INFO_URL' => URL::build('/queries/user/', 'id='),
diff --git a/core/integration/run_mcassoc.php b/core/integration/run_mcassoc.php
index dae1531663..4ba53782a1 100644
--- a/core/integration/run_mcassoc.php
+++ b/core/integration/run_mcassoc.php
@@ -44,7 +44,7 @@
         }
     }
 
-    $return_link = rtrim(Util::getSelfURL(), '/') . URL::build('/register/', 'step=2');
+    $return_link = rtrim(URL::getSelfURL(), '/') . URL::build('/register/', 'step=2');
     $key = $mcassoc->generateKey($username);
 
     $smarty->assign('MCASSOC', '
diff --git a/custom/templates/DefaultRevamp/template.php b/custom/templates/DefaultRevamp/template.php
index bbf33a24c4..08692ea31b 100755
--- a/custom/templates/DefaultRevamp/template.php
+++ b/custom/templates/DefaultRevamp/template.php
@@ -95,7 +95,7 @@ public function onPageLoad() {
         $JSVariables = [
             'siteName' => Output::getClean(SITE_NAME),
             'siteURL' => URL::build('/'),
-            'fullSiteUrl' => Util::getSelfURL() . ltrim(URL::build('/'), '/'),
+            'fullSiteUrl' => URL::getSelfURL() . ltrim(URL::build('/'), '/'),
             'page' => PAGE,
             'avatarSource' => AvatarSource::getUrlToFormat(),
             'copied' => $this->_language->get('general', 'copied'),
diff --git a/modules/Core/hooks/ContentHook.php b/modules/Core/hooks/ContentHook.php
index ce2f17991d..f5403ced05 100644
--- a/modules/Core/hooks/ContentHook.php
+++ b/modules/Core/hooks/ContentHook.php
@@ -56,7 +56,7 @@ public static function purify(array $params = []): array {
 
     public static function renderEmojis(array $params = []): array {
         if (parent::validateParams($params, ['content'])) {
-            $params['content'] = Util::renderEmojis($params['content']);
+            $params['content'] = Text::renderEmojis($params['content']);
         }
 
         return $params;
@@ -64,7 +64,7 @@ public static function renderEmojis(array $params = []): array {
 
     public static function replaceAnchors(array $params = []): array {
         if (parent::validateParams($params, ['content'])) {
-            $params['content'] = Util::replaceAnchorsWithText($params['content']);
+            $params['content'] = URL::replaceAnchorsWithText($params['content']);
         }
 
         return $params;
diff --git a/modules/Core/includes/emails/register.php b/modules/Core/includes/emails/register.php
index 80cbe04301..7aa32fb3b4 100644
--- a/modules/Core/includes/emails/register.php
+++ b/modules/Core/includes/emails/register.php
@@ -10,7 +10,7 @@
  */
 
 function sendRegisterEmail(Language $language, string $email_address, string $username, int $user_id, string $code): bool {
-    $link = rtrim(Util::getSelfURL(), '/') . URL::build('/validate/', 'c=' . urlencode($code));
+    $link = rtrim(URL::getSelfURL(), '/') . URL::build('/validate/', 'c=' . urlencode($code));
 
     $sent = Email::send(
         ['email' => Output::getClean($email_address), 'name' => Output::getClean($username)],
diff --git a/modules/Core/includes/endpoints/GetNotificationsEndpoint.php b/modules/Core/includes/endpoints/GetNotificationsEndpoint.php
index 1552933d5a..a72e70ae3f 100644
--- a/modules/Core/includes/endpoints/GetNotificationsEndpoint.php
+++ b/modules/Core/includes/endpoints/GetNotificationsEndpoint.php
@@ -28,7 +28,7 @@ public function execute(Nameless2API $api, User $user): void {
                     'type' => $result->type,
                     'message_short' => $result->content_short,
                     'message' => ($result->content) ? strip_tags($result->content) : $result->content_short,
-                    'url' => rtrim(Util::getSelfURL(), '/') . URL::build('/user/alerts/', 'view=' . urlencode($result->id)),
+                    'url' => rtrim(URL::getSelfURL(), '/') . URL::build('/user/alerts/', 'view=' . urlencode($result->id)),
                     'received_at' => $result->created,
                 ];
             }
@@ -40,7 +40,7 @@ public function execute(Nameless2API $api, User $user): void {
             foreach ($messages->results() as $result) {
                 $return['notifications'][] = [
                     'type' => 'message',
-                    'url' => Util::getSelfURL() . ltrim(URL::build('/user/messaging/', 'action=view&message=' . urlencode($result->id)), '/'),
+                    'url' => URL::getSelfURL() . ltrim(URL::build('/user/messaging/', 'action=view&message=' . urlencode($result->id)), '/'),
                     'message_short' => $result->title,
                     'message' => $result->title
                 ];
diff --git a/modules/Core/includes/endpoints/ListUsersEndpoint.php b/modules/Core/includes/endpoints/ListUsersEndpoint.php
index bc057a680d..a6b674ed91 100644
--- a/modules/Core/includes/endpoints/ListUsersEndpoint.php
+++ b/modules/Core/includes/endpoints/ListUsersEndpoint.php
@@ -59,7 +59,7 @@ public function execute(Nameless2API $api): void {
             'previous_page' => null,
         ];
 
-        $base_url = Util::getSelfURL() . 'index.php?route=/api/v2/users&';
+        $base_url = URL::getSelfURL() . 'index.php?route=/api/v2/users&';
         if (isset($_GET['limit']) && is_numeric($_GET['limit'])) {
             $limit = (int) $_GET['limit'];
             if ($limit >= 1) {
diff --git a/modules/Core/includes/endpoints/RegisterEndpoint.php b/modules/Core/includes/endpoints/RegisterEndpoint.php
index 8256703095..983f4b5d8d 100644
--- a/modules/Core/includes/endpoints/RegisterEndpoint.php
+++ b/modules/Core/includes/endpoints/RegisterEndpoint.php
@@ -166,13 +166,13 @@ private function createUser(Nameless2API $api, string $username, string $email,
                         'user' => $user->getDisplayname(),
                     ]),
                     'avatar_url' => $user->getAvatar(128, true),
-                    'url' => Util::getSelfURL() . ltrim($user->getProfileURL(), '/'),
+                    'url' => URL::getSelfURL() . ltrim($user->getProfileURL(), '/'),
                     'language' => $api->getLanguage(),
                 ]
             );
 
             if ($return) {
-                $api->returnArray(['message' => $api->getLanguage()->get('api', 'finish_registration_link'), 'user_id' => $user_id, 'link' => rtrim(Util::getSelfURL(), '/') . URL::build('/complete_signup/', 'c=' . urlencode($code))]);
+                $api->returnArray(['message' => $api->getLanguage()->get('api', 'finish_registration_link'), 'user_id' => $user_id, 'link' => rtrim(URL::getSelfURL(), '/') . URL::build('/complete_signup/', 'c=' . urlencode($code))]);
             }
 
             return ['user_id' => $user_id];
@@ -201,7 +201,7 @@ private function sendRegistrationEmail(Nameless2API $api, string $username, stri
         $user_id = $user_id['user_id'];
 
         // Get link + template
-        $link = Util::getSelfURL() . ltrim(URL::build('/complete_signup/', 'c=' . urlencode($code)), '/');
+        $link = URL::getSelfURL() . ltrim(URL::build('/complete_signup/', 'c=' . urlencode($code)), '/');
 
         $sent = Email::send(
             ['email' => Output::getClean($email), 'name' => Output::getClean($username)],
diff --git a/modules/Core/pages/complete_signup.php b/modules/Core/pages/complete_signup.php
index b5d8aae265..6272dcc451 100644
--- a/modules/Core/pages/complete_signup.php
+++ b/modules/Core/pages/complete_signup.php
@@ -73,7 +73,7 @@
                         'username' => $target_user->getDisplayname(),
                         'content' => $default_language->get('user', 'user_x_has_validated', ['user' => $target_user->getDisplayname()]),
                         'avatar_url' => $target_user->getAvatar(128, true),
-                        'url' => Util::getSelfURL() . ltrim($target_user->getProfileURL(), '/'),
+                        'url' => URL::getSelfURL() . ltrim($target_user->getProfileURL(), '/'),
                         'language' => $default_language
                     ]);
 
diff --git a/modules/Core/pages/custom.php b/modules/Core/pages/custom.php
index 80c2906590..9e68944676 100644
--- a/modules/Core/pages/custom.php
+++ b/modules/Core/pages/custom.php
@@ -75,7 +75,7 @@
 $smarty->assign([
     'WIDGETS_LEFT' => $widgets->getWidgets('left'),
     'WIDGETS_RIGHT' => $widgets->getWidgets('right'),
-    'CONTENT' => Util::renderEmojis(
+    'CONTENT' => Text::renderEmojis(
         $custom_page->all_html
             ? Output::getDecoded($custom_page->content)
             : Output::getPurified($custom_page->content)
diff --git a/modules/Core/pages/forgot_password.php b/modules/Core/pages/forgot_password.php
index 9d4c80751c..6ba141d869 100644
--- a/modules/Core/pages/forgot_password.php
+++ b/modules/Core/pages/forgot_password.php
@@ -33,7 +33,7 @@
                     $code = SecureRandom::alphanumeric();
 
                     // Send an email
-                    $link = rtrim(Util::getSelfURL(), '/') . URL::build('/forgot_password/', 'c=' . urlencode($code));
+                    $link = rtrim(URL::getSelfURL(), '/') . URL::build('/forgot_password/', 'c=' . urlencode($code));
 
                     $sent = Email::send(
                         ['email' => Output::getClean($target_user->data()->email), 'name' => $target_user->getDisplayname()],
diff --git a/modules/Core/pages/panel/api.php b/modules/Core/pages/panel/api.php
index c8c372d613..46c569daca 100644
--- a/modules/Core/pages/panel/api.php
+++ b/modules/Core/pages/panel/api.php
@@ -233,7 +233,7 @@
             'NO' => $language->get('general', 'no'),
             'CHANGE' => $language->get('general', 'change'),
             'API_URL' => $language->get('admin', 'api_url'),
-            'API_URL_VALUE' => rtrim(Util::getSelfURL(), '/') . rtrim(URL::build('/api/v2/', '', 'non-friendly'), '/'),
+            'API_URL_VALUE' => rtrim(URL::getSelfURL(), '/') . rtrim(URL::build('/api/v2/', '', 'non-friendly'), '/'),
             'ENABLE_API_FOR_URL' => $language->get('admin', 'api_disabled'),
             'COPY' => $language->get('admin', 'copy'),
             'USERNAME_SYNC' => $language->get('admin', 'enable_username_sync'),
diff --git a/modules/Core/pages/panel/emails.php b/modules/Core/pages/panel/emails.php
index f4f59788c6..e390fe7095 100644
--- a/modules/Core/pages/panel/emails.php
+++ b/modules/Core/pages/panel/emails.php
@@ -73,7 +73,7 @@
         } else {
             $smarty->assign([
                 'SEND_TEST_EMAIL_INFO' => $language->get('admin', 'send_test_email_info', [
-                    'email' => Util::bold(Output::getClean($user->data()->email))
+                    'email' => Text::bold(Output::getClean($user->data()->email))
                 ]),
                 'INFO' => $language->get('general', 'info'),
                 'SEND' => $language->get('admin', 'send'),
diff --git a/modules/Core/pages/panel/emails_errors.php b/modules/Core/pages/panel/emails_errors.php
index 68976bc2cf..8f02117a8e 100644
--- a/modules/Core/pages/panel/emails_errors.php
+++ b/modules/Core/pages/panel/emails_errors.php
@@ -109,7 +109,7 @@
                         $smarty->assign([
                             'REGISTRATION_LINK' => $language->get('admin', 'registration_link'),
                             'SHOW_REGISTRATION_LINK' => $language->get('admin', 'show_registration_link'),
-                            'REGISTRATION_LINK_VALUE' => rtrim(Util::getSelfURL(), '/') . URL::build('/complete_signup/', 'c=' . urlencode($user_error->reset_code))
+                            'REGISTRATION_LINK_VALUE' => rtrim(URL::getSelfURL(), '/') . URL::build('/complete_signup/', 'c=' . urlencode($user_error->reset_code))
                         ]);
                     }
                 }
diff --git a/modules/Core/pages/panel/images.php b/modules/Core/pages/panel/images.php
index 6acae755a4..03f9e3185a 100644
--- a/modules/Core/pages/panel/images.php
+++ b/modules/Core/pages/panel/images.php
@@ -201,25 +201,25 @@
 
 if (!is_writable(ROOT_PATH . '/uploads/backgrounds')) {
     $smarty->assign('BACKGROUNDS_NOT_WRITABLE', $language->get('admin', 'x_directory_not_writable', [
-        'directory' => Util::bold('uploads/backgrounds')
+        'directory' => Text::bold('uploads/backgrounds')
     ]));
 }
 
 if (!is_writable(ROOT_PATH . '/uploads/template_banners')) {
     $smarty->assign('TEMPLATE_BANNERS_DIRECTORY_NOT_WRITABLE', $language->get('admin', 'x_directory_not_writable', [
-        'directory' => Util::bold('uploads/template_banners')
+        'directory' => Text::bold('uploads/template_banners')
     ]));
 }
 
 if (!is_writable(ROOT_PATH . '/uploads/logos')) {
     $smarty->assign('LOGOS_DIRECTORY_NOT_WRITABLE', $language->get('admin', 'x_directory_not_writable', [
-        'directory' => Util::bold('uploads/logos')
+        'directory' => Text::bold('uploads/logos')
     ]));
 }
 
 if (!is_writable(ROOT_PATH . '/uploads/favicons')) {
     $smarty->assign('FAVICONS_DIRECTORY_NOT_WRITABLE', $language->get('admin', 'x_directory_not_writable', [
-        'directory' => Util::bold('uploads/favicons')
+        'directory' => Text::bold('uploads/favicons')
     ]));
 }
 
@@ -244,15 +244,15 @@
     'RESET_FAVICON_LINK' => URL::build('/panel/core/images/', 'action=reset_favicon'),
     'BANNER_IMAGES_ARRAY' => $template_banner_images,
     'BANNER_IMAGE' => $language->get('admin', 'banner_image_x', [
-        'imageName' => Util::bold($banner_img)
+        'imageName' => Text::bold($banner_img)
     ]),
     'LOGO_IMAGES_ARRAY' => $logo_images,
     'LOGO_IMAGE' => $language->get('admin', 'logo_image_x', [
-        'imageName' => Util::bold($logo_img)
+        'imageName' => Text::bold($logo_img)
     ]),
     'FAVICON_IMAGES_ARRAY' => $favicon_images,
     'FAVICON_IMAGE' => $language->get('admin', 'favicon_image_x', [
-        'imageName' => Util::bold($favicon_img)
+        'imageName' => Text::bold($favicon_img)
     ]),
     'ERRORS_TITLE' => $language->get('general', 'error'),
     'INFO' => $language->get('general', 'info'),
diff --git a/modules/Core/pages/panel/index.php b/modules/Core/pages/panel/index.php
index 93d6feee22..819b6273d0 100644
--- a/modules/Core/pages/panel/index.php
+++ b/modules/Core/pages/panel/index.php
@@ -241,7 +241,7 @@
     'SIDE_ITEMS' => CollectionManager::getEnabledCollection('dashboard_side_items'),
     // TODO: show latest git commit hash?
     'NAMELESS_VERSION' => $language->get('admin', 'running_nameless_version', [
-        'version' => Util::bold(NAMELESS_VERSION)
+        'version' => Text::bold(NAMELESS_VERSION)
     ]),
 ]);
 
diff --git a/modules/Core/pages/panel/minecraft_server_banners.php b/modules/Core/pages/panel/minecraft_server_banners.php
index 966c6e8ac8..4464a439c6 100644
--- a/modules/Core/pages/panel/minecraft_server_banners.php
+++ b/modules/Core/pages/panel/minecraft_server_banners.php
@@ -65,7 +65,7 @@
             'BACK' => $language->get('general', 'back'),
             'BACK_LINK' => URL::build('/panel/minecraft/banners'),
             'SERVER_NAME' => Output::getClean($server->name),
-            'BANNER_URL' => Util::getSelfURL() . ltrim(rtrim(URL::build('/banner/' . urlencode($server->name) . '.png'), '/'), '/'),
+            'BANNER_URL' => URL::getSelfURL() . ltrim(rtrim(URL::build('/banner/' . urlencode($server->name) . '.png'), '/'), '/'),
             'BANNER_PATH' => rtrim(URL::build('/banner/' . urlencode($server->name) . '.png'), '/')
         ]);
 
diff --git a/modules/Core/pages/panel/modules.php b/modules/Core/pages/panel/modules.php
index bce7e15513..53faa15d6a 100644
--- a/modules/Core/pages/panel/modules.php
+++ b/modules/Core/pages/panel/modules.php
@@ -55,8 +55,8 @@
             'author' => Output::getPurified($module->getAuthor()),
             'author_x' => $language->get('admin', 'author_x', ['author' => Output::getPurified($module->getAuthor())]),
             'version_mismatch' => (($module->getNamelessVersion() != NAMELESS_VERSION) ? $language->get('admin', 'module_outdated', [
-                'intendedVersion' => Util::bold(Output::getClean($module->getNamelessVersion())),
-                'actualVersion' => Util::bold(NAMELESS_VERSION)
+                'intendedVersion' => Text::bold(Output::getClean($module->getNamelessVersion())),
+                'actualVersion' => Text::bold(NAMELESS_VERSION)
             ]) : false),
             'disable_link' => (($module->getName() != 'Core' && $item->enabled) ? URL::build('/panel/core/modules/', 'action=disable&m=' . urlencode($item->id)) : null),
             'enable_link' => (($module->getName() != 'Core' && !$item->enabled) ? URL::build('/panel/core/modules/', 'action=enable&m=' . urlencode($item->id)) : null),
@@ -89,7 +89,7 @@
                 $all_modules[] = [
                     'name' => Output::getClean($item->name),
                     'description' => Output::getPurified($item->description),
-                    'description_short' => Util::truncate(Output::getPurified($item->description)),
+                    'description_short' => Text::truncate(Output::getPurified($item->description)),
                     'author' => Output::getClean($item->author),
                     'author_x' => $language->get('admin', 'author_x', ['author' => Output::getClean($item->author)]),
                     'updated_x' => $language->get('admin', 'updated_x', ['updatedAt' => date(DATE_FORMAT, $item->updated)]),
diff --git a/modules/Core/pages/panel/pages.php b/modules/Core/pages/panel/pages.php
index e4a33840cf..7d42765256 100644
--- a/modules/Core/pages/panel/pages.php
+++ b/modules/Core/pages/panel/pages.php
@@ -479,7 +479,7 @@
                 'YES' => $language->get('general', 'yes'),
                 'NO' => $language->get('general', 'no'),
                 'EDITING_PAGE' => $language->get('admin', 'editing_page_x', [
-                    'page' => Util::bold(Output::getClean($page->title))
+                    'page' => Text::bold(Output::getClean($page->title))
                 ]),
                 'PAGE_TITLE' => $language->get('admin', 'page_title'),
                 'PAGE_TITLE_VALUE' => (isset($_POST['page_title']) ? Output::getClean(Input::get('page_title')) : Output::getClean($page->title)),
diff --git a/modules/Core/pages/panel/panel_templates.php b/modules/Core/pages/panel/panel_templates.php
index 7a93691798..2d5a51a90c 100644
--- a/modules/Core/pages/panel/panel_templates.php
+++ b/modules/Core/pages/panel/panel_templates.php
@@ -90,7 +90,7 @@
                 $all_templates[] = [
                     'name' => Output::getClean($item->name),
                     'description' => Output::getPurified($item->description),
-                    'description_short' => Util::truncate(Output::getPurified($item->description)),
+                    'description_short' => Text::truncate(Output::getPurified($item->description)),
                     'author' => Output::getClean($item->author),
                     'author_x' => $language->get('admin', 'author_x', ['author' => Output::getClean($item->author)]),
                     'updated_x' => $language->get('admin', 'updated_x', ['updatedAt' => date(DATE_FORMAT, $item->updated)]),
diff --git a/modules/Core/pages/panel/registration.php b/modules/Core/pages/panel/registration.php
index 3b00c448af..5b2ec1d6ef 100644
--- a/modules/Core/pages/panel/registration.php
+++ b/modules/Core/pages/panel/registration.php
@@ -67,7 +67,7 @@
                     $provider = CaptchaBase::getActiveProvider();
                     if ($provider->validateSecret(Input::get('recaptcha_secret')) == false || $provider->validateKey(Input::get('recaptcha')) == false) {
                         $errors[] = $language->get('admin', 'invalid_recaptcha_settings', [
-                            'recaptchaProvider' => Util::bold(Input::get('captcha_type'))
+                            'recaptchaProvider' => Text::bold(Input::get('captcha_type'))
                         ]);
 
                     } else {
diff --git a/modules/Core/pages/panel/seo.php b/modules/Core/pages/panel/seo.php
index e7468dbcc0..2c3dcfd166 100644
--- a/modules/Core/pages/panel/seo.php
+++ b/modules/Core/pages/panel/seo.php
@@ -41,7 +41,7 @@
         if (Token::check(Input::get('token'))) {
             if (Input::get('type') == 'sitemap') {
 
-                $sitemap = new \SitemapPHP\Sitemap(rtrim(Util::getSelfURL(), '/'));
+                $sitemap = new \SitemapPHP\Sitemap(rtrim(URL::getSelfURL(), '/'));
                 $sitemap->setPath(ROOT_PATH . '/cache/sitemaps/');
 
                 $methods = $pages->getSitemapMethods();
@@ -54,7 +54,7 @@
                     $method($sitemap, $cache);
                 }
 
-                $sitemap->createSitemapIndex(rtrim(Util::getSelfURL(), '/') . (defined('CONFIG_PATH') ? CONFIG_PATH : '') . '/cache/sitemaps/');
+                $sitemap->createSitemapIndex(rtrim(URL::getSelfURL(), '/') . (defined('CONFIG_PATH') ? CONFIG_PATH : '') . '/cache/sitemaps/');
 
                 $cache->setCache('sitemap_cache');
                 $cache->store('updated', date(DATE_FORMAT));
@@ -85,10 +85,10 @@
 
             $smarty->assign([
                 'SITEMAP_LAST_GENERATED' => $language->get('admin', 'sitemap_last_generated_x', [
-                    'generatedAt' => Util::bold($updated)
+                    'generatedAt' => Text::bold($updated)
                 ]),
                 'SITEMAP_LINK' => (defined('CONFIG_PATH') ? CONFIG_PATH : '') . '/cache/sitemaps/sitemap-index.xml',
-                'SITEMAP_FULL_LINK' => rtrim(Util::getSelfURL(), '/') . (defined('CONFIG_PATH') ? CONFIG_PATH : '') . '/cache/sitemaps/sitemap-index.xml',
+                'SITEMAP_FULL_LINK' => rtrim(URL::getSelfURL(), '/') . (defined('CONFIG_PATH') ? CONFIG_PATH : '') . '/cache/sitemaps/sitemap-index.xml',
                 'DOWNLOAD_SITEMAP' => $language->get('admin', 'download_sitemap'),
                 'LINK' => $language->get('admin', 'sitemap_link')
             ]);
@@ -159,7 +159,7 @@
         'BACK' => $language->get('general', 'back'),
         'BACK_LINK' => URL::build('/panel/core/seo'),
         'EDITING_PAGE' => $language->get('admin', 'editing_page_x', [
-            'page' => Util::bold(Output::getClean($page['key']))
+            'page' => Text::bold(Output::getClean($page['key']))
         ]),
         'DESCRIPTION' => $language->get('admin', 'description'),
         'DESCRIPTION_VALUE' => $description,
diff --git a/modules/Core/pages/panel/templates.php b/modules/Core/pages/panel/templates.php
index f784109d65..9a9a758718 100644
--- a/modules/Core/pages/panel/templates.php
+++ b/modules/Core/pages/panel/templates.php
@@ -58,8 +58,8 @@
             'author_x' => $language->get('admin', 'author_x', ['author' => $template->getAuthor()]),
             'version_mismatch' => (($template->getNamelessVersion() != NAMELESS_VERSION)
                 ? $language->get('admin', 'template_outdated', [
-                    'intendedVersion' => Util::bold(Output::getClean($template->getNamelessVersion())),
-                    'actualVersion' => Util::bold(NAMELESS_VERSION)
+                    'intendedVersion' => Text::bold(Output::getClean($template->getNamelessVersion())),
+                    'actualVersion' => Text::bold(NAMELESS_VERSION)
                 ])
                 : false
             ),
@@ -100,7 +100,7 @@
                 $all_templates[] = [
                     'name' => Output::getClean($item->name),
                     'description' => Output::getPurified($item->description),
-                    'description_short' => Util::truncate(Output::getPurified($item->description)),
+                    'description_short' => Text::truncate(Output::getPurified($item->description)),
                     'author' => Output::getClean($item->author),
                     'author_x' => $language->get('admin', 'author_x', ['author' => Output::getClean($item->author)]),
                     'updated_x' => $language->get('admin', 'updated_x', ['updatedAt' => date(DATE_FORMAT, $item->updated)]),
@@ -352,7 +352,7 @@
 
                     $smarty->assign([
                         'EDITING_TEMPLATE' => $language->get('admin', 'editing_template_x', [
-                            'template' => Util::bold(Output::getClean($template_query->name))
+                            'template' => Text::bold(Output::getClean($template_query->name))
                         ]),
                         'BACK' => $language->get('general', 'back'),
                         'BACK_LINK' => URL::build('/panel/core/templates'),
@@ -476,7 +476,7 @@
 
             $smarty->assign([
                 'EDITING_TEMPLATE' => $language->get('admin', 'editing_template_x', [
-                    'template' => Util::bold(Output::getClean($template_query->name))
+                    'template' => Text::bold(Output::getClean($template_query->name))
                 ]),
                 'BACK' => $language->get('general', 'back'),
                 'BACK_LINK' => URL::build('/panel/core/templates'),
@@ -683,8 +683,8 @@
 
                         $smarty->assign([
                             'EDITING_FILE' => $language->get('admin', 'editing_template_file_in_template', [
-                                'file' => Util::bold($template_path),
-                                'template' => Util::bold(Output::getClean($template_query->name)),
+                                'file' => Text::bold($template_path),
+                                'template' => Text::bold(Output::getClean($template_query->name)),
                             ]),
                             'CANCEL' => $language->get('general', 'cancel'),
                             'ARE_YOU_SURE' => $language->get('general', 'are_you_sure'),
@@ -703,7 +703,7 @@
 
             $smarty->assign([
                 'EDITING_TEMPLATE' => $language->get('admin', 'editing_template_x', [
-                    'template' => Util::bold(Output::getClean($template_query->name))
+                    'template' => Text::bold(Output::getClean($template_query->name))
                 ]),
             ]);
 
diff --git a/modules/Core/pages/panel/users_ip_lookup.php b/modules/Core/pages/panel/users_ip_lookup.php
index 6b61d38275..be7d5963d4 100644
--- a/modules/Core/pages/panel/users_ip_lookup.php
+++ b/modules/Core/pages/panel/users_ip_lookup.php
@@ -47,12 +47,12 @@
 
         if (count($user_ips) == 1) {
             $count_accounts = $language->get('moderator', '1_ip_with_name', [
-                'user' => Util::bold(Output::getClean($user_query->username))
+                'user' => Text::bold(Output::getClean($user_query->username))
             ]);
         } else {
             $count_accounts = $language->get('moderator', 'count_ips_with_name', [
                 'count' => count($user_ips),
-                'user' => Util::bold(Output::getClean($user_query->username))
+                'user' => Text::bold(Output::getClean($user_query->username))
             ]);
         }
 
diff --git a/modules/Core/pages/panel/users_oauth.php b/modules/Core/pages/panel/users_oauth.php
index 86820a8246..b50717083e 100644
--- a/modules/Core/pages/panel/users_oauth.php
+++ b/modules/Core/pages/panel/users_oauth.php
@@ -69,7 +69,7 @@
     'TOKEN' => Token::get(),
     'SUBMIT' => $language->get('general', 'submit'),
     'EDITING_USER' => $language->get('admin', 'editing_user_x', [
-        'user' => Util::bold(Output::getClean($user_query->nickname))
+        'user' => Text::bold(Output::getClean($user_query->nickname))
     ]),
     'USER_ID' => $user_query->id,
     'BACK_LINK' => URL::build('/panel/user/' . urlencode($user_query->id)),
diff --git a/modules/Core/pages/panel/widgets.php b/modules/Core/pages/panel/widgets.php
index 98924ee388..8e8e6d9a5a 100644
--- a/modules/Core/pages/panel/widgets.php
+++ b/modules/Core/pages/panel/widgets.php
@@ -199,7 +199,7 @@
         $smarty->assign(
             [
                 'EDITING_WIDGET' => $language->get('admin', 'editing_widget_x', [
-                    'widget' => Util::bold(Output::getClean($widget->name))
+                    'widget' => Text::bold(Output::getClean($widget->name))
                 ]),
                 'BACK' => $language->get('general', 'back'),
                 'BACK_LINK' => URL::build('/panel/core/widgets'),
@@ -242,7 +242,7 @@
             $smarty->assign(
                 [
                     'EDITING_WIDGET' => $language->get('admin', 'editing_widget_x', [
-                        'widget' => Util::bold(Output::getClean($widget->name))
+                        'widget' => Text::bold(Output::getClean($widget->name))
                     ]),
                     'BACK' => $language->get('general', 'back'),
                     'BACK_LINK' => URL::build('/panel/core/widgets/', 'action=edit&w=' . urlencode($widget->id))
diff --git a/modules/Core/pages/register.php b/modules/Core/pages/register.php
index 69f4be4b30..c3470f7679 100644
--- a/modules/Core/pages/register.php
+++ b/modules/Core/pages/register.php
@@ -365,7 +365,7 @@
                                 'user' => Input::get('username'),
                             ]),
                             'avatar_url' => $user->getAvatar(128, true),
-                            'url' => Util::getSelfURL() . ltrim(URL::build('/profile/' . urlencode(Input::get('username'))), '/'),
+                            'url' => URL::getSelfURL() . ltrim(URL::build('/profile/' . urlencode(Input::get('username'))), '/'),
                             'language' => $default_language,
                         ]);
 
diff --git a/modules/Core/pages/validate.php b/modules/Core/pages/validate.php
index 706e68003b..846f33a54e 100644
--- a/modules/Core/pages/validate.php
+++ b/modules/Core/pages/validate.php
@@ -31,7 +31,7 @@
             'username' => $user->getDisplayname(),
             'content' => $default_language->get('user', 'user_x_has_validated', ['user' => $user->getDisplayname()]),
             'avatar_url' => $user->getAvatar(128, true),
-            'url' => Util::getSelfURL() . ltrim($user->getProfileURL(), '/'),
+            'url' => URL::getSelfURL() . ltrim($user->getProfileURL(), '/'),
             'language' => $default_language
         ]);
 
diff --git a/modules/Core/widgets/ProfilePostsWidget.php b/modules/Core/widgets/ProfilePostsWidget.php
index 15144d4ec6..bf8157d659 100644
--- a/modules/Core/widgets/ProfilePostsWidget.php
+++ b/modules/Core/widgets/ProfilePostsWidget.php
@@ -73,7 +73,7 @@ public function initialise(): void {
                     'avatar' => $post_author->getAvatar(),
                     'username' => $post_author->getDisplayname(),
                     'username_style' => $post_author->getGroupStyle(),
-                    'content' => Util::truncate(strip_tags($post->content), 20),
+                    'content' => Text::truncate(strip_tags($post->content), 20),
                     'link' => $link . '/#post-' . $post->id,
                     'date_ago' => date(DATE_FORMAT, $post->time),
                     'user_id' => $post->author_id,
diff --git a/modules/Core/widgets/ServerStatusWidget.php b/modules/Core/widgets/ServerStatusWidget.php
index 013b846e4c..69daa0946d 100644
--- a/modules/Core/widgets/ServerStatusWidget.php
+++ b/modules/Core/widgets/ServerStatusWidget.php
@@ -46,7 +46,7 @@ public function initialise(): void {
             $server = $server[0];
 
             if ($server != null) {
-                $server_array_request = HttpClient::get(rtrim(Util::getSelfURL(), '/') . URL::build('/queries/server/', 'id=' . $server->id));
+                $server_array_request = HttpClient::get(rtrim(URL::getSelfURL(), '/') . URL::build('/queries/server/', 'id=' . $server->id));
                 if (!$server_array_request->hasError()) {
                     $server_array = $server_array_request->json(true);
                     foreach ($server_array as $key => $value) {
diff --git a/modules/Forum/classes/Forum.php b/modules/Forum/classes/Forum.php
index 6e2583afe5..6891687ccd 100644
--- a/modules/Forum/classes/Forum.php
+++ b/modules/Forum/classes/Forum.php
@@ -513,7 +513,7 @@ public function getLatestNews(int $number = 5): array {
                 'topic_title' => $item->topic_title,
                 'topic_views' => $item->topic_views,
                 'author' => $item->topic_creator,
-                'content' => Util::truncate($post),
+                'content' => Text::truncate($post),
                 'replies' => $posts,
                 'label' => count($labels) ? $labels[0] : null,
                 'labels' => $labels
diff --git a/modules/Forum/classes/Forum_Sitemap.php b/modules/Forum/classes/Forum_Sitemap.php
index 43bf6d6444..11f36c9e25 100644
--- a/modules/Forum/classes/Forum_Sitemap.php
+++ b/modules/Forum/classes/Forum_Sitemap.php
@@ -27,7 +27,7 @@ public static function generateSitemap(Sitemap $sitemap): void {
         $forums = $db->query('SELECT id, forum_title, last_post_date FROM nl2_forums WHERE id IN (SELECT forum_id FROM nl2_forums_permissions WHERE group_id = 0 AND `view` = 1)')->results();
 
         foreach ($forums as $forum) {
-            $sitemap->addItem(URL::build('/forum/view/' . urlencode($forum->id) . '-' . Util::stringToURL($forum->forum_title)), 0.5, 'daily', date('Y-m-d', $forum->last_post_date));
+            $sitemap->addItem(URL::build('/forum/view/' . urlencode($forum->id) . '-' . Text::urlSafe($forum->forum_title)), 0.5, 'daily', date('Y-m-d', $forum->last_post_date));
         }
 
         $forums = null;
@@ -35,7 +35,7 @@ public static function generateSitemap(Sitemap $sitemap): void {
         $topics = $db->query('SELECT id, forum_id, topic_title FROM nl2_topics WHERE deleted = 0 AND forum_id IN (SELECT forum_id FROM nl2_forums_permissions WHERE group_id = 0 AND `view` = 1)')->results();
 
         foreach ($topics as $topic) {
-            $sitemap->addItem(URL::build('/forum/topic/' . urlencode($topic->id) . '-' . Util::stringToURL($topic->topic_title)), 0.5);
+            $sitemap->addItem(URL::build('/forum/topic/' . urlencode($topic->id) . '-' . Text::urlSafe($topic->topic_title)), 0.5);
         }
 
         $topics = null;
diff --git a/modules/Forum/pages/forum/index.php b/modules/Forum/pages/forum/index.php
index d3463eda30..5a20ad28c5 100644
--- a/modules/Forum/pages/forum/index.php
+++ b/modules/Forum/pages/forum/index.php
@@ -87,7 +87,7 @@
                         }
                     }
 
-                    if ($forums[$key]['subforums'][$subforum_id]->redirect_forum == 1 && Util::isExternalURL($forums[$key]['subforums'][$subforum_id]->redirect_url)) {
+                    if ($forums[$key]['subforums'][$subforum_id]->redirect_forum == 1 && URL::isExternalURL($forums[$key]['subforums'][$subforum_id]->redirect_url)) {
                         $forums[$key]['subforums'][$subforum_id]->redirect_confirm = $forum_language->get('forum', 'forum_redirect_warning', ['url' => $forums[$key]['subforums'][$subforum_id]->redirect_to]);
                     }
                 }
diff --git a/modules/Forum/pages/forum/new_topic.php b/modules/Forum/pages/forum/new_topic.php
index ed246b219f..5ba41b8a57 100644
--- a/modules/Forum/pages/forum/new_topic.php
+++ b/modules/Forum/pages/forum/new_topic.php
@@ -213,7 +213,7 @@
                     'content_full' => strip_tags(str_ireplace(['<br />', '<br>', '<br/>'], "\r\n", Input::get('content'))),
                     'avatar_url' => $user->getAvatar(128, true),
                     'title' => Input::get('title'),
-                    'url' => Util::getSelfURL() . ltrim(URL::build('/forum/topic/' . urlencode($topic_id) . '-' . $forum->titleToURL(Input::get('title'))), '/'),
+                    'url' => URL::getSelfURL() . ltrim(URL::build('/forum/topic/' . urlencode($topic_id) . '-' . $forum->titleToURL(Input::get('title'))), '/'),
                     'available_hooks' => $available_hooks == null ? [] : $available_hooks
                 ]);
 
diff --git a/modules/Forum/pages/forum/view_forum.php b/modules/Forum/pages/forum/view_forum.php
index 0d6e380874..e8040fca3f 100644
--- a/modules/Forum/pages/forum/view_forum.php
+++ b/modules/Forum/pages/forum/view_forum.php
@@ -78,7 +78,7 @@
 
 // Redirect forum?
 if ($forum_query->redirect_forum == 1) {
-    if (!Util::isExternalURL($forum_query->redirect_url)) {
+    if (!URL::isExternalURL($forum_query->redirect_url)) {
         Redirect::to(Output::getClean($forum_query->redirect_url));
     }
 
diff --git a/modules/Forum/pages/forum/view_topic.php b/modules/Forum/pages/forum/view_topic.php
index e81357fb49..0382718014 100644
--- a/modules/Forum/pages/forum/view_topic.php
+++ b/modules/Forum/pages/forum/view_topic.php
@@ -309,7 +309,7 @@
                 'content_full' => strip_tags(str_ireplace(['<br />', '<br>', '<br/>'], "\r\n", $content)),
                 'avatar_url' => $user->getAvatar(128, true),
                 'title' => $topic->topic_title,
-                'url' => Util::getSelfURL() . ltrim(URL::build('/forum/topic/' . urlencode($topic->id) . '-' . $forum->titleToURL($topic->topic_title)), '/'),
+                'url' => URL::getSelfURL() . ltrim(URL::build('/forum/topic/' . urlencode($topic->id) . '-' . $forum->titleToURL($topic->topic_title)), '/'),
                 'topic_author_user_id' => $topic_user->data()->id,
                 'topic_author_username' => $topic_user->data()->username,
                 'topic_author_nickname' => $topic_user->data()->nickname,
@@ -352,7 +352,7 @@
                         $language->get('emails', 'forum_topic_reply_subject', ['author' => $user->data()->username, 'topic' => $topic->topic_title]),
                         $language->get('emails', 'greeting'),
                         $language->get('emails', 'forum_topic_reply_message', ['author' => $user->data()->username, 'content' => html_entity_decode($content)]),
-                        rtrim(Util::getSelfURL(), '/') . URL::build('/forum/topic/' . urlencode($tid) . '-' . $forum->titleToURL($topic->topic_title), 'pid=' . $last_post_id),
+                        rtrim(URL::getSelfURL(), '/') . URL::build('/forum/topic/' . urlencode($tid) . '-' . $forum->titleToURL($topic->topic_title), 'pid=' . $last_post_id),
                         $language->get('emails', 'thanks')
                     ],
                     $html
@@ -532,9 +532,9 @@
 $smarty->assign([
     'SHARE' => $forum_language->get('forum', 'share'),
     'SHARE_TWITTER' => $forum_language->get('forum', 'share_twitter'),
-    'SHARE_TWITTER_URL' => 'https://twitter.com/intent/tweet?text=' . urlencode(rtrim(Util::getSelfURL(), '/')) . URL::build('/forum/topic/' . urlencode($tid) . '-' . $forum->titleToURL($topic->topic_title)),
+    'SHARE_TWITTER_URL' => 'https://twitter.com/intent/tweet?text=' . urlencode(rtrim(URL::getSelfURL(), '/')) . URL::build('/forum/topic/' . urlencode($tid) . '-' . $forum->titleToURL($topic->topic_title)),
     'SHARE_FACEBOOK' => $forum_language->get('forum', 'share_facebook'),
-    'SHARE_FACEBOOK_URL' => 'https://www.facebook.com/sharer/sharer.php?u=' . urlencode(rtrim(Util::getSelfURL(), '/')) . URL::build('/forum/topic/' . urlencode($tid) . '-' . $forum->titleToURL($topic->topic_title))
+    'SHARE_FACEBOOK_URL' => 'https://www.facebook.com/sharer/sharer.php?u=' . urlencode(rtrim(URL::getSelfURL(), '/')) . URL::build('/forum/topic/' . urlencode($tid) . '-' . $forum->titleToURL($topic->topic_title))
 ]);
 
 // Pagination
@@ -730,7 +730,7 @@
         'post_date' => $post_date,
         'buttons' => $buttons,
         'content' => $content,
-        'signature' => Output::getPurified(Util::renderEmojis($signature)),
+        'signature' => Output::getPurified(Text::renderEmojis($signature)),
         'fields' => (empty($fields) ? [] : $fields),
         'edited' => is_null($nValue->last_edited)
             ? null

From 957121ae3a5474275500df7fb07c72f44225ca06 Mon Sep 17 00:00:00 2001
From: PadowYT2 <me@padow.ru>
Date: Tue, 14 Jun 2022 12:45:46 +0800
Subject: [PATCH 109/337] Patch dropdown (#2853)

---
 custom/templates/DefaultRevamp/css/custom.css | 158 ++++++++++--------
 custom/templates/DefaultRevamp/footer.tpl     |   4 +-
 2 files changed, 89 insertions(+), 73 deletions(-)

diff --git a/custom/templates/DefaultRevamp/css/custom.css b/custom/templates/DefaultRevamp/css/custom.css
index 6ae2b3586b..bb90d020ab 100755
--- a/custom/templates/DefaultRevamp/css/custom.css
+++ b/custom/templates/DefaultRevamp/css/custom.css
@@ -12,8 +12,8 @@ body.pushable>.pusher {
 }
 
 /*
-  *  [ NAVIGATION BAR ]
-  */
+   *  [ NAVIGATION BAR ]
+   */
 
 .ui.secondary.menu {
     background: #fff;
@@ -71,8 +71,8 @@ body.pushable>.pusher {
 }
 
 /*
-  *  [ HEADER ]
-  */
+   *  [ HEADER ]
+   */
 
 .ui.masthead {
     background: linear-gradient(90deg, rgb(41, 117, 286) 0%, rgb(2, 117, 216) 100%);
@@ -109,8 +109,8 @@ body.pushable>.pusher {
 }
 
 /*
-  *  -[ SEGMENT ]-
-  */
+   *  -[ SEGMENT ]-
+   */
 
 .ui.segment {
     background: #fff;
@@ -130,8 +130,8 @@ body.pushable>.pusher {
 }
 
 /*
-  *  [ NEWS POST ]
-  */
+   *  [ NEWS POST ]
+   */
 
 #news-post .badge,
 #news-post .ui.label {
@@ -146,8 +146,8 @@ body.pushable>.pusher {
 }
 
 /*
-  *  [ FORUM NODE ]
-  */
+   *  [ FORUM NODE ]
+   */
 
 #forum-node #last-post {
     width: 250px;
@@ -158,8 +158,8 @@ body.pushable>.pusher {
 }
 
 /*
-  *  [ FORUM PAGE ]
-  */
+   *  [ FORUM PAGE ]
+   */
 
 #sticky-threads tbody tr td:last-child:not(:first-child),
 #normal-threads tbody tr td:last-child:not(:first-child) {
@@ -187,8 +187,8 @@ body.pushable>.pusher {
 }
 
 /*
-  *  [ TOPIC PAGE ]
-  */
+   *  [ TOPIC PAGE ]
+   */
 
 #topic-post #post-sidebar .ui.small.image,
 #topic-reply #reply-sidebar .ui.small.image {
@@ -296,8 +296,8 @@ body.pushable>.pusher {
 }
 
 /*
-  *  [ ACCOUNT MESSAGES ]
-  */
+   *  [ ACCOUNT MESSAGES ]
+   */
 
 #view-message #message .header {
     font-size: 1.15rem;
@@ -320,8 +320,8 @@ body.pushable>.pusher {
 }
 
 /*
-  *  -[ 404 ERROR ]-
-  */
+   *  -[ 404 ERROR ]-
+   */
 
 #error-403 .ui.container,
 #error-404 .ui.container,
@@ -342,8 +342,8 @@ body.pushable>.pusher {
 }
 
 /*
-  *  [ PROFILE PAGE ]
-  */
+   *  [ PROFILE PAGE ]
+   */
 
 #profile-header {
     background: #fff;
@@ -366,8 +366,8 @@ body.pushable>.pusher {
 }
 
 /*
-  *  [ FORUM SEARCH ]
-  */
+   *  [ FORUM SEARCH ]
+   */
 
 #forum-search-result h3.ui.header {
     margin-top: 0;
@@ -375,16 +375,16 @@ body.pushable>.pusher {
 }
 
 /*
-  *  [ SERVER PAGE ]
-  */
+   *  [ SERVER PAGE ]
+   */
 
 [id*="server"] #server-players a:not(:last-child) {
     margin-right: .3rem;
 }
 
 /*
-  *  [ WIDGETS ]
-  */
+   *  [ WIDGETS ]
+   */
 
 [id*="widget"] .item .content {
     width: calc(100% - 40px) !important;
@@ -437,8 +437,8 @@ body.pushable>.pusher {
 }
 
 /*
-  *  -[ FOOTER ]-
-  */
+   *  -[ FOOTER ]-
+   */
 
 .ui.footer.segment {
     margin: 1rem 0 -.5rem 0;
@@ -451,9 +451,21 @@ body.pushable>.pusher {
     }
 }
 
+.ui.link.list.list .active.item {
+    color: rgba(255, 255, 255, .5);
+}
+
+.ui.link.list.list .active.item a:not(.ui) {
+    color: rgba(0, 0, 0, .87) !important;
+}
+
+.ui.link.list.list .active.item a:not(.ui):hover {
+    background: rgba(0, 0, 0, .05) !important;
+}
+
 /*
-  *  [ TABLE ]
-  */
+   *  [ TABLE ]
+   */
 
 @media (max-width: 576px) {
     .ui.table.res thead tr th:first-child {
@@ -480,8 +492,8 @@ body.pushable>.pusher {
 }
 
 /*
-  *  -[ GRID ]-
-  */
+   *  -[ GRID ]-
+   */
 
 .ui.grid+.grid {
     margin-top: 0.3rem;
@@ -502,8 +514,8 @@ body.pushable>.pusher {
 }
 
 /*
-  *  [ LINK LIST ]
-  */
+   *  [ LINK LIST ]
+   */
 
 .ui.link.list.list .item a:not(.ui):hover,
 .ui.link.list.list a.item:hover {
@@ -515,8 +527,8 @@ body.pushable>.pusher {
 }
 
 /*
-  *  [ USES POPUP ]
-  */
+   *  [ USES POPUP ]
+   */
 
 #user-popup .header {
     text-align: center;
@@ -531,8 +543,8 @@ body.pushable>.pusher {
 }
 
 /*
-  *  [ COOKIE NOTICE ]
-  */
+   *  [ COOKIE NOTICE ]
+   */
 
 .cc-window.cc-floating {
     padding: 1rem 1.5rem;
@@ -568,8 +580,8 @@ body.pushable>.pusher {
 }
 
 /*
-  *  [ SPOILER ]
-  */
+   *  [ SPOILER ]
+   */
 
 #tinymce .spoiler,
 .spoiler {
@@ -591,16 +603,16 @@ body.pushable>.pusher {
 }
 
 /*
-  *  [ MESSAGE ]
-  */
+   *  [ MESSAGE ]
+   */
 
 .ui.message>.close.icon {
     right: .8em;
 }
 
 /*
-  *  [ UPDATE MESSAGE ]
-  */
+   *  [ UPDATE MESSAGE ]
+   */
 
 #update-message {
     margin-bottom: 1rem;
@@ -632,8 +644,8 @@ body.pushable>.pusher {
 }
 
 /*
-  *  [ PAGINATION ]
-  */
+   *  [ PAGINATION ]
+   */
 
 .ui.mini.pagination.menu .item:first-child,
 .ui.mini.pagination.menu .item:last-child {
@@ -641,8 +653,8 @@ body.pushable>.pusher {
 }
 
 /*
-  *  -[ ALIGNMENTS ]-
-  */
+   *  -[ ALIGNMENTS ]-
+   */
 
 [class*="left aligned"] {
     text-align: left;
@@ -657,8 +669,8 @@ body.pushable>.pusher {
 }
 
 /*
-  *  [ FLOATS ]
-  */
+   *  [ FLOATS ]
+   */
 
 [class*="left floated"],
 [class*="res left floated"] {
@@ -696,8 +708,8 @@ body.pushable>.pusher {
 }
 
 /*
-  *  [ DISPLAY ]
-  */
+   *  [ DISPLAY ]
+   */
 
 [display="block"] {
     display: block !important;
@@ -712,8 +724,8 @@ body.pushable>.pusher {
 }
 
 /*
-  *  [ VISIBILITY ]
-  */
+   *  [ VISIBILITY ]
+   */
 
 @media only screen and (max-width: 576px) {
 
@@ -776,8 +788,8 @@ body.pushable>.pusher {
 }
 
 /*
-  *  [ USER BADGES ]
-  */
+   *  [ USER BADGES ]
+   */
 
 .badge {
     display: inline-block;
@@ -895,8 +907,8 @@ a.badge-dark:focus {
 }
 
 /*
-  *  [ OTHER ]
-  */
+   *  [ OTHER ]
+   */
 
 select {
     font-family: Lato, 'Helvetica Neue', Arial, Helvetica, sans-serif;
@@ -959,8 +971,8 @@ select {
 }
 
 /*
-  *  [ DARK MODE ]
-  */
+   *  [ DARK MODE ]
+   */
 
 body.dark,
 body.dark>.pusher,
@@ -1019,11 +1031,6 @@ body.dark .ui.dropdown .menu {
     color: rgba(255, 255, 255, 0.6);
 }
 
-body.dark .ui.menu .dropdown.item .menu,
-body.dark .ui.dropdown .menu {
-    min-width: calc(100% - 1px);
-}
-
 body.dark .ui.button,
 body.dark .ui.default.button,
 body.dark .ui.mini.icon.button,
@@ -1134,8 +1141,15 @@ body.dark .ui.comments .comment .actions a,
 body.dark .ui.card>.extra a:not(.ui),
 body.dark .ui.cards>.card>.extra a:not(.ui),
 body.dark .ui.relaxed.list .item .content,
-body.dark .ui.horizontal.divider {
-    color: rgba(255, 255, 255, 0.6);
+body.dark .ui.horizontal.divider,
+body.dark .ui.dropdown .menu>.header:not(.ui),
+body.dark .ui.link.list.list .active.item,
+body.dark .ui.link.list.list .active.item a:not(.ui) {
+    color: rgba(255, 255, 255, 0.6) !important;
+}
+
+body.dark .ui.menu .ui.dropdown .menu>.item:hover {
+    background-color: rgba(0, 0, 0, .05) !important;
 }
 
 body.dark .ui.secondary.inverted.menu .popup .list a.item,
@@ -1144,8 +1158,10 @@ body.dark .ui.pointing.dropdown>.menu>.item {
 }
 
 body.dark .ui.menu .ui.dropdown .menu>.item:hover,
+body.dark .ui.dropdown .menu>.item:hover,
 body.dark .ui.menu .ui.dropdown .menu>.item.active,
-body.dark .ui.list>.item a.header {
+body.dark .ui.list>.item a.header,
+body.dark .ui.link.list.list .active.item a:not(.ui):hover {
     color: #fff !important;
 }
 
@@ -1350,9 +1366,9 @@ body.dark .cc-window.cc-floating .cc-highlight .cc-btn.cc-allow {
 }
 
 /*
-  * Colours
-  */
+   * Colours
+   */
 
 body.dark .white {
     color: #fff;
-}
+}
\ No newline at end of file
diff --git a/custom/templates/DefaultRevamp/footer.tpl b/custom/templates/DefaultRevamp/footer.tpl
index e0658526a5..1db808052e 100755
--- a/custom/templates/DefaultRevamp/footer.tpl
+++ b/custom/templates/DefaultRevamp/footer.tpl
@@ -23,8 +23,8 @@
                 <div class="ui inverted link list">
                     {foreach from=$FOOTER_NAVIGATION key=name item=item}
                     {if isset($item.items)}
-                    <div class="ui pointing dropdown link item">
-                        <span class="text">{$item.icon} {$item.title}</span> <i class="dropdown icon"></i>
+                    <div class="ui dropdown item">
+                        <span class="text">{$item.icon} {$item.title} <i class="dropdown icon"></i></span>
                         <div class="menu">
                             <div class="header">{$item.title}</div>
                             {foreach from=$item.items item=dropdown}

From 71ddcfdf867d60efee2aaaae0634505d0b1aceec Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Mon, 13 Jun 2022 22:52:32 -0600
Subject: [PATCH 110/337] Use translation for group sync warning

---
 custom/languages/en_UK.json             | 1 +
 modules/Core/pages/panel/users_edit.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/custom/languages/en_UK.json b/custom/languages/en_UK.json
index 424a24dcec..8e1189ccef 100644
--- a/custom/languages/en_UK.json
+++ b/custom/languages/en_UK.json
@@ -256,6 +256,7 @@
     "admin/group_sync_rule_created_successfully": "The group sync rule has been created successfully.",
     "admin/group_sync_rule_deleted_successfully": "The group sync rule has been deleted successfully.",
     "admin/group_sync_rules_updated_successfully": "Group sync rules have been updated successfully.",
+    "admin/group_sync_no_results_warning": "Group sync rules are setup but no changes were reported. This could indicate a misconfiguration.",
     "admin/group_updated_successfully": "Group updated successfully.",
     "admin/group_cloned_successfully": "Group cloned successfully.",
     "admin/group_username_colour": "Group Username Colour",
diff --git a/modules/Core/pages/panel/users_edit.php b/modules/Core/pages/panel/users_edit.php
index 57ea7c9ad0..a40a53366f 100644
--- a/modules/Core/pages/panel/users_edit.php
+++ b/modules/Core/pages/panel/users_edit.php
@@ -207,7 +207,7 @@
                             'SELECT COUNT(*) AS count FROM nl2_group_sync WHERE website_group_id IN (' . implode(', ', $modified) . ') AND discord_role_id IS NOT NULL;'
                         )->first()->count;
                         if ($rules > 0) {
-                            Session::flash('edit_user_warnings', 'Group sync rules are setup but no changes were reported. This could indicate a misconfiguration.');
+                            Session::flash('edit_user_warnings', $language->get('admin', 'group_sync_no_results_warning'));
                         }
                     }
 

From 8a5b2772ae740652edbff41d9b17d0417d1479a8 Mon Sep 17 00:00:00 2001
From: Supercrafter100 <admin@supercrafter100.com>
Date: Tue, 7 Jun 2022 14:18:25 +0000
Subject: [PATCH 111/337] Translated using Weblate (Dutch)

Currently translated at 100.0% (1221 of 1221 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/nl/
---
 custom/languages/nl_NL.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/languages/nl_NL.json b/custom/languages/nl_NL.json
index bb81fa8b90..4323d91c2b 100644
--- a/custom/languages/nl_NL.json
+++ b/custom/languages/nl_NL.json
@@ -185,7 +185,7 @@
     "admin/enable_registration": "Schakel registratie in?",
     "admin/enable_status_query": "Status query aanzetten?",
     "admin/enable_username_sync": "Gebruikersnaam synchroniseren?",
-    "admin/enable_username_sync_info": "Indien ingeschakeld, zullen de gebruikersnamen van de website worden aangepast aan de ingame gebruikersnamen.",
+    "admin/enable_username_sync_info": "Indien ingeschakeld, zullen de gebruikersnamen van de website worden aangepast aan de ingame gebruikersnamen. Dit zal gebeuren wanneer de plugin in minecraft een lijst verzend van UUIDs en gebruikersnamen, voor online spelers, naar de website.",
     "admin/enabled": "Ingeschakeld",
     "admin/enter_authme_db_details": "Vul geldige database gegevens in.",
     "admin/error_deleted_successfully": "De fout is met succes verwijderd.",

From 4f468bf8fb6de5616977507c29f73e194c3638e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Loskot?= <fjuro@seznam.cz>
Date: Tue, 7 Jun 2022 17:01:02 +0000
Subject: [PATCH 112/337] Translated using Weblate (Czech)

Currently translated at 100.0% (1221 of 1221 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/cs/
---
 custom/languages/cs_CZ.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/custom/languages/cs_CZ.json b/custom/languages/cs_CZ.json
index e0c7c7cc4b..be9204a85f 100644
--- a/custom/languages/cs_CZ.json
+++ b/custom/languages/cs_CZ.json
@@ -191,7 +191,7 @@
     "admin/enable_registration": "Povolit registrace?",
     "admin/enable_status_query": "Povolit query stavu?",
     "admin/enable_username_sync": "Povolit synchronizaci uživatelských jmen?",
-    "admin/enable_username_sync_info": "Pokud povolíte tuto možnost, uživatelská jména na webu budou aktualizována tak, aby odpovídala uživatelským jménům ve hře.",
+    "admin/enable_username_sync_info": "Pokud povolíte tuto možnost, uživatelská jména na webu budou aktualizována tak, aby odpovídala uživatelským jménům ve hře. Toto se bude dít, když herní plugin odešle seznam UUID a uživatelských jmen online hráčů na web.",
     "admin/enabled": "Povoleno",
     "admin/enter_authme_db_details": "Zadejte platné podrobnosti databáze.",
     "admin/error_deleted_successfully": "Chyba byla úspěšně odstraněna.",
@@ -1217,5 +1217,7 @@
     "admin/test_email_suggest_1": "Počkejte pár minut a zkontrolujte složku s nevyžádanou poštou.",
     "admin/test_email_suggest_2": "Aktualizujte záznamy DNS vašeho webu (zkontrolujte SPF a DKIM).",
     "admin/test_email_suggest_3": "Nastavte server SMTP. {{docLinkStart}}Zjistit více »{{docLinkEnd}}",
-    "admin/debug_link_info": "Důležité - tento odkaz sdílejte pouze s lidmi, kterým důvěřujete!"
+    "admin/debug_link_info": "Důležité - tento odkaz sdílejte pouze s lidmi, kterým důvěřujete!",
+    "general/deleted_user": "Smazaný uživatel",
+    "admin/use_external_mail_server": "Použít externí e-mailový server"
 }

From 272e2873d4f4a26e05994222340c463b40ff02b0 Mon Sep 17 00:00:00 2001
From: enno123 <admin@enno123.de>
Date: Mon, 6 Jun 2022 21:53:08 +0000
Subject: [PATCH 113/337] Translated using Weblate (German)

Currently translated at 100.0% (1221 of 1221 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/
---
 custom/languages/de_DE.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index cb73df605c..62149fa3d7 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -182,7 +182,7 @@
     "admin/enable_registration": "Registrierung aktivieren?",
     "admin/enable_status_query": "Aktiviere Status Abfrage?",
     "admin/enable_username_sync": "Username Synchronisation aktivieren?",
-    "admin/enable_username_sync_info": "Wenn diese Option aktiviert ist, werden die Nutzernamen der Website aktualisiert, damit sie mit den Benutzernamen im Spiel übereinstimmen.",
+    "admin/enable_username_sync_info": "Wenn diese Option aktiviert ist, werden die Benutzernamen der Website aktualisiert, damit sie mit den Benutzernamen im Spiel übereinstimmen. Dies geschieht, wenn das In-Game-Plugin eine Liste von UUIDs und Benutzernamen für Online-Spieler an die Website sendet.",
     "admin/enabled": "Aktiviert",
     "admin/enter_authme_db_details": "Bitte gebe gültige Datenbank Informationen ein.",
     "admin/error_deleted_successfully": "Der Fehler wurde erfolgreich gelöscht.",

From c0e671c14eb2618425b9a34d6c978cdeeff73d0d Mon Sep 17 00:00:00 2001
From: romir shima <romirshima@gmail.com>
Date: Tue, 7 Jun 2022 15:26:16 +0000
Subject: [PATCH 114/337] Translated using Weblate (Italian)

Currently translated at 83.4% (1019 of 1221 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/it/
---
 custom/languages/it_IT.json | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/custom/languages/it_IT.json b/custom/languages/it_IT.json
index ca2e0edd63..3112a2b5cd 100644
--- a/custom/languages/it_IT.json
+++ b/custom/languages/it_IT.json
@@ -7,7 +7,7 @@
     "admin/active": "Attivato",
     "admin/add_server": "Aggiungi Server",
     "admin/adding_server": "Aggiunta Server",
-    "admin/admin_dir_still_exists": "Attenzione! La directory <strong>modules/Core/pages/admin</strong> esiste ancora. Si prega di rimuovere questa directory.",
+    "admin/admin_dir_still_exists": "Avvertimento! La directory /modules/Core/pages/admin esiste ancora. Si prega di rimuovere questa directory.",
     "admin/all_logs": "Tutti i log",
     "admin/allow_custom_avatars": "Permettere agli utenti di caricare avatar personalizzati?",
     "admin/announcement_icon_instructions": "Puoi anche aggiungere un'icona a ogni annuncio qui, per esempio usando {{faLink}}, {{semLink}}.",
@@ -23,7 +23,7 @@
     "admin/api_settings_updated_successfully": "Impostazioni API aggiornate con successo.",
     "admin/api_url": "URL dell'API",
     "admin/api_verification": "Abilitare la verifica dell'API?",
-    "admin/api_verification_info": "Se abilitata, gli account possono essere verificati solo tramite l'API, ad esempio ingame utilizzando il plugin Nameless ufficiale. <strong>Questa opzione annullerà la verifica e-mail e gli account verranno automaticamente attivati!</strong> <br /> Dovresti impostare il tuo gruppo predefinito con autorizzazioni limitate e quindi aggiornare il gruppo post-validazione in Pannello Staff -> Configurazione -> Registration tab to the full member group with normal permissions.",
+    "admin/api_verification_info": "Se abilitati, gli account possono essere verificati solo tramite l'API, ad esempio in-game utilizzando il plug-in Nameless ufficiale. Questa opzione sovrascriverà la verifica e-mail e gli account verranno attivati automaticamente!\\nDovresti impostare il tuo gruppo predefinito in modo che abbia autorizzazioni limitate, quindi aggiornare il gruppo post-convalida in StaffCP -> Configurazione -> scheda Registrazione al gruppo di membri completo con i normali permessi.",
     "admin/authme_db_address": "Indrizzo Database AuthMe",
     "admin/authme_db_name": "Nome Database AuthMe",
     "admin/authme_db_password": "Password Database AuthMe",
@@ -33,9 +33,9 @@
     "admin/authme_db_user": "Nome utente Database AuthMe",
     "admin/authme_hash_algorithm": "Algoritmo Hashing AuthMe",
     "admin/authme_integration": "Integrazione AuthMe",
-    "admin/authme_integration_info": "Quando l'integrazione con AuthMe è abilitata, gli utenti possono registrarsi solo in gioco.",
+    "admin/authme_integration_info": "Quando l'integrazione AuthMe è abilitata, gli utenti possono registrarsi solo nel gioco.",
     "admin/authme_password_sync": "Sincronizzare password AuthMe?",
-    "admin/authme_password_sync_help": "Se abilitato, ogni volta che la password di un utente viene aggiornata in gioco, la password verrà anche aggiornata sul sito web.",
+    "admin/authme_password_sync_help": "Se abilitato, ogni volta che la password di un utente viene aggiornata nel gioco, la password verrà aggiornata anche sul sito web.",
     "admin/author": "Autore:",
     "admin/author_x": "Autore: {{author}}",
     "admin/avatar_settings_updated_successfully": "Impostazioni avatar aggiornate con successo.",
@@ -43,7 +43,7 @@
     "admin/average_players": "Giocatori Medi",
     "admin/background_colour": "Colore di sfondo",
     "admin/background_colour_required": "Il colore di sfondo è obbligatorio",
-    "admin/ban_hook_info": "User banned",
+    "admin/ban_hook_info": "Utente bannato",
     "admin/banner_background": "Sfondo banner",
     "admin/banner_image_x": "Immagine banner: {{imageName}}",
     "admin/banner_updated_successfully": "Banner aggiornato con successo. Potrebbe volerci un po' prima che le modifiche abbiano effetto.",
@@ -1022,5 +1022,16 @@
     "user/x_reactions": "{{count}} reazioni",
     "user/x_replies": "{{count}} risposte",
     "user/you_have_been_banned": "Sei stato bannato!",
-    "user/you_have_received_a_warning": "Hai ricevuto un avvertimento!"
+    "user/you_have_received_a_warning": "Hai ricevuto un avvertimento!",
+    "admin/administrator": "Amministratore",
+    "admin/user_group_added_hook_info": "Gruppo utenti aggiunto",
+    "admin/user_group_removed_hook_info": "Gruppo utenti rimosso",
+    "admin/administrator_permission_info": "I membri con questa autorizzazione avranno ogni autorizzazione. Questo è un permesso pericoloso da concedere.",
+    "admin/announcement_hook_info": "Creazione annuncio",
+    "admin/announcement_order": "Ordine",
+    "admin/at_least_one_external": "Inserisci almeno 1 gruppo esterno (Minecraft o Discord)",
+    "admin/bedrock_help": "Seleziona questa opzione se il server è un server Bedrock.",
+    "admin/cache_cleared": "Cache del modello cancellata",
+    "admin/can_unlink": "Può scollegare",
+    "admin/bedrock": "Roccia di fondo?"
 }

From 5c1fce9bc8eb119072ba8628d351efe653b3c149 Mon Sep 17 00:00:00 2001
From: Botan Stefan Alin <stefan.amnox@gmail.com>
Date: Tue, 7 Jun 2022 17:48:44 +0000
Subject: [PATCH 115/337] Translated using Weblate (Romanian)

Currently translated at 83.7% (1022 of 1221 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/ro/
---
 custom/languages/ro_RO.json | 108 ++++++++++++++++++++++++++++++++----
 1 file changed, 97 insertions(+), 11 deletions(-)

diff --git a/custom/languages/ro_RO.json b/custom/languages/ro_RO.json
index aaac72913f..e38efec978 100644
--- a/custom/languages/ro_RO.json
+++ b/custom/languages/ro_RO.json
@@ -10,14 +10,14 @@
     "admin/all_logs": "Toate jurnalele",
     "admin/allow_custom_avatars": "Permiteți utilizatorului să utilizeze avatare personalizate?",
     "admin/api": "API",
-    "admin/api_info": "API permite ca pluginurile și alte servicii să interacționeze cu site-ul dvs. web, cum ar fi {{pluginLinkStart}}pluginul oficial Nameless{{pluginLinkEnd}}.",
-    "admin/api_key": "Cheia API",
+    "admin/api_info": "API-ul permite ca pluginurile și alte servicii să interacționeze cu site-ul dvs. web, cum ar fi {{pluginLinkStart}}pluginul oficial Nameless{{pluginLinkEnd}}, cat si {{botLinkStart}}botul de discord NamelessMC{{botLinkEnd}}.",
+    "admin/api_key": "Cheie API",
     "admin/api_key_regenerated": "Cheia API a fost regenerată cu succes.",
     "admin/api_registration_email": "API pentru înregistrarea e-mail",
     "admin/api_settings_updated_successfully": "Setările API s-au actualizat cu succes.",
     "admin/api_url": "Adresa URL API",
     "admin/api_verification": "Activați verificarea API?",
-    "admin/api_verification_info": "Dacă este activat, conturile pot fi verificate numai prin API, de exemplu, utilizând pluginul oficial Nameless in joc.<strong> Această opțiune va înlocui verificarea prin e-mail și conturile vor fi activate automat! </strong> <br />Ar trebui să vă configurați grupul implicit pentru a avea permisiuni limitate și apoi să actualizați grupul de post-validare (în Panou de Control -> Configurație -> Înregistrare) cu permisiunile obișnuite.",
+    "admin/api_verification_info": "Dacă este activat, conturile pot fi verificate numai prin API, de exemplu, utilizând pluginul oficial Nameless in joc. Această opțiune va înlocui verificarea prin e-mail și conturile vor fi activate automat! Ar trebui să vă configurați grupul implicit pentru a avea permisiuni limitate și apoi să actualizați grupul de post-validare (în Panou de Control -> Configurație -> Înregistrare) cu permisiunile obișnuite.",
     "admin/authme_db_address": "IP-ul (gazda) bazei de date AuthMe",
     "admin/authme_db_name": "Numele bazei de date AuthMe",
     "admin/authme_db_password": "Parola bazei de date AuthMe",
@@ -27,15 +27,15 @@
     "admin/authme_db_user": "Utilizatorul bazei de date AuthMe",
     "admin/authme_hash_algorithm": "Algoritmul de criptare AuthMe",
     "admin/authme_integration": "Integrare AuthMe",
-    "admin/authme_integration_info": "Atunci când integrarea AuthMe este activată, utilizatorii se pot înscrie numai în joc.",
+    "admin/authme_integration_info": "Atunci când integrarea AuthMe este activată, utilizatorii se pot inregistra numai în joc.",
     "admin/authme_password_sync": "Sincronizați parolele AuthMe?",
-    "admin/authme_password_sync_help": "Dacă este activată, ori de câte ori parola utilizatorului este actualizată, parola va fi actualizată și pe site.",
+    "admin/authme_password_sync_help": "Daca este activata, de fiecare data cand un utilizator isi va schimba parola pe joc, aceasta o sa fie actualizata si pe website.",
     "admin/author": "Autor:",
     "admin/author_x": "Autor: {{author}}",
     "admin/avatar_settings_updated_successfully": "Setările avatarelor s-au actualizat cu succes.",
     "admin/avatars": "Avatare",
     "admin/average_players": "Media jucătorilor",
-    "admin/banner_background": "Alegeți imaginea de fundal pentru bannerul serverului:",
+    "admin/banner_background": "Imagine de fundal pentru banner",
     "admin/banner_image_x": "Imagine banner: {{imageName}}",
     "admin/banner_updated_successfully": "Bannerul a fost actualizat cu succes. Ar putea dura ceva timp pentru ca modificările să fie vizibile.",
     "admin/basic_page": "Basic page?",
@@ -86,7 +86,7 @@
     "admin/default_avatar": "Avatar implicit",
     "admin/default_group": "Grupul este grupul implicit pentru utilizatorii noi?",
     "admin/default_language": "Limbă implicită",
-    "admin/default_language_help": "Utilizatorii vor putea alege din limbile instalate.",
+    "admin/default_language_help": "Utilizatorii vor putea alege din limbile instalate. {{docLinkStart}}Citeste mai mult »{{docLinkEnd}}",
     "admin/default_server": "Serverul implicit",
     "admin/default_template_set": "Șablonul prestabilit a fost setat la {{template}} cu succes.",
     "admin/default_timezone": "Fusul orar prestabilit",
@@ -127,7 +127,7 @@
     "admin/enable_api": "Activare API?",
     "admin/enable_authme": "Activați integrarea AuthMe?",
     "admin/enable_debug_mode": "Activați modul de depanare?",
-    "admin/enable_mailer_help": "Activați această opțiune dacă e-mailurile nu sunt trimise în mod implicit. Utilizarea programului PHPMailer necesită un serviciu care să poată trimite e-mailuri, cum ar fi Gmail sau un furnizor SMTP.",
+    "admin/enable_mailer_help": "Daca este activ, email-urile vor fi trimise folosind PHPMailer in loc de sistemul predefinit. Acest lucru s-ar putea sa ajute cu trimiterea, dar trebuie sa configurezi un provider SMTP. {{docLinkStart}}Citeste mai mult »{{docLinkEnd}}",
     "admin/enable_maintenance_mode": "Activați modul de întreținere?",
     "admin/enable_minecraft_integration": "Activați integrarea Minecraft?",
     "admin/enable_nicknames_on_registration": "Activați poreclele pentru utilizatorii ce se înregistrează?",
@@ -136,7 +136,7 @@
     "admin/enable_registration": "Activați înregistrarea?",
     "admin/enable_status_query": "Activați interogarea de stare?",
     "admin/enable_username_sync": "Activați sincronizarea numelor de utilizator?",
-    "admin/enable_username_sync_info": "Dacă este activat, numele de utilizator de pe site va fi actualizat pentru a se potrivi cu numele de utilizator din joc.",
+    "admin/enable_username_sync_info": "Daca este activat, numele de utilizator de pe site va fi actualizat pentru a se potrivi cu numele de utilizator din joc. Acest lucru se intampla cand pluginul din joc trimite o lista cu UUID-uri si nume, pentru jucatorii online catre website.",
     "admin/enabled": "Activat",
     "admin/enter_authme_db_details": "Vă rugăm să introduceți datele valide ale bazei de date.",
     "admin/error_deleted_successfully": "Eroarea a fost ștearsă cu succes.",
@@ -156,7 +156,7 @@
     "admin/find_modules": "Găsiți module",
     "admin/find_templates": "Găsiți șabloane",
     "admin/force_https": "Forțează https?",
-    "admin/force_https_help": "Dacă este activată setarea, toate solicitările către site-ul dvs. vor fi redirecționate către https de la http. Trebuie să aveți un certificat SSL valabil activ pentru ca aceasta să funcționeze corect.",
+    "admin/force_https_help": "Dacă este activat, toate solicitările către site-ul dvs. vor fi redirecționate către https de la http. Trebuie să aveți un certificat SSL valabil activ pentru ca acesta să funcționeze corect.",
     "admin/force_premium_accounts": "Forțează deținere unui cont de Minecraft permium?",
     "admin/force_www": "Forţează www?",
     "admin/forgot_password_email": "E-mail de resetare parolă",
@@ -944,5 +944,91 @@
     "user/x_reactions": "{{count}} reacții",
     "user/x_replies": "{{count}} răspunsuri",
     "user/you_have_been_banned": "Ați fost banat!",
-    "user/you_have_received_a_warning": "Ați primit un avertisment!"
+    "user/you_have_received_a_warning": "Ați primit un avertisment!",
+    "admin/admin_dir_still_exists": "Atentie! Fisierul /modules/Core/pages/admin inca exista. Te rugam sa stergi acest fisier.",
+    "admin/bedrock": "Bedrock?",
+    "admin/bedrock_help": "Selecteaza aceasta optiune daca serverul este unul de tip Bedrock.",
+    "admin/cache_cleared": "Cache-ul pentru template-uri a fost curatat",
+    "admin/can_unlink": "Se poate desincroniza",
+    "admin/can_unlink_integration": "Pot utilizatorii sa dezactiveze integrarea?",
+    "admin/can_view_announcement": "Poate vedea anuntul",
+    "admin/captcha_general": "Activezi Captcha pe pagina de inregistrare?",
+    "admin/captcha_login": "Activezi Captcha pe pagina de autentificare?",
+    "admin/captcha_secret_key": "Cheie secreta Captcha",
+    "admin/captcha_site_key": "Cheie Site Captcha",
+    "admin/captcha_type": "Tip Captcha",
+    "admin/closable": "Se poate inchide",
+    "admin/creating_announcement": "Creare anunt",
+    "admin/creating_announcement_failure": "Crearea anuntului a esuat.",
+    "admin/creating_announcement_success": "Anuntul a fost creat cu succes.",
+    "admin/creating_new_hook": "Se creaza un nou Webhook",
+    "admin/cloning_group": "Clonarea grupului {{group}}",
+    "admin/dark_mode": "Mod intunecat",
+    "admin/debug_link": "Depanare link",
+    "admin/emails_mass_message": "Mesaj in masa prin email",
+    "admin/emails_mass_message_replacements": "Poti folosi variabile in mesajul email-ului. Variabile disponibile: {username}, {sitename}",
+    "admin/emails_mass_message_loading": "Se incarca... Te rugam sa nu reincarci pagina. S-ar putea sa dureze ceva.",
+    "admin/enable_placeholders": "Activezi Placeholderele?",
+    "admin/group_name": "Nume grup",
+    "admin/group_sync_logs": "Schimbari de sincronizare grup",
+    "admin/group_sync_plugin_not_set_up": "Plugin-ul din joc nu este configurat",
+    "admin/announcement_info": "Creaza anunturi pentru a arata un mesaj grupurilor selectate pe pagini specifice de pe website-ul tau.",
+    "admin/api_endpoints_info": "API Endpoint-urile permit modulelor sa creeze metode pentru aplicatiile externe (precum Minecraft si Discord) sa interactioneze cu website-ul tau. Verifica documentatia pentru API {{docLinkStart}}aici{{docLinkEnd}}",
+    "admin/clear_cache": "Curata Cache-ul template-urilor",
+    "admin/editing_integration_for_x": "Editand integrarea {{integration}} pentru {{user}}",
+    "admin/email_language_info": "Nu vezi limba ta? Asigura-te ca fila de limba are permisiuni de scriere de catre webserver-ul tau in /custom/languages.",
+    "admin/use_external_mail_server": "Foloseste server de mail extern",
+    "admin/force_tfa_warning": "Asigura-te ca stii ce face asta sau risti sa te blochezi pe tine si pe restul membrilor din grup pe dinafara.",
+    "admin/debug_link_toast": "Link-ul de depanare a fost copiat!<br>Vizualizeaza logul {{linkStart}}aici{{linkEnd}}",
+    "admin/custom_content": "Content custom",
+    "admin/editing_language": "Editand limba",
+    "admin/editing_messages": "Editand mesajele",
+    "admin/force_tfa_alert": "Grupul tau necesita sa ai autentificarea in doi pasi activa.",
+    "admin/forum_topic_reply_email": "Raspuns la subiectul forumului",
+    "admin/debug_link_info": "Important - partajeaza acest link doar cu persoanele de incredere!",
+    "admin/delete_hook": "Esti sigur ca vrei sa stergi acest hook?",
+    "admin/delete_hook_info": "Stergerea utilizatorului",
+    "admin/deleted_announcement_success": "Anunt sters cu succes.",
+    "admin/dropdown_name": "Nume derulant",
+    "admin/edit_email_messages": "Mesage email",
+    "admin/editing_announcement": "Editare anunt",
+    "admin/editing_announcement_failure": "Actualizarea anuntului a esuat.",
+    "admin/editing_announcement_success": "Actualizarea anuntului a fost facuta cu succes.",
+    "admin/editing_hook": "Editare Webhook",
+    "admin/editing_integration_x": "Editand integrarea {{integration}}",
+    "admin/email_logs": "Emailuri in masa",
+    "admin/email_message_greeting": "Salut",
+    "admin/email_message_message": "Mesaj",
+    "admin/email_message_options": "Optiuni",
+    "admin/email_message_subject": "Subiect",
+    "admin/email_message_thanks": "Multumesc",
+    "admin/email_port_invalid": "Te rugam sa introduci un port valid pentru email.",
+    "admin/email_preview_popup": "Previzualizare",
+    "admin/email_resend_failed": "Retrimiterea emailului a esuat, verifica setarile email-ului tau.",
+    "admin/email_resent_successfully": "Retrimiterea email-ului a fost facuta cu succes.",
+    "admin/group_cloned_successfully": "Clonarea grupului a fost facuta cu succes.",
+    "admin/groups_added": "Grupuri adaugate",
+    "admin/groups_removed": "Grupuri sterse",
+    "admin/header": "Antet",
+    "admin/header_required": "Antetul este necesar.",
+    "admin/home_custom_content": "Content custom pentru acasa",
+    "admin/homepage_news": "Noutati",
+    "admin/hook_created": "Hook creat cu succes.",
+    "admin/hook_deleted": "Hook sters cu succes.",
+    "admin/hook_edited": "Hook editat cu succes.",
+    "admin/user_group_added_hook_info": "Grup de utilizatori adaugat",
+    "admin/user_group_removed_hook_info": "Grup de utilizatori sters",
+    "admin/administrator": "Administrator",
+    "admin/administrator_permission_info": "Membrii cu aceasta permisiune vor avea toate permisiunile disponibile. Aceasta actiune este periculoasa.",
+    "admin/announcement_hook_info": "Creare anunt",
+    "admin/announcement_icon_instructions": "De asemenea, poti adauga si o iconita la fiecare anunt aici, spre exemplu folosind {{faLink}} sau {{semLink}}.",
+    "admin/announcement_order": "Ordine",
+    "admin/announcements": "Anunturi",
+    "admin/api_endpoints": "Puncte finale API",
+    "admin/at_least_one_external": "Introdu minim un grup extern (Minecrat sau Discord)",
+    "admin/background_colour": "Culoare de fundal",
+    "admin/background_colour_required": "Culoarea de fundal este necesara",
+    "admin/ban_hook_info": "Utilizator interzis",
+    "admin/email_preview_popup_message": "Click aici pentru a vedea o previzualizare a email-ului.",
+    "admin/force_tfa": "Autentificare fortata cu doi factori pentru membrii grupului?"
 }

From acc782533d893f35bb087fa33c5a5e20fc1268b7 Mon Sep 17 00:00:00 2001
From: PadowYT2 <me@padow.ml>
Date: Tue, 7 Jun 2022 14:20:11 +0000
Subject: [PATCH 116/337] Translated using Weblate (Russian)

Currently translated at 100.0% (1221 of 1221 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/ru/
---
 custom/languages/ru_RU.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/languages/ru_RU.json b/custom/languages/ru_RU.json
index 6fb82772c4..79e09915bc 100644
--- a/custom/languages/ru_RU.json
+++ b/custom/languages/ru_RU.json
@@ -194,7 +194,7 @@
     "admin/enable_registration": "Включить регистрацию?",
     "admin/enable_status_query": "Включить запрос статуса сервера?",
     "admin/enable_username_sync": "Включить синхронизацию имён пользователей?",
-    "admin/enable_username_sync_info": "Если этот параметр включен, имена пользователей веб-сайта будут обновлены в соответствии с игровыми именами пользователей.",
+    "admin/enable_username_sync_info": "Если этот параметр включен, имена пользователей веб-сайта будут обновлены в соответствии с игровыми именами пользователей. Это происходит когда игровой плагин отправляет список UUIDов и никнеймов, для онлайн игроков, на сайт.",
     "admin/enabled": "Включено",
     "admin/enter_authme_db_details": "Введите корректные данные базы данных.",
     "admin/error_deleted_successfully": "Ошибка была успешно удалена.",

From 71927a8e52a731ca46aa901278e5f919d253806b Mon Sep 17 00:00:00 2001
From: romir shima <romirshima@gmail.com>
Date: Tue, 7 Jun 2022 15:05:16 +0000
Subject: [PATCH 117/337] Translated using Weblate (Italian)

Currently translated at 100.0% (51 of 51 strings)

Translation: NamelessMC/Website - Discord Integration
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-discord-integration/it/
---
 .../Discord Integration/language/it_IT.json   | 37 +++++++++++++++----
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/modules/Discord Integration/language/it_IT.json b/modules/Discord Integration/language/it_IT.json
index c8b8ce2a8b..bf9422a48d 100644
--- a/modules/Discord Integration/language/it_IT.json	
+++ b/modules/Discord Integration/language/it_IT.json	
@@ -2,13 +2,13 @@
     "discord_integration/discord": "Discord",
     "discord_integration/discord_already_pending": "Hai già una verifica in sospeso.",
     "discord_integration/discord_bot_must_be_setup": "Non è possibile abilitare l'integrazione con Discord fino a che il bot non sarà configurato. Per informazioni, {{linkStart}}clicca qui{{linkEnd}}.",
-    "discord_integration/discord_bot_setup": "Configurazione del bot",
+    "discord_integration/discord_bot_setup": "Bot configurato?",
     "discord_integration/discord_communication_error": "Si è verificato un errore durante la comunicazione con il Bot di Discord. Assicurati che il bot sia in esecuzione e che l'URL del tuo Bot sia corretto.",
     "discord_integration/discord_database_error": "Il database dei collegamenti di Nameless è attualmente inattivo. Riprova più tardi.",
     "discord_integration/discord_guild_id": "ID Server Discord",
     "discord_integration/discord_id_help": "Per informazioni su dove trovare gli ID Discord, leggi {{linkStart}}questo.{{linkEnd}}",
-    "discord_integration/discord_id_length": "Assicurati che il tuo ID Discord sia lungo 18 caratteri.",
-    "discord_integration/discord_id_numeric": "Assicurati che il tuo ID Discord sia numerico (solo numeri).",
+    "discord_integration/discord_id_length": "Assicurati che il tuo ID Discord Server sia lungo 18 caratteri.",
+    "discord_integration/discord_id_numeric": "Assicurati che l'ID del tuo server Discord sia numerico (solo numeri).",
     "discord_integration/discord_id_set": "ID Discord impostato correttamente",
     "discord_integration/discord_id_taken": "Quell'ID Discord è già stato preso.",
     "discord_integration/discord_id_unlinked": "Scollegato con successo il tuo ID utente Discord.",
@@ -19,12 +19,35 @@
     "discord_integration/discord_role_id_numeric": "L'ID ruolo Discord deve essere numerico.",
     "discord_integration/discord_settings_updated": "Impostazioni di Discord aggiornate con successo",
     "discord_integration/discord_unknown_error": "Si è verificato un errore sconosciuto durante la sincronizzazione dei ruoli di Discord. Contatta un amministratore.",
-    "discord_integration/discord_widget_theme": "Tema Widget Discord",
-    "discord_integration/enable_discord_integration": "Abilitare l'integrazione con Discord?",
+    "discord_integration/discord_widget_theme": "Tema del widget Discord",
+    "discord_integration/enable_discord_integration": "Abilitare l'integrazione di Discord?",
     "discord_integration/linked": "Collegato",
     "discord_integration/not_linked": "Non collegato",
-    "discord_integration/pending_link": "In attesa",
+    "discord_integration/pending_link": "In attesa di",
     "discord_integration/provide_one_discord_settings": "Fornisci almeno uno dei seguenti: \"url\", \"guild_id\"",
     "discord_integration/unable_to_set_discord_bot_url": "Impossibile impostare l'URL del bot Discord",
-    "discord_integration/unable_to_set_discord_id": "Impossibile impostare l'ID Discord."
+    "discord_integration/unable_to_set_discord_id": "Impossibile impostare l'ID discordia.",
+    "discord_integration/get_link_code": "Ottieni il codice di collegamento",
+    "discord_integration/discord_widget_error": "Si è verificato un errore durante il recupero del widget Discord: {{error}}.",
+    "discord_integration/discord_id_required": "Inserisci il tuo ID del server Discord.",
+    "discord_integration/no_pending_verification_for_token": "Non ci sono verifiche in sospeso per il token fornito.",
+    "discord_integration/unable_to_update_discord_bot_username": "Impossibile aggiornare il nome utente del bot Discord.",
+    "discord_integration/unable_to_update_discord_roles": "Impossibile aggiornare l'elenco dei ruoli Discord.",
+    "discord_integration/unable_to_update_discord_username": "Impossibile aggiornare il nome utente Discord.",
+    "discord_integration/discord_bot_check_logs": "Dovresti verificare la presenza di un errore più specifico (se presente) in StaffCP -> Sicurezza -> Tutti i registri.",
+    "discord_integration/discord_bot_error_badparameter": "Corpo della richiesta non valido.",
+    "discord_integration/discord_bot_error_invguild": "A condizione che l'ID gilda non sia valido o che il bot non sia presente.",
+    "discord_integration/discord_bot_error_invrole": "L'ID ruolo fornito non è valido.",
+    "discord_integration/discord_bot_error_invuser": "L'ID utente fornito non è valido o non è nella gilda specificata.",
+    "discord_integration/discord_bot_error_notlinked": "Il bot non è collegato a questo sito Web per l'ID gilda fornito.",
+    "discord_integration/discord_bot_error_partsuccess": "Il bot non ha potuto modificare uno o più ruoli a causa di un'errata configurazione della gerarchia di Discord.",
+    "discord_integration/discord_bot_error_unauthorized": "La chiave API del sito Web non è valida",
+    "discord_integration/discord_id_confirm": "Esegui il comando \"/verify {{token}}\" in Discord per completare il collegamento del tuo account Discord.",
+    "discord_integration/discord_integration_not_setup": "L'integrazione di Discord non è impostata",
+    "discord_integration/discord_invite_info": "Per invitare il bot Nameless Link sul tuo server Discord, fai clic {{inviteLinkStart}}qui{{inviteLinkEnd}}. Quindi, esegui il comando {{command}} per collegare il bot al tuo sito web. In alternativa, puoi {{selfHostLinkStart}}ospitare il bot da solo{{selfHostLinkEnd}}.",
+    "discord_integration/discord_bot_error_error": "Si è verificato un errore interno del bot.",
+    "discord_integration/discord_user_id": "ID utente Discord",
+    "discord_integration/discord_username": "Nome utente Discord",
+    "discord_integration/discord_usernames_updated": "Nomi utente Discord aggiornati correttamente",
+    "discord_integration/discord_widget_disabled": "Il widget è disabilitato per il server Discord specificato. Vai alla scheda \"Widget\" nelle impostazioni del tuo server Discord e assicurati che il widget Discord sia abilitato e che l'ID sia corretto."
 }

From 2668ae3d1545a730aa2e3ffd6089efcc6fc85a44 Mon Sep 17 00:00:00 2001
From: romir shima <romirshima@gmail.com>
Date: Tue, 7 Jun 2022 15:22:13 +0000
Subject: [PATCH 118/337] Translated using Weblate (Italian)

Currently translated at 100.0% (11 of 11 strings)

Translation: NamelessMC/Website - Cookie Consent
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/cookie-consent/it/
---
 modules/Cookie Consent/language/it.json | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/Cookie Consent/language/it.json b/modules/Cookie Consent/language/it.json
index 0967ef424b..340c8df594 100644
--- a/modules/Cookie Consent/language/it.json	
+++ b/modules/Cookie Consent/language/it.json	
@@ -1 +1,13 @@
-{}
+{
+    "cookie/cookie_notice": "Avviso sui cookie",
+    "cookie/cookie_notice_info": "Questo widget richiede i cookie",
+    "cookie/cookie_popup": "Questo sito utilizza i cookie per migliorare la tua esperienza di navigazione.",
+    "cookie/cookie_popup_allow": "Consenti i cookie",
+    "cookie/cookie_popup_disallow": "Non consentire i cookie",
+    "cookie/cookie_popup_more_info": "Ulteriori informazioni",
+    "cookie/cookies": "Biscotti",
+    "cookie/update_settings": "Mostra popup cookie",
+    "cookie/configure_cookies": "Configura i cookie",
+    "cookie/cookie_notice_success": "Avviso sui cookie aggiornato correttamente.",
+    "cookie/cookie_notice_error": "Inserisci un avviso sui cookie di massimo 10.000 caratteri."
+}

From 8d8f5e578c69ad6c201b74b90ad3d444d2c06677 Mon Sep 17 00:00:00 2001
From: romir shima <romirshima@gmail.com>
Date: Tue, 7 Jun 2022 15:13:14 +0000
Subject: [PATCH 119/337] Translated using Weblate (Italian)

Currently translated at 100.0% (195 of 195 strings)

Translation: NamelessMC/Website - Forum
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-forum/it/
---
 modules/Forum/language/it_IT.json | 371 ++++++++++++++++--------------
 1 file changed, 196 insertions(+), 175 deletions(-)

diff --git a/modules/Forum/language/it_IT.json b/modules/Forum/language/it_IT.json
index fe3f0ff4d4..df2a202dae 100644
--- a/modules/Forum/language/it_IT.json
+++ b/modules/Forum/language/it_IT.json
@@ -1,176 +1,197 @@
 {
-    "forum\/available_hooks": "Available Hooks",
-    "forum\/average_posts": "Numero medio di post dell'utente",
-    "forum\/by": "da",
-    "forum\/can_create_topic": "Puoi creare discussioni?",
-    "forum\/can_edit_topic": "Can edit their topics?",
-    "forum\/can_moderate_forum": "Può moderare il forum?",
-    "forum\/can_post_reply": "Puoi creare risposte?",
-    "forum\/can_view_forum": "Può vedere il forum?",
-    "forum\/can_view_other_topics": "Può visualizzare le discussioni degli altri utenti?",
-    "forum\/confirm_delete_post": "Sei sicuro di voler eliminare questo post?",
-    "forum\/confirm_delete_short": "Conferma eliminazione",
-    "forum\/confirm_delete_topic": "Sei sicuro di voler eliminare questa discussione?",
-    "forum\/content_max_50000": "Il contenuto del tuo post non deve essere più lungo di 50000 caratteri",
-    "forum\/content_min_2": "Il contenuto del tuo post deve contenere almeno 2 caratteri",
-    "forum\/content_required": "Non puoi creare un post vuoto!",
-    "forum\/creating_forum": "Crea un nuovo forum",
-    "forum\/creating_label": "Creazione di una nuova etichetta",
-    "forum\/creating_label_type": "Creazione di un nuovo tipo di etichetta",
-    "forum\/creating_topic_in_x": "Creazione della discussione in {{forum}}",
-    "forum\/delete_forum": "Elimina forum",
-    "forum\/delete_topic": "Elimina discussione",
-    "forum\/delete_topics_and_posts": "Elimina discussioni e post",
-    "forum\/discussion": "Discussione",
-    "forum\/display_topics_as_news": "Mostra discussioni come notizie in prima pagina?",
-    "forum\/edit": "Modifica",
-    "forum\/edit_post": "Modifica post",
-    "forum\/editing_label": "Modifica etichetta",
-    "forum\/editing_label_type": "Modifica del tipo di etichetta",
-    "forum\/error_quoting_posts": "Spiacenti, si è verificato un problema durante la citazione dei post.",
-    "forum\/error_rating_post": "Spiacenti, si è verificato un errore durante la valutazione del post.",
-    "forum\/follow": "Segui",
-    "forum\/forum": "Forum",
-    "forum\/forum_created_successfully": "Forum creato con successo.",
-    "forum\/forum_deleted_successfully": "Forum eliminato con successo.",
-    "forum\/forum_description": "Descrizione del forum",
-    "forum\/forum_description_maximum": "La descrizione del forum deve essere al massimo di 255 caratteri.",
-    "forum\/forum_description_minimum": "La descrizione del forum deve contenere almeno 2 caratteri.",
-    "forum\/forum_icon": "Icona del forum",
-    "forum\/forum_icon_maximum": "L'icona del forum deve avere un massimo di 256 caratteri.",
-    "forum\/forum_index": "Home",
-    "forum\/forum_layout": "Layout del forum",
-    "forum\/forum_name": "Nome del forum",
-    "forum\/forum_name_maximum": "Il nome del forum deve contenere un massimo di 150 caratteri.",
-    "forum\/forum_name_minimum": "Il nome del forum deve contenere almeno 2 caratteri.",
-    "forum\/forum_permissions": "Permessi del forum",
-    "forum\/forum_redirect_warning": "Avviso: stai per uscire da questo sito! Sei sicuro di voler procedere verso {{url}}?",
-    "forum\/forum_search": "Ricerca nel forum",
-    "forum\/forum_type": "Tipo di forum",
-    "forum\/forum_type_category": "Categoria",
-    "forum\/forum_type_forum": "Forum",
-    "forum\/forum_updated_successfully": "Forum aggiornato con successo.",
-    "forum\/forums": "Forum",
-    "forum\/group": "Gruppo",
-    "forum\/guests": "Ospiti",
-    "forum\/has_no_parent": "Nessun forum principale",
-    "forum\/in": "nel",
-    "forum\/include_in_hook": "Includere nuove discussioni da questo forum nel webhook?",
-    "forum\/input_forum_description": "Si prega di inserire una descrizione del forum.",
-    "forum\/input_forum_title": "Si prega di inserire un titolo del forum.",
-    "forum\/insert_quotes": "Inserisci citazioni",
-    "forum\/invalid_action": "Azione non valida",
-    "forum\/invalid_redirect_url": "Hai attivato il reindirizzamento del forum, ma non hai inserito un URL valido tra 1 e 512 caratteri.",
-    "forum\/invalid_search_query": "Inserisci una query di ricerca compresa tra 3 e 128 caratteri.",
-    "forum\/label": "Etichetta",
-    "forum\/label_creation_error": "Errore durante la creazione dell'etichetta. Assicurati che il nome non sia più lungo di 32 caratteri e che tu abbia specificato un tipo.",
-    "forum\/label_creation_success": "Etichetta creata con successo.",
-    "forum\/label_deleted_successfully": "Etichetta eliminata con successo.",
-    "forum\/label_edit_success": "Etichetta modificata correttamente.",
-    "forum\/label_forums": "Etichette forum",
-    "forum\/label_groups": "Gruppi di etichette",
-    "forum\/label_name": "Nome dell'etichetta",
-    "forum\/label_type": "Tipo di etichetta",
-    "forum\/label_type_creation_error": "Errore durante la creazione di un tipo di etichetta. Assicurati che il nome non sia più lungo di 32 caratteri e che l'HTML non sia più lungo di 1024 caratteri.",
-    "forum\/label_type_creation_success": "Tipo di etichetta creato correttamente.",
-    "forum\/label_type_deleted_successfully": "Tipo di etichetta eliminata con successo.",
-    "forum\/label_type_edit_success": "Tipo di etichetta modificato correttamente.",
-    "forum\/label_type_html": "Codice HTML tipo etichetta",
-    "forum\/label_type_html_help": "L'HTML deve includere {x} come segnaposto per il nome dell'etichetta",
-    "forum\/label_type_name": "Nome del tipo di etichetta",
-    "forum\/label_types": "Tipi di etichette",
-    "forum\/labels": "Etichette",
-    "forum\/last_7_days_posts": "Post del forum (ultimi 7 giorni)",
-    "forum\/last_edited": "Ultima modifica: {{lastEditedAt}}",
-    "forum\/last_reply": "Ultima risposta",
-    "forum\/latest_announcements": "Ultimi Annunci",
-    "forum\/latest_discussions": "Ultime Discussioni",
-    "forum\/latest_discussions_view": "Vista ultime discussioni",
-    "forum\/latest_posts": "Ultimi post",
-    "forum\/lock_topic": "Blocca discussione",
-    "forum\/merge_instructions": "La discussione da unire <strong>deve<\/strong> essere all'interno dello stesso forum. Sposta la discussione se necessario.",
-    "forum\/merge_topic": "Unisci discussione",
-    "forum\/merge_topics": "Unisci discussioni",
-    "forum\/mod_actions": "Moderazione",
-    "forum\/move_topic": "Sposta discussione",
-    "forum\/move_topic_to": "Sposta la discussione in:",
-    "forum\/move_topics_and_posts_to": "Sposta discussioni e post a",
-    "forum\/new_forum": "<i class=\"fa fa-plus-circle\"><\/i> Nuovo forum",
-    "forum\/new_label": "<i class=\"fa fa-plus-circle\"><\/i> Nuova etichetta",
-    "forum\/new_label_type": "<i class=\"fa fa-plus-circle\"><\/i> Nuovo tipo di etichetta",
-    "forum\/new_reply": "Nuova risposta",
-    "forum\/new_reply_in_topic": "{{author}} ha risposto alla discussione {{topic}}",
-    "forum\/new_search": "Nuova ricerca",
-    "forum\/new_topic": "Nuova discussione",
-    "forum\/new_topic_hook_info": "Nuova discussione",
-    "forum\/new_topic_text": "Discussione creata in {{forum}} da {{author}}",
-    "forum\/no_forums": "Nessun forum",
-    "forum\/no_label": "Senza etichetta",
-    "forum\/no_label_types_defined": "Nessun tipo di etichetta è stato ancora definito.",
-    "forum\/no_labels_defined": "Nessuna etichetta è stata ancora definita.",
-    "forum\/no_longer_following_topic": "Non stai più seguendo questa discussione e non riceverai alcuna notifica di nuove risposte.",
-    "forum\/no_results_found": "Nessun risultato trovato.",
-    "forum\/no_topics": "Non c'è ancora nessuna discussione.",
-    "forum\/no_topics_short": "Nessuna discussione",
-    "forum\/no_users_online": "Nesssun utente online",
-    "forum\/now_following_topic": "Ora stai seguendo questa discussione e sarai informato di eventuali nuove risposte.",
-    "forum\/online_users": "Utenti Online",
-    "forum\/overview": "Panoramica",
-    "forum\/parent_forum": "Forum principale",
-    "forum\/parent_forum_x": "Forum principale: {{forum}}",
-    "forum\/post_already_reported": "Hai già segnalato questo post!",
-    "forum\/post_edited_successfully": "Post modificato con successo.",
-    "forum\/post_successful": "Postato con successo.",
-    "forum\/posts": "post",
-    "forum\/posts_title": "Post",
-    "forum\/quote": "Quota",
-    "forum\/quoted_post": "Post aggiunto ai post citati.",
-    "forum\/quoting_posts": "Inserimento citazioni..",
-    "forum\/re": "RI: ",
-    "forum\/read_full_post": "Leggi l'articolo completo",
-    "forum\/recent_posts": "Post recenti",
-    "forum\/recent_topics": "Discussioni recenti",
-    "forum\/redirect_forum": "Forum di reindirizzamento?",
-    "forum\/redirect_url": "URL di reindirizzamento",
-    "forum\/registered_x": "Iscritto: {{registeredAt}}",
-    "forum\/removed_quoted_post": "Post rimosso dai post citati.",
-    "forum\/search_again_in_x_seconds": "Attendi {{count}} secondi prima di effettuare nuovamente la ricerca.",
-    "forum\/search_results": "Risultati della ricerca",
-    "forum\/select_a_parent_forum": "Seleziona un forum principale",
-    "forum\/settings_updated_successfully": "Impostazioni aggiornate con successo.",
-    "forum\/share": "Condividi",
-    "forum\/share_facebook": "Condividi su Facebook",
-    "forum\/share_twitter": "Condividi su Twitter",
-    "forum\/spam_wait": "Attendi {{count}} secondi prima di postare di nuovo.",
-    "forum\/started_by_x": "Avviato da {{author}}",
-    "forum\/stats": "Statistiche",
-    "forum\/stick_topic": "Fissa discussione",
-    "forum\/sticky_topics": "Discussioni in rilievo",
-    "forum\/subforum": "Sotto-forum",
-    "forum\/subforums": "Sotto-forum",
-    "forum\/table_view": "Vista tabella",
-    "forum\/title_max_64": "Il titolo della discussione non deve contenere più di 64 caratteri",
-    "forum\/title_min_2": "Il titolo della discussione deve contenere almeno 2 caratteri",
-    "forum\/title_required": "Devi inserire il titolo della discussione!",
-    "forum\/topic": "Discussione",
-    "forum\/topic_locked": "Discussione  bloccato",
-    "forum\/topic_locked_notice": "Questa discussione è bloccata, ma i tuoi permessi ti consentono di creare una risposta.",
-    "forum\/topic_placeholder": "Topic segnaposto",
-    "forum\/topic_stuck": "La discussione è rimasta bloccata.",
-    "forum\/topic_title": "Titolo del topic",
-    "forum\/topic_unstuck": "La discussione è stato sbloccata.",
-    "forum\/topics": "discussioni",
-    "forum\/topics_title": "Discussioni",
-    "forum\/total_posts": "Conteggio totale delle post",
-    "forum\/unfollow": "Smetti di seguire",
-    "forum\/unlock_topic": "Sblocca discussione",
-    "forum\/unstick_topic": "Togli la discussione dai fissati",
-    "forum\/use_reactions": "Utilizzare le reazioni?",
-    "forum\/user_no_posts": "Questo utente non ha ancora creato nessun post nel forum.",
-    "forum\/user_tag": "Sei stato taggato in un post.",
-    "forum\/user_tag_info": "Sei stato taggato in un post da {{author}}.",
-    "forum\/views": "visualizzazioni",
-    "forum\/x_posts": "{{count}} post",
-    "forum\/x_topics": "{{count}} discussioni",
-    "forum\/your_posts": "Il tuo numero di post"
-}
\ No newline at end of file
+    "forum/available_hooks": "Available Hooks",
+    "forum/average_posts": "Numero medio di post dell'utente",
+    "forum/by": "da",
+    "forum/can_create_topic": "Puoi creare discussioni?",
+    "forum/can_edit_topic": "Can edit their topics?",
+    "forum/can_moderate_forum": "Può moderare il forum?",
+    "forum/can_post_reply": "Puoi creare risposte?",
+    "forum/can_view_forum": "Può vedere il forum?",
+    "forum/can_view_other_topics": "Può visualizzare le discussioni degli altri utenti?",
+    "forum/confirm_delete_post": "Sei sicuro di voler eliminare questo post?",
+    "forum/confirm_delete_short": "Conferma eliminazione",
+    "forum/confirm_delete_topic": "Sei sicuro di voler eliminare questa discussione?",
+    "forum/content_max_50000": "Il contenuto del tuo post non deve essere più lungo di 50000 caratteri",
+    "forum/content_min_2": "Il contenuto del tuo post deve contenere almeno 2 caratteri",
+    "forum/content_required": "Non puoi creare un post vuoto!",
+    "forum/creating_forum": "Crea un nuovo forum",
+    "forum/creating_label": "Creazione di una nuova etichetta",
+    "forum/creating_label_type": "Creazione di un nuovo tipo di etichetta",
+    "forum/creating_topic_in_x": "Creazione della discussione in {{forum}}",
+    "forum/delete_forum": "Elimina forum",
+    "forum/delete_topic": "Elimina discussione",
+    "forum/delete_topics_and_posts": "Elimina discussioni e post",
+    "forum/discussion": "Discussione",
+    "forum/display_topics_as_news": "Mostra discussioni come notizie in prima pagina?",
+    "forum/edit": "Modifica",
+    "forum/edit_post": "Modifica post",
+    "forum/editing_label": "Modifica etichetta",
+    "forum/editing_label_type": "Modifica del tipo di etichetta",
+    "forum/error_quoting_posts": "Spiacenti, si è verificato un problema durante la citazione dei post.",
+    "forum/error_rating_post": "Spiacenti, si è verificato un errore durante la valutazione del post.",
+    "forum/follow": "Segui",
+    "forum/forum": "Forum",
+    "forum/forum_created_successfully": "Forum creato con successo.",
+    "forum/forum_deleted_successfully": "Forum eliminato con successo.",
+    "forum/forum_description": "Descrizione del forum",
+    "forum/forum_description_maximum": "La descrizione del forum deve essere al massimo di 255 caratteri.",
+    "forum/forum_description_minimum": "La descrizione del forum deve contenere almeno 2 caratteri.",
+    "forum/forum_icon": "Icona del forum",
+    "forum/forum_icon_maximum": "L'icona del forum deve avere un massimo di 256 caratteri.",
+    "forum/forum_index": "Home",
+    "forum/forum_layout": "Layout del forum",
+    "forum/forum_name": "Nome del forum",
+    "forum/forum_name_maximum": "Il nome del forum deve contenere un massimo di 150 caratteri.",
+    "forum/forum_name_minimum": "Il nome del forum deve contenere almeno 2 caratteri.",
+    "forum/forum_permissions": "Permessi del forum",
+    "forum/forum_redirect_warning": "Avviso: stai per uscire da questo sito! Sei sicuro di voler procedere verso {{url}}?",
+    "forum/forum_search": "Ricerca nel forum",
+    "forum/forum_type": "Tipo di forum",
+    "forum/forum_type_category": "Categoria",
+    "forum/forum_type_forum": "Forum",
+    "forum/forum_updated_successfully": "Forum aggiornato con successo.",
+    "forum/forums": "Forum",
+    "forum/group": "Gruppo",
+    "forum/guests": "Ospiti",
+    "forum/has_no_parent": "Nessun forum principale",
+    "forum/in": "nel",
+    "forum/include_in_hook": "Includere eventi da questo forum nei webhook?",
+    "forum/input_forum_description": "Si prega di inserire una descrizione del forum.",
+    "forum/input_forum_title": "Si prega di inserire un titolo del forum.",
+    "forum/insert_quotes": "Inserisci citazioni",
+    "forum/invalid_action": "Azione non valida",
+    "forum/invalid_redirect_url": "Hai attivato il reindirizzamento del forum, ma non hai inserito un URL valido tra 1 e 512 caratteri.",
+    "forum/invalid_search_query": "Inserisci una query di ricerca compresa tra 3 e 128 caratteri.",
+    "forum/label": "Etichetta",
+    "forum/label_creation_error": "Errore durante la creazione dell'etichetta. Assicurati che il nome non sia più lungo di 32 caratteri e che tu abbia specificato un tipo.",
+    "forum/label_creation_success": "Etichetta creata con successo.",
+    "forum/label_deleted_successfully": "Etichetta eliminata con successo.",
+    "forum/label_edit_success": "Etichetta modificata correttamente.",
+    "forum/label_forums": "Etichette forum",
+    "forum/label_groups": "Gruppi di etichette",
+    "forum/label_name": "Nome dell'etichetta",
+    "forum/label_type": "Tipo di etichetta",
+    "forum/label_type_creation_error": "Errore durante la creazione di un tipo di etichetta. Assicurati che il nome non sia più lungo di 32 caratteri e che l'HTML non sia più lungo di 1024 caratteri.",
+    "forum/label_type_creation_success": "Tipo di etichetta creato correttamente.",
+    "forum/label_type_deleted_successfully": "Tipo di etichetta eliminata con successo.",
+    "forum/label_type_edit_success": "Tipo di etichetta modificato correttamente.",
+    "forum/label_type_html": "Codice HTML tipo etichetta",
+    "forum/label_type_html_help": "L'HTML deve includere {x} come segnaposto per il nome dell'etichetta",
+    "forum/label_type_name": "Nome del tipo di etichetta",
+    "forum/label_types": "Tipi di etichette",
+    "forum/labels": "Etichette",
+    "forum/last_7_days_posts": "Post del forum (ultimi 7 giorni)",
+    "forum/last_edited": "Ultima modifica: {{lastEditedAt}}",
+    "forum/last_reply": "Ultima risposta",
+    "forum/latest_announcements": "Ultimi Annunci",
+    "forum/latest_discussions": "Ultime Discussioni",
+    "forum/latest_discussions_view": "Vista ultime discussioni",
+    "forum/latest_posts": "Ultimi post",
+    "forum/lock_topic": "Blocca discussione",
+    "forum/merge_instructions": "La discussione da unire <strong>deve</strong> essere all'interno dello stesso forum. Sposta la discussione se necessario.",
+    "forum/merge_topic": "Unisci discussione",
+    "forum/merge_topics": "Unisci discussioni",
+    "forum/mod_actions": "Moderazione",
+    "forum/move_topic": "Sposta discussione",
+    "forum/move_topic_to": "Sposta la discussione in:",
+    "forum/move_topics_and_posts_to": "Sposta discussioni e post a",
+    "forum/new_forum": "<i class=\"fa fa-plus-circle\"></i> Nuovo forum",
+    "forum/new_label": "<i class=\"fa fa-plus-circle\"></i> Nuova etichetta",
+    "forum/new_label_type": "<i class=\"fa fa-plus-circle\"></i> Nuovo tipo di etichetta",
+    "forum/new_reply": "Nuova risposta",
+    "forum/new_reply_in_topic": "{{author}} ha risposto alla discussione {{topic}}",
+    "forum/new_search": "Nuova ricerca",
+    "forum/new_topic": "Nuova discussione",
+    "forum/new_topic_hook_info": "Nuova discussione",
+    "forum/new_topic_text": "Discussione creata in {{forum}} da {{author}}",
+    "forum/no_forums": "Nessun forum",
+    "forum/no_label": "Senza etichetta",
+    "forum/no_label_types_defined": "Nessun tipo di etichetta è stato ancora definito.",
+    "forum/no_labels_defined": "Nessuna etichetta è stata ancora definita.",
+    "forum/no_longer_following_topic": "Non stai più seguendo questa discussione e non riceverai alcuna notifica di nuove risposte.",
+    "forum/no_results_found": "Nessun risultato trovato.",
+    "forum/no_topics": "Non c'è ancora nessuna discussione.",
+    "forum/no_topics_short": "Nessuna discussione",
+    "forum/no_users_online": "Nessun utente in linea.",
+    "forum/now_following_topic": "Ora stai seguendo questa discussione e sarai informato di eventuali nuove risposte.",
+    "forum/online_users": "Utenti Online",
+    "forum/overview": "Panoramica",
+    "forum/parent_forum": "Forum principale",
+    "forum/parent_forum_x": "Forum principale: {{forum}}",
+    "forum/post_already_reported": "Hai già segnalato questo post!",
+    "forum/post_edited_successfully": "Post modificato con successo.",
+    "forum/post_successful": "Postato con successo.",
+    "forum/posts": "post",
+    "forum/posts_title": "Post",
+    "forum/quote": "Quota",
+    "forum/quoted_post": "Post aggiunto ai post citati.",
+    "forum/quoting_posts": "Inserimento citazioni..",
+    "forum/re": "RI: ",
+    "forum/read_full_post": "Leggi l'articolo completo",
+    "forum/recent_posts": "Post recenti",
+    "forum/recent_topics": "Discussioni recenti",
+    "forum/redirect_forum": "Forum di reindirizzamento?",
+    "forum/redirect_url": "URL di reindirizzamento",
+    "forum/registered_x": "Iscritto: {{registeredAt}}",
+    "forum/removed_quoted_post": "Post rimosso dai post citati.",
+    "forum/search_again_in_x_seconds": "Attendi {{count}} secondi prima di effettuare nuovamente la ricerca.",
+    "forum/search_results": "Risultati della ricerca",
+    "forum/select_a_parent_forum": "Seleziona un forum principale",
+    "forum/settings_updated_successfully": "Impostazioni aggiornate con successo.",
+    "forum/share": "Condividi",
+    "forum/share_facebook": "Condividi su Facebook",
+    "forum/share_twitter": "Condividi su Twitter",
+    "forum/spam_wait": "Attendi {{count}} secondi prima di postare di nuovo.",
+    "forum/started_by_x": "Avviato da {{author}}",
+    "forum/stats": "Statistiche",
+    "forum/stick_topic": "Fissa discussione",
+    "forum/sticky_topics": "Discussioni in rilievo",
+    "forum/subforum": "Sotto-forum",
+    "forum/subforums": "Sotto-forum",
+    "forum/table_view": "Vista tabella",
+    "forum/title_max_64": "Il titolo della discussione non deve contenere più di 64 caratteri",
+    "forum/title_min_2": "Il titolo della discussione deve contenere almeno 2 caratteri",
+    "forum/title_required": "Inserisci il titolo di un argomento",
+    "forum/topic": "Discussione",
+    "forum/topic_locked": "Discussione bloccato",
+    "forum/topic_locked_notice": "Questa discussione è bloccata, ma i tuoi permessi ti consentono di creare una risposta.",
+    "forum/topic_placeholder": "Topic segnaposto",
+    "forum/topic_stuck": "La discussione è rimasta bloccata.",
+    "forum/topic_title": "Titolo del topic",
+    "forum/topic_unstuck": "La discussione è stato sbloccata.",
+    "forum/topics": "discussioni",
+    "forum/topics_title": "Discussioni",
+    "forum/total_posts": "Conteggio totale delle post",
+    "forum/unfollow": "Smetti di seguire",
+    "forum/unlock_topic": "Sblocca discussione",
+    "forum/unstick_topic": "Togli la discussione dai fissati",
+    "forum/use_reactions": "Utilizzare le reazioni?",
+    "forum/user_no_posts": "Questo utente non ha ancora creato nessun post nel forum.",
+    "forum/user_tag": "Sei stato taggato in un post.",
+    "forum/user_tag_info": "Sei stato taggato in un post da {{author}}.",
+    "forum/views": "visualizzazioni",
+    "forum/x_posts": "{{count}} post",
+    "forum/x_topics": "{{count}} discussioni",
+    "forum/your_posts": "Il tuo numero di post",
+    "forum/no_news": "Non ci sono notizie.",
+    "forum/not_following_any_topics": "Non stai seguendo nessun argomento.",
+    "forum/post_id": "ID postale",
+    "forum/topic_id": "ID argomento",
+    "forum/all_topics_unfollowed": "Tutti gli argomenti non sono stati seguiti.",
+    "forum/topic_reply": "Risposta argomento",
+    "forum/default_labels_info": "Questi verranno assegnati a un nuovo argomento nel forum a meno che non vengano ignorati durante la creazione dell'argomento. Ctrl+Clic per selezionare più",
+    "forum/confirm_unfollow_all_topics": "Sei sicuro di voler smettere di seguire tutti gli argomenti?",
+    "forum/default_labels": "Etichette predefinite",
+    "forum/following_topics": "Argomenti seguiti",
+    "forum/new_topic_reply_text": "Risposta all'argomento creata in {{forum}} da {{author}}",
+    "forum/pre_post_create_hook_info": "Creazione pre-post",
+    "forum/pre_post_edit_hook_info": "Modifica pre-post",
+    "forum/pre_topic_create_hook_info": "Creazione pre-argomento",
+    "forum/pre_topic_edit_hook_info": "Modifica pre-argomento",
+    "forum/user_object": "Oggetto utente",
+    "forum/label_type_in_use": "Il tipo di etichetta è in uso, non può essere eliminato.",
+    "forum/topic_author_nickname": "Soprannome dell'autore dell'argomento",
+    "forum/topic_author_uuid": "ID utente dell'autore dell'argomento",
+    "forum/topic_author_username": "Nome utente dell'autore dell'argomento",
+    "forum/unfollow_all_topics": "Smetti di seguire tutti gli argomenti"
+}

From e18f8256a3c757c1a3ea16c01c0e75cfdbc8f5c9 Mon Sep 17 00:00:00 2001
From: Gabriel <gabydev14@gmail.com>
Date: Wed, 8 Jun 2022 17:28:10 +0000
Subject: [PATCH 120/337] Translated using Weblate (Romanian)

Currently translated at 83.7% (1022 of 1221 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/ro/
---
 custom/languages/ro_RO.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/custom/languages/ro_RO.json b/custom/languages/ro_RO.json
index e38efec978..ef98d2a7f8 100644
--- a/custom/languages/ro_RO.json
+++ b/custom/languages/ro_RO.json
@@ -1,5 +1,5 @@
 {
-    "admin/account_verification": "Verificarea contului Minecraft",
+    "admin/account_verification": "Verificarea contului de Minecraft",
     "admin/acp_logins": "Conectări în Panoul de Control",
     "admin/action": "Acțiune",
     "admin/action_info": "Informații despre acțiune",
@@ -10,14 +10,14 @@
     "admin/all_logs": "Toate jurnalele",
     "admin/allow_custom_avatars": "Permiteți utilizatorului să utilizeze avatare personalizate?",
     "admin/api": "API",
-    "admin/api_info": "API-ul permite ca pluginurile și alte servicii să interacționeze cu site-ul dvs. web, cum ar fi {{pluginLinkStart}}pluginul oficial Nameless{{pluginLinkEnd}}, cat si {{botLinkStart}}botul de discord NamelessMC{{botLinkEnd}}.",
+    "admin/api_info": "API-ul permite ca plugin-urile și alte servicii să interacționeze cu site-ul dvs. web, cum ar fi {{pluginLinkStart}}plugin-ul oficial Nameless{{pluginLinkEnd}}, cât si {{botLinkStart}}bot-ul de discord NamelessMC{{botLinkEnd}}.",
     "admin/api_key": "Cheie API",
     "admin/api_key_regenerated": "Cheia API a fost regenerată cu succes.",
     "admin/api_registration_email": "API pentru înregistrarea e-mail",
     "admin/api_settings_updated_successfully": "Setările API s-au actualizat cu succes.",
     "admin/api_url": "Adresa URL API",
     "admin/api_verification": "Activați verificarea API?",
-    "admin/api_verification_info": "Dacă este activat, conturile pot fi verificate numai prin API, de exemplu, utilizând pluginul oficial Nameless in joc. Această opțiune va înlocui verificarea prin e-mail și conturile vor fi activate automat! Ar trebui să vă configurați grupul implicit pentru a avea permisiuni limitate și apoi să actualizați grupul de post-validare (în Panou de Control -> Configurație -> Înregistrare) cu permisiunile obișnuite.",
+    "admin/api_verification_info": "Dacă este activat, conturile pot fi verificate numai prin API, de exemplu, utilizând plugin-ul oficial Nameless in joc. Această opțiune va înlocui verificarea prin e-mail și conturile vor fi activate automat! Ar trebui să vă configurați grupul implicit pentru a avea permisiuni limitate și apoi să actualizați grupul de post-validare (în Panou de Control -> Configurație -> Înregistrare) cu permisiunile obișnuite.",
     "admin/authme_db_address": "IP-ul (gazda) bazei de date AuthMe",
     "admin/authme_db_name": "Numele bazei de date AuthMe",
     "admin/authme_db_password": "Parola bazei de date AuthMe",
@@ -945,7 +945,7 @@
     "user/x_replies": "{{count}} răspunsuri",
     "user/you_have_been_banned": "Ați fost banat!",
     "user/you_have_received_a_warning": "Ați primit un avertisment!",
-    "admin/admin_dir_still_exists": "Atentie! Fisierul /modules/Core/pages/admin inca exista. Te rugam sa stergi acest fisier.",
+    "admin/admin_dir_still_exists": "Atentie! Fisierul '/modules/Core/pages/admin' inca exista. Va rugam sa stergeti acest fisier.",
     "admin/bedrock": "Bedrock?",
     "admin/bedrock_help": "Selecteaza aceasta optiune daca serverul este unul de tip Bedrock.",
     "admin/cache_cleared": "Cache-ul pentru template-uri a fost curatat",
@@ -972,8 +972,8 @@
     "admin/group_name": "Nume grup",
     "admin/group_sync_logs": "Schimbari de sincronizare grup",
     "admin/group_sync_plugin_not_set_up": "Plugin-ul din joc nu este configurat",
-    "admin/announcement_info": "Creaza anunturi pentru a arata un mesaj grupurilor selectate pe pagini specifice de pe website-ul tau.",
-    "admin/api_endpoints_info": "API Endpoint-urile permit modulelor sa creeze metode pentru aplicatiile externe (precum Minecraft si Discord) sa interactioneze cu website-ul tau. Verifica documentatia pentru API {{docLinkStart}}aici{{docLinkEnd}}",
+    "admin/announcement_info": "Crează anunțuri pentru a afișa un mesaj grupurilor selectate pe pagini specifice de pe website-ul tau.",
+    "admin/api_endpoints_info": "API Endpoint-urile permit modulelor să creeze metode pentru aplicațiile externe (precum Minecraft și Discord) să interacționeze cu website-ul tau. Verifică documentația pentru API {{docLinkStart}}aici{{docLinkEnd}}",
     "admin/clear_cache": "Curata Cache-ul template-urilor",
     "admin/editing_integration_for_x": "Editand integrarea {{integration}} pentru {{user}}",
     "admin/email_language_info": "Nu vezi limba ta? Asigura-te ca fila de limba are permisiuni de scriere de catre webserver-ul tau in /custom/languages.",
@@ -1016,16 +1016,16 @@
     "admin/hook_created": "Hook creat cu succes.",
     "admin/hook_deleted": "Hook sters cu succes.",
     "admin/hook_edited": "Hook editat cu succes.",
-    "admin/user_group_added_hook_info": "Grup de utilizatori adaugat",
-    "admin/user_group_removed_hook_info": "Grup de utilizatori sters",
+    "admin/user_group_added_hook_info": "Grupul de utilizatori a fost adaugat cu succes.",
+    "admin/user_group_removed_hook_info": "Grupul de utilizatori a fost eliminat",
     "admin/administrator": "Administrator",
     "admin/administrator_permission_info": "Membrii cu aceasta permisiune vor avea toate permisiunile disponibile. Aceasta actiune este periculoasa.",
     "admin/announcement_hook_info": "Creare anunt",
-    "admin/announcement_icon_instructions": "De asemenea, poti adauga si o iconita la fiecare anunt aici, spre exemplu folosind {{faLink}} sau {{semLink}}.",
+    "admin/announcement_icon_instructions": "De asemenea, puteți adăuga și o iconița la fiecare anunt aici, spre exemplu folosind {{faLink}} sau {{semLink}}.",
     "admin/announcement_order": "Ordine",
-    "admin/announcements": "Anunturi",
+    "admin/announcements": "Anunțuri",
     "admin/api_endpoints": "Puncte finale API",
-    "admin/at_least_one_external": "Introdu minim un grup extern (Minecrat sau Discord)",
+    "admin/at_least_one_external": "Vă rugam, introduceți minim un grup extern (Minecraft sau Discord)",
     "admin/background_colour": "Culoare de fundal",
     "admin/background_colour_required": "Culoarea de fundal este necesara",
     "admin/ban_hook_info": "Utilizator interzis",

From 7917787750852e0017d54808dbcc72e7183e6c71 Mon Sep 17 00:00:00 2001
From: enno123 <admin@enno123.de>
Date: Fri, 10 Jun 2022 17:10:03 +0000
Subject: [PATCH 121/337] Translated using Weblate (German)

Currently translated at 100.0% (1221 of 1221 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/
---
 custom/languages/de_DE.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index 62149fa3d7..28d9528c09 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -784,7 +784,7 @@
     "installer/step_general_config": "Allgemeine Konfiguration",
     "installer/step_home": "Startseite",
     "installer/step_requirements": "Anforderungen",
-    "installer/step_site_config": "Standort Konfiguration",
+    "installer/step_site_config": "Konfiguration der Website",
     "installer/support_message": "Wenn du irgendwelche Unterstützung benötigst, schau dir unsere Website {{websiteLinkStart}}NamelessMC{{websiteLinkEnd}} an, oder besuch doch unseren {{discordLinkStart}}Discord Server{{discordLinkEnd}} sowie unser {{githubLinkStart}}GitHub repository{{githubLinkEnd}}",
     "installer/template_cache_writable": "Vorlagen Cache beschreibbar",
     "installer/terms_and_conditions": "Wenn Sie fortfahren, stimmen Sie den Allgemeinen Geschäftsbedingungen zu.",

From 98447c7e143a63a471463f9508d860f44d2a4ad9 Mon Sep 17 00:00:00 2001
From: enno123 <admin@enno123.de>
Date: Sat, 11 Jun 2022 13:17:40 +0000
Subject: [PATCH 122/337] Translated using Weblate (German)

Currently translated at 100.0% (1221 of 1221 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/
---
 custom/languages/de_DE.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index 28d9528c09..5fd26df6e9 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -701,7 +701,7 @@
     "general/success": "Erfolgreich",
     "general/total_online": "Insgesamt online",
     "general/total_online_staff": "Teammitglieder online: {{count}}",
-    "general/total_online_users": "Total Online Users: {{count}}",
+    "general/total_online_users": "Total User online: {{count}}",
     "general/total_posts": "Beiträge insgesamt",
     "general/total_threads": "Gesamtanzahl der Threads",
     "general/unlink": "Verknüpfung aufheben",

From 71b793aaa7fadb2f836c10e15bfe0f40d07cc1bf Mon Sep 17 00:00:00 2001
From: enno123 <admin@enno123.de>
Date: Sat, 11 Jun 2022 13:16:32 +0000
Subject: [PATCH 123/337] Translated using Weblate (German)

Currently translated at 100.0% (195 of 195 strings)

Translation: NamelessMC/Website - Forum
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-forum/de/
---
 modules/Forum/language/de_DE.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/Forum/language/de_DE.json b/modules/Forum/language/de_DE.json
index 99a8d181fd..93b8b97d78 100644
--- a/modules/Forum/language/de_DE.json
+++ b/modules/Forum/language/de_DE.json
@@ -32,7 +32,7 @@
     "forum/error_quoting_posts": "Beim Einfügen des Zitats ist etwas fehlgeschlagen.",
     "forum/error_rating_post": "Entschuldige, du kannst diesen Beitrag nicht bewerten.",
     "forum/follow": "Folgen",
-    "forum/following_topics": "Folgende Themen",
+    "forum/following_topics": "Gefolgte Themen",
     "forum/forum": "Forum",
     "forum/forum_created_successfully": "Forum wurde erfolgreich erstellt.",
     "forum/forum_deleted_successfully": "Forum erfolgreich gelöscht.",

From 2f0aa1ca07df0882ca1f80d23fe3b23cb5e46bff Mon Sep 17 00:00:00 2001
From: enno123 <admin@enno123.de>
Date: Sun, 12 Jun 2022 21:55:16 +0000
Subject: [PATCH 124/337] Translated using Weblate (German)

Currently translated at 100.0% (1223 of 1223 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/
---
 custom/languages/de_DE.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index 5fd26df6e9..c6d434985a 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -1219,5 +1219,7 @@
     "admin/test_email_suggest_3": "Einen SMTP-Server einrichten. {{docLinkStart}}Weiterlesen \"{{docLinkEnd}}",
     "admin/debug_link_info": "Wichtig - teile diesen Link nur mit Personen, denen du vertraust!",
     "general/deleted_user": "Gelöschte Benutzer",
-    "admin/use_external_mail_server": "Externen Mailserver verwenden"
+    "admin/use_external_mail_server": "Externen Mailserver verwenden",
+    "admin/trusted_proxies_configured": "Vertrauenswürdige Proxys",
+    "admin/trusted_proxies_not_configured": "{{linkStart}}Vertrauenswürdige Proxys{{linkEnd}} sind nicht konfiguriert, IP-Sperren funktionieren möglicherweise nicht richtig."
 }

From 5efd08b94602d1ee97ecdcb6ab2e01bfe31756dc Mon Sep 17 00:00:00 2001
From: PadowYT2 <me@padow.ru>
Date: Sun, 12 Jun 2022 23:15:04 +0000
Subject: [PATCH 125/337] Translated using Weblate (Russian)

Currently translated at 100.0% (1223 of 1223 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/ru/
---
 custom/languages/ru_RU.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/custom/languages/ru_RU.json b/custom/languages/ru_RU.json
index 79e09915bc..00c981dcbc 100644
--- a/custom/languages/ru_RU.json
+++ b/custom/languages/ru_RU.json
@@ -1219,5 +1219,7 @@
     "installer/upgrade_error": "Произошли ошибки при обновлении.",
     "admin/debug_link_info": "Важно - только делитесь этой ссылкой с людьми которыми вы доверяете!",
     "general/deleted_user": "Удаленный Пользователь",
-    "admin/use_external_mail_server": "Использовать внешний почтовый сервер"
+    "admin/use_external_mail_server": "Использовать внешний почтовый сервер",
+    "admin/trusted_proxies_not_configured": "{{linkStart}}Доверенные прокси{{linkEnd}} не настроены, IP баны могут не так работать.",
+    "admin/trusted_proxies_configured": "Доверенные прокси"
 }

From cb45562e3313bb38dd7ac98792cb1a4a01b1ac12 Mon Sep 17 00:00:00 2001
From: namelessmc-bot <rs.systems@derkad.es>
Date: Mon, 13 Jun 2022 02:21:26 +0000
Subject: [PATCH 126/337] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/
---
 custom/languages/cs_CZ.json  | 1 -
 custom/languages/da_DK.json  | 1 -
 custom/languages/de_DE.json  | 1 -
 custom/languages/en_US.json  | 1 -
 custom/languages/es_419.json | 1 -
 custom/languages/es_ES.json  | 1 -
 custom/languages/it_IT.json  | 1 -
 custom/languages/ja_JP.json  | 1 -
 custom/languages/nl_NL.json  | 1 -
 custom/languages/no_NO.json  | 1 -
 custom/languages/pl_PL.json  | 1 -
 custom/languages/pt_BR.json  | 1 -
 custom/languages/ru_RU.json  | 1 -
 custom/languages/sk_SK.json  | 1 -
 custom/languages/sv_SE.json  | 1 -
 custom/languages/th_TH.json  | 1 -
 custom/languages/uk_UA.json  | 1 -
 custom/languages/zh_CN.json  | 1 -
 18 files changed, 18 deletions(-)

diff --git a/custom/languages/cs_CZ.json b/custom/languages/cs_CZ.json
index be9204a85f..a8100f01b3 100644
--- a/custom/languages/cs_CZ.json
+++ b/custom/languages/cs_CZ.json
@@ -743,7 +743,6 @@
     "installer/back": "Zpět",
     "installer/cache_writable": "Mezipaměť zapisovatelná",
     "installer/character_set": "Znaková sada",
-    "installer/config_not_writable": "Konfigurační soubor není zapisovatelný.",
     "installer/config_writable": "Soubor core/config.php zapisovatelný",
     "installer/configuration": "Konfigurace",
     "installer/configuration_error": "Zadejte platný název webu o délce 1 až 32 znaků a platnou e-mailovou adresu o délce 4 až 64 znaků.",
diff --git a/custom/languages/da_DK.json b/custom/languages/da_DK.json
index a9cd7a06f8..43c4d27254 100644
--- a/custom/languages/da_DK.json
+++ b/custom/languages/da_DK.json
@@ -249,7 +249,6 @@
     "installer/back": "Tilbage",
     "installer/cache_writable": "Cache Skrivbar",
     "installer/character_set": "Tegn Sæt",
-    "installer/config_not_writable": "Konfigurationsfilen kan ikke skrives i.",
     "installer/config_writable": "core/config.php Skrivbar",
     "installer/configuration": "Indstilling",
     "installer/configuration_error": "Angiv venligst et gyldigt webstedsnavn på mellem 1 og 32 tegn og gyldige e-mailadresser på mellem 4 og 64 tegn.",
diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index c6d434985a..24355ea4d6 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -715,7 +715,6 @@
     "installer/back": "Zurück",
     "installer/cache_writable": "Cache beschreibbar",
     "installer/character_set": "Zeichensatz",
-    "installer/config_not_writable": "Die Konfigurationsdatei ist nicht beschreibbar.",
     "installer/config_writable": "core/config.php beschreibbar",
     "installer/configuration": "Konfiguration",
     "installer/configuration_error": "Bitte geben Sie einen gültigen Website-Namen zwischen 1 und 32 Zeichen lang und gültige E-Mail-Adressen zwischen 4 und 64 Zeichen lang ein.",
diff --git a/custom/languages/en_US.json b/custom/languages/en_US.json
index e1f001f4be..2a60b9ac89 100644
--- a/custom/languages/en_US.json
+++ b/custom/languages/en_US.json
@@ -764,7 +764,6 @@
     "installer/back": "Back",
     "installer/cache_writable": "Cache Writable",
     "installer/character_set": "Character Set",
-    "installer/config_not_writable": "The config file is not writable.",
     "installer/config_writable": "core/config.php Writable",
     "installer/configuration": "Configuration",
     "installer/configuration_error": "Please input a valid site name between 1 and 32 characters long, and valid email addresses between 4 and 64 characters long.",
diff --git a/custom/languages/es_419.json b/custom/languages/es_419.json
index bcc002240c..1a03328dbc 100644
--- a/custom/languages/es_419.json
+++ b/custom/languages/es_419.json
@@ -729,7 +729,6 @@
     "installer/back": "Volver",
     "installer/cache_writable": "Caché grabable",
     "installer/character_set": "Conjunto de carácteres",
-    "installer/config_not_writable": "El archivo de configuracion no es writable",
     "installer/config_writable": "Escritura del core/config.php",
     "installer/configuration": "Configuración",
     "installer/configuration_error": "Introduzca un nombre de sitio válido entre 1 y 32 caracteres y direcciones de correo electrónico válidas entre 4 y 64 caracteres.",
diff --git a/custom/languages/es_ES.json b/custom/languages/es_ES.json
index aae29e8d36..57a775eed4 100644
--- a/custom/languages/es_ES.json
+++ b/custom/languages/es_ES.json
@@ -746,7 +746,6 @@
     "installer/back": "Volver",
     "installer/cache_writable": "Caché escribible",
     "installer/character_set": "Juego de caracteres",
-    "installer/config_not_writable": "El archivo de configuración no es escribible.",
     "installer/config_writable": "core/config.php Escribible",
     "installer/configuration": "Configuración",
     "installer/configuration_error": "Por favor, introduzca un nombre de sitio válido de entre 1 y 32 caracteres, y direcciones de correo electrónico válidas de entre 4 y 64 caracteres.",
diff --git a/custom/languages/it_IT.json b/custom/languages/it_IT.json
index 3112a2b5cd..7aef94730c 100644
--- a/custom/languages/it_IT.json
+++ b/custom/languages/it_IT.json
@@ -674,7 +674,6 @@
     "installer/back": "Indietro",
     "installer/cache_writable": "Cache scrivibile",
     "installer/character_set": "Set di caratteri",
-    "installer/config_not_writable": "Il file di configurazione non è scrivibile.",
     "installer/config_writable": "core/config.php scrivibile",
     "installer/configuration": "Configurazione",
     "installer/configuration_error": "Inserisci un nome sito valido compreso tra 1 e 32 caratteri e un indirizzo email valido da 4 a 64 caratteri.",
diff --git a/custom/languages/ja_JP.json b/custom/languages/ja_JP.json
index 8765d7370a..a0599fd67c 100644
--- a/custom/languages/ja_JP.json
+++ b/custom/languages/ja_JP.json
@@ -763,7 +763,6 @@
     "installer/back": "戻る",
     "installer/cache_writable": "cache 書き込み可能",
     "installer/character_set": "キャラクターセット",
-    "installer/config_not_writable": "設定ファイルが書き込み可能ではありません。",
     "installer/config_writable": "core/config.php 書き込み可能",
     "installer/configuration": "設定",
     "installer/configuration_error": "1~32文字の有効なサイト名と、4~64文字の有効なメールアドレスを入力してください。",
diff --git a/custom/languages/nl_NL.json b/custom/languages/nl_NL.json
index 4323d91c2b..00e458a3a1 100644
--- a/custom/languages/nl_NL.json
+++ b/custom/languages/nl_NL.json
@@ -732,7 +732,6 @@
     "installer/back": "Terug",
     "installer/cache_writable": "Cache Schrijfbaar",
     "installer/character_set": "Karakterset",
-    "installer/config_not_writable": "Het configuratiebestand is niet beschrijfbaar.",
     "installer/config_writable": "core/config.php Schrijfbaar",
     "installer/configuration": "Configuratie",
     "installer/configuration_error": "Voer een geldige naam in voor de site die tussen de 1 en 32 tekens lang is, en geldige e-mailadressen die tussen de 4 en 64 tekens lang zijn.",
diff --git a/custom/languages/no_NO.json b/custom/languages/no_NO.json
index d157ff3d3c..14e1049d4e 100644
--- a/custom/languages/no_NO.json
+++ b/custom/languages/no_NO.json
@@ -694,7 +694,6 @@
     "installer/back": "Tilbake",
     "installer/cache_writable": "Cache skrivelig",
     "installer/character_set": "Tegnsetting",
-    "installer/config_not_writable": "Konfigurasjonsfilen er ikke skrivbar.",
     "installer/config_writable": "core/config.php skrivelig",
     "installer/configuration": "Konfigurering",
     "installer/configuration_error": "Skriv inn et nettsidenavn mellom 1 til 32 tegn, og en gyldig e-postadresse mellom 4 til 64 tegn.",
diff --git a/custom/languages/pl_PL.json b/custom/languages/pl_PL.json
index 6067d66314..9b782c8a66 100644
--- a/custom/languages/pl_PL.json
+++ b/custom/languages/pl_PL.json
@@ -723,7 +723,6 @@
     "installer/back": "Powrót",
     "installer/cache_writable": "Pamięć podręczna do zapisu",
     "installer/character_set": "Zestaw znaków",
-    "installer/config_not_writable": "Plik konfiguracyjny jest zablokowany.",
     "installer/config_writable": "Zapistywalność pliku core/config.php",
     "installer/configuration": "Konfiguracja",
     "installer/configuration_error": "Wpisz nazwę strony mającą od 1 do 32 znaków, i twój adres email mający od 4 do 64 znaków długości.",
diff --git a/custom/languages/pt_BR.json b/custom/languages/pt_BR.json
index 19c15def13..c742579192 100644
--- a/custom/languages/pt_BR.json
+++ b/custom/languages/pt_BR.json
@@ -749,7 +749,6 @@
     "installer/back": "Voltar",
     "installer/cache_writable": "Cache é Gravável",
     "installer/character_set": "Conjunto de caracteres",
-    "installer/config_not_writable": "O arquivo de configuração não é gravável.",
     "installer/config_writable": "core/config.php é Gravável",
     "installer/configuration": "Configuração",
     "installer/configuration_error": "Digite um nome de site válido entre 1 e 32 caracteres e endereços de email válidos entre 4 e 64 caracteres.",
diff --git a/custom/languages/ru_RU.json b/custom/languages/ru_RU.json
index 00c981dcbc..5f149e0513 100644
--- a/custom/languages/ru_RU.json
+++ b/custom/languages/ru_RU.json
@@ -762,7 +762,6 @@
     "installer/back": "Назад",
     "installer/cache_writable": "Cache доступен для записи",
     "installer/character_set": "Кодировка",
-    "installer/config_not_writable": "Файл конфигурации недоступен для записи.",
     "installer/config_writable": "core/config.php доступен для записи",
     "installer/configuration": "Конфигурация",
     "installer/configuration_error": "Пожалуйста, введите действительное название сайта длиной от 1 до 32 символов и действительные адреса электронной почты длиной от 4 до 64 символов.",
diff --git a/custom/languages/sk_SK.json b/custom/languages/sk_SK.json
index 3d2951bf22..2b77686647 100644
--- a/custom/languages/sk_SK.json
+++ b/custom/languages/sk_SK.json
@@ -755,7 +755,6 @@
     "installer/back": "Späť",
     "installer/cache_writable": "Cache zapisovateľná",
     "installer/character_set": "Znaková sada",
-    "installer/config_not_writable": "Do konfiguračného súboru nie je možné zapisovať.",
     "installer/config_writable": "core/config.php zapisovateľné",
     "installer/configuration": "Konfigurácia",
     "installer/configuration_error": "Zadajte platný názov webu s dĺžkou od 1 do 32 znakov a platné emailové adresy s dĺžkou od 4 do 64 znakov.",
diff --git a/custom/languages/sv_SE.json b/custom/languages/sv_SE.json
index 363c82d053..4cdcf30a94 100644
--- a/custom/languages/sv_SE.json
+++ b/custom/languages/sv_SE.json
@@ -715,7 +715,6 @@
     "installer/back": "Tillbaka",
     "installer/cache_writable": "Cache Skrivbar",
     "installer/character_set": "Teckenuppsättning",
-    "installer/config_not_writable": "Konfigurationsfilen är inte skrivbar.",
     "installer/config_writable": "core/config.php Skrivbar",
     "installer/configuration": "Konfiguration",
     "installer/configuration_error": "Ange ett giltigt webbplatsnamn mellan 1 och 32 tecken långt och giltiga e-postadresser mellan 4 och 64 tecken långa.",
diff --git a/custom/languages/th_TH.json b/custom/languages/th_TH.json
index f6025aa808..78e50b4681 100644
--- a/custom/languages/th_TH.json
+++ b/custom/languages/th_TH.json
@@ -719,7 +719,6 @@
     "installer/back": "กลับ",
     "installer/cache_writable": "cache เขียนได้",
     "installer/character_set": "ชุดตัวอักษร",
-    "installer/config_not_writable": "ไฟล์กำหนดค่าไม่สามารถเขียนได้",
     "installer/config_writable": "core/config.php เขียนได้",
     "installer/configuration": "การกำหนดค่า",
     "installer/configuration_error": "โปรดป้อนชื่อไซต์ที่ถูกต้องระหว่าง 1 ถึง 32 อักขระ และที่อยู่อีเมลที่ถูกต้องระหว่าง 4 ถึง 64 อักขระ",
diff --git a/custom/languages/uk_UA.json b/custom/languages/uk_UA.json
index afcf39ce09..a47faf16f9 100644
--- a/custom/languages/uk_UA.json
+++ b/custom/languages/uk_UA.json
@@ -724,7 +724,6 @@
     "installer/back": "Назад",
     "installer/cache_writable": "Cache доступний для запису",
     "installer/character_set": "Кодування",
-    "installer/config_not_writable": "Файл конфігурації недоступний для запису.",
     "installer/config_writable": "core/config.php доступний для запису",
     "installer/configuration": "Конфігурація",
     "installer/configuration_error": "Будь ласка, введіть дійсну назву сайту довжиною від 1 до 32 символів та дійсні адреси електронної пошти довжиною від 4 до 64 символів.",
diff --git a/custom/languages/zh_CN.json b/custom/languages/zh_CN.json
index 2736a69ebd..e4b6fbe139 100644
--- a/custom/languages/zh_CN.json
+++ b/custom/languages/zh_CN.json
@@ -737,7 +737,6 @@
     "installer/back": "返回",
     "installer/cache_writable": "Cache 可写",
     "installer/character_set": "字符集",
-    "installer/config_not_writable": "配置文件无法写入",
     "installer/config_writable": "core/config.php 可写",
     "installer/configuration": "配置",
     "installer/configuration_error": "请输入有效的网站名称，长度在 1 到 32 个字符之间，有效的电子邮箱地址在 4 到 64 个字符之间。",

From ec4933ac380b506a4e8ff4a60f1ce7fc46fab597 Mon Sep 17 00:00:00 2001
From: Supercrafter100 <admin@supercrafter100.com>
Date: Mon, 13 Jun 2022 13:10:57 +0000
Subject: [PATCH 127/337] Translated using Weblate (Dutch)

Currently translated at 100.0% (1225 of 1225 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/nl/
---
 custom/languages/nl_NL.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/custom/languages/nl_NL.json b/custom/languages/nl_NL.json
index 00e458a3a1..f227372771 100644
--- a/custom/languages/nl_NL.json
+++ b/custom/languages/nl_NL.json
@@ -1218,5 +1218,10 @@
     "installer/upgrade_error": "Er zijn fouten ontstaan tijdens het upgraden.",
     "admin/custom_content": "Aangepaste Inhoud",
     "general/deleted_user": "Verwijderde gebruiker",
-    "admin/use_external_mail_server": "Gebruik externe mail server"
+    "admin/use_external_mail_server": "Gebruik externe mail server",
+    "installer/config_write_failed": "Fout met het schrijven naar config bestand: {{message}}",
+    "installer/database_connection_failed": "Fout met het connecteren naar de database: <br>{{message}}",
+    "admin/trusted_proxies_configured": "Vertrouwde proxies",
+    "admin/trusted_proxies_not_configured": "{{linkStart}}Vertrouwde proxies{{linkEnd}} zijn nog niet geconfigureerd, IP verbanningen zouden niet correct kunnen werken.",
+    "admin/https_port_80": "Het lijkt erop dat je HTTPS op poort 80 gebruikt, wat hoogstwaarschijnlijk niet correct is. Als je CloudFlare gebruikt, zorg ervoor dat je TLS encryptie modus op Full (strict) zet. Als je je eigen proxy runt, configureer dan de X-Forwarded-Port header."
 }

From 74af3c972e8acde8210f741c8e6365356f933ae7 Mon Sep 17 00:00:00 2001
From: enno123 <admin@enno123.de>
Date: Mon, 13 Jun 2022 16:06:19 +0000
Subject: [PATCH 128/337] Translated using Weblate (German)

Currently translated at 100.0% (1226 of 1226 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/
---
 custom/languages/de_DE.json | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index 24355ea4d6..b5436c6a7f 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -749,8 +749,8 @@
     "installer/host_help": "Der Hostname ist die <strong>base URL</strong> für Ihre Website. Fügen Sie hier keine Unterordner aus dem Feld Installationspfad oder http(s):// ein!!",
     "installer/hostname_error": "Bitte geben gib einen gültigen Hostnamen ohne http:// oder https:// ein",
     "installer/initialising_database_and_cache": "Initialisierung von Datenbank und Cache, bitte warten ...",
-    "installer/input_maximum": "Bitte stellen Sie sicher, dass Ihr Benutzername maximal 20 Zeichen beträgt und Ihre E-Mail-Adresse und Ihr Passwort maximal 64 Zeichen haben.",
-    "installer/input_minimum": "Bitte achte darauf, dass dein Benutzername mindestens 3 Zeichen, deine E-Mail-Adresse mindestens 4 Zeichen und deinPasswort mindestens {{minPassword}} Zeichen lang ist.",
+    "installer/input_maximum": "Bitte achte darauf, dass dein Benutzername maximal {{maxUsername}} Zeichen, deine E-Mail-Adresse maximal {{maxEmail}} Zeichen und dein Passwort maximal {{maxPassword}} Zeichen lang ist.",
+    "installer/input_minimum": "Bitte achte darauf, dass dein Benutzername mindestens {{minUsername}} Zeichen, deine E-Mail-Adresse mindestens {{minEmail}} Zeichen und dein Passwort mindestens {{minPassword}} Zeichen lang ist.",
     "installer/input_required": "Bitte geben Sie einen gültigen Benutzernamen, eine E-Mail-Adresse und ein Passwort ein.",
     "installer/input_v1_details": "Bitte geben Sie die Datenbankdetails für Ihre Nameless Version 1 Installation ein.",
     "installer/install": "Installieren",
@@ -1220,5 +1220,9 @@
     "general/deleted_user": "Gelöschte Benutzer",
     "admin/use_external_mail_server": "Externen Mailserver verwenden",
     "admin/trusted_proxies_configured": "Vertrauenswürdige Proxys",
-    "admin/trusted_proxies_not_configured": "{{linkStart}}Vertrauenswürdige Proxys{{linkEnd}} sind nicht konfiguriert, IP-Sperren funktionieren möglicherweise nicht richtig."
+    "admin/trusted_proxies_not_configured": "{{linkStart}}Vertrauenswürdige Proxys{{linkEnd}} sind nicht konfiguriert, IP-Sperren funktionieren möglicherweise nicht richtig.",
+    "installer/config_write_failed": "Das Schreiben in die Konfigurationsdatei ist fehlgeschlagen: {{message}}",
+    "installer/database_connection_failed": "Verbindung zur Datenbank fehlgeschlagen:<br>{{message}}",
+    "admin/debugging_enabled": "Wenn Debugging aktiviert ist, können sensible Informationen für unbefugte Besucher zugänglich sein. Debugging sollte nur für die Entwicklung verwendet werden, nicht auf öffentlichen Seiten.",
+    "admin/https_port_80": "Es sieht so aus, als ob du HTTPS auf Port 80 verwendest, was mit ziemlicher Sicherheit nicht der Fall ist. Wenn du CloudFlare verwendest, stelle sicher, dass du den TLS-Verschlüsselungsmodus auf Full (strict) gesetzt hast. Wenndu deine eigene Proxy verwendest, konfiguriere ihn bitte so, dass er den X-Forwarded-Port-Header sendet."
 }

From 707cc6237c78364362e4b7c14030ffaf735ab898 Mon Sep 17 00:00:00 2001
From: enno123 <admin@enno123.de>
Date: Mon, 13 Jun 2022 18:29:04 +0000
Subject: [PATCH 129/337] Translated using Weblate (German)

Currently translated at 100.0% (1226 of 1226 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/
---
 custom/languages/de_DE.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index b5436c6a7f..8bd15d3382 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -103,7 +103,7 @@
     "admin/deactivate": "Deaktivieren",
     "admin/debugging_and_maintenance": "Fehlerbenachrichtigung",
     "admin/debugging_settings_updated_successfully": "Debugging Einstellungen wurden gespeichert.",
-    "admin/default": "Normal",
+    "admin/default": "Standard",
     "admin/default_avatar": "Standard Avatar",
     "admin/default_group": "Ist diese Gruppe die Standard Gruppe (Für neue User)??",
     "admin/default_language": "Standardsprache",

From 5d538c16c0fd546ee9cf282dbc242812ef6df0de Mon Sep 17 00:00:00 2001
From: namelessmc-bot <76107159+namelessmc-bot@users.noreply.github.com>
Date: Tue, 14 Jun 2022 06:53:01 +0200
Subject: [PATCH 130/337] Translations update (#2839)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Translated using Weblate (Dutch)

Currently translated at 100.0% (1221 of 1221 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/nl/

* Translated using Weblate (Czech)

Currently translated at 100.0% (1221 of 1221 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/cs/

* Translated using Weblate (German)

Currently translated at 100.0% (1221 of 1221 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/

* Translated using Weblate (Italian)

Currently translated at 83.4% (1019 of 1221 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/it/

* Translated using Weblate (Romanian)

Currently translated at 83.7% (1022 of 1221 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/ro/

* Translated using Weblate (Russian)

Currently translated at 100.0% (1221 of 1221 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/ru/

* Translated using Weblate (Italian)

Currently translated at 100.0% (51 of 51 strings)

Translation: NamelessMC/Website - Discord Integration
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-discord-integration/it/

* Translated using Weblate (Italian)

Currently translated at 100.0% (11 of 11 strings)

Translation: NamelessMC/Website - Cookie Consent
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/cookie-consent/it/

* Translated using Weblate (Italian)

Currently translated at 100.0% (195 of 195 strings)

Translation: NamelessMC/Website - Forum
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-forum/it/

* Translated using Weblate (Romanian)

Currently translated at 83.7% (1022 of 1221 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/ro/

* Translated using Weblate (German)

Currently translated at 100.0% (1221 of 1221 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/

* Translated using Weblate (German)

Currently translated at 100.0% (1221 of 1221 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/

* Translated using Weblate (German)

Currently translated at 100.0% (195 of 195 strings)

Translation: NamelessMC/Website - Forum
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-forum/de/

* Translated using Weblate (German)

Currently translated at 100.0% (1223 of 1223 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/

* Translated using Weblate (Russian)

Currently translated at 100.0% (1223 of 1223 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/ru/

* Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (1225 of 1225 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/nl/

* Translated using Weblate (German)

Currently translated at 100.0% (1226 of 1226 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/

* Translated using Weblate (German)

Currently translated at 100.0% (1226 of 1226 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/

Co-authored-by: Supercrafter100 <admin@supercrafter100.com>
Co-authored-by: Jonáš Loskot <fjuro@seznam.cz>
Co-authored-by: enno123 <admin@enno123.de>
Co-authored-by: romir shima <romirshima@gmail.com>
Co-authored-by: Botan Stefan Alin <stefan.amnox@gmail.com>
Co-authored-by: PadowYT2 <me@padow.ml>
Co-authored-by: Gabriel <gabydev14@gmail.com>
Co-authored-by: PadowYT2 <me@padow.ru>
Co-authored-by: namelessmc-bot <rs.systems@derkad.es>
---
 custom/languages/cs_CZ.json                   |   7 +-
 custom/languages/da_DK.json                   |   1 -
 custom/languages/de_DE.json                   |  21 +-
 custom/languages/en_US.json                   |   1 -
 custom/languages/es_419.json                  |   1 -
 custom/languages/es_ES.json                   |   1 -
 custom/languages/it_IT.json                   |  24 +-
 custom/languages/ja_JP.json                   |   1 -
 custom/languages/nl_NL.json                   |  10 +-
 custom/languages/no_NO.json                   |   1 -
 custom/languages/pl_PL.json                   |   1 -
 custom/languages/pt_BR.json                   |   1 -
 custom/languages/ro_RO.json                   | 110 +++++-
 custom/languages/ru_RU.json                   |   7 +-
 custom/languages/sk_SK.json                   |   1 -
 custom/languages/sv_SE.json                   |   1 -
 custom/languages/th_TH.json                   |   1 -
 custom/languages/uk_UA.json                   |   1 -
 custom/languages/zh_CN.json                   |   1 -
 modules/Cookie Consent/language/it.json       |  14 +-
 .../Discord Integration/language/it_IT.json   |  37 +-
 modules/Forum/language/de_DE.json             |   2 +-
 modules/Forum/language/it_IT.json             | 371 +++++++++---------
 23 files changed, 383 insertions(+), 233 deletions(-)

diff --git a/custom/languages/cs_CZ.json b/custom/languages/cs_CZ.json
index e0c7c7cc4b..a8100f01b3 100644
--- a/custom/languages/cs_CZ.json
+++ b/custom/languages/cs_CZ.json
@@ -191,7 +191,7 @@
     "admin/enable_registration": "Povolit registrace?",
     "admin/enable_status_query": "Povolit query stavu?",
     "admin/enable_username_sync": "Povolit synchronizaci uživatelských jmen?",
-    "admin/enable_username_sync_info": "Pokud povolíte tuto možnost, uživatelská jména na webu budou aktualizována tak, aby odpovídala uživatelským jménům ve hře.",
+    "admin/enable_username_sync_info": "Pokud povolíte tuto možnost, uživatelská jména na webu budou aktualizována tak, aby odpovídala uživatelským jménům ve hře. Toto se bude dít, když herní plugin odešle seznam UUID a uživatelských jmen online hráčů na web.",
     "admin/enabled": "Povoleno",
     "admin/enter_authme_db_details": "Zadejte platné podrobnosti databáze.",
     "admin/error_deleted_successfully": "Chyba byla úspěšně odstraněna.",
@@ -743,7 +743,6 @@
     "installer/back": "Zpět",
     "installer/cache_writable": "Mezipaměť zapisovatelná",
     "installer/character_set": "Znaková sada",
-    "installer/config_not_writable": "Konfigurační soubor není zapisovatelný.",
     "installer/config_writable": "Soubor core/config.php zapisovatelný",
     "installer/configuration": "Konfigurace",
     "installer/configuration_error": "Zadejte platný název webu o délce 1 až 32 znaků a platnou e-mailovou adresu o délce 4 až 64 znaků.",
@@ -1217,5 +1216,7 @@
     "admin/test_email_suggest_1": "Počkejte pár minut a zkontrolujte složku s nevyžádanou poštou.",
     "admin/test_email_suggest_2": "Aktualizujte záznamy DNS vašeho webu (zkontrolujte SPF a DKIM).",
     "admin/test_email_suggest_3": "Nastavte server SMTP. {{docLinkStart}}Zjistit více »{{docLinkEnd}}",
-    "admin/debug_link_info": "Důležité - tento odkaz sdílejte pouze s lidmi, kterým důvěřujete!"
+    "admin/debug_link_info": "Důležité - tento odkaz sdílejte pouze s lidmi, kterým důvěřujete!",
+    "general/deleted_user": "Smazaný uživatel",
+    "admin/use_external_mail_server": "Použít externí e-mailový server"
 }
diff --git a/custom/languages/da_DK.json b/custom/languages/da_DK.json
index a9cd7a06f8..43c4d27254 100644
--- a/custom/languages/da_DK.json
+++ b/custom/languages/da_DK.json
@@ -249,7 +249,6 @@
     "installer/back": "Tilbage",
     "installer/cache_writable": "Cache Skrivbar",
     "installer/character_set": "Tegn Sæt",
-    "installer/config_not_writable": "Konfigurationsfilen kan ikke skrives i.",
     "installer/config_writable": "core/config.php Skrivbar",
     "installer/configuration": "Indstilling",
     "installer/configuration_error": "Angiv venligst et gyldigt webstedsnavn på mellem 1 og 32 tegn og gyldige e-mailadresser på mellem 4 og 64 tegn.",
diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index cb73df605c..8bd15d3382 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -103,7 +103,7 @@
     "admin/deactivate": "Deaktivieren",
     "admin/debugging_and_maintenance": "Fehlerbenachrichtigung",
     "admin/debugging_settings_updated_successfully": "Debugging Einstellungen wurden gespeichert.",
-    "admin/default": "Normal",
+    "admin/default": "Standard",
     "admin/default_avatar": "Standard Avatar",
     "admin/default_group": "Ist diese Gruppe die Standard Gruppe (Für neue User)??",
     "admin/default_language": "Standardsprache",
@@ -182,7 +182,7 @@
     "admin/enable_registration": "Registrierung aktivieren?",
     "admin/enable_status_query": "Aktiviere Status Abfrage?",
     "admin/enable_username_sync": "Username Synchronisation aktivieren?",
-    "admin/enable_username_sync_info": "Wenn diese Option aktiviert ist, werden die Nutzernamen der Website aktualisiert, damit sie mit den Benutzernamen im Spiel übereinstimmen.",
+    "admin/enable_username_sync_info": "Wenn diese Option aktiviert ist, werden die Benutzernamen der Website aktualisiert, damit sie mit den Benutzernamen im Spiel übereinstimmen. Dies geschieht, wenn das In-Game-Plugin eine Liste von UUIDs und Benutzernamen für Online-Spieler an die Website sendet.",
     "admin/enabled": "Aktiviert",
     "admin/enter_authme_db_details": "Bitte gebe gültige Datenbank Informationen ein.",
     "admin/error_deleted_successfully": "Der Fehler wurde erfolgreich gelöscht.",
@@ -701,7 +701,7 @@
     "general/success": "Erfolgreich",
     "general/total_online": "Insgesamt online",
     "general/total_online_staff": "Teammitglieder online: {{count}}",
-    "general/total_online_users": "Total Online Users: {{count}}",
+    "general/total_online_users": "Total User online: {{count}}",
     "general/total_posts": "Beiträge insgesamt",
     "general/total_threads": "Gesamtanzahl der Threads",
     "general/unlink": "Verknüpfung aufheben",
@@ -715,7 +715,6 @@
     "installer/back": "Zurück",
     "installer/cache_writable": "Cache beschreibbar",
     "installer/character_set": "Zeichensatz",
-    "installer/config_not_writable": "Die Konfigurationsdatei ist nicht beschreibbar.",
     "installer/config_writable": "core/config.php beschreibbar",
     "installer/configuration": "Konfiguration",
     "installer/configuration_error": "Bitte geben Sie einen gültigen Website-Namen zwischen 1 und 32 Zeichen lang und gültige E-Mail-Adressen zwischen 4 und 64 Zeichen lang ein.",
@@ -750,8 +749,8 @@
     "installer/host_help": "Der Hostname ist die <strong>base URL</strong> für Ihre Website. Fügen Sie hier keine Unterordner aus dem Feld Installationspfad oder http(s):// ein!!",
     "installer/hostname_error": "Bitte geben gib einen gültigen Hostnamen ohne http:// oder https:// ein",
     "installer/initialising_database_and_cache": "Initialisierung von Datenbank und Cache, bitte warten ...",
-    "installer/input_maximum": "Bitte stellen Sie sicher, dass Ihr Benutzername maximal 20 Zeichen beträgt und Ihre E-Mail-Adresse und Ihr Passwort maximal 64 Zeichen haben.",
-    "installer/input_minimum": "Bitte achte darauf, dass dein Benutzername mindestens 3 Zeichen, deine E-Mail-Adresse mindestens 4 Zeichen und deinPasswort mindestens {{minPassword}} Zeichen lang ist.",
+    "installer/input_maximum": "Bitte achte darauf, dass dein Benutzername maximal {{maxUsername}} Zeichen, deine E-Mail-Adresse maximal {{maxEmail}} Zeichen und dein Passwort maximal {{maxPassword}} Zeichen lang ist.",
+    "installer/input_minimum": "Bitte achte darauf, dass dein Benutzername mindestens {{minUsername}} Zeichen, deine E-Mail-Adresse mindestens {{minEmail}} Zeichen und dein Passwort mindestens {{minPassword}} Zeichen lang ist.",
     "installer/input_required": "Bitte geben Sie einen gültigen Benutzernamen, eine E-Mail-Adresse und ein Passwort ein.",
     "installer/input_v1_details": "Bitte geben Sie die Datenbankdetails für Ihre Nameless Version 1 Installation ein.",
     "installer/install": "Installieren",
@@ -784,7 +783,7 @@
     "installer/step_general_config": "Allgemeine Konfiguration",
     "installer/step_home": "Startseite",
     "installer/step_requirements": "Anforderungen",
-    "installer/step_site_config": "Standort Konfiguration",
+    "installer/step_site_config": "Konfiguration der Website",
     "installer/support_message": "Wenn du irgendwelche Unterstützung benötigst, schau dir unsere Website {{websiteLinkStart}}NamelessMC{{websiteLinkEnd}} an, oder besuch doch unseren {{discordLinkStart}}Discord Server{{discordLinkEnd}} sowie unser {{githubLinkStart}}GitHub repository{{githubLinkEnd}}",
     "installer/template_cache_writable": "Vorlagen Cache beschreibbar",
     "installer/terms_and_conditions": "Wenn Sie fortfahren, stimmen Sie den Allgemeinen Geschäftsbedingungen zu.",
@@ -1219,5 +1218,11 @@
     "admin/test_email_suggest_3": "Einen SMTP-Server einrichten. {{docLinkStart}}Weiterlesen \"{{docLinkEnd}}",
     "admin/debug_link_info": "Wichtig - teile diesen Link nur mit Personen, denen du vertraust!",
     "general/deleted_user": "Gelöschte Benutzer",
-    "admin/use_external_mail_server": "Externen Mailserver verwenden"
+    "admin/use_external_mail_server": "Externen Mailserver verwenden",
+    "admin/trusted_proxies_configured": "Vertrauenswürdige Proxys",
+    "admin/trusted_proxies_not_configured": "{{linkStart}}Vertrauenswürdige Proxys{{linkEnd}} sind nicht konfiguriert, IP-Sperren funktionieren möglicherweise nicht richtig.",
+    "installer/config_write_failed": "Das Schreiben in die Konfigurationsdatei ist fehlgeschlagen: {{message}}",
+    "installer/database_connection_failed": "Verbindung zur Datenbank fehlgeschlagen:<br>{{message}}",
+    "admin/debugging_enabled": "Wenn Debugging aktiviert ist, können sensible Informationen für unbefugte Besucher zugänglich sein. Debugging sollte nur für die Entwicklung verwendet werden, nicht auf öffentlichen Seiten.",
+    "admin/https_port_80": "Es sieht so aus, als ob du HTTPS auf Port 80 verwendest, was mit ziemlicher Sicherheit nicht der Fall ist. Wenn du CloudFlare verwendest, stelle sicher, dass du den TLS-Verschlüsselungsmodus auf Full (strict) gesetzt hast. Wenndu deine eigene Proxy verwendest, konfiguriere ihn bitte so, dass er den X-Forwarded-Port-Header sendet."
 }
diff --git a/custom/languages/en_US.json b/custom/languages/en_US.json
index e1f001f4be..2a60b9ac89 100644
--- a/custom/languages/en_US.json
+++ b/custom/languages/en_US.json
@@ -764,7 +764,6 @@
     "installer/back": "Back",
     "installer/cache_writable": "Cache Writable",
     "installer/character_set": "Character Set",
-    "installer/config_not_writable": "The config file is not writable.",
     "installer/config_writable": "core/config.php Writable",
     "installer/configuration": "Configuration",
     "installer/configuration_error": "Please input a valid site name between 1 and 32 characters long, and valid email addresses between 4 and 64 characters long.",
diff --git a/custom/languages/es_419.json b/custom/languages/es_419.json
index bcc002240c..1a03328dbc 100644
--- a/custom/languages/es_419.json
+++ b/custom/languages/es_419.json
@@ -729,7 +729,6 @@
     "installer/back": "Volver",
     "installer/cache_writable": "Caché grabable",
     "installer/character_set": "Conjunto de carácteres",
-    "installer/config_not_writable": "El archivo de configuracion no es writable",
     "installer/config_writable": "Escritura del core/config.php",
     "installer/configuration": "Configuración",
     "installer/configuration_error": "Introduzca un nombre de sitio válido entre 1 y 32 caracteres y direcciones de correo electrónico válidas entre 4 y 64 caracteres.",
diff --git a/custom/languages/es_ES.json b/custom/languages/es_ES.json
index aae29e8d36..57a775eed4 100644
--- a/custom/languages/es_ES.json
+++ b/custom/languages/es_ES.json
@@ -746,7 +746,6 @@
     "installer/back": "Volver",
     "installer/cache_writable": "Caché escribible",
     "installer/character_set": "Juego de caracteres",
-    "installer/config_not_writable": "El archivo de configuración no es escribible.",
     "installer/config_writable": "core/config.php Escribible",
     "installer/configuration": "Configuración",
     "installer/configuration_error": "Por favor, introduzca un nombre de sitio válido de entre 1 y 32 caracteres, y direcciones de correo electrónico válidas de entre 4 y 64 caracteres.",
diff --git a/custom/languages/it_IT.json b/custom/languages/it_IT.json
index ca2e0edd63..7aef94730c 100644
--- a/custom/languages/it_IT.json
+++ b/custom/languages/it_IT.json
@@ -7,7 +7,7 @@
     "admin/active": "Attivato",
     "admin/add_server": "Aggiungi Server",
     "admin/adding_server": "Aggiunta Server",
-    "admin/admin_dir_still_exists": "Attenzione! La directory <strong>modules/Core/pages/admin</strong> esiste ancora. Si prega di rimuovere questa directory.",
+    "admin/admin_dir_still_exists": "Avvertimento! La directory /modules/Core/pages/admin esiste ancora. Si prega di rimuovere questa directory.",
     "admin/all_logs": "Tutti i log",
     "admin/allow_custom_avatars": "Permettere agli utenti di caricare avatar personalizzati?",
     "admin/announcement_icon_instructions": "Puoi anche aggiungere un'icona a ogni annuncio qui, per esempio usando {{faLink}}, {{semLink}}.",
@@ -23,7 +23,7 @@
     "admin/api_settings_updated_successfully": "Impostazioni API aggiornate con successo.",
     "admin/api_url": "URL dell'API",
     "admin/api_verification": "Abilitare la verifica dell'API?",
-    "admin/api_verification_info": "Se abilitata, gli account possono essere verificati solo tramite l'API, ad esempio ingame utilizzando il plugin Nameless ufficiale. <strong>Questa opzione annullerà la verifica e-mail e gli account verranno automaticamente attivati!</strong> <br /> Dovresti impostare il tuo gruppo predefinito con autorizzazioni limitate e quindi aggiornare il gruppo post-validazione in Pannello Staff -> Configurazione -> Registration tab to the full member group with normal permissions.",
+    "admin/api_verification_info": "Se abilitati, gli account possono essere verificati solo tramite l'API, ad esempio in-game utilizzando il plug-in Nameless ufficiale. Questa opzione sovrascriverà la verifica e-mail e gli account verranno attivati automaticamente!\\nDovresti impostare il tuo gruppo predefinito in modo che abbia autorizzazioni limitate, quindi aggiornare il gruppo post-convalida in StaffCP -> Configurazione -> scheda Registrazione al gruppo di membri completo con i normali permessi.",
     "admin/authme_db_address": "Indrizzo Database AuthMe",
     "admin/authme_db_name": "Nome Database AuthMe",
     "admin/authme_db_password": "Password Database AuthMe",
@@ -33,9 +33,9 @@
     "admin/authme_db_user": "Nome utente Database AuthMe",
     "admin/authme_hash_algorithm": "Algoritmo Hashing AuthMe",
     "admin/authme_integration": "Integrazione AuthMe",
-    "admin/authme_integration_info": "Quando l'integrazione con AuthMe è abilitata, gli utenti possono registrarsi solo in gioco.",
+    "admin/authme_integration_info": "Quando l'integrazione AuthMe è abilitata, gli utenti possono registrarsi solo nel gioco.",
     "admin/authme_password_sync": "Sincronizzare password AuthMe?",
-    "admin/authme_password_sync_help": "Se abilitato, ogni volta che la password di un utente viene aggiornata in gioco, la password verrà anche aggiornata sul sito web.",
+    "admin/authme_password_sync_help": "Se abilitato, ogni volta che la password di un utente viene aggiornata nel gioco, la password verrà aggiornata anche sul sito web.",
     "admin/author": "Autore:",
     "admin/author_x": "Autore: {{author}}",
     "admin/avatar_settings_updated_successfully": "Impostazioni avatar aggiornate con successo.",
@@ -43,7 +43,7 @@
     "admin/average_players": "Giocatori Medi",
     "admin/background_colour": "Colore di sfondo",
     "admin/background_colour_required": "Il colore di sfondo è obbligatorio",
-    "admin/ban_hook_info": "User banned",
+    "admin/ban_hook_info": "Utente bannato",
     "admin/banner_background": "Sfondo banner",
     "admin/banner_image_x": "Immagine banner: {{imageName}}",
     "admin/banner_updated_successfully": "Banner aggiornato con successo. Potrebbe volerci un po' prima che le modifiche abbiano effetto.",
@@ -674,7 +674,6 @@
     "installer/back": "Indietro",
     "installer/cache_writable": "Cache scrivibile",
     "installer/character_set": "Set di caratteri",
-    "installer/config_not_writable": "Il file di configurazione non è scrivibile.",
     "installer/config_writable": "core/config.php scrivibile",
     "installer/configuration": "Configurazione",
     "installer/configuration_error": "Inserisci un nome sito valido compreso tra 1 e 32 caratteri e un indirizzo email valido da 4 a 64 caratteri.",
@@ -1022,5 +1021,16 @@
     "user/x_reactions": "{{count}} reazioni",
     "user/x_replies": "{{count}} risposte",
     "user/you_have_been_banned": "Sei stato bannato!",
-    "user/you_have_received_a_warning": "Hai ricevuto un avvertimento!"
+    "user/you_have_received_a_warning": "Hai ricevuto un avvertimento!",
+    "admin/administrator": "Amministratore",
+    "admin/user_group_added_hook_info": "Gruppo utenti aggiunto",
+    "admin/user_group_removed_hook_info": "Gruppo utenti rimosso",
+    "admin/administrator_permission_info": "I membri con questa autorizzazione avranno ogni autorizzazione. Questo è un permesso pericoloso da concedere.",
+    "admin/announcement_hook_info": "Creazione annuncio",
+    "admin/announcement_order": "Ordine",
+    "admin/at_least_one_external": "Inserisci almeno 1 gruppo esterno (Minecraft o Discord)",
+    "admin/bedrock_help": "Seleziona questa opzione se il server è un server Bedrock.",
+    "admin/cache_cleared": "Cache del modello cancellata",
+    "admin/can_unlink": "Può scollegare",
+    "admin/bedrock": "Roccia di fondo?"
 }
diff --git a/custom/languages/ja_JP.json b/custom/languages/ja_JP.json
index 8765d7370a..a0599fd67c 100644
--- a/custom/languages/ja_JP.json
+++ b/custom/languages/ja_JP.json
@@ -763,7 +763,6 @@
     "installer/back": "戻る",
     "installer/cache_writable": "cache 書き込み可能",
     "installer/character_set": "キャラクターセット",
-    "installer/config_not_writable": "設定ファイルが書き込み可能ではありません。",
     "installer/config_writable": "core/config.php 書き込み可能",
     "installer/configuration": "設定",
     "installer/configuration_error": "1~32文字の有効なサイト名と、4~64文字の有効なメールアドレスを入力してください。",
diff --git a/custom/languages/nl_NL.json b/custom/languages/nl_NL.json
index bb81fa8b90..f227372771 100644
--- a/custom/languages/nl_NL.json
+++ b/custom/languages/nl_NL.json
@@ -185,7 +185,7 @@
     "admin/enable_registration": "Schakel registratie in?",
     "admin/enable_status_query": "Status query aanzetten?",
     "admin/enable_username_sync": "Gebruikersnaam synchroniseren?",
-    "admin/enable_username_sync_info": "Indien ingeschakeld, zullen de gebruikersnamen van de website worden aangepast aan de ingame gebruikersnamen.",
+    "admin/enable_username_sync_info": "Indien ingeschakeld, zullen de gebruikersnamen van de website worden aangepast aan de ingame gebruikersnamen. Dit zal gebeuren wanneer de plugin in minecraft een lijst verzend van UUIDs en gebruikersnamen, voor online spelers, naar de website.",
     "admin/enabled": "Ingeschakeld",
     "admin/enter_authme_db_details": "Vul geldige database gegevens in.",
     "admin/error_deleted_successfully": "De fout is met succes verwijderd.",
@@ -732,7 +732,6 @@
     "installer/back": "Terug",
     "installer/cache_writable": "Cache Schrijfbaar",
     "installer/character_set": "Karakterset",
-    "installer/config_not_writable": "Het configuratiebestand is niet beschrijfbaar.",
     "installer/config_writable": "core/config.php Schrijfbaar",
     "installer/configuration": "Configuratie",
     "installer/configuration_error": "Voer een geldige naam in voor de site die tussen de 1 en 32 tekens lang is, en geldige e-mailadressen die tussen de 4 en 64 tekens lang zijn.",
@@ -1219,5 +1218,10 @@
     "installer/upgrade_error": "Er zijn fouten ontstaan tijdens het upgraden.",
     "admin/custom_content": "Aangepaste Inhoud",
     "general/deleted_user": "Verwijderde gebruiker",
-    "admin/use_external_mail_server": "Gebruik externe mail server"
+    "admin/use_external_mail_server": "Gebruik externe mail server",
+    "installer/config_write_failed": "Fout met het schrijven naar config bestand: {{message}}",
+    "installer/database_connection_failed": "Fout met het connecteren naar de database: <br>{{message}}",
+    "admin/trusted_proxies_configured": "Vertrouwde proxies",
+    "admin/trusted_proxies_not_configured": "{{linkStart}}Vertrouwde proxies{{linkEnd}} zijn nog niet geconfigureerd, IP verbanningen zouden niet correct kunnen werken.",
+    "admin/https_port_80": "Het lijkt erop dat je HTTPS op poort 80 gebruikt, wat hoogstwaarschijnlijk niet correct is. Als je CloudFlare gebruikt, zorg ervoor dat je TLS encryptie modus op Full (strict) zet. Als je je eigen proxy runt, configureer dan de X-Forwarded-Port header."
 }
diff --git a/custom/languages/no_NO.json b/custom/languages/no_NO.json
index d157ff3d3c..14e1049d4e 100644
--- a/custom/languages/no_NO.json
+++ b/custom/languages/no_NO.json
@@ -694,7 +694,6 @@
     "installer/back": "Tilbake",
     "installer/cache_writable": "Cache skrivelig",
     "installer/character_set": "Tegnsetting",
-    "installer/config_not_writable": "Konfigurasjonsfilen er ikke skrivbar.",
     "installer/config_writable": "core/config.php skrivelig",
     "installer/configuration": "Konfigurering",
     "installer/configuration_error": "Skriv inn et nettsidenavn mellom 1 til 32 tegn, og en gyldig e-postadresse mellom 4 til 64 tegn.",
diff --git a/custom/languages/pl_PL.json b/custom/languages/pl_PL.json
index 6067d66314..9b782c8a66 100644
--- a/custom/languages/pl_PL.json
+++ b/custom/languages/pl_PL.json
@@ -723,7 +723,6 @@
     "installer/back": "Powrót",
     "installer/cache_writable": "Pamięć podręczna do zapisu",
     "installer/character_set": "Zestaw znaków",
-    "installer/config_not_writable": "Plik konfiguracyjny jest zablokowany.",
     "installer/config_writable": "Zapistywalność pliku core/config.php",
     "installer/configuration": "Konfiguracja",
     "installer/configuration_error": "Wpisz nazwę strony mającą od 1 do 32 znaków, i twój adres email mający od 4 do 64 znaków długości.",
diff --git a/custom/languages/pt_BR.json b/custom/languages/pt_BR.json
index 19c15def13..c742579192 100644
--- a/custom/languages/pt_BR.json
+++ b/custom/languages/pt_BR.json
@@ -749,7 +749,6 @@
     "installer/back": "Voltar",
     "installer/cache_writable": "Cache é Gravável",
     "installer/character_set": "Conjunto de caracteres",
-    "installer/config_not_writable": "O arquivo de configuração não é gravável.",
     "installer/config_writable": "core/config.php é Gravável",
     "installer/configuration": "Configuração",
     "installer/configuration_error": "Digite um nome de site válido entre 1 e 32 caracteres e endereços de email válidos entre 4 e 64 caracteres.",
diff --git a/custom/languages/ro_RO.json b/custom/languages/ro_RO.json
index aaac72913f..ef98d2a7f8 100644
--- a/custom/languages/ro_RO.json
+++ b/custom/languages/ro_RO.json
@@ -1,5 +1,5 @@
 {
-    "admin/account_verification": "Verificarea contului Minecraft",
+    "admin/account_verification": "Verificarea contului de Minecraft",
     "admin/acp_logins": "Conectări în Panoul de Control",
     "admin/action": "Acțiune",
     "admin/action_info": "Informații despre acțiune",
@@ -10,14 +10,14 @@
     "admin/all_logs": "Toate jurnalele",
     "admin/allow_custom_avatars": "Permiteți utilizatorului să utilizeze avatare personalizate?",
     "admin/api": "API",
-    "admin/api_info": "API permite ca pluginurile și alte servicii să interacționeze cu site-ul dvs. web, cum ar fi {{pluginLinkStart}}pluginul oficial Nameless{{pluginLinkEnd}}.",
-    "admin/api_key": "Cheia API",
+    "admin/api_info": "API-ul permite ca plugin-urile și alte servicii să interacționeze cu site-ul dvs. web, cum ar fi {{pluginLinkStart}}plugin-ul oficial Nameless{{pluginLinkEnd}}, cât si {{botLinkStart}}bot-ul de discord NamelessMC{{botLinkEnd}}.",
+    "admin/api_key": "Cheie API",
     "admin/api_key_regenerated": "Cheia API a fost regenerată cu succes.",
     "admin/api_registration_email": "API pentru înregistrarea e-mail",
     "admin/api_settings_updated_successfully": "Setările API s-au actualizat cu succes.",
     "admin/api_url": "Adresa URL API",
     "admin/api_verification": "Activați verificarea API?",
-    "admin/api_verification_info": "Dacă este activat, conturile pot fi verificate numai prin API, de exemplu, utilizând pluginul oficial Nameless in joc.<strong> Această opțiune va înlocui verificarea prin e-mail și conturile vor fi activate automat! </strong> <br />Ar trebui să vă configurați grupul implicit pentru a avea permisiuni limitate și apoi să actualizați grupul de post-validare (în Panou de Control -> Configurație -> Înregistrare) cu permisiunile obișnuite.",
+    "admin/api_verification_info": "Dacă este activat, conturile pot fi verificate numai prin API, de exemplu, utilizând plugin-ul oficial Nameless in joc. Această opțiune va înlocui verificarea prin e-mail și conturile vor fi activate automat! Ar trebui să vă configurați grupul implicit pentru a avea permisiuni limitate și apoi să actualizați grupul de post-validare (în Panou de Control -> Configurație -> Înregistrare) cu permisiunile obișnuite.",
     "admin/authme_db_address": "IP-ul (gazda) bazei de date AuthMe",
     "admin/authme_db_name": "Numele bazei de date AuthMe",
     "admin/authme_db_password": "Parola bazei de date AuthMe",
@@ -27,15 +27,15 @@
     "admin/authme_db_user": "Utilizatorul bazei de date AuthMe",
     "admin/authme_hash_algorithm": "Algoritmul de criptare AuthMe",
     "admin/authme_integration": "Integrare AuthMe",
-    "admin/authme_integration_info": "Atunci când integrarea AuthMe este activată, utilizatorii se pot înscrie numai în joc.",
+    "admin/authme_integration_info": "Atunci când integrarea AuthMe este activată, utilizatorii se pot inregistra numai în joc.",
     "admin/authme_password_sync": "Sincronizați parolele AuthMe?",
-    "admin/authme_password_sync_help": "Dacă este activată, ori de câte ori parola utilizatorului este actualizată, parola va fi actualizată și pe site.",
+    "admin/authme_password_sync_help": "Daca este activata, de fiecare data cand un utilizator isi va schimba parola pe joc, aceasta o sa fie actualizata si pe website.",
     "admin/author": "Autor:",
     "admin/author_x": "Autor: {{author}}",
     "admin/avatar_settings_updated_successfully": "Setările avatarelor s-au actualizat cu succes.",
     "admin/avatars": "Avatare",
     "admin/average_players": "Media jucătorilor",
-    "admin/banner_background": "Alegeți imaginea de fundal pentru bannerul serverului:",
+    "admin/banner_background": "Imagine de fundal pentru banner",
     "admin/banner_image_x": "Imagine banner: {{imageName}}",
     "admin/banner_updated_successfully": "Bannerul a fost actualizat cu succes. Ar putea dura ceva timp pentru ca modificările să fie vizibile.",
     "admin/basic_page": "Basic page?",
@@ -86,7 +86,7 @@
     "admin/default_avatar": "Avatar implicit",
     "admin/default_group": "Grupul este grupul implicit pentru utilizatorii noi?",
     "admin/default_language": "Limbă implicită",
-    "admin/default_language_help": "Utilizatorii vor putea alege din limbile instalate.",
+    "admin/default_language_help": "Utilizatorii vor putea alege din limbile instalate. {{docLinkStart}}Citeste mai mult »{{docLinkEnd}}",
     "admin/default_server": "Serverul implicit",
     "admin/default_template_set": "Șablonul prestabilit a fost setat la {{template}} cu succes.",
     "admin/default_timezone": "Fusul orar prestabilit",
@@ -127,7 +127,7 @@
     "admin/enable_api": "Activare API?",
     "admin/enable_authme": "Activați integrarea AuthMe?",
     "admin/enable_debug_mode": "Activați modul de depanare?",
-    "admin/enable_mailer_help": "Activați această opțiune dacă e-mailurile nu sunt trimise în mod implicit. Utilizarea programului PHPMailer necesită un serviciu care să poată trimite e-mailuri, cum ar fi Gmail sau un furnizor SMTP.",
+    "admin/enable_mailer_help": "Daca este activ, email-urile vor fi trimise folosind PHPMailer in loc de sistemul predefinit. Acest lucru s-ar putea sa ajute cu trimiterea, dar trebuie sa configurezi un provider SMTP. {{docLinkStart}}Citeste mai mult »{{docLinkEnd}}",
     "admin/enable_maintenance_mode": "Activați modul de întreținere?",
     "admin/enable_minecraft_integration": "Activați integrarea Minecraft?",
     "admin/enable_nicknames_on_registration": "Activați poreclele pentru utilizatorii ce se înregistrează?",
@@ -136,7 +136,7 @@
     "admin/enable_registration": "Activați înregistrarea?",
     "admin/enable_status_query": "Activați interogarea de stare?",
     "admin/enable_username_sync": "Activați sincronizarea numelor de utilizator?",
-    "admin/enable_username_sync_info": "Dacă este activat, numele de utilizator de pe site va fi actualizat pentru a se potrivi cu numele de utilizator din joc.",
+    "admin/enable_username_sync_info": "Daca este activat, numele de utilizator de pe site va fi actualizat pentru a se potrivi cu numele de utilizator din joc. Acest lucru se intampla cand pluginul din joc trimite o lista cu UUID-uri si nume, pentru jucatorii online catre website.",
     "admin/enabled": "Activat",
     "admin/enter_authme_db_details": "Vă rugăm să introduceți datele valide ale bazei de date.",
     "admin/error_deleted_successfully": "Eroarea a fost ștearsă cu succes.",
@@ -156,7 +156,7 @@
     "admin/find_modules": "Găsiți module",
     "admin/find_templates": "Găsiți șabloane",
     "admin/force_https": "Forțează https?",
-    "admin/force_https_help": "Dacă este activată setarea, toate solicitările către site-ul dvs. vor fi redirecționate către https de la http. Trebuie să aveți un certificat SSL valabil activ pentru ca aceasta să funcționeze corect.",
+    "admin/force_https_help": "Dacă este activat, toate solicitările către site-ul dvs. vor fi redirecționate către https de la http. Trebuie să aveți un certificat SSL valabil activ pentru ca acesta să funcționeze corect.",
     "admin/force_premium_accounts": "Forțează deținere unui cont de Minecraft permium?",
     "admin/force_www": "Forţează www?",
     "admin/forgot_password_email": "E-mail de resetare parolă",
@@ -944,5 +944,91 @@
     "user/x_reactions": "{{count}} reacții",
     "user/x_replies": "{{count}} răspunsuri",
     "user/you_have_been_banned": "Ați fost banat!",
-    "user/you_have_received_a_warning": "Ați primit un avertisment!"
+    "user/you_have_received_a_warning": "Ați primit un avertisment!",
+    "admin/admin_dir_still_exists": "Atentie! Fisierul '/modules/Core/pages/admin' inca exista. Va rugam sa stergeti acest fisier.",
+    "admin/bedrock": "Bedrock?",
+    "admin/bedrock_help": "Selecteaza aceasta optiune daca serverul este unul de tip Bedrock.",
+    "admin/cache_cleared": "Cache-ul pentru template-uri a fost curatat",
+    "admin/can_unlink": "Se poate desincroniza",
+    "admin/can_unlink_integration": "Pot utilizatorii sa dezactiveze integrarea?",
+    "admin/can_view_announcement": "Poate vedea anuntul",
+    "admin/captcha_general": "Activezi Captcha pe pagina de inregistrare?",
+    "admin/captcha_login": "Activezi Captcha pe pagina de autentificare?",
+    "admin/captcha_secret_key": "Cheie secreta Captcha",
+    "admin/captcha_site_key": "Cheie Site Captcha",
+    "admin/captcha_type": "Tip Captcha",
+    "admin/closable": "Se poate inchide",
+    "admin/creating_announcement": "Creare anunt",
+    "admin/creating_announcement_failure": "Crearea anuntului a esuat.",
+    "admin/creating_announcement_success": "Anuntul a fost creat cu succes.",
+    "admin/creating_new_hook": "Se creaza un nou Webhook",
+    "admin/cloning_group": "Clonarea grupului {{group}}",
+    "admin/dark_mode": "Mod intunecat",
+    "admin/debug_link": "Depanare link",
+    "admin/emails_mass_message": "Mesaj in masa prin email",
+    "admin/emails_mass_message_replacements": "Poti folosi variabile in mesajul email-ului. Variabile disponibile: {username}, {sitename}",
+    "admin/emails_mass_message_loading": "Se incarca... Te rugam sa nu reincarci pagina. S-ar putea sa dureze ceva.",
+    "admin/enable_placeholders": "Activezi Placeholderele?",
+    "admin/group_name": "Nume grup",
+    "admin/group_sync_logs": "Schimbari de sincronizare grup",
+    "admin/group_sync_plugin_not_set_up": "Plugin-ul din joc nu este configurat",
+    "admin/announcement_info": "Crează anunțuri pentru a afișa un mesaj grupurilor selectate pe pagini specifice de pe website-ul tau.",
+    "admin/api_endpoints_info": "API Endpoint-urile permit modulelor să creeze metode pentru aplicațiile externe (precum Minecraft și Discord) să interacționeze cu website-ul tau. Verifică documentația pentru API {{docLinkStart}}aici{{docLinkEnd}}",
+    "admin/clear_cache": "Curata Cache-ul template-urilor",
+    "admin/editing_integration_for_x": "Editand integrarea {{integration}} pentru {{user}}",
+    "admin/email_language_info": "Nu vezi limba ta? Asigura-te ca fila de limba are permisiuni de scriere de catre webserver-ul tau in /custom/languages.",
+    "admin/use_external_mail_server": "Foloseste server de mail extern",
+    "admin/force_tfa_warning": "Asigura-te ca stii ce face asta sau risti sa te blochezi pe tine si pe restul membrilor din grup pe dinafara.",
+    "admin/debug_link_toast": "Link-ul de depanare a fost copiat!<br>Vizualizeaza logul {{linkStart}}aici{{linkEnd}}",
+    "admin/custom_content": "Content custom",
+    "admin/editing_language": "Editand limba",
+    "admin/editing_messages": "Editand mesajele",
+    "admin/force_tfa_alert": "Grupul tau necesita sa ai autentificarea in doi pasi activa.",
+    "admin/forum_topic_reply_email": "Raspuns la subiectul forumului",
+    "admin/debug_link_info": "Important - partajeaza acest link doar cu persoanele de incredere!",
+    "admin/delete_hook": "Esti sigur ca vrei sa stergi acest hook?",
+    "admin/delete_hook_info": "Stergerea utilizatorului",
+    "admin/deleted_announcement_success": "Anunt sters cu succes.",
+    "admin/dropdown_name": "Nume derulant",
+    "admin/edit_email_messages": "Mesage email",
+    "admin/editing_announcement": "Editare anunt",
+    "admin/editing_announcement_failure": "Actualizarea anuntului a esuat.",
+    "admin/editing_announcement_success": "Actualizarea anuntului a fost facuta cu succes.",
+    "admin/editing_hook": "Editare Webhook",
+    "admin/editing_integration_x": "Editand integrarea {{integration}}",
+    "admin/email_logs": "Emailuri in masa",
+    "admin/email_message_greeting": "Salut",
+    "admin/email_message_message": "Mesaj",
+    "admin/email_message_options": "Optiuni",
+    "admin/email_message_subject": "Subiect",
+    "admin/email_message_thanks": "Multumesc",
+    "admin/email_port_invalid": "Te rugam sa introduci un port valid pentru email.",
+    "admin/email_preview_popup": "Previzualizare",
+    "admin/email_resend_failed": "Retrimiterea emailului a esuat, verifica setarile email-ului tau.",
+    "admin/email_resent_successfully": "Retrimiterea email-ului a fost facuta cu succes.",
+    "admin/group_cloned_successfully": "Clonarea grupului a fost facuta cu succes.",
+    "admin/groups_added": "Grupuri adaugate",
+    "admin/groups_removed": "Grupuri sterse",
+    "admin/header": "Antet",
+    "admin/header_required": "Antetul este necesar.",
+    "admin/home_custom_content": "Content custom pentru acasa",
+    "admin/homepage_news": "Noutati",
+    "admin/hook_created": "Hook creat cu succes.",
+    "admin/hook_deleted": "Hook sters cu succes.",
+    "admin/hook_edited": "Hook editat cu succes.",
+    "admin/user_group_added_hook_info": "Grupul de utilizatori a fost adaugat cu succes.",
+    "admin/user_group_removed_hook_info": "Grupul de utilizatori a fost eliminat",
+    "admin/administrator": "Administrator",
+    "admin/administrator_permission_info": "Membrii cu aceasta permisiune vor avea toate permisiunile disponibile. Aceasta actiune este periculoasa.",
+    "admin/announcement_hook_info": "Creare anunt",
+    "admin/announcement_icon_instructions": "De asemenea, puteți adăuga și o iconița la fiecare anunt aici, spre exemplu folosind {{faLink}} sau {{semLink}}.",
+    "admin/announcement_order": "Ordine",
+    "admin/announcements": "Anunțuri",
+    "admin/api_endpoints": "Puncte finale API",
+    "admin/at_least_one_external": "Vă rugam, introduceți minim un grup extern (Minecraft sau Discord)",
+    "admin/background_colour": "Culoare de fundal",
+    "admin/background_colour_required": "Culoarea de fundal este necesara",
+    "admin/ban_hook_info": "Utilizator interzis",
+    "admin/email_preview_popup_message": "Click aici pentru a vedea o previzualizare a email-ului.",
+    "admin/force_tfa": "Autentificare fortata cu doi factori pentru membrii grupului?"
 }
diff --git a/custom/languages/ru_RU.json b/custom/languages/ru_RU.json
index 6fb82772c4..5f149e0513 100644
--- a/custom/languages/ru_RU.json
+++ b/custom/languages/ru_RU.json
@@ -194,7 +194,7 @@
     "admin/enable_registration": "Включить регистрацию?",
     "admin/enable_status_query": "Включить запрос статуса сервера?",
     "admin/enable_username_sync": "Включить синхронизацию имён пользователей?",
-    "admin/enable_username_sync_info": "Если этот параметр включен, имена пользователей веб-сайта будут обновлены в соответствии с игровыми именами пользователей.",
+    "admin/enable_username_sync_info": "Если этот параметр включен, имена пользователей веб-сайта будут обновлены в соответствии с игровыми именами пользователей. Это происходит когда игровой плагин отправляет список UUIDов и никнеймов, для онлайн игроков, на сайт.",
     "admin/enabled": "Включено",
     "admin/enter_authme_db_details": "Введите корректные данные базы данных.",
     "admin/error_deleted_successfully": "Ошибка была успешно удалена.",
@@ -762,7 +762,6 @@
     "installer/back": "Назад",
     "installer/cache_writable": "Cache доступен для записи",
     "installer/character_set": "Кодировка",
-    "installer/config_not_writable": "Файл конфигурации недоступен для записи.",
     "installer/config_writable": "core/config.php доступен для записи",
     "installer/configuration": "Конфигурация",
     "installer/configuration_error": "Пожалуйста, введите действительное название сайта длиной от 1 до 32 символов и действительные адреса электронной почты длиной от 4 до 64 символов.",
@@ -1219,5 +1218,7 @@
     "installer/upgrade_error": "Произошли ошибки при обновлении.",
     "admin/debug_link_info": "Важно - только делитесь этой ссылкой с людьми которыми вы доверяете!",
     "general/deleted_user": "Удаленный Пользователь",
-    "admin/use_external_mail_server": "Использовать внешний почтовый сервер"
+    "admin/use_external_mail_server": "Использовать внешний почтовый сервер",
+    "admin/trusted_proxies_not_configured": "{{linkStart}}Доверенные прокси{{linkEnd}} не настроены, IP баны могут не так работать.",
+    "admin/trusted_proxies_configured": "Доверенные прокси"
 }
diff --git a/custom/languages/sk_SK.json b/custom/languages/sk_SK.json
index 3d2951bf22..2b77686647 100644
--- a/custom/languages/sk_SK.json
+++ b/custom/languages/sk_SK.json
@@ -755,7 +755,6 @@
     "installer/back": "Späť",
     "installer/cache_writable": "Cache zapisovateľná",
     "installer/character_set": "Znaková sada",
-    "installer/config_not_writable": "Do konfiguračného súboru nie je možné zapisovať.",
     "installer/config_writable": "core/config.php zapisovateľné",
     "installer/configuration": "Konfigurácia",
     "installer/configuration_error": "Zadajte platný názov webu s dĺžkou od 1 do 32 znakov a platné emailové adresy s dĺžkou od 4 do 64 znakov.",
diff --git a/custom/languages/sv_SE.json b/custom/languages/sv_SE.json
index 363c82d053..4cdcf30a94 100644
--- a/custom/languages/sv_SE.json
+++ b/custom/languages/sv_SE.json
@@ -715,7 +715,6 @@
     "installer/back": "Tillbaka",
     "installer/cache_writable": "Cache Skrivbar",
     "installer/character_set": "Teckenuppsättning",
-    "installer/config_not_writable": "Konfigurationsfilen är inte skrivbar.",
     "installer/config_writable": "core/config.php Skrivbar",
     "installer/configuration": "Konfiguration",
     "installer/configuration_error": "Ange ett giltigt webbplatsnamn mellan 1 och 32 tecken långt och giltiga e-postadresser mellan 4 och 64 tecken långa.",
diff --git a/custom/languages/th_TH.json b/custom/languages/th_TH.json
index f6025aa808..78e50b4681 100644
--- a/custom/languages/th_TH.json
+++ b/custom/languages/th_TH.json
@@ -719,7 +719,6 @@
     "installer/back": "กลับ",
     "installer/cache_writable": "cache เขียนได้",
     "installer/character_set": "ชุดตัวอักษร",
-    "installer/config_not_writable": "ไฟล์กำหนดค่าไม่สามารถเขียนได้",
     "installer/config_writable": "core/config.php เขียนได้",
     "installer/configuration": "การกำหนดค่า",
     "installer/configuration_error": "โปรดป้อนชื่อไซต์ที่ถูกต้องระหว่าง 1 ถึง 32 อักขระ และที่อยู่อีเมลที่ถูกต้องระหว่าง 4 ถึง 64 อักขระ",
diff --git a/custom/languages/uk_UA.json b/custom/languages/uk_UA.json
index afcf39ce09..a47faf16f9 100644
--- a/custom/languages/uk_UA.json
+++ b/custom/languages/uk_UA.json
@@ -724,7 +724,6 @@
     "installer/back": "Назад",
     "installer/cache_writable": "Cache доступний для запису",
     "installer/character_set": "Кодування",
-    "installer/config_not_writable": "Файл конфігурації недоступний для запису.",
     "installer/config_writable": "core/config.php доступний для запису",
     "installer/configuration": "Конфігурація",
     "installer/configuration_error": "Будь ласка, введіть дійсну назву сайту довжиною від 1 до 32 символів та дійсні адреси електронної пошти довжиною від 4 до 64 символів.",
diff --git a/custom/languages/zh_CN.json b/custom/languages/zh_CN.json
index 2736a69ebd..e4b6fbe139 100644
--- a/custom/languages/zh_CN.json
+++ b/custom/languages/zh_CN.json
@@ -737,7 +737,6 @@
     "installer/back": "返回",
     "installer/cache_writable": "Cache 可写",
     "installer/character_set": "字符集",
-    "installer/config_not_writable": "配置文件无法写入",
     "installer/config_writable": "core/config.php 可写",
     "installer/configuration": "配置",
     "installer/configuration_error": "请输入有效的网站名称，长度在 1 到 32 个字符之间，有效的电子邮箱地址在 4 到 64 个字符之间。",
diff --git a/modules/Cookie Consent/language/it.json b/modules/Cookie Consent/language/it.json
index 0967ef424b..340c8df594 100644
--- a/modules/Cookie Consent/language/it.json	
+++ b/modules/Cookie Consent/language/it.json	
@@ -1 +1,13 @@
-{}
+{
+    "cookie/cookie_notice": "Avviso sui cookie",
+    "cookie/cookie_notice_info": "Questo widget richiede i cookie",
+    "cookie/cookie_popup": "Questo sito utilizza i cookie per migliorare la tua esperienza di navigazione.",
+    "cookie/cookie_popup_allow": "Consenti i cookie",
+    "cookie/cookie_popup_disallow": "Non consentire i cookie",
+    "cookie/cookie_popup_more_info": "Ulteriori informazioni",
+    "cookie/cookies": "Biscotti",
+    "cookie/update_settings": "Mostra popup cookie",
+    "cookie/configure_cookies": "Configura i cookie",
+    "cookie/cookie_notice_success": "Avviso sui cookie aggiornato correttamente.",
+    "cookie/cookie_notice_error": "Inserisci un avviso sui cookie di massimo 10.000 caratteri."
+}
diff --git a/modules/Discord Integration/language/it_IT.json b/modules/Discord Integration/language/it_IT.json
index c8b8ce2a8b..bf9422a48d 100644
--- a/modules/Discord Integration/language/it_IT.json	
+++ b/modules/Discord Integration/language/it_IT.json	
@@ -2,13 +2,13 @@
     "discord_integration/discord": "Discord",
     "discord_integration/discord_already_pending": "Hai già una verifica in sospeso.",
     "discord_integration/discord_bot_must_be_setup": "Non è possibile abilitare l'integrazione con Discord fino a che il bot non sarà configurato. Per informazioni, {{linkStart}}clicca qui{{linkEnd}}.",
-    "discord_integration/discord_bot_setup": "Configurazione del bot",
+    "discord_integration/discord_bot_setup": "Bot configurato?",
     "discord_integration/discord_communication_error": "Si è verificato un errore durante la comunicazione con il Bot di Discord. Assicurati che il bot sia in esecuzione e che l'URL del tuo Bot sia corretto.",
     "discord_integration/discord_database_error": "Il database dei collegamenti di Nameless è attualmente inattivo. Riprova più tardi.",
     "discord_integration/discord_guild_id": "ID Server Discord",
     "discord_integration/discord_id_help": "Per informazioni su dove trovare gli ID Discord, leggi {{linkStart}}questo.{{linkEnd}}",
-    "discord_integration/discord_id_length": "Assicurati che il tuo ID Discord sia lungo 18 caratteri.",
-    "discord_integration/discord_id_numeric": "Assicurati che il tuo ID Discord sia numerico (solo numeri).",
+    "discord_integration/discord_id_length": "Assicurati che il tuo ID Discord Server sia lungo 18 caratteri.",
+    "discord_integration/discord_id_numeric": "Assicurati che l'ID del tuo server Discord sia numerico (solo numeri).",
     "discord_integration/discord_id_set": "ID Discord impostato correttamente",
     "discord_integration/discord_id_taken": "Quell'ID Discord è già stato preso.",
     "discord_integration/discord_id_unlinked": "Scollegato con successo il tuo ID utente Discord.",
@@ -19,12 +19,35 @@
     "discord_integration/discord_role_id_numeric": "L'ID ruolo Discord deve essere numerico.",
     "discord_integration/discord_settings_updated": "Impostazioni di Discord aggiornate con successo",
     "discord_integration/discord_unknown_error": "Si è verificato un errore sconosciuto durante la sincronizzazione dei ruoli di Discord. Contatta un amministratore.",
-    "discord_integration/discord_widget_theme": "Tema Widget Discord",
-    "discord_integration/enable_discord_integration": "Abilitare l'integrazione con Discord?",
+    "discord_integration/discord_widget_theme": "Tema del widget Discord",
+    "discord_integration/enable_discord_integration": "Abilitare l'integrazione di Discord?",
     "discord_integration/linked": "Collegato",
     "discord_integration/not_linked": "Non collegato",
-    "discord_integration/pending_link": "In attesa",
+    "discord_integration/pending_link": "In attesa di",
     "discord_integration/provide_one_discord_settings": "Fornisci almeno uno dei seguenti: \"url\", \"guild_id\"",
     "discord_integration/unable_to_set_discord_bot_url": "Impossibile impostare l'URL del bot Discord",
-    "discord_integration/unable_to_set_discord_id": "Impossibile impostare l'ID Discord."
+    "discord_integration/unable_to_set_discord_id": "Impossibile impostare l'ID discordia.",
+    "discord_integration/get_link_code": "Ottieni il codice di collegamento",
+    "discord_integration/discord_widget_error": "Si è verificato un errore durante il recupero del widget Discord: {{error}}.",
+    "discord_integration/discord_id_required": "Inserisci il tuo ID del server Discord.",
+    "discord_integration/no_pending_verification_for_token": "Non ci sono verifiche in sospeso per il token fornito.",
+    "discord_integration/unable_to_update_discord_bot_username": "Impossibile aggiornare il nome utente del bot Discord.",
+    "discord_integration/unable_to_update_discord_roles": "Impossibile aggiornare l'elenco dei ruoli Discord.",
+    "discord_integration/unable_to_update_discord_username": "Impossibile aggiornare il nome utente Discord.",
+    "discord_integration/discord_bot_check_logs": "Dovresti verificare la presenza di un errore più specifico (se presente) in StaffCP -> Sicurezza -> Tutti i registri.",
+    "discord_integration/discord_bot_error_badparameter": "Corpo della richiesta non valido.",
+    "discord_integration/discord_bot_error_invguild": "A condizione che l'ID gilda non sia valido o che il bot non sia presente.",
+    "discord_integration/discord_bot_error_invrole": "L'ID ruolo fornito non è valido.",
+    "discord_integration/discord_bot_error_invuser": "L'ID utente fornito non è valido o non è nella gilda specificata.",
+    "discord_integration/discord_bot_error_notlinked": "Il bot non è collegato a questo sito Web per l'ID gilda fornito.",
+    "discord_integration/discord_bot_error_partsuccess": "Il bot non ha potuto modificare uno o più ruoli a causa di un'errata configurazione della gerarchia di Discord.",
+    "discord_integration/discord_bot_error_unauthorized": "La chiave API del sito Web non è valida",
+    "discord_integration/discord_id_confirm": "Esegui il comando \"/verify {{token}}\" in Discord per completare il collegamento del tuo account Discord.",
+    "discord_integration/discord_integration_not_setup": "L'integrazione di Discord non è impostata",
+    "discord_integration/discord_invite_info": "Per invitare il bot Nameless Link sul tuo server Discord, fai clic {{inviteLinkStart}}qui{{inviteLinkEnd}}. Quindi, esegui il comando {{command}} per collegare il bot al tuo sito web. In alternativa, puoi {{selfHostLinkStart}}ospitare il bot da solo{{selfHostLinkEnd}}.",
+    "discord_integration/discord_bot_error_error": "Si è verificato un errore interno del bot.",
+    "discord_integration/discord_user_id": "ID utente Discord",
+    "discord_integration/discord_username": "Nome utente Discord",
+    "discord_integration/discord_usernames_updated": "Nomi utente Discord aggiornati correttamente",
+    "discord_integration/discord_widget_disabled": "Il widget è disabilitato per il server Discord specificato. Vai alla scheda \"Widget\" nelle impostazioni del tuo server Discord e assicurati che il widget Discord sia abilitato e che l'ID sia corretto."
 }
diff --git a/modules/Forum/language/de_DE.json b/modules/Forum/language/de_DE.json
index 99a8d181fd..93b8b97d78 100644
--- a/modules/Forum/language/de_DE.json
+++ b/modules/Forum/language/de_DE.json
@@ -32,7 +32,7 @@
     "forum/error_quoting_posts": "Beim Einfügen des Zitats ist etwas fehlgeschlagen.",
     "forum/error_rating_post": "Entschuldige, du kannst diesen Beitrag nicht bewerten.",
     "forum/follow": "Folgen",
-    "forum/following_topics": "Folgende Themen",
+    "forum/following_topics": "Gefolgte Themen",
     "forum/forum": "Forum",
     "forum/forum_created_successfully": "Forum wurde erfolgreich erstellt.",
     "forum/forum_deleted_successfully": "Forum erfolgreich gelöscht.",
diff --git a/modules/Forum/language/it_IT.json b/modules/Forum/language/it_IT.json
index fe3f0ff4d4..df2a202dae 100644
--- a/modules/Forum/language/it_IT.json
+++ b/modules/Forum/language/it_IT.json
@@ -1,176 +1,197 @@
 {
-    "forum\/available_hooks": "Available Hooks",
-    "forum\/average_posts": "Numero medio di post dell'utente",
-    "forum\/by": "da",
-    "forum\/can_create_topic": "Puoi creare discussioni?",
-    "forum\/can_edit_topic": "Can edit their topics?",
-    "forum\/can_moderate_forum": "Può moderare il forum?",
-    "forum\/can_post_reply": "Puoi creare risposte?",
-    "forum\/can_view_forum": "Può vedere il forum?",
-    "forum\/can_view_other_topics": "Può visualizzare le discussioni degli altri utenti?",
-    "forum\/confirm_delete_post": "Sei sicuro di voler eliminare questo post?",
-    "forum\/confirm_delete_short": "Conferma eliminazione",
-    "forum\/confirm_delete_topic": "Sei sicuro di voler eliminare questa discussione?",
-    "forum\/content_max_50000": "Il contenuto del tuo post non deve essere più lungo di 50000 caratteri",
-    "forum\/content_min_2": "Il contenuto del tuo post deve contenere almeno 2 caratteri",
-    "forum\/content_required": "Non puoi creare un post vuoto!",
-    "forum\/creating_forum": "Crea un nuovo forum",
-    "forum\/creating_label": "Creazione di una nuova etichetta",
-    "forum\/creating_label_type": "Creazione di un nuovo tipo di etichetta",
-    "forum\/creating_topic_in_x": "Creazione della discussione in {{forum}}",
-    "forum\/delete_forum": "Elimina forum",
-    "forum\/delete_topic": "Elimina discussione",
-    "forum\/delete_topics_and_posts": "Elimina discussioni e post",
-    "forum\/discussion": "Discussione",
-    "forum\/display_topics_as_news": "Mostra discussioni come notizie in prima pagina?",
-    "forum\/edit": "Modifica",
-    "forum\/edit_post": "Modifica post",
-    "forum\/editing_label": "Modifica etichetta",
-    "forum\/editing_label_type": "Modifica del tipo di etichetta",
-    "forum\/error_quoting_posts": "Spiacenti, si è verificato un problema durante la citazione dei post.",
-    "forum\/error_rating_post": "Spiacenti, si è verificato un errore durante la valutazione del post.",
-    "forum\/follow": "Segui",
-    "forum\/forum": "Forum",
-    "forum\/forum_created_successfully": "Forum creato con successo.",
-    "forum\/forum_deleted_successfully": "Forum eliminato con successo.",
-    "forum\/forum_description": "Descrizione del forum",
-    "forum\/forum_description_maximum": "La descrizione del forum deve essere al massimo di 255 caratteri.",
-    "forum\/forum_description_minimum": "La descrizione del forum deve contenere almeno 2 caratteri.",
-    "forum\/forum_icon": "Icona del forum",
-    "forum\/forum_icon_maximum": "L'icona del forum deve avere un massimo di 256 caratteri.",
-    "forum\/forum_index": "Home",
-    "forum\/forum_layout": "Layout del forum",
-    "forum\/forum_name": "Nome del forum",
-    "forum\/forum_name_maximum": "Il nome del forum deve contenere un massimo di 150 caratteri.",
-    "forum\/forum_name_minimum": "Il nome del forum deve contenere almeno 2 caratteri.",
-    "forum\/forum_permissions": "Permessi del forum",
-    "forum\/forum_redirect_warning": "Avviso: stai per uscire da questo sito! Sei sicuro di voler procedere verso {{url}}?",
-    "forum\/forum_search": "Ricerca nel forum",
-    "forum\/forum_type": "Tipo di forum",
-    "forum\/forum_type_category": "Categoria",
-    "forum\/forum_type_forum": "Forum",
-    "forum\/forum_updated_successfully": "Forum aggiornato con successo.",
-    "forum\/forums": "Forum",
-    "forum\/group": "Gruppo",
-    "forum\/guests": "Ospiti",
-    "forum\/has_no_parent": "Nessun forum principale",
-    "forum\/in": "nel",
-    "forum\/include_in_hook": "Includere nuove discussioni da questo forum nel webhook?",
-    "forum\/input_forum_description": "Si prega di inserire una descrizione del forum.",
-    "forum\/input_forum_title": "Si prega di inserire un titolo del forum.",
-    "forum\/insert_quotes": "Inserisci citazioni",
-    "forum\/invalid_action": "Azione non valida",
-    "forum\/invalid_redirect_url": "Hai attivato il reindirizzamento del forum, ma non hai inserito un URL valido tra 1 e 512 caratteri.",
-    "forum\/invalid_search_query": "Inserisci una query di ricerca compresa tra 3 e 128 caratteri.",
-    "forum\/label": "Etichetta",
-    "forum\/label_creation_error": "Errore durante la creazione dell'etichetta. Assicurati che il nome non sia più lungo di 32 caratteri e che tu abbia specificato un tipo.",
-    "forum\/label_creation_success": "Etichetta creata con successo.",
-    "forum\/label_deleted_successfully": "Etichetta eliminata con successo.",
-    "forum\/label_edit_success": "Etichetta modificata correttamente.",
-    "forum\/label_forums": "Etichette forum",
-    "forum\/label_groups": "Gruppi di etichette",
-    "forum\/label_name": "Nome dell'etichetta",
-    "forum\/label_type": "Tipo di etichetta",
-    "forum\/label_type_creation_error": "Errore durante la creazione di un tipo di etichetta. Assicurati che il nome non sia più lungo di 32 caratteri e che l'HTML non sia più lungo di 1024 caratteri.",
-    "forum\/label_type_creation_success": "Tipo di etichetta creato correttamente.",
-    "forum\/label_type_deleted_successfully": "Tipo di etichetta eliminata con successo.",
-    "forum\/label_type_edit_success": "Tipo di etichetta modificato correttamente.",
-    "forum\/label_type_html": "Codice HTML tipo etichetta",
-    "forum\/label_type_html_help": "L'HTML deve includere {x} come segnaposto per il nome dell'etichetta",
-    "forum\/label_type_name": "Nome del tipo di etichetta",
-    "forum\/label_types": "Tipi di etichette",
-    "forum\/labels": "Etichette",
-    "forum\/last_7_days_posts": "Post del forum (ultimi 7 giorni)",
-    "forum\/last_edited": "Ultima modifica: {{lastEditedAt}}",
-    "forum\/last_reply": "Ultima risposta",
-    "forum\/latest_announcements": "Ultimi Annunci",
-    "forum\/latest_discussions": "Ultime Discussioni",
-    "forum\/latest_discussions_view": "Vista ultime discussioni",
-    "forum\/latest_posts": "Ultimi post",
-    "forum\/lock_topic": "Blocca discussione",
-    "forum\/merge_instructions": "La discussione da unire <strong>deve<\/strong> essere all'interno dello stesso forum. Sposta la discussione se necessario.",
-    "forum\/merge_topic": "Unisci discussione",
-    "forum\/merge_topics": "Unisci discussioni",
-    "forum\/mod_actions": "Moderazione",
-    "forum\/move_topic": "Sposta discussione",
-    "forum\/move_topic_to": "Sposta la discussione in:",
-    "forum\/move_topics_and_posts_to": "Sposta discussioni e post a",
-    "forum\/new_forum": "<i class=\"fa fa-plus-circle\"><\/i> Nuovo forum",
-    "forum\/new_label": "<i class=\"fa fa-plus-circle\"><\/i> Nuova etichetta",
-    "forum\/new_label_type": "<i class=\"fa fa-plus-circle\"><\/i> Nuovo tipo di etichetta",
-    "forum\/new_reply": "Nuova risposta",
-    "forum\/new_reply_in_topic": "{{author}} ha risposto alla discussione {{topic}}",
-    "forum\/new_search": "Nuova ricerca",
-    "forum\/new_topic": "Nuova discussione",
-    "forum\/new_topic_hook_info": "Nuova discussione",
-    "forum\/new_topic_text": "Discussione creata in {{forum}} da {{author}}",
-    "forum\/no_forums": "Nessun forum",
-    "forum\/no_label": "Senza etichetta",
-    "forum\/no_label_types_defined": "Nessun tipo di etichetta è stato ancora definito.",
-    "forum\/no_labels_defined": "Nessuna etichetta è stata ancora definita.",
-    "forum\/no_longer_following_topic": "Non stai più seguendo questa discussione e non riceverai alcuna notifica di nuove risposte.",
-    "forum\/no_results_found": "Nessun risultato trovato.",
-    "forum\/no_topics": "Non c'è ancora nessuna discussione.",
-    "forum\/no_topics_short": "Nessuna discussione",
-    "forum\/no_users_online": "Nesssun utente online",
-    "forum\/now_following_topic": "Ora stai seguendo questa discussione e sarai informato di eventuali nuove risposte.",
-    "forum\/online_users": "Utenti Online",
-    "forum\/overview": "Panoramica",
-    "forum\/parent_forum": "Forum principale",
-    "forum\/parent_forum_x": "Forum principale: {{forum}}",
-    "forum\/post_already_reported": "Hai già segnalato questo post!",
-    "forum\/post_edited_successfully": "Post modificato con successo.",
-    "forum\/post_successful": "Postato con successo.",
-    "forum\/posts": "post",
-    "forum\/posts_title": "Post",
-    "forum\/quote": "Quota",
-    "forum\/quoted_post": "Post aggiunto ai post citati.",
-    "forum\/quoting_posts": "Inserimento citazioni..",
-    "forum\/re": "RI: ",
-    "forum\/read_full_post": "Leggi l'articolo completo",
-    "forum\/recent_posts": "Post recenti",
-    "forum\/recent_topics": "Discussioni recenti",
-    "forum\/redirect_forum": "Forum di reindirizzamento?",
-    "forum\/redirect_url": "URL di reindirizzamento",
-    "forum\/registered_x": "Iscritto: {{registeredAt}}",
-    "forum\/removed_quoted_post": "Post rimosso dai post citati.",
-    "forum\/search_again_in_x_seconds": "Attendi {{count}} secondi prima di effettuare nuovamente la ricerca.",
-    "forum\/search_results": "Risultati della ricerca",
-    "forum\/select_a_parent_forum": "Seleziona un forum principale",
-    "forum\/settings_updated_successfully": "Impostazioni aggiornate con successo.",
-    "forum\/share": "Condividi",
-    "forum\/share_facebook": "Condividi su Facebook",
-    "forum\/share_twitter": "Condividi su Twitter",
-    "forum\/spam_wait": "Attendi {{count}} secondi prima di postare di nuovo.",
-    "forum\/started_by_x": "Avviato da {{author}}",
-    "forum\/stats": "Statistiche",
-    "forum\/stick_topic": "Fissa discussione",
-    "forum\/sticky_topics": "Discussioni in rilievo",
-    "forum\/subforum": "Sotto-forum",
-    "forum\/subforums": "Sotto-forum",
-    "forum\/table_view": "Vista tabella",
-    "forum\/title_max_64": "Il titolo della discussione non deve contenere più di 64 caratteri",
-    "forum\/title_min_2": "Il titolo della discussione deve contenere almeno 2 caratteri",
-    "forum\/title_required": "Devi inserire il titolo della discussione!",
-    "forum\/topic": "Discussione",
-    "forum\/topic_locked": "Discussione  bloccato",
-    "forum\/topic_locked_notice": "Questa discussione è bloccata, ma i tuoi permessi ti consentono di creare una risposta.",
-    "forum\/topic_placeholder": "Topic segnaposto",
-    "forum\/topic_stuck": "La discussione è rimasta bloccata.",
-    "forum\/topic_title": "Titolo del topic",
-    "forum\/topic_unstuck": "La discussione è stato sbloccata.",
-    "forum\/topics": "discussioni",
-    "forum\/topics_title": "Discussioni",
-    "forum\/total_posts": "Conteggio totale delle post",
-    "forum\/unfollow": "Smetti di seguire",
-    "forum\/unlock_topic": "Sblocca discussione",
-    "forum\/unstick_topic": "Togli la discussione dai fissati",
-    "forum\/use_reactions": "Utilizzare le reazioni?",
-    "forum\/user_no_posts": "Questo utente non ha ancora creato nessun post nel forum.",
-    "forum\/user_tag": "Sei stato taggato in un post.",
-    "forum\/user_tag_info": "Sei stato taggato in un post da {{author}}.",
-    "forum\/views": "visualizzazioni",
-    "forum\/x_posts": "{{count}} post",
-    "forum\/x_topics": "{{count}} discussioni",
-    "forum\/your_posts": "Il tuo numero di post"
-}
\ No newline at end of file
+    "forum/available_hooks": "Available Hooks",
+    "forum/average_posts": "Numero medio di post dell'utente",
+    "forum/by": "da",
+    "forum/can_create_topic": "Puoi creare discussioni?",
+    "forum/can_edit_topic": "Can edit their topics?",
+    "forum/can_moderate_forum": "Può moderare il forum?",
+    "forum/can_post_reply": "Puoi creare risposte?",
+    "forum/can_view_forum": "Può vedere il forum?",
+    "forum/can_view_other_topics": "Può visualizzare le discussioni degli altri utenti?",
+    "forum/confirm_delete_post": "Sei sicuro di voler eliminare questo post?",
+    "forum/confirm_delete_short": "Conferma eliminazione",
+    "forum/confirm_delete_topic": "Sei sicuro di voler eliminare questa discussione?",
+    "forum/content_max_50000": "Il contenuto del tuo post non deve essere più lungo di 50000 caratteri",
+    "forum/content_min_2": "Il contenuto del tuo post deve contenere almeno 2 caratteri",
+    "forum/content_required": "Non puoi creare un post vuoto!",
+    "forum/creating_forum": "Crea un nuovo forum",
+    "forum/creating_label": "Creazione di una nuova etichetta",
+    "forum/creating_label_type": "Creazione di un nuovo tipo di etichetta",
+    "forum/creating_topic_in_x": "Creazione della discussione in {{forum}}",
+    "forum/delete_forum": "Elimina forum",
+    "forum/delete_topic": "Elimina discussione",
+    "forum/delete_topics_and_posts": "Elimina discussioni e post",
+    "forum/discussion": "Discussione",
+    "forum/display_topics_as_news": "Mostra discussioni come notizie in prima pagina?",
+    "forum/edit": "Modifica",
+    "forum/edit_post": "Modifica post",
+    "forum/editing_label": "Modifica etichetta",
+    "forum/editing_label_type": "Modifica del tipo di etichetta",
+    "forum/error_quoting_posts": "Spiacenti, si è verificato un problema durante la citazione dei post.",
+    "forum/error_rating_post": "Spiacenti, si è verificato un errore durante la valutazione del post.",
+    "forum/follow": "Segui",
+    "forum/forum": "Forum",
+    "forum/forum_created_successfully": "Forum creato con successo.",
+    "forum/forum_deleted_successfully": "Forum eliminato con successo.",
+    "forum/forum_description": "Descrizione del forum",
+    "forum/forum_description_maximum": "La descrizione del forum deve essere al massimo di 255 caratteri.",
+    "forum/forum_description_minimum": "La descrizione del forum deve contenere almeno 2 caratteri.",
+    "forum/forum_icon": "Icona del forum",
+    "forum/forum_icon_maximum": "L'icona del forum deve avere un massimo di 256 caratteri.",
+    "forum/forum_index": "Home",
+    "forum/forum_layout": "Layout del forum",
+    "forum/forum_name": "Nome del forum",
+    "forum/forum_name_maximum": "Il nome del forum deve contenere un massimo di 150 caratteri.",
+    "forum/forum_name_minimum": "Il nome del forum deve contenere almeno 2 caratteri.",
+    "forum/forum_permissions": "Permessi del forum",
+    "forum/forum_redirect_warning": "Avviso: stai per uscire da questo sito! Sei sicuro di voler procedere verso {{url}}?",
+    "forum/forum_search": "Ricerca nel forum",
+    "forum/forum_type": "Tipo di forum",
+    "forum/forum_type_category": "Categoria",
+    "forum/forum_type_forum": "Forum",
+    "forum/forum_updated_successfully": "Forum aggiornato con successo.",
+    "forum/forums": "Forum",
+    "forum/group": "Gruppo",
+    "forum/guests": "Ospiti",
+    "forum/has_no_parent": "Nessun forum principale",
+    "forum/in": "nel",
+    "forum/include_in_hook": "Includere eventi da questo forum nei webhook?",
+    "forum/input_forum_description": "Si prega di inserire una descrizione del forum.",
+    "forum/input_forum_title": "Si prega di inserire un titolo del forum.",
+    "forum/insert_quotes": "Inserisci citazioni",
+    "forum/invalid_action": "Azione non valida",
+    "forum/invalid_redirect_url": "Hai attivato il reindirizzamento del forum, ma non hai inserito un URL valido tra 1 e 512 caratteri.",
+    "forum/invalid_search_query": "Inserisci una query di ricerca compresa tra 3 e 128 caratteri.",
+    "forum/label": "Etichetta",
+    "forum/label_creation_error": "Errore durante la creazione dell'etichetta. Assicurati che il nome non sia più lungo di 32 caratteri e che tu abbia specificato un tipo.",
+    "forum/label_creation_success": "Etichetta creata con successo.",
+    "forum/label_deleted_successfully": "Etichetta eliminata con successo.",
+    "forum/label_edit_success": "Etichetta modificata correttamente.",
+    "forum/label_forums": "Etichette forum",
+    "forum/label_groups": "Gruppi di etichette",
+    "forum/label_name": "Nome dell'etichetta",
+    "forum/label_type": "Tipo di etichetta",
+    "forum/label_type_creation_error": "Errore durante la creazione di un tipo di etichetta. Assicurati che il nome non sia più lungo di 32 caratteri e che l'HTML non sia più lungo di 1024 caratteri.",
+    "forum/label_type_creation_success": "Tipo di etichetta creato correttamente.",
+    "forum/label_type_deleted_successfully": "Tipo di etichetta eliminata con successo.",
+    "forum/label_type_edit_success": "Tipo di etichetta modificato correttamente.",
+    "forum/label_type_html": "Codice HTML tipo etichetta",
+    "forum/label_type_html_help": "L'HTML deve includere {x} come segnaposto per il nome dell'etichetta",
+    "forum/label_type_name": "Nome del tipo di etichetta",
+    "forum/label_types": "Tipi di etichette",
+    "forum/labels": "Etichette",
+    "forum/last_7_days_posts": "Post del forum (ultimi 7 giorni)",
+    "forum/last_edited": "Ultima modifica: {{lastEditedAt}}",
+    "forum/last_reply": "Ultima risposta",
+    "forum/latest_announcements": "Ultimi Annunci",
+    "forum/latest_discussions": "Ultime Discussioni",
+    "forum/latest_discussions_view": "Vista ultime discussioni",
+    "forum/latest_posts": "Ultimi post",
+    "forum/lock_topic": "Blocca discussione",
+    "forum/merge_instructions": "La discussione da unire <strong>deve</strong> essere all'interno dello stesso forum. Sposta la discussione se necessario.",
+    "forum/merge_topic": "Unisci discussione",
+    "forum/merge_topics": "Unisci discussioni",
+    "forum/mod_actions": "Moderazione",
+    "forum/move_topic": "Sposta discussione",
+    "forum/move_topic_to": "Sposta la discussione in:",
+    "forum/move_topics_and_posts_to": "Sposta discussioni e post a",
+    "forum/new_forum": "<i class=\"fa fa-plus-circle\"></i> Nuovo forum",
+    "forum/new_label": "<i class=\"fa fa-plus-circle\"></i> Nuova etichetta",
+    "forum/new_label_type": "<i class=\"fa fa-plus-circle\"></i> Nuovo tipo di etichetta",
+    "forum/new_reply": "Nuova risposta",
+    "forum/new_reply_in_topic": "{{author}} ha risposto alla discussione {{topic}}",
+    "forum/new_search": "Nuova ricerca",
+    "forum/new_topic": "Nuova discussione",
+    "forum/new_topic_hook_info": "Nuova discussione",
+    "forum/new_topic_text": "Discussione creata in {{forum}} da {{author}}",
+    "forum/no_forums": "Nessun forum",
+    "forum/no_label": "Senza etichetta",
+    "forum/no_label_types_defined": "Nessun tipo di etichetta è stato ancora definito.",
+    "forum/no_labels_defined": "Nessuna etichetta è stata ancora definita.",
+    "forum/no_longer_following_topic": "Non stai più seguendo questa discussione e non riceverai alcuna notifica di nuove risposte.",
+    "forum/no_results_found": "Nessun risultato trovato.",
+    "forum/no_topics": "Non c'è ancora nessuna discussione.",
+    "forum/no_topics_short": "Nessuna discussione",
+    "forum/no_users_online": "Nessun utente in linea.",
+    "forum/now_following_topic": "Ora stai seguendo questa discussione e sarai informato di eventuali nuove risposte.",
+    "forum/online_users": "Utenti Online",
+    "forum/overview": "Panoramica",
+    "forum/parent_forum": "Forum principale",
+    "forum/parent_forum_x": "Forum principale: {{forum}}",
+    "forum/post_already_reported": "Hai già segnalato questo post!",
+    "forum/post_edited_successfully": "Post modificato con successo.",
+    "forum/post_successful": "Postato con successo.",
+    "forum/posts": "post",
+    "forum/posts_title": "Post",
+    "forum/quote": "Quota",
+    "forum/quoted_post": "Post aggiunto ai post citati.",
+    "forum/quoting_posts": "Inserimento citazioni..",
+    "forum/re": "RI: ",
+    "forum/read_full_post": "Leggi l'articolo completo",
+    "forum/recent_posts": "Post recenti",
+    "forum/recent_topics": "Discussioni recenti",
+    "forum/redirect_forum": "Forum di reindirizzamento?",
+    "forum/redirect_url": "URL di reindirizzamento",
+    "forum/registered_x": "Iscritto: {{registeredAt}}",
+    "forum/removed_quoted_post": "Post rimosso dai post citati.",
+    "forum/search_again_in_x_seconds": "Attendi {{count}} secondi prima di effettuare nuovamente la ricerca.",
+    "forum/search_results": "Risultati della ricerca",
+    "forum/select_a_parent_forum": "Seleziona un forum principale",
+    "forum/settings_updated_successfully": "Impostazioni aggiornate con successo.",
+    "forum/share": "Condividi",
+    "forum/share_facebook": "Condividi su Facebook",
+    "forum/share_twitter": "Condividi su Twitter",
+    "forum/spam_wait": "Attendi {{count}} secondi prima di postare di nuovo.",
+    "forum/started_by_x": "Avviato da {{author}}",
+    "forum/stats": "Statistiche",
+    "forum/stick_topic": "Fissa discussione",
+    "forum/sticky_topics": "Discussioni in rilievo",
+    "forum/subforum": "Sotto-forum",
+    "forum/subforums": "Sotto-forum",
+    "forum/table_view": "Vista tabella",
+    "forum/title_max_64": "Il titolo della discussione non deve contenere più di 64 caratteri",
+    "forum/title_min_2": "Il titolo della discussione deve contenere almeno 2 caratteri",
+    "forum/title_required": "Inserisci il titolo di un argomento",
+    "forum/topic": "Discussione",
+    "forum/topic_locked": "Discussione bloccato",
+    "forum/topic_locked_notice": "Questa discussione è bloccata, ma i tuoi permessi ti consentono di creare una risposta.",
+    "forum/topic_placeholder": "Topic segnaposto",
+    "forum/topic_stuck": "La discussione è rimasta bloccata.",
+    "forum/topic_title": "Titolo del topic",
+    "forum/topic_unstuck": "La discussione è stato sbloccata.",
+    "forum/topics": "discussioni",
+    "forum/topics_title": "Discussioni",
+    "forum/total_posts": "Conteggio totale delle post",
+    "forum/unfollow": "Smetti di seguire",
+    "forum/unlock_topic": "Sblocca discussione",
+    "forum/unstick_topic": "Togli la discussione dai fissati",
+    "forum/use_reactions": "Utilizzare le reazioni?",
+    "forum/user_no_posts": "Questo utente non ha ancora creato nessun post nel forum.",
+    "forum/user_tag": "Sei stato taggato in un post.",
+    "forum/user_tag_info": "Sei stato taggato in un post da {{author}}.",
+    "forum/views": "visualizzazioni",
+    "forum/x_posts": "{{count}} post",
+    "forum/x_topics": "{{count}} discussioni",
+    "forum/your_posts": "Il tuo numero di post",
+    "forum/no_news": "Non ci sono notizie.",
+    "forum/not_following_any_topics": "Non stai seguendo nessun argomento.",
+    "forum/post_id": "ID postale",
+    "forum/topic_id": "ID argomento",
+    "forum/all_topics_unfollowed": "Tutti gli argomenti non sono stati seguiti.",
+    "forum/topic_reply": "Risposta argomento",
+    "forum/default_labels_info": "Questi verranno assegnati a un nuovo argomento nel forum a meno che non vengano ignorati durante la creazione dell'argomento. Ctrl+Clic per selezionare più",
+    "forum/confirm_unfollow_all_topics": "Sei sicuro di voler smettere di seguire tutti gli argomenti?",
+    "forum/default_labels": "Etichette predefinite",
+    "forum/following_topics": "Argomenti seguiti",
+    "forum/new_topic_reply_text": "Risposta all'argomento creata in {{forum}} da {{author}}",
+    "forum/pre_post_create_hook_info": "Creazione pre-post",
+    "forum/pre_post_edit_hook_info": "Modifica pre-post",
+    "forum/pre_topic_create_hook_info": "Creazione pre-argomento",
+    "forum/pre_topic_edit_hook_info": "Modifica pre-argomento",
+    "forum/user_object": "Oggetto utente",
+    "forum/label_type_in_use": "Il tipo di etichetta è in uso, non può essere eliminato.",
+    "forum/topic_author_nickname": "Soprannome dell'autore dell'argomento",
+    "forum/topic_author_uuid": "ID utente dell'autore dell'argomento",
+    "forum/topic_author_username": "Nome utente dell'autore dell'argomento",
+    "forum/unfollow_all_topics": "Smetti di seguire tutti gli argomenti"
+}

From e4430977ef6d35b3ce641e44ac626f36a0338d4f Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Tue, 14 Jun 2022 14:34:40 +0200
Subject: [PATCH 131/337] Print invalid proto value for debugging

---
 core/classes/Misc/HttpUtils.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/classes/Misc/HttpUtils.php b/core/classes/Misc/HttpUtils.php
index d7a55c32bd..d47ddb23d4 100644
--- a/core/classes/Misc/HttpUtils.php
+++ b/core/classes/Misc/HttpUtils.php
@@ -92,7 +92,7 @@ public static function getProtocol(): string {
         if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
             $proto = $_SERVER['HTTP_X_FORWARDED_PROTO'];
             if ($proto !== 'http' && $proto !== 'https') {
-                die("Invalid X-Forwarded-Proto header, should be 'http' or 'https'.");
+                die('Invalid X-Forwarded-Proto header, should be "http" or "https" but it is "' . Output::getClean($proto) . '".');
             }
             return $proto;
         }

From 58b29bc65acbb3207c1e49f97164f84f90aaccf7 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Tue, 14 Jun 2022 15:33:19 +0200
Subject: [PATCH 132/337] Recommend not using urlSafe()

---
 core/classes/Misc/Text.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/classes/Misc/Text.php b/core/classes/Misc/Text.php
index 0db2507d50..7465cc2514 100644
--- a/core/classes/Misc/Text.php
+++ b/core/classes/Misc/Text.php
@@ -125,6 +125,7 @@ public static function truncate(string $text, int $length = 750, array $options
      *
      * @param string|null $string $string String to URLify
      * @return string Url-ified string. (I dont know what this means)
+     * @deprecated This should no longer be used because it doesn't work well for non-latin languages. Just use urlencode() instead.
      */
     public static function urlSafe(string $string = null): string {
         if ($string) {

From 461cd1d38dc84a96ff34b8eea720a02b55bbc5d8 Mon Sep 17 00:00:00 2001
From: Mac <37410297+itsmemac@users.noreply.github.com>
Date: Tue, 14 Jun 2022 20:49:26 +0530
Subject: [PATCH 133/337] Fix Cloudflare typo

---
 core/classes/Misc/HttpUtils.php | 2 +-
 custom/languages/de_DE.json     | 2 +-
 custom/languages/en_UK.json     | 2 +-
 custom/languages/nl_NL.json     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/classes/Misc/HttpUtils.php b/core/classes/Misc/HttpUtils.php
index d47ddb23d4..ed76467573 100644
--- a/core/classes/Misc/HttpUtils.php
+++ b/core/classes/Misc/HttpUtils.php
@@ -31,7 +31,7 @@ public static function getRemoteAddress(): ?string {
             return $headers['X-Real-Ip'];
         }
 
-        // Non-standard header sent by CloudFlare that only contains the origin address
+        // Non-standard header sent by Cloudflare that only contains the origin address
         if (isset($headers['Cf-Connecting-Ip'])) {
             return $headers['Cf-Connecting-Ip'];
         }
diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index 8bd15d3382..0a6705fb1a 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -1224,5 +1224,5 @@
     "installer/config_write_failed": "Das Schreiben in die Konfigurationsdatei ist fehlgeschlagen: {{message}}",
     "installer/database_connection_failed": "Verbindung zur Datenbank fehlgeschlagen:<br>{{message}}",
     "admin/debugging_enabled": "Wenn Debugging aktiviert ist, können sensible Informationen für unbefugte Besucher zugänglich sein. Debugging sollte nur für die Entwicklung verwendet werden, nicht auf öffentlichen Seiten.",
-    "admin/https_port_80": "Es sieht so aus, als ob du HTTPS auf Port 80 verwendest, was mit ziemlicher Sicherheit nicht der Fall ist. Wenn du CloudFlare verwendest, stelle sicher, dass du den TLS-Verschlüsselungsmodus auf Full (strict) gesetzt hast. Wenndu deine eigene Proxy verwendest, konfiguriere ihn bitte so, dass er den X-Forwarded-Port-Header sendet."
+    "admin/https_port_80": "Es sieht so aus, als ob du HTTPS auf Port 80 verwendest, was mit ziemlicher Sicherheit nicht der Fall ist. Wenn du Cloudflare verwendest, stelle sicher, dass du den TLS-Verschlüsselungsmodus auf Full (strict) gesetzt hast. Wenndu deine eigene Proxy verwendest, konfiguriere ihn bitte so, dass er den X-Forwarded-Port-Header sendet."
 }
diff --git a/custom/languages/en_UK.json b/custom/languages/en_UK.json
index 8e1189ccef..c24e36e850 100644
--- a/custom/languages/en_UK.json
+++ b/custom/languages/en_UK.json
@@ -682,7 +682,7 @@
     "admin/api_disabled": "API is disabled",
     "admin/trusted_proxies_configured": "Trusted proxies",
     "admin/trusted_proxies_not_configured": "{{linkStart}}Trusted proxies{{linkEnd}} are not configured, IP bans may not work properly.",
-    "admin/https_port_80": "You appear as if you are using HTTPS on port 80, which is almost definitely not true. If you use CloudFlare, make sure to set TLS encryption mode to Full (strict). If you run your own proxy, please configure it to send the X-Forwarded-Port header.",
+    "admin/https_port_80": "You appear as if you are using HTTPS on port 80, which is almost definitely not true. If you use Cloudflare, make sure to set TLS encryption mode to Full (strict). If you run your own proxy, please configure it to send the X-Forwarded-Port header.",
     "admin/debugging_enabled": "Debugging is enabled, sensitive information may be exposed to unauthorised visitors. Debugging should only be used for development, not on public sites.",
     "api/account_validated": "Account validated successfully",
     "api/finish_registration_email": "Please check your emails to complete registration.",
diff --git a/custom/languages/nl_NL.json b/custom/languages/nl_NL.json
index f227372771..641484df96 100644
--- a/custom/languages/nl_NL.json
+++ b/custom/languages/nl_NL.json
@@ -1223,5 +1223,5 @@
     "installer/database_connection_failed": "Fout met het connecteren naar de database: <br>{{message}}",
     "admin/trusted_proxies_configured": "Vertrouwde proxies",
     "admin/trusted_proxies_not_configured": "{{linkStart}}Vertrouwde proxies{{linkEnd}} zijn nog niet geconfigureerd, IP verbanningen zouden niet correct kunnen werken.",
-    "admin/https_port_80": "Het lijkt erop dat je HTTPS op poort 80 gebruikt, wat hoogstwaarschijnlijk niet correct is. Als je CloudFlare gebruikt, zorg ervoor dat je TLS encryptie modus op Full (strict) zet. Als je je eigen proxy runt, configureer dan de X-Forwarded-Port header."
+    "admin/https_port_80": "Het lijkt erop dat je HTTPS op poort 80 gebruikt, wat hoogstwaarschijnlijk niet correct is. Als je Cloudflare gebruikt, zorg ervoor dat je TLS encryptie modus op Full (strict) zet. Als je je eigen proxy runt, configureer dan de X-Forwarded-Port header."
 }

From 524cebd2b97b2857343146c8c7504ac8eef8cf6c Mon Sep 17 00:00:00 2001
From: Partydragen <adrian_kili@outlook.com>
Date: Tue, 14 Jun 2022 18:21:48 +0200
Subject: [PATCH 134/337] Return empty array when no active page is set

---
 core/classes/Core/Pages.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/classes/Core/Pages.php b/core/classes/Core/Pages.php
index 584c06ba16..a119e9e6da 100644
--- a/core/classes/Core/Pages.php
+++ b/core/classes/Core/Pages.php
@@ -17,7 +17,7 @@ class Pages {
     /**
      * @var array Array of data about the active page.
      */
-    private array $_active_page;
+    private array $_active_page = [];
 
     /**
      * @var array<callable> Array of sitemap files and methods.

From 05ca34599acad2343b9628d8a4d84f8cdf539755 Mon Sep 17 00:00:00 2001
From: PadowYT2 <me@padow.ru>
Date: Tue, 14 Jun 2022 15:22:30 +0000
Subject: [PATCH 135/337] Translated using Weblate (Russian)

Currently translated at 100.0% (1227 of 1227 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/ru/
---
 custom/languages/ru_RU.json | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/custom/languages/ru_RU.json b/custom/languages/ru_RU.json
index 5f149e0513..32db223784 100644
--- a/custom/languages/ru_RU.json
+++ b/custom/languages/ru_RU.json
@@ -796,8 +796,8 @@
     "installer/host_help": "Адрес это <strong>базовый URL</strong> для вашего веб-сайта. Не включайте вложенные каталоги или http(s):// в поле адреса сайта!",
     "installer/hostname_error": "Введите домен без http:// или https://",
     "installer/initialising_database_and_cache": "Инициализация базы данных и кэша, пожалуйста, подождите...",
-    "installer/input_maximum": "Пожалуйста, убедитесь, что ваше имя пользователя содержит не более 20 символов, а адрес электронной почты и пароль - не более 64 символов.",
-    "installer/input_minimum": "Пожалуйста, убедитесь, что ваше имя пользователя состоит минимум из 3 символов, адрес электронной почты - минимум из 4 символов, а пароль - минимум из {{minPassword}} символов.",
+    "installer/input_maximum": "Пожалуйста, убедитесь, что ваше имя пользователя содержит не более {{maxUsername}} символов, а ваш адрес электронной почты не более {{maxEmail}} символов, и ваш пароль - не более\n{{maxPassword}} символов.",
+    "installer/input_minimum": "Пожалуйста, убедитесь, что ваше имя пользователя состоит минимум из {{minUsername}} символов, адрес электронной почты - минимум из {{minEmail}} символов, а пароль - минимум из {{minPassword}} символов.",
     "installer/input_required": "Пожалуйста, введите действительное имя пользователя, адрес электронной почты и пароль.",
     "installer/input_v1_details": "Пожалуйста, введите данные базы данных для вашего Nameless версии 1.",
     "installer/install": "Установка",
@@ -1220,5 +1220,10 @@
     "general/deleted_user": "Удаленный Пользователь",
     "admin/use_external_mail_server": "Использовать внешний почтовый сервер",
     "admin/trusted_proxies_not_configured": "{{linkStart}}Доверенные прокси{{linkEnd}} не настроены, IP баны могут не так работать.",
-    "admin/trusted_proxies_configured": "Доверенные прокси"
+    "admin/trusted_proxies_configured": "Доверенные прокси",
+    "admin/debugging_enabled": "Откладка включена, конфиденциальная информация может показаться для неразрешенных посетителей. Откладка должна использоваться только для разработки, не на публичных сайтах.",
+    "installer/database_connection_failed": "Не удалось подключиться к датабазе:<br>{{message}}",
+    "admin/https_port_80": "Похоже вы используйте HTTPS на порте 80, что скорее всего не правда. Если вы используете Cloudflare, не забудьте сделать TLS шифрование на Полное (строгое). Если у вас свой прокси, настройте его для отправки X-Forwarded-Port заголовка.",
+    "admin/group_sync_no_results_warning": "Правила синхронизации групп настроены, но нет изменений которые были сообщены. Это может произойти из-за не правильной настройки.",
+    "installer/config_write_failed": "Не удалось написать в конфиг файл: {{message}}"
 }

From 01856b1bd1b6b0b25bdff06681afc55c4c1247b8 Mon Sep 17 00:00:00 2001
From: PadowYT2 <me@padow.ru>
Date: Tue, 14 Jun 2022 15:24:07 +0000
Subject: [PATCH 136/337] Translated using Weblate (Russian)

Currently translated at 100.0% (1227 of 1227 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/ru/
---
 custom/languages/ru_RU.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/languages/ru_RU.json b/custom/languages/ru_RU.json
index 32db223784..bbedcdcacb 100644
--- a/custom/languages/ru_RU.json
+++ b/custom/languages/ru_RU.json
@@ -796,7 +796,7 @@
     "installer/host_help": "Адрес это <strong>базовый URL</strong> для вашего веб-сайта. Не включайте вложенные каталоги или http(s):// в поле адреса сайта!",
     "installer/hostname_error": "Введите домен без http:// или https://",
     "installer/initialising_database_and_cache": "Инициализация базы данных и кэша, пожалуйста, подождите...",
-    "installer/input_maximum": "Пожалуйста, убедитесь, что ваше имя пользователя содержит не более {{maxUsername}} символов, а ваш адрес электронной почты не более {{maxEmail}} символов, и ваш пароль - не более\n{{maxPassword}} символов.",
+    "installer/input_maximum": "Пожалуйста, убедитесь, что ваше имя пользователя содержит не более {{maxUsername}} символов, а ваш адрес электронной почты не более {{maxEmail}} символов, и ваш пароль - не более {{maxPassword}} символов.",
     "installer/input_minimum": "Пожалуйста, убедитесь, что ваше имя пользователя состоит минимум из {{minUsername}} символов, адрес электронной почты - минимум из {{minEmail}} символов, а пароль - минимум из {{minPassword}} символов.",
     "installer/input_required": "Пожалуйста, введите действительное имя пользователя, адрес электронной почты и пароль.",
     "installer/input_v1_details": "Пожалуйста, введите данные базы данных для вашего Nameless версии 1.",

From 8ba42f7a839a4f4f5586f8ad8153c44b8034d35d Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Tue, 14 Jun 2022 20:30:54 -0600
Subject: [PATCH 137/337] Fix random issue with `Forum::getLatestDiscussions`
 returning an array of objects

---
 core/classes/Database/DB.php                |  9 ++---
 modules/Forum/classes/Forum.php             | 44 +++++++++------------
 modules/Forum/widgets/LatestPostsWidget.php | 42 ++++++++++----------
 3 files changed, 44 insertions(+), 51 deletions(-)

diff --git a/core/classes/Database/DB.php b/core/classes/Database/DB.php
index e47196b8dd..67822d6b1d 100644
--- a/core/classes/Database/DB.php
+++ b/core/classes/Database/DB.php
@@ -178,10 +178,9 @@ public function delete(string $table, array $where) {
      *
      * @param string $sql The SQL query string to execute.
      * @param array $params The parameters to bind to the query.
-     * @param int $fetch_method The PDO fetch method to use.
      * @return static This DB instance.
      */
-    public function query(string $sql, array $params = [], int $fetch_method = PDO::FETCH_OBJ) {
+    public function query(string $sql, array $params = []) {
         $this->_error = false;
         if ($this->_statement = $this->_pdo->prepare($sql)) {
             $x = 1;
@@ -202,7 +201,7 @@ public function query(string $sql, array $params = [], int $fetch_method = PDO::
             if ($this->_statement->execute()) {
                 // Only fetch the results if this is a SELECT query.
                 if (str_starts_with(strtoupper($sql), 'SELECT')) {
-                    $this->_results = $this->_statement->fetchAll($fetch_method);
+                    $this->_results = $this->_statement->fetchAll(PDO::FETCH_OBJ);
                 }
                 $this->_count = $this->_statement->rowCount();
             } else {
@@ -218,8 +217,8 @@ public function query(string $sql, array $params = [], int $fetch_method = PDO::
      * @deprecated Use query() instead. Will be removed in 2.1.0
      * @return static
      */
-    public function selectQuery(string $sql, array $params = [], int $fetch_method = PDO::FETCH_OBJ) {
-        return $this->query($sql, $params, $fetch_method);
+    public function selectQuery(string $sql, array $params = []) {
+        return $this->query($sql, $params);
     }
 
     /**
diff --git a/modules/Forum/classes/Forum.php b/modules/Forum/classes/Forum.php
index 6891687ccd..9d272ccf91 100644
--- a/modules/Forum/classes/Forum.php
+++ b/modules/Forum/classes/Forum.php
@@ -216,47 +216,41 @@ public function getLatestDiscussions(array $groups = [0], int $user_id = 0): arr
 
         $all_topics_forums = DB::getInstance()->query('SELECT forum_id FROM nl2_forums_permissions WHERE group_id IN (' . rtrim(implode(',', $groups), ',') . ') AND `view` = 1 AND view_other_topics = 1')->results();
 
+        $own_topics_forums = [];
         if ($user_id > 0) {
             $own_topics_forums = DB::getInstance()->query('SELECT forum_id FROM nl2_forums_permissions WHERE group_id IN (' . rtrim(implode(',', $groups), ',') . ') AND `view` = 1 AND view_other_topics = 0')->results();
-        } else {
-            $own_topics_forums = [];
         }
 
         if (!count($all_topics_forums) && !count($own_topics_forums)) {
             return [];
         }
 
-        $all_topics_forums_string = '(';
         foreach ($all_topics_forums as $forum) {
             $all_topics_forums_string .= $forum->forum_id . ',';
         }
         $all_topics_forums_string = rtrim($all_topics_forums_string, ',');
-        $all_topics_forums_string .= ')';
 
-        try {
-            if (count($own_topics_forums)) {
-
-                $own_topics_forums_string = '(';
-                foreach ($own_topics_forums as $forum) {
-                    $own_topics_forums_string .= $forum->forum_id . ',';
-                }
-                $own_topics_forums_string = rtrim($own_topics_forums_string, ',');
-                $own_topics_forums_string .= ')';
-
-                $query = DB::getInstance()->query('(
-                SELECT topics.id as id, topics.forum_id as forum_id, topics.topic_title as topic_title, topics.topic_creator as topic_creator, topics.topic_last_user as topic_last_user, topics.topic_date as topic_date, topics.topic_reply_date as topic_reply_date, topics.topic_views as topic_views, topics.locked as locked, topics.sticky as sticky, topics.label as label, topics.deleted as deleted, posts.id as last_post_id FROM nl2_topics topics LEFT JOIN nl2_posts posts ON topics.id = posts.topic_id AND posts.id = (SELECT MAX(id) FROM nl2_posts p WHERE p.topic_id = topics.id AND p.deleted = 0) WHERE topics.deleted = 0 AND topics.forum_id IN ' . $all_topics_forums_string . ' ORDER BY topics.topic_reply_date DESC LIMIT 50
-                ) UNION (
-                SELECT topics.id as id, topics.forum_id as forum_id, topics.topic_title as topic_title, topics.topic_creator as topic_creator, topics.topic_last_user as topic_last_user, topics.topic_date as topic_date, topics.topic_reply_date as topic_reply_date, topics.topic_views as topic_views, topics.locked as locked, topics.sticky as sticky, topics.label as label, topics.deleted as deleted, posts.id as last_post_id FROM nl2_topics topics LEFT JOIN nl2_posts posts ON topics.id = posts.topic_id AND posts.id = (SELECT MAX(id) FROM nl2_posts p WHERE p.topic_id = topics.id AND p.deleted = 0) WHERE topics.deleted = 0 AND ((topics.forum_id IN ' . $own_topics_forums_string . ' AND topics.topic_creator = ?) OR topics.sticky = 1) ORDER BY topics.topic_reply_date DESC LIMIT 50
-                ) ORDER BY topic_reply_date DESC LIMIT 50', [$user_id], PDO::FETCH_ASSOC)->results();
-            } else {
-                $query = DB::getInstance()->query('SELECT topics.id as id, topics.forum_id as forum_id, topics.topic_title as topic_title, topics.topic_creator as topic_creator, topics.topic_last_user as topic_last_user, topics.topic_date as topic_date, topics.topic_reply_date as topic_reply_date, topics.topic_views as topic_views, topics.locked as locked, topics.sticky as sticky, topics.label as label, topics.deleted as deleted, posts.id as last_post_id FROM nl2_topics topics LEFT JOIN nl2_posts posts ON topics.id = posts.topic_id AND posts.id = (SELECT MAX(id) FROM nl2_posts p WHERE p.topic_id = topics.id AND p.deleted = 0) WHERE topics.deleted = 0 AND topics.forum_id IN ' . $all_topics_forums_string . ' ORDER BY topics.topic_reply_date DESC LIMIT 50', [], PDO::FETCH_ASSOC)->results();
+        if (count($own_topics_forums)) {
+            foreach ($own_topics_forums as $forum) {
+                $own_topics_forums_string .= $forum->forum_id . ',';
             }
-        } catch (Exception $e) {
-            // Likely no permissions to view any forums
-            $query = [];
+            $own_topics_forums_string = rtrim($own_topics_forums_string, ',');
+
+            return DB::getInstance()->query(
+                '(SELECT topics.id as id, topics.forum_id as forum_id, topics.topic_title as topic_title, topics.topic_creator as topic_creator, topics.topic_last_user as topic_last_user, topics.topic_date as topic_date, topics.topic_reply_date as topic_reply_date, topics.topic_views as topic_views, topics.locked as locked, topics.sticky as sticky, topics.label as label, topics.deleted as deleted, posts.id as last_post_id FROM nl2_topics topics LEFT JOIN nl2_posts posts ON topics.id = posts.topic_id AND posts.id = (SELECT MAX(id) FROM nl2_posts p WHERE p.topic_id = topics.id AND p.deleted = 0) WHERE topics.deleted = 0 AND topics.forum_id IN (' . $all_topics_forums_string . ') ORDER BY topics.topic_reply_date DESC LIMIT 50)
+                UNION
+                (SELECT topics.id as id, topics.forum_id as forum_id, topics.topic_title as topic_title, topics.topic_creator as topic_creator, topics.topic_last_user as topic_last_user, topics.topic_date as topic_date, topics.topic_reply_date as topic_reply_date, topics.topic_views as topic_views, topics.locked as locked, topics.sticky as sticky, topics.label as label, topics.deleted as deleted, posts.id as last_post_id FROM nl2_topics topics LEFT JOIN nl2_posts posts ON topics.id = posts.topic_id AND posts.id = (SELECT MAX(id) FROM nl2_posts p WHERE p.topic_id = topics.id AND p.deleted = 0) WHERE topics.deleted = 0 AND ((topics.forum_id IN (' . $own_topics_forums_string . ') AND topics.topic_creator = ?) OR topics.sticky = 1) ORDER BY topics.topic_reply_date DESC LIMIT 50)
+                ORDER BY topic_reply_date DESC LIMIT 50',
+                [$user_id]
+            )->results();
         }
 
-        return $query;
+        return DB::getInstance()->query(
+            'SELECT topics.id as id, topics.forum_id as forum_id, topics.topic_title as topic_title, topics.topic_creator as topic_creator, topics.topic_last_user as topic_last_user, topics.topic_date as topic_date, topics.topic_reply_date as topic_reply_date, topics.topic_views as topic_views, topics.locked as locked, topics.sticky as sticky, topics.label as label, topics.deleted as deleted, posts.id as last_post_id
+            FROM nl2_topics topics 
+            LEFT JOIN nl2_posts posts ON topics.id = posts.topic_id AND posts.id = (SELECT MAX(id) FROM nl2_posts p WHERE p.topic_id = topics.id AND p.deleted = 0) 
+            WHERE topics.deleted = 0 AND topics.forum_id IN (' . $all_topics_forums_string . ') ORDER BY topics.topic_reply_date DESC LIMIT 50',
+        )->results();
     }
 
     /**
diff --git a/modules/Forum/widgets/LatestPostsWidget.php b/modules/Forum/widgets/LatestPostsWidget.php
index 7419fbb2e6..e6012e4a61 100644
--- a/modules/Forum/widgets/LatestPostsWidget.php
+++ b/modules/Forum/widgets/LatestPostsWidget.php
@@ -68,18 +68,18 @@ public function initialise(): void {
 
             // Generate an array to pass to template
             while ($n < $limit) {
+                $discussion = $discussions[$n];
                 // Get the name of the forum from the ID
-                $forum_name = $db->get('forums', ['id', $discussions[$n]['forum_id']])->results();
+                $forum_name = $db->get('forums', ['id', $discussion->forum_id])->results();
                 $forum_name = Output::getPurified($forum_name[0]->forum_title);
 
                 // Get the number of replies
-                $posts = $db->get('posts', ['topic_id', $discussions[$n]['id']])->results();
-                $posts = count($posts);
+                $posts = $db->get('posts', ['topic_id', $discussion->id])->count();
 
                 // Is there a label?
-                if ($discussions[$n]['label'] != 0) { // yes
+                if ($discussion->label != 0) {
                     // Get label
-                    $label = $db->get('forums_topic_labels', ['id', $discussions[$n]['label']])->results();
+                    $label = $db->get('forums_topic_labels', ['id', $discussion->label])->results();
                     if (count($label)) {
                         $label = $label[0];
 
@@ -98,35 +98,35 @@ public function initialise(): void {
                 }
 
                 // Add to array
-                $topic_creator = new User($discussions[$n]['topic_creator']);
-                $last_reply_user = new User($discussions[$n]['topic_last_user']);
+                $topic_creator = new User($discussion->topic_creator);
+                $last_reply_user = new User($discussion->topic_last_user);
                 $template_array[] = [
-                    'topic_title' => Output::getClean($discussions[$n]['topic_title']),
-                    'topic_id' => $discussions[$n]['id'],
-                    'topic_created_rough' => $timeago->inWords($discussions[$n]['topic_date'], $this->_language),
-                    'topic_created' => date(DATE_FORMAT, $discussions[$n]['topic_date']),
+                    'topic_title' => Output::getClean($discussion->topic_title),
+                    'topic_id' => $discussion->id,
+                    'topic_created_rough' => $timeago->inWords($discussion->topic_date, $this->_language),
+                    'topic_created' => date(DATE_FORMAT, $discussion->topic_date),
                     'topic_created_username' => $topic_creator->getDisplayname(),
                     'topic_created_mcname' => $topic_creator->getDisplayname(true),
                     'topic_created_style' => $topic_creator->getGroupStyle(),
-                    'topic_created_user_id' => Output::getClean($discussions[$n]['topic_creator']),
-                    'locked' => $discussions[$n]['locked'],
+                    'topic_created_user_id' => Output::getClean($discussion->topic_creator),
+                    'locked' => $discussion->locked,
                     'forum_name' => $forum_name,
-                    'forum_id' => $discussions[$n]['forum_id'],
-                    'views' => $discussions[$n]['topic_views'],
+                    'forum_id' => $discussion->forum_id,
+                    'views' => $discussion->topic_views,
                     'posts' => $posts,
                     'last_reply_avatar' => $last_reply_user->getAvatar(64),
-                    'last_reply_rough' => $timeago->inWords($discussions[$n]['topic_reply_date'], $this->_language),
-                    'last_reply' => date(DATE_FORMAT, $discussions[$n]['topic_reply_date']),
+                    'last_reply_rough' => $timeago->inWords($discussion->topic_reply_date, $this->_language),
+                    'last_reply' => date(DATE_FORMAT, $discussion->topic_reply_date),
                     'last_reply_username' => $last_reply_user->getDisplayname(),
                     'last_reply_mcname' => $last_reply_user->getDisplayname(true),
                     'last_reply_style' => $last_reply_user->getGroupStyle(),
-                    'last_reply_user_id' => Output::getClean($discussions[$n]['topic_last_user']),
+                    'last_reply_user_id' => Output::getClean($discussion->topic_last_user),
                     'label' => $label,
-                    'link' => URL::build('/forum/topic/' . urlencode($discussions[$n]['id']) . '-' . $forum->titleToURL($discussions[$n]['topic_title'])),
-                    'forum_link' => URL::build('/forum/forum/' . $discussions[$n]['forum_id']),
+                    'link' => URL::build('/forum/topic/' . urlencode($discussion->id) . '-' . $forum->titleToURL($discussion->topic_title)),
+                    'forum_link' => URL::build('/forum/forum/' . $discussion->forum_id),
                     'author_link' => $topic_creator->getProfileURL(),
                     'last_reply_profile_link' => $last_reply_user->getProfileURL(),
-                    'last_reply_link' => URL::build('/forum/topic/' . $discussions[$n]['id'] . '-' . $forum->titleToURL($discussions[$n]['topic_title']), 'pid=' . $discussions[$n]['last_post_id'])
+                    'last_reply_link' => URL::build('/forum/topic/' . $discussion->id . '-' . $forum->titleToURL($discussion->topic_title), 'pid=' . $discussion->last_post_id)
                 ];
 
                 $n++;

From 95d0d54302337f85719068646c0bc70632ad9043 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Wed, 15 Jun 2022 15:19:25 +0200
Subject: [PATCH 138/337] Add Albanian language

---
 core/classes/Core/Language.php                  | 4 ++++
 custom/languages/sq_AL.json                     | 1 +
 modules/Cookie Consent/language/sq_AL.json      | 0
 modules/Discord Integration/language/sq_AL.json | 1 +
 modules/Forum/language/sq_AL.json               | 1 +
 5 files changed, 7 insertions(+)
 create mode 100644 custom/languages/sq_AL.json
 create mode 100644 modules/Cookie Consent/language/sq_AL.json
 create mode 100644 modules/Discord Integration/language/sq_AL.json
 create mode 100644 modules/Forum/language/sq_AL.json

diff --git a/core/classes/Core/Language.php b/core/classes/Core/Language.php
index 6ee4784be7..ef309c0b35 100644
--- a/core/classes/Core/Language.php
+++ b/core/classes/Core/Language.php
@@ -92,6 +92,10 @@ class Language {
             'name' => 'Slovak',
             'htmlCode' => 'sk',
         ],
+        'sq_AL' => [
+            'name' => 'Albanian',
+            'htmlCode' => 'sq',
+        ],
         'es_419' => [
             'name' => 'Spanish',
             'htmlCode' => 'es',
diff --git a/custom/languages/sq_AL.json b/custom/languages/sq_AL.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/custom/languages/sq_AL.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Cookie Consent/language/sq_AL.json b/modules/Cookie Consent/language/sq_AL.json
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/modules/Discord Integration/language/sq_AL.json b/modules/Discord Integration/language/sq_AL.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Discord Integration/language/sq_AL.json	
@@ -0,0 +1 @@
+{}
diff --git a/modules/Forum/language/sq_AL.json b/modules/Forum/language/sq_AL.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Forum/language/sq_AL.json
@@ -0,0 +1 @@
+{}

From 042727bcc4e8836d2b5b93ca1c933506f046db0a Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Wed, 15 Jun 2022 15:22:07 +0200
Subject: [PATCH 139/337] Fix cookie consent language file names

---
 modules/Cookie Consent/language/{cs.json => cs_CZ.json} | 0
 modules/Cookie Consent/language/{da.json => da_DK.json} | 0
 modules/Cookie Consent/language/{fr.json => fr_FR.json} | 0
 modules/Cookie Consent/language/{it.json => it_IT.json} | 0
 modules/Cookie Consent/language/{ja.json => ja_JP.json} | 0
 modules/Cookie Consent/language/{nl.json => nl_NL.json} | 0
 modules/Cookie Consent/language/{pl.json => pl_PL.json} | 0
 modules/Cookie Consent/language/{th.json => th_TH.json} | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 rename modules/Cookie Consent/language/{cs.json => cs_CZ.json} (100%)
 rename modules/Cookie Consent/language/{da.json => da_DK.json} (100%)
 rename modules/Cookie Consent/language/{fr.json => fr_FR.json} (100%)
 rename modules/Cookie Consent/language/{it.json => it_IT.json} (100%)
 rename modules/Cookie Consent/language/{ja.json => ja_JP.json} (100%)
 rename modules/Cookie Consent/language/{nl.json => nl_NL.json} (100%)
 rename modules/Cookie Consent/language/{pl.json => pl_PL.json} (100%)
 rename modules/Cookie Consent/language/{th.json => th_TH.json} (100%)

diff --git a/modules/Cookie Consent/language/cs.json b/modules/Cookie Consent/language/cs_CZ.json
similarity index 100%
rename from modules/Cookie Consent/language/cs.json
rename to modules/Cookie Consent/language/cs_CZ.json
diff --git a/modules/Cookie Consent/language/da.json b/modules/Cookie Consent/language/da_DK.json
similarity index 100%
rename from modules/Cookie Consent/language/da.json
rename to modules/Cookie Consent/language/da_DK.json
diff --git a/modules/Cookie Consent/language/fr.json b/modules/Cookie Consent/language/fr_FR.json
similarity index 100%
rename from modules/Cookie Consent/language/fr.json
rename to modules/Cookie Consent/language/fr_FR.json
diff --git a/modules/Cookie Consent/language/it.json b/modules/Cookie Consent/language/it_IT.json
similarity index 100%
rename from modules/Cookie Consent/language/it.json
rename to modules/Cookie Consent/language/it_IT.json
diff --git a/modules/Cookie Consent/language/ja.json b/modules/Cookie Consent/language/ja_JP.json
similarity index 100%
rename from modules/Cookie Consent/language/ja.json
rename to modules/Cookie Consent/language/ja_JP.json
diff --git a/modules/Cookie Consent/language/nl.json b/modules/Cookie Consent/language/nl_NL.json
similarity index 100%
rename from modules/Cookie Consent/language/nl.json
rename to modules/Cookie Consent/language/nl_NL.json
diff --git a/modules/Cookie Consent/language/pl.json b/modules/Cookie Consent/language/pl_PL.json
similarity index 100%
rename from modules/Cookie Consent/language/pl.json
rename to modules/Cookie Consent/language/pl_PL.json
diff --git a/modules/Cookie Consent/language/th.json b/modules/Cookie Consent/language/th_TH.json
similarity index 100%
rename from modules/Cookie Consent/language/th.json
rename to modules/Cookie Consent/language/th_TH.json

From ecb2607ab036c9a20a4866bf370486dc844dec37 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Wed, 15 Jun 2022 15:23:22 +0200
Subject: [PATCH 140/337] Json file should have content

---
 modules/Cookie Consent/language/sq_AL.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/Cookie Consent/language/sq_AL.json b/modules/Cookie Consent/language/sq_AL.json
index e69de29bb2..0967ef424b 100644
--- a/modules/Cookie Consent/language/sq_AL.json	
+++ b/modules/Cookie Consent/language/sq_AL.json	
@@ -0,0 +1 @@
+{}

From 3478e9327e950524fde9ecc51b04269ef573c27d Mon Sep 17 00:00:00 2001
From: Supercrafter100 <58982133+supercrafter100@users.noreply.github.com>
Date: Wed, 15 Jun 2022 15:56:38 +0200
Subject: [PATCH 141/337] Fix subdirectory installation issues (#2867)

---
 core/classes/Core/Input.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/classes/Core/Input.php b/core/classes/Core/Input.php
index 738240eb2b..ae17529b56 100644
--- a/core/classes/Core/Input.php
+++ b/core/classes/Core/Input.php
@@ -124,7 +124,7 @@ public static function createTinyEditor(Language $language, string $name, ?strin
                 'hr', 'image', 'link', 'lists', 'spoiler', 'code', 'table',
               ],
               external_plugins: {
-                'spoiler': " . (defined('CONFIG_PATH') ? CONFIG_PATH : '') . " '/core/assets/plugins/tinymce_spoiler/plugin.min.js',
+                'spoiler': '" . (defined('CONFIG_PATH') ? CONFIG_PATH : '') . "/core/assets/plugins/tinymce_spoiler/plugin.min.js',
               },
               toolbar: 'undo redo | bold italic underline strikethrough formatselect forecolor backcolor ltr rtl emoticons | alignleft aligncenter alignright alignjustify | codesample code hr image link numlist bullist | spoiler-add spoiler-remove',
               spoiler_caption: '{$language->get('general', 'spoiler')}',

From d6fc794f5b9fa7b2357ac3b4a0f8b0f1d184ed0a Mon Sep 17 00:00:00 2001
From: Supercrafter100 <admin@supercrafter100.com>
Date: Tue, 14 Jun 2022 17:46:40 +0000
Subject: [PATCH 142/337] Translated using Weblate (Dutch)

Currently translated at 100.0% (1227 of 1227 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/nl/
---
 custom/languages/nl_NL.json | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/custom/languages/nl_NL.json b/custom/languages/nl_NL.json
index 641484df96..add2b9d994 100644
--- a/custom/languages/nl_NL.json
+++ b/custom/languages/nl_NL.json
@@ -764,8 +764,8 @@
     "installer/host": "Hostnaam",
     "installer/host_help": "De hostnaam is de basis URL voor uw website. Voeg hier geen submappen toe uit het Installatiepad veld, of http(s):// !",
     "installer/initialising_database_and_cache": "Initialiseren van de database en cache, even geduld...",
-    "installer/input_maximum": "Zorg ervoor dat uw gebruikersnaam een maximum van 20 karakters, en uw e-mailadres en wachtwoord maximaal 64 tekens bevatten.",
-    "installer/input_minimum": "Zorg ervoor dat uw gebruikersnaam een minimum van 3 karakters, je e-mailadres een minimum van 4 karakters, en uw wachtwoord minimaal {{minPassword}} karakters heeft.",
+    "installer/input_maximum": "Zorg ervoor dat uw gebruikersnaam een maximum van {{maxUsername}} karakters, uw e-mailadres een maximum van {{maxEmail}} karakters, en uw wachtwoord maximaal {{maxPassword}} karakters bevat.",
+    "installer/input_minimum": "Zorg ervoor dat uw gebruikersnaam een minimum van {{minUsername}} karakters, je e-mailadres een minimum van {{minEmail}} karakters, en uw wachtwoord minimaal {{minPassword}} karakters heeft.",
     "installer/input_required": "Graag een geldige gebruikersnaam, email adres en wachtwoord invullen.",
     "installer/input_v1_details": "Voer de database-informatie in van uw Nameless versie 1 installatie.",
     "installer/install": "Installatie",
@@ -1223,5 +1223,7 @@
     "installer/database_connection_failed": "Fout met het connecteren naar de database: <br>{{message}}",
     "admin/trusted_proxies_configured": "Vertrouwde proxies",
     "admin/trusted_proxies_not_configured": "{{linkStart}}Vertrouwde proxies{{linkEnd}} zijn nog niet geconfigureerd, IP verbanningen zouden niet correct kunnen werken.",
-    "admin/https_port_80": "Het lijkt erop dat je HTTPS op poort 80 gebruikt, wat hoogstwaarschijnlijk niet correct is. Als je Cloudflare gebruikt, zorg ervoor dat je TLS encryptie modus op Full (strict) zet. Als je je eigen proxy runt, configureer dan de X-Forwarded-Port header."
+    "admin/https_port_80": "Het lijkt erop dat je HTTPS op poort 80 gebruikt, wat hoogstwaarschijnlijk niet correct is. Als je Cloudflare gebruikt, zorg ervoor dat je TLS encryptie modus op Full (strict) zet. Als je je eigen proxy runt, configureer dan de X-Forwarded-Port header.",
+    "admin/debugging_enabled": "Debugging is ingeschakeld, gevoelige informatie zou kunnen worden blootgesteld aan onbevoegde bezoekers. Debugging zou alleen mogen worden gebruikt voor ontwikkeling, niet voor publieke sites.",
+    "admin/group_sync_no_results_warning": "Group synchronisatie regels zijn ingesteld maar geen wijzigingen zijn gerapporteerd. Dit kan een misconfiguratie aanwijzen."
 }

From 3bff62410df8cf8ef1b4b9b3e6462bb7cc6495a5 Mon Sep 17 00:00:00 2001
From: enno123 <admin@enno123.de>
Date: Tue, 14 Jun 2022 16:53:58 +0000
Subject: [PATCH 143/337] Translated using Weblate (German)

Currently translated at 100.0% (1227 of 1227 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/
---
 custom/languages/de_DE.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index 0a6705fb1a..1cadf27906 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -1224,5 +1224,6 @@
     "installer/config_write_failed": "Das Schreiben in die Konfigurationsdatei ist fehlgeschlagen: {{message}}",
     "installer/database_connection_failed": "Verbindung zur Datenbank fehlgeschlagen:<br>{{message}}",
     "admin/debugging_enabled": "Wenn Debugging aktiviert ist, können sensible Informationen für unbefugte Besucher zugänglich sein. Debugging sollte nur für die Entwicklung verwendet werden, nicht auf öffentlichen Seiten.",
-    "admin/https_port_80": "Es sieht so aus, als ob du HTTPS auf Port 80 verwendest, was mit ziemlicher Sicherheit nicht der Fall ist. Wenn du Cloudflare verwendest, stelle sicher, dass du den TLS-Verschlüsselungsmodus auf Full (strict) gesetzt hast. Wenndu deine eigene Proxy verwendest, konfiguriere ihn bitte so, dass er den X-Forwarded-Port-Header sendet."
+    "admin/https_port_80": "Es sieht so aus, als ob du HTTPS auf Port 80 verwendest, was mit ziemlicher Sicherheit nicht der Fall ist. Wenn du Cloudflare verwendest, stelle sicher, dass du den TLS-Verschlüsselungsmodus auf Full (strict) gesetzt hast. Wenndu deine eigene Proxy verwendest, konfiguriere ihn bitte so, dass er den X-Forwarded-Port-Header sendet.",
+    "admin/group_sync_no_results_warning": "Gruppensynchronisierungsregeln sind eingerichtet, aber es wurden keine Änderungen gemeldet. Dies könnte auf eine Fehlkonfiguration hindeuten."
 }

From 090e5ca1705d9516d458aa7e3bac474a98d162c2 Mon Sep 17 00:00:00 2001
From: Jack <jackplayzxd@gmail.com>
Date: Tue, 14 Jun 2022 21:21:52 +0000
Subject: [PATCH 144/337] Translated using Weblate (English (United States))

Currently translated at 100.0% (1227 of 1227 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/en_US/
---
 custom/languages/en_US.json | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/custom/languages/en_US.json b/custom/languages/en_US.json
index 2a60b9ac89..687c270e3b 100644
--- a/custom/languages/en_US.json
+++ b/custom/languages/en_US.json
@@ -194,7 +194,7 @@
     "admin/enable_registration": "Enable registration?",
     "admin/enable_status_query": "Enable status query?",
     "admin/enable_username_sync": "Enable username sync?",
-    "admin/enable_username_sync_info": "If enabled, website usernames will be updated to match ingame usernames.",
+    "admin/enable_username_sync_info": "If enabled, website usernames will be updated to match in-game usernames. This happens when the in-game plugin sends a list of UUIDs and usernames, for online players, to the website.",
     "admin/enabled": "Enabled",
     "admin/enter_authme_db_details": "Please enter valid database details.",
     "admin/error_deleted_successfully": "The error has been deleted successfully.",
@@ -1216,5 +1216,12 @@
     "admin/custom_content": "Custom Content",
     "user/no_providers_admin": "No OAuth providers have been configured by site administrators yet.",
     "general/red": "Red",
-    "admin/not_set": "Not set"
+    "admin/not_set": "Not set",
+    "general/deleted_user": "Deleted User",
+    "admin/use_external_mail_server": "Use external mail server",
+    "admin/debugging_enabled": "Debugging is enabled, sensitive information may be exposed to unauthorised visitors. Debugging should only be used for development, not on public sites.",
+    "admin/trusted_proxies_configured": "Trusted proxies",
+    "admin/trusted_proxies_not_configured": "{{linkStart}}Trusted proxies{{linkEnd}} are not configured, IP bans may not work properly.",
+    "admin/https_port_80": "You appear as if you are using HTTPS on port 80, which is almost definitely not true. If you use Cloudflare, make sure to set TLS encryption mode to Full (strict). If you run your own proxy, please configure it to send the X-Forwarded-Port header.",
+    "admin/group_sync_no_results_warning": "Group sync rules are setup but no changes were reported. This could indicate a misconfiguration."
 }

From bc7e378c1825af96e72f7d82185899ca958b9824 Mon Sep 17 00:00:00 2001
From: Andrea Toska <toskaandrea@gmail.com>
Date: Wed, 15 Jun 2022 13:12:50 +0000
Subject: [PATCH 145/337] Translated using Weblate (English (United States))

Currently translated at 100.0% (1227 of 1227 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/en_US/
---
 custom/languages/en_US.json | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/custom/languages/en_US.json b/custom/languages/en_US.json
index 687c270e3b..7a852e4a3a 100644
--- a/custom/languages/en_US.json
+++ b/custom/languages/en_US.json
@@ -798,8 +798,8 @@
     "installer/host_help": "The hostname is the <strong>base URL</strong> for your website. Do not include the subfolders from the Installation Path field, or http(s):// here!",
     "installer/hostname_error": "Please enter a valid hostname without http:// or https://",
     "installer/initialising_database_and_cache": "Initializing database and cache, please wait...",
-    "installer/input_maximum": "Please ensure your username is a maximum of 20 characters, and your email address and password are a maximum of 64 characters.",
-    "installer/input_minimum": "Please ensure your username is a minimum of 3 characters, your email address is a minimum of 4 characters, and your password is a minimum of {{minPassword}} characters.",
+    "installer/input_maximum": "Please ensure your username is a maximum of {{maxUsername}} characters, your email address is a maximum of {{maxEmail}} characters, and your password ia a maximum of {{maxPassword}} characters.",
+    "installer/input_minimum": "Please ensure your username is a minimum of {{minUsername}} characters, your email address is a minimum of {{minEmail}} characters, and your password is a minimum of {{minPassword}} characters.",
     "installer/input_required": "Please input a valid username, email address and password.",
     "installer/input_v1_details": "Please input the database details for your Nameless version 1 installation.",
     "installer/install": "Install",
@@ -1223,5 +1223,7 @@
     "admin/trusted_proxies_configured": "Trusted proxies",
     "admin/trusted_proxies_not_configured": "{{linkStart}}Trusted proxies{{linkEnd}} are not configured, IP bans may not work properly.",
     "admin/https_port_80": "You appear as if you are using HTTPS on port 80, which is almost definitely not true. If you use Cloudflare, make sure to set TLS encryption mode to Full (strict). If you run your own proxy, please configure it to send the X-Forwarded-Port header.",
-    "admin/group_sync_no_results_warning": "Group sync rules are setup but no changes were reported. This could indicate a misconfiguration."
+    "admin/group_sync_no_results_warning": "Group sync rules are setup but no changes were reported. This could indicate a misconfiguration.",
+    "installer/config_write_failed": "Failed to write to config file: {{message}}",
+    "installer/database_connection_failed": "Failed to connect to the database:<br>{{message}}"
 }

From 4ab19bfebc2ec3d59d8c7b436b4dcb8de6e51e27 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Thu, 16 Jun 2022 22:28:58 -0600
Subject: [PATCH 146/337] Fix weird edge case of MOTD

---
 core/classes/Minecraft/MCQuery.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/classes/Minecraft/MCQuery.php b/core/classes/Minecraft/MCQuery.php
index 498ddaa921..e8fd7af0bc 100644
--- a/core/classes/Minecraft/MCQuery.php
+++ b/core/classes/Minecraft/MCQuery.php
@@ -82,7 +82,7 @@ public static function singleQuery(array $ip, string $type, bool $bedrock, Langu
                             'format_player_list' => self::formatPlayerList($player_list),
                             'x_players_online' => $language->get('general', 'currently_x_players_online', ['count' => Output::getClean($query['players']['online'])]),
                             'motd' => self::getMotd(
-                                $query['description']['text'],
+                                is_string($text = $query['description']) ? $text : $text['text'],
                                 $query['description']['extra'] ?? [],
                             ),
                             'version' => $query['version']['name']

From 5d6cafcb0d65ec7f651da760a42d8f244db858e9 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Fri, 17 Jun 2022 12:03:35 +0200
Subject: [PATCH 147/337] Rename UPDATE/UPDATE_LINK so it doesn't conflict with
 variables added by modules

---
 custom/panel_templates/Default/includes/update.tpl | 2 +-
 custom/templates/DefaultRevamp/navbar.tpl          | 2 +-
 modules/Core/module.php                            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/custom/panel_templates/Default/includes/update.tpl b/custom/panel_templates/Default/includes/update.tpl
index ac5790d7df..9ea6dc4d7c 100644
--- a/custom/panel_templates/Default/includes/update.tpl
+++ b/custom/panel_templates/Default/includes/update.tpl
@@ -8,7 +8,7 @@
         </button>
     {/if}
     {$NEW_UPDATE}<br />
-    <a href="{$UPDATE_LINK}" class="btn btn-info">{$UPDATE}</a>
+    <a href="{$NAMELESS_UPDATE_LINK}" class="btn btn-info">{$NAMELESS_UPDATE}</a>
     <hr style="border-color: rgba(0,0,0,.1)" /> {$CURRENT_VERSION}
     <br />{$NEW_VERSION}
     </div>
diff --git a/custom/templates/DefaultRevamp/navbar.tpl b/custom/templates/DefaultRevamp/navbar.tpl
index 0afd7f2d67..f2cdfbf6a1 100755
--- a/custom/templates/DefaultRevamp/navbar.tpl
+++ b/custom/templates/DefaultRevamp/navbar.tpl
@@ -143,7 +143,7 @@
                 <div class="ui info icon message" id="update-message">
                     <i class="close icon"></i>
                     {/if}
-                    <a href="{$UPDATE_LINK}">
+                    <a href="{$NAMELESS_UPDATE_LINK}">
                         <i class="download icon"></i>
                     </a>
                     <div class="content">
diff --git a/modules/Core/module.php b/modules/Core/module.php
index 2982d6e88e..ade8c0ee0d 100644
--- a/modules/Core/module.php
+++ b/modules/Core/module.php
@@ -763,8 +763,8 @@ public function onPageLoad(User $user, Pages $pages, Cache $cache, Smarty $smart
                         'NEW_VERSION' => $language->get('admin', 'new_version_x', [
                             'version' => Output::getClean($update_check->version())
                         ]),
-                        'UPDATE' => $language->get('admin', 'update'),
-                        'UPDATE_LINK' => URL::build('/panel/update')
+                        'NAMELESS_UPDATE' => $language->get('admin', 'update'),
+                        'NAMELESS_UPDATE_LINK' => URL::build('/panel/update')
                     ]);
                 }
             }

From ebb261c73f2c4e83eada8650544d7c4065e0910b Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Fri, 17 Jun 2022 16:30:31 +0200
Subject: [PATCH 148/337] Remove charset configuration from installer

---
 core/installation/steps/database_configuration.php  | 9 ++-------
 core/installation/steps/database_initialization.php | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/core/installation/steps/database_configuration.php b/core/installation/steps/database_configuration.php
index 8064be13f7..9418794bff 100644
--- a/core/installation/steps/database_configuration.php
+++ b/core/installation/steps/database_configuration.php
@@ -34,7 +34,6 @@
         $db_username = $_POST['db_username'];
         $db_password = ((isset($_POST['db_password']) && !empty($_POST['db_password'])) ? str_replace('\'', '\\\'', $_POST['db_password']) : '');
         $db_name = $_POST['db_name'];
-        $db_charset = ($_POST['charset'] == 'latin1') ? 'latin1' : 'utf8mb4';
 
         try {
             // This throws a PDOException if the connection fails
@@ -47,7 +46,7 @@
                     'username' => $db_username,
                     'password' => $db_password,
                     'db' => $db_name,
-                    'charset' => $charset,
+                    'charset' => 'utf8mb4',
                     'initialise_charset' => true,
                 ],
                 'remember' => [
@@ -73,7 +72,7 @@
 
             try {
                 Config::write($conf);
-                $_SESSION['charset'] = $charset;
+                $_SESSION['database_configured'] = true;
                 Redirect::to('?step=database_initialization');
             } catch (RuntimeException $e) {
                 $error = $language->get('installer', 'config_write_failed', ['message' => $e->getMessage()]);
@@ -118,10 +117,6 @@
                         create_field('text', $language->get('installer', 'database_username'), 'db_username', 'inputDBUsername', $default_user);
                         create_field('password', $language->get('installer', 'database_password'), 'db_password', 'inputDBPassword', $default_pass);
                         create_field('text', $language->get('installer', 'database_name'), 'db_name', 'inputDBName', $default_name);
-                        create_field('select', $language->get('installer', 'character_set'), 'charset', 'inputCharset', $default_charset, [
-                            'utf8mb4' => 'Unicode (utf8mb4)',
-                            'latin1' => 'Latin (latin1)',
-                        ]);
                         ?>
                     </div>
                 </div>
diff --git a/core/installation/steps/database_initialization.php b/core/installation/steps/database_initialization.php
index ad44723105..a6d8a45ffa 100644
--- a/core/installation/steps/database_initialization.php
+++ b/core/installation/steps/database_initialization.php
@@ -3,7 +3,7 @@
     Redirect::to('?step=site_configuration');
 }
 
-if (!isset($_SESSION['charset'])) {
+if (!isset($_SESSION['database_configured'])) {
     Redirect::to('?step=database_configuration');
 }
 

From 0cc2d53b5bbeb38a2e2cc19e449581f775a8f2e6 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Fri, 17 Jun 2022 21:26:56 +0200
Subject: [PATCH 149/337] Add Hungarian language

---
 core/classes/Core/Language.php                  | 4 ++++
 custom/languages/hu_HU.json                     | 1 +
 modules/Cookie Consent/language/hu_HU.json      | 1 +
 modules/Discord Integration/language/hu_HU.json | 1 +
 modules/Forum/language/hu_HU.json               | 1 +
 5 files changed, 8 insertions(+)
 create mode 100644 custom/languages/hu_HU.json
 create mode 100644 modules/Cookie Consent/language/hu_HU.json
 create mode 100644 modules/Discord Integration/language/hu_HU.json
 create mode 100644 modules/Forum/language/hu_HU.json

diff --git a/core/classes/Core/Language.php b/core/classes/Core/Language.php
index ef309c0b35..888b25b570 100644
--- a/core/classes/Core/Language.php
+++ b/core/classes/Core/Language.php
@@ -56,6 +56,10 @@ class Language {
             'name' => 'Greek',
             'htmlCode' => 'el',
         ],
+        'hu_HU' => [
+            'name' => 'Hungarian',
+            'htmlCode' => 'hu',
+        ],
         'it_IT' => [
             'name' => 'Italian',
             'htmlCode' => 'it',
diff --git a/custom/languages/hu_HU.json b/custom/languages/hu_HU.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/custom/languages/hu_HU.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Cookie Consent/language/hu_HU.json b/modules/Cookie Consent/language/hu_HU.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Cookie Consent/language/hu_HU.json	
@@ -0,0 +1 @@
+{}
diff --git a/modules/Discord Integration/language/hu_HU.json b/modules/Discord Integration/language/hu_HU.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Discord Integration/language/hu_HU.json	
@@ -0,0 +1 @@
+{}
diff --git a/modules/Forum/language/hu_HU.json b/modules/Forum/language/hu_HU.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Forum/language/hu_HU.json
@@ -0,0 +1 @@
+{}

From 314c80984994f012accd39fdbf1207397b072ce6 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Fri, 17 Jun 2022 22:46:42 -0600
Subject: [PATCH 150/337] Global debugging constants to optimize requests when
 users cannot view exception page (#2872)

---
 core/classes/Database/QueryRecorder.php |  6 ++--
 core/classes/Misc/Debugging.php         | 32 +++++++++++++++++
 core/classes/Misc/ErrorHandler.php      | 48 ++++++++++---------------
 core/init.php                           |  6 ++++
 index.php                               |  2 +-
 5 files changed, 62 insertions(+), 32 deletions(-)
 create mode 100644 core/classes/Misc/Debugging.php

diff --git a/core/classes/Database/QueryRecorder.php b/core/classes/Database/QueryRecorder.php
index ceb8437c6f..aa167f4517 100644
--- a/core/classes/Database/QueryRecorder.php
+++ b/core/classes/Database/QueryRecorder.php
@@ -29,10 +29,12 @@ public function getSqlStack(): array {
      * @param array $params Bound parameters used in the query
      */
     public function pushQuery(string $sql, array $params): void {
+        if (!Debugging::canViewDetailedError()) {
+            return;
+        }
+
         $backtrace = $this->lastReleventBacktrace();
 
-        // TODO: if/when we have a globally available way to get the logged in user,
-        // check if they're able to view the sql exception page, and don't waste time doing all this if they can't
         $this->_query_stack[] = [
             'number' => $this->_query_stack_num,
             'frame' => ErrorHandler::parseFrame(null, $backtrace['file'], $backtrace['line'], $this->_query_stack_num),
diff --git a/core/classes/Misc/Debugging.php b/core/classes/Misc/Debugging.php
new file mode 100644
index 0000000000..3b966c4089
--- /dev/null
+++ b/core/classes/Misc/Debugging.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Class to help manage global state of various debugging variables.
+ * TODO: Make `Debugging::enabled()` instead of needing to do `defined('DEBUGGING') && DEBUGGING`
+ *
+ * @package NamelessMC\Misc
+ * @author Aberdeener
+ * @version 2.0.0
+ * @license MIT
+ */
+class Debugging {
+
+    private static bool $_can_view_detailed_error;
+    private static bool $_can_generate_debug_link;
+
+    public static function canViewDetailedError(): bool {
+        return self::$_can_view_detailed_error;
+    }
+
+    public static function setCanViewDetailedError(bool $detailed_error): void {
+        self::$_can_view_detailed_error = $detailed_error;
+    }
+
+    public static function canGenerateDebugLink(): bool {
+        return self::$_can_generate_debug_link;
+    }
+
+    public static function setCanGenerateDebugLink(bool $can_generate_debug_link): void {
+        self::$_can_generate_debug_link = $can_generate_debug_link;
+    }
+
+}
diff --git a/core/classes/Misc/ErrorHandler.php b/core/classes/Misc/ErrorHandler.php
index 1473158023..44a018a504 100644
--- a/core/classes/Misc/ErrorHandler.php
+++ b/core/classes/Misc/ErrorHandler.php
@@ -78,28 +78,30 @@ public static function catchException(?Throwable $exception, ?string $error_stri
             die($error_string . ' in ' . $error_file . ' on line ' . $error_line . (!is_null($exception) ? PHP_EOL . $exception->getTraceAsString() : ''));
         }
 
-        $frames = [];
+        if (Debugging::canViewDetailedError()) {
+            $frames = [];
 
-        // Most recent frame is not included in getTrace(), so deal with it individually
-        $frames[] = self::parseFrame($exception, $error_file, $error_line);
+            // Most recent frame is not included in getTrace(), so deal with it individually
+            $frames[] = self::parseFrame($exception, $error_file, $error_line);
 
-        $skip_frames = 0;
+            $skip_frames = 0;
 
-        // Loop all frames in the exception trace & get relevent information
-        if ($exception != null) {
+            // Loop all frames in the exception trace & get relevent information
+            if ($exception != null) {
 
-            $i = count($exception->getTrace());
+                $i = count($exception->getTrace());
 
-            foreach ($exception->getTrace() as $frame) {
+                foreach ($exception->getTrace() as $frame) {
 
-                // Check if previous frame had same file and line number (ie: DB->query(...) reports same file and line twice in a row)
-                if (end($frames)['file'] == $frame['file'] && end($frames)['line'] == $frame['line']) {
-                    ++$skip_frames;
-                    continue;
-                }
+                    // Check if previous frame had same file and line number (ie: DB->query(...) reports same file and line twice in a row)
+                    if (end($frames)['file'] == $frame['file'] && end($frames)['line'] == $frame['line']) {
+                        ++$skip_frames;
+                        continue;
+                    }
 
-                $frames[] = self::parseFrame($exception, $frame['file'], $frame['line'], $i);
-                $i--;
+                    $frames[] = self::parseFrame($exception, $frame['file'], $frame['line'], $i);
+                    $i--;
+                }
             }
         }
 
@@ -110,18 +112,6 @@ public static function catchException(?Throwable $exception, ?string $error_stri
             $language = new Language('core', 'en_UK');
         }
 
-        $detailed_error = defined('DEBUGGING') && DEBUGGING;
-        $can_generate_debug = defined('DEBUGGING') && DEBUGGING;
-
-        try {
-            $user = new User();
-            $detailed_error |= $user->isLoggedIn() && $user->hasPermission('admincp.errors');
-            $can_generate_debug |= $user->hasPermission('admincp.core.debugging');
-        } catch (Exception $ignored) {
-            // Getting user info might fail, for example if the website isn't
-            // installed yet. Assume the user does not have permission.
-        }
-
         $path = (defined('CONFIG_PATH') ? CONFIG_PATH : '') . '/core/assets/';
         $site_name = defined('SITE_NAME') ? Output::getClean(SITE_NAME) : 'NamelessMC';
 
@@ -144,7 +134,7 @@ public static function catchException(?Throwable $exception, ?string $error_stri
             'PRISM_JS' => $path . 'plugins/prism/prism.js',
             'TOAST_CSS' => $path . 'css/fomantic.toast.min.css',
             'TOAST_JS' => $path . 'js/fomantic.toast.min.js',
-            'DETAILED_ERROR' => $detailed_error,
+            'DETAILED_ERROR' => Debugging::canViewDetailedError(),
             'FATAL_ERROR_TITLE' => $language->get('errors', 'fatal_error_title'),
             'FATAL_ERROR_MESSAGE_ADMIN' => $language->get('errors', 'fatal_error_message_admin'),
             'FATAL_ERROR_MESSAGE_USER' => $language->get('errors', 'fatal_error_message_user'),
@@ -152,7 +142,7 @@ public static function catchException(?Throwable $exception, ?string $error_stri
             'ERROR_STRING' => Output::getClean($error_string),
             'ERROR_FILE' => $error_file,
             'CANCEL' => $language->get('general', 'cancel'),
-            'CAN_GENERATE_DEBUG' => $can_generate_debug,
+            'CAN_GENERATE_DEBUG' => Debugging::canGenerateDebugLink(),
             'DEBUG_LINK' => $language->get('admin', 'debug_link'),
             'DEBUG_LINK_INFO' => $language->get('admin', 'debug_link_info'),
             'DEBUG_LINK_URL' => URL::build('/queries/debug_link'),
diff --git a/core/init.php b/core/init.php
index 370910b328..21030ca3be 100644
--- a/core/init.php
+++ b/core/init.php
@@ -22,6 +22,9 @@
     die('$page variable is unset. Cannot continue.');
 }
 
+Debugging::setCanViewDetailedError(defined('DEBUGGING') && DEBUGGING);
+Debugging::setCanGenerateDebugLink(defined('DEBUGGING') && DEBUGGING);
+
 // All paths should be writable, but recursively checking everything would take too much time.
 // Only check the most important paths.
 $writable_check_paths = [
@@ -500,6 +503,9 @@
 
     // Perform tasks if the user is logged in
     if ($user->isLoggedIn()) {
+        Debugging::setCanViewDetailedError($user->hasPermission('admincp.errors'));
+        Debugging::setCanGenerateDebugLink($user->hasPermission('admincp.core.debugging'));
+
         // Ensure a user is not banned
         if ($user->data()->isbanned == 1) {
             $user->logout();
diff --git a/index.php b/index.php
index 1b1af95de8..7330a8b55e 100644
--- a/index.php
+++ b/index.php
@@ -15,7 +15,7 @@
 header('X-Frame-Options: SAMEORIGIN');
 
 if ((!defined('DEBUGGING') || !DEBUGGING) && (getenv('NAMELESS_DEBUGGING') || isset($_SERVER['NAMELESS_DEBUGGING']))) {
-    define('DEBUGGING', 1);
+    define('DEBUGGING', true);
 }
 
 if (defined('DEBUGGING') && DEBUGGING) {

From b1493fdf78d9fdcdfdbb236931f69ab2eb7510ff Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Fri, 17 Jun 2022 23:09:01 -0600
Subject: [PATCH 151/337] Track avatar validity requests in debugbar

---
 core/classes/Avatars/AvatarSource.php | 3 +--
 core/classes/Core/HttpClient.php      | 8 +++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/classes/Avatars/AvatarSource.php b/core/classes/Avatars/AvatarSource.php
index 9463650a0c..f8645329a3 100644
--- a/core/classes/Avatars/AvatarSource.php
+++ b/core/classes/Avatars/AvatarSource.php
@@ -111,8 +111,7 @@ private static function validImageUrl(string $url): bool {
 
         $is_valid = false;
         try {
-            $client = new Client();
-            $response = $client->head($url);
+            $response = HttpClient::createClient()->head($url);
             $headers = $response->getHeaders();
             if (isset($headers['Content-Type']) && $headers['Content-Type'][0] === 'image/png') {
                 $is_valid = true;
diff --git a/core/classes/Core/HttpClient.php b/core/classes/Core/HttpClient.php
index 4723deb0dc..7fb772db22 100755
--- a/core/classes/Core/HttpClient.php
+++ b/core/classes/Core/HttpClient.php
@@ -83,7 +83,13 @@ public static function post(string $url, $data, array $options = []): HttpClient
         );
     }
 
-    private static function createClient(array $options): Client {
+    /**
+     * Make a new Guzzle Client instance and attach it to the debug bar to display requests.
+     *
+     * @param array $options Options to provide Guzzle instance.
+     * @return Client New Guzzle instance.
+     */
+    public static function createClient(array $options = []): Client {
         $debugBar = DebugBarHelper::getInstance()->getDebugBar();
         $stack = HandlerStack::create();
 

From cd1f39768a67567933230f1e54a0dde4a768f04a Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Fri, 17 Jun 2022 23:21:29 -0600
Subject: [PATCH 152/337] Fix statistics widget alignment

---
 custom/templates/DefaultRevamp/widgets/statistics.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/templates/DefaultRevamp/widgets/statistics.tpl b/custom/templates/DefaultRevamp/widgets/statistics.tpl
index 132b5a3e5f..f6fea82701 100755
--- a/custom/templates/DefaultRevamp/widgets/statistics.tpl
+++ b/custom/templates/DefaultRevamp/widgets/statistics.tpl
@@ -18,7 +18,7 @@
                     <div class="description right floated"><b>{$USERS_REGISTERED_VALUE}</b></div>
                 </div>
                 <div class="item" style="display: flex;">
-                    <span class="text">{$LATEST_MEMBER}</span>
+                    <span class="text" style="width: 100%;">{$LATEST_MEMBER}</span>
                     <div class="description right floated">
                         <a href="{$LATEST_MEMBER_VALUE.profile}" data-poload="{$USER_INFO_URL}{$LATEST_MEMBER_VALUE.id}"
                             style="{$LATEST_MEMBER_VALUE.style}"><b>{$LATEST_MEMBER_VALUE.nickname}</b></a>

From e769c28996fa91a55c28aeed75fbd3353b5cee66 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Fri, 17 Jun 2022 23:28:32 -0600
Subject: [PATCH 153/337] Throw exception with details when an invalid
 perspective is passed to `getRelativePerspective`

---
 core/classes/Avatars/AvatarSource.php     |  3 ---
 core/classes/Avatars/AvatarSourceBase.php | 10 ++++++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/core/classes/Avatars/AvatarSource.php b/core/classes/Avatars/AvatarSource.php
index f8645329a3..68971c3e22 100644
--- a/core/classes/Avatars/AvatarSource.php
+++ b/core/classes/Avatars/AvatarSource.php
@@ -1,7 +1,4 @@
 <?php
-
-use GuzzleHttp\Client;
-
 /**
  * Manages avatar sources and provides static methods for fetching avatars.
  *
diff --git a/core/classes/Avatars/AvatarSourceBase.php b/core/classes/Avatars/AvatarSourceBase.php
index bd39230e8d..3ee53fe55e 100644
--- a/core/classes/Avatars/AvatarSourceBase.php
+++ b/core/classes/Avatars/AvatarSourceBase.php
@@ -59,7 +59,7 @@ public function getPerspectives(): array {
      * @return string Compiled URL of avatar image.
      */
     public function getAvatar(string $uuid, string $perspective, int $size = 128): string {
-        return $this->formatUrl($this->getUrlToFormat($perspective), $uuid, $size);
+        return $this->formatUrl($this->getUrlToFormat(strtolower($perspective)), $uuid, $size);
     }
 
     /**
@@ -95,8 +95,14 @@ abstract public function getUrlToFormat(string $perspective): string;
      *
      * @param string $perspective NamelessMC perspective name to translate.
      * @return string Translated perspective name.
+     * @throws InvalidArgumentException When an invalid perspective is passed.
      */
     public function getRelativePerspective(string $perspective): string {
-        return $this->_perspectives_map[strtolower($perspective)];
+        if (isset($this->_perspectives_map[$perspective])) {
+            return $this->_perspectives_map[$perspective];
+        }
+
+        $class = static::class;
+        throw new InvalidArgumentException("Attempted to get invalid perspective of: {$perspective} on {$class}");
     }
 }

From 19842a2c974d2b89016b0a840a1cbc4b3efdca30 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Fri, 17 Jun 2022 23:31:51 -0600
Subject: [PATCH 154/337] Fix lowercase call

---
 core/classes/Avatars/AvatarSourceBase.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/classes/Avatars/AvatarSourceBase.php b/core/classes/Avatars/AvatarSourceBase.php
index 3ee53fe55e..14ecde017c 100644
--- a/core/classes/Avatars/AvatarSourceBase.php
+++ b/core/classes/Avatars/AvatarSourceBase.php
@@ -59,7 +59,7 @@ public function getPerspectives(): array {
      * @return string Compiled URL of avatar image.
      */
     public function getAvatar(string $uuid, string $perspective, int $size = 128): string {
-        return $this->formatUrl($this->getUrlToFormat(strtolower($perspective)), $uuid, $size);
+        return $this->formatUrl($this->getUrlToFormat($perspective), $uuid, $size);
     }
 
     /**
@@ -98,6 +98,7 @@ abstract public function getUrlToFormat(string $perspective): string;
      * @throws InvalidArgumentException When an invalid perspective is passed.
      */
     public function getRelativePerspective(string $perspective): string {
+        $perspective = strtolower($perspective);
         if (isset($this->_perspectives_map[$perspective])) {
             return $this->_perspectives_map[$perspective];
         }

From ac0c91f6b0cfc8ec1dffb227d9ed3172cc83c7d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Loskot?= <fjuro@seznam.cz>
Date: Thu, 16 Jun 2022 12:29:16 +0000
Subject: [PATCH 155/337] Translated using Weblate (Czech)

Currently translated at 100.0% (1227 of 1227 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/cs/
---
 custom/languages/cs_CZ.json | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/custom/languages/cs_CZ.json b/custom/languages/cs_CZ.json
index a8100f01b3..edd4afd121 100644
--- a/custom/languages/cs_CZ.json
+++ b/custom/languages/cs_CZ.json
@@ -777,8 +777,8 @@
     "installer/host_help": "Adresa je <strong>základní URL</strong> vašeho webu. Nepatří sem podsložky z pole Instalační cesta ani http(s)://!",
     "installer/hostname_error": "Zadejte prosím platného hostitele bez http:// nebo https://",
     "installer/initialising_database_and_cache": "Příprava databáze a mezipaměti, vydržte prosím...",
-    "installer/input_maximum": "Ujistěte se, že vaše uživatelské jméno má maximálně 20 znaků a e-mailová adresa a heslo maximálně 64 znaků.",
-    "installer/input_minimum": "Ujistěte se, že vaše uživatelské jméno má minimálně 3 znaky, e-mailová adresa minimálně 4 znaky a heslo minimálně {{minPassword}} znaků.",
+    "installer/input_maximum": "Ujistěte se, že vaše uživatelské jméno má maximálně {{maxUsername}} znaků, e-mailová adresa maximálně {{maxEmail}} znaků a heslo maximálně {{maxPassword}} znaků.",
+    "installer/input_minimum": "Ujistěte se, že vaše uživatelské jméno má minimálně {{minUsername}} znaky, e-mailová adresa minimálně {{minEmail}} znaky a heslo minimálně {{minPassword}} znaků.",
     "installer/input_required": "Zadejte platné uživatelské jméno, e-mailovou adresu a heslo.",
     "installer/input_v1_details": "Zadejte podrobnosti databáze instalace vašeho Nameless verze 1.",
     "installer/install": "Instalace",
@@ -1218,5 +1218,12 @@
     "admin/test_email_suggest_3": "Nastavte server SMTP. {{docLinkStart}}Zjistit více »{{docLinkEnd}}",
     "admin/debug_link_info": "Důležité - tento odkaz sdílejte pouze s lidmi, kterým důvěřujete!",
     "general/deleted_user": "Smazaný uživatel",
-    "admin/use_external_mail_server": "Použít externí e-mailový server"
+    "admin/use_external_mail_server": "Použít externí e-mailový server",
+    "installer/config_write_failed": "Nepodařilo se zapsat konfigurační soubor: {{message}}",
+    "installer/database_connection_failed": "Nepodařilo se připojit k databázi:<br>{{message}}",
+    "admin/trusted_proxies_configured": "Důvěryhodné sítě proxy",
+    "admin/trusted_proxies_not_configured": "{{linkStart}}Důvěryhodné sítě proxy{{linkEnd}} nejsou nastaveny, IP bany nemusí správně fungovat.",
+    "admin/debugging_enabled": "Ladění je povoleno, nepovoleným návštěvníkům mohou být zobrazeny citlivé informacy. Ladění by mělo být použito pouze při vývoji, ne na veřejných webech.",
+    "admin/https_port_80": "Vypadá to, že používáte HTTPS na portu 80, což nejspíše není pravda. Pokud používáte Cloudflare, nezapomeňte nastavit šifrování TLS na Full (strict). Pokud máte svou vlastní síť proxy, nastavte ji tak, aby posílala hlavičku X-Forwarded-Port.",
+    "admin/group_sync_no_results_warning": "Pravidla synchronizace skupin jsou nastavena, ale nebyly nahlášeny žádné změny. Toto může znamenat nesprávné nastavení."
 }

From 9b474e5b034c0423cc8fb034dec3d1e754379732 Mon Sep 17 00:00:00 2001
From: Andrea Toska <toskaandrea@gmail.com>
Date: Wed, 15 Jun 2022 13:59:28 +0000
Subject: [PATCH 156/337] Translated using Weblate (Albanian)

Currently translated at 0.1% (2 of 1227 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/sq/
---
 custom/languages/sq_AL.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/custom/languages/sq_AL.json b/custom/languages/sq_AL.json
index 0967ef424b..60a777906e 100644
--- a/custom/languages/sq_AL.json
+++ b/custom/languages/sq_AL.json
@@ -1 +1,4 @@
-{}
+{
+    "admin/user_group_removed_hook_info": "Grupi i përdoruesit u hoq",
+    "admin/user_group_added_hook_info": "Grupi i përdoruesit u shtua"
+}

From dd525941c42db8c53f9e992c9b0c6b9e7bf9c24d Mon Sep 17 00:00:00 2001
From: snake <admin@viasnake.com>
Date: Sat, 18 Jun 2022 04:45:48 +0000
Subject: [PATCH 157/337] Translated using Weblate (Japanese)

Currently translated at 99.1% (1217 of 1227 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/ja/
---
 custom/languages/ja_JP.json | 61 ++++++++++++++++++++++++++++++++-----
 1 file changed, 54 insertions(+), 7 deletions(-)

diff --git a/custom/languages/ja_JP.json b/custom/languages/ja_JP.json
index a0599fd67c..45252200a3 100644
--- a/custom/languages/ja_JP.json
+++ b/custom/languages/ja_JP.json
@@ -194,7 +194,7 @@
     "admin/enable_registration": "新規登録を許可しますか？",
     "admin/enable_status_query": "ステータスクエリを有効にしますか？",
     "admin/enable_username_sync": "ユーザーネームの同期を有効にしますか？",
-    "admin/enable_username_sync_info": "有効にすると、WebサイトのユーザーネームをMinecraftユーザーネームと同期します。",
+    "admin/enable_username_sync_info": "有効にすると、ウェブサイトのユーザー名をMinecraftユーザー名と同期します。これはゲーム内プラグインがオンラインプレイヤーのUUIDとユーザー名一覧をウェブサイトに送信する際に動作します。",
     "admin/enabled": "有効",
     "admin/enter_authme_db_details": "有効なデータベース情報を入力してください。",
     "admin/error_deleted_successfully": "エラーは正常に削除されました。",
@@ -688,7 +688,7 @@
     "general/content": "コンテンツ",
     "general/cookie_notice": "当ウェブサイトでは、より快適に閲覧していただくためにCookieを使用しています。当ウェブサイトに登録する、もしくはこの通知を閉じることにより、Cookieの使用に同意したことになります。",
     "general/copied": "クリップボードにコピーしました。",
-    "general/currently_1_player_online": "現在<strong>1</strong>人のプレイヤーが参加しています。",
+    "general/currently_1_player_online": "現在1人のプレイヤーが参加しています。",
     "general/currently_x_players_online": "現在 {{count}} 人のプレイヤーが参加しています。",
     "general/date": "日付",
     "general/delete": "削除",
@@ -797,8 +797,8 @@
     "installer/host_help": "ホスト名は、ウェブサイトの<strong>ベースURL</strong>です。インストールパス欄のサブフォルダや、http(s)://をここに入れないでください！",
     "installer/hostname_error": "有効なホスト名を http:// または https:// を付けずに入力してください。",
     "installer/initialising_database_and_cache": "データベースとキャッシュを初期化しています、しばらくお待ちください...",
-    "installer/input_maximum": "ユーザー名は20文字以下、メールアドレスとパスワードは64文字以下の必要があります。",
-    "installer/input_minimum": "ユーザー名は3文字以上、メールアドレスは4文字以上、パスワードは6文字以上の必要があります。",
+    "installer/input_maximum": "ユーザー名は最大で{{maxUsername}}文字、メールアドレスは最大で{{maxEmail}}文字、パスワードは最大で{{maxPassword}}文字であることを確認してください。",
+    "installer/input_minimum": "ユーザー名は{{minUsername}}文字以上、メールアドレスは{{minEmail}}文字以上、パスワードは{{minPassword}}文字以上であることを確認してください。",
     "installer/input_required": "有効なユーザー名、メールアドレス、パスワードを入力してください。",
     "installer/input_v1_details": "NamelessMC v1のデータベースに関する情報を入力してください。",
     "installer/install": "インストール",
@@ -952,7 +952,7 @@
     "user/authme_account_linked": "アカウントのリンクに成功しました。",
     "user/authme_email_help_1": "最後に、メールアドレスを入力してください。",
     "user/authme_email_help_2": "最後に、メールアドレスを入力し、アカウントの表示名を選択してください。",
-    "user/authme_help": "ゲーム内の AuthMeアカウントの詳細を入力してください。 まだアカウントを作成していない場合はサーバーに参加し、表示される説明に従ってください。",
+    "user/authme_help": "ゲーム内のAuthMeのアカウント情報を入力してください。 まだゲーム内でアカウントを作成していない場合は、サーバーに参加し表示される指示に従ってください。",
     "user/authme_username_exists": "指定されたAuthMeアカウントはすでにウェブサイトに接続されています。",
     "user/avatar": "アバター",
     "user/block_user": "ユーザをブロック",
@@ -1111,7 +1111,7 @@
     "user/username_required": "ユーザー名は必須です。",
     "user/users_to_required": "メッセージ受信者を入力してください。",
     "user/uuid_already_exists": "指定されたのUUIDはすでに存在しています。このMinecraftアカウントはすでに登録されています。",
-    "user/validate_account_command": "登録を完了するには、ゲーム内で /verify {{command}} コマンドを送信してください。",
+    "user/validate_account_command": "登録を完了するには、ゲーム内で{{command}}コマンドを実行してください。",
     "user/validation_complete": "アカウントが検証されました。ログインが可能です。",
     "user/validation_error": "アカウントの検証中に不明なエラーが発生しました。ウェブサイトの管理者に連絡してください。",
     "user/verification_failed": "検証に失敗しました、再試行してください。",
@@ -1168,5 +1168,52 @@
     "admin/test_email_query": "受信トレイに届きませんか？以下をお試しください:",
     "admin/test_email_suggest_1": "数分待って、迷惑メールフォルダを確認してください。",
     "admin/test_email_suggest_2": "ウェブサイトのDNSレコードを更新してください。（SPFとDKIMを確認）",
-    "admin/test_email_suggest_3": "SMTPサーバーを設定する。{{docLinkStart}}続きを読む »{{docLinkEnd}}"
+    "admin/test_email_suggest_3": "SMTPサーバーを設定する。{{docLinkStart}}続きを読む »{{docLinkEnd}}",
+    "user/no_providers": "OAuthプロバイダが設定されていない。",
+    "general/deleted_user": "削除されたユーザー",
+    "user/integration_required_to_continue": "このウェブサイトを引き続き使用する前に、必要な接続を行い、確認してください。",
+    "general/yellow": "黄",
+    "general/blue": "青",
+    "general/violet": "バイオレット",
+    "general/teal": "青緑",
+    "user/connections": "接続",
+    "user/nickname_required": "ニックネームは必須です。",
+    "user/no_providers_admin": "サイト管理者が設定したOAuthプロバイダーはまだありません。",
+    "installer/database_connection_failed": "データベースへの接続に失敗しました:<br>{{message}}",
+    "admin/use_external_mail_server": "外部のメールサーバーを利用",
+    "general/pink": "ピンク",
+    "general/brown": "茶",
+    "general/grey": "灰",
+    "admin/group_sync_no_results_warning": "グループ同期ルールが設定されていますが、変更が報告されていません。これは設定を間違っている可能性があります。",
+    "admin/trusted_proxies_configured": "信頼のおけるプロキシ",
+    "admin/debugging_enabled": "デバッグを有効にすると、権限のない閲覧者に機密情報が公開される可能性があります。デバッグは開発のみに使用し、公開サイトでは使用しないでください。",
+    "errors/fatal_error": "致命的なエラー",
+    "general/auto_language": "自動言語",
+    "general/purple": "紫",
+    "installer/config_write_failed": "設定ファイルへの書き込みに失敗しました: {{message}}",
+    "installer/database_configured": "データベースが設定されました。",
+    "user/mcname_already_exists": "あなたのMinecraftユーザー名はすでに存在しています。",
+    "general/default": "既定値",
+    "general/red": "赤",
+    "admin/https_port_80": "80番ポートでHTTPSを使用しているように見えますが、これはほぼ間違いなく正しくありません。Cloudflareを使用している場合は、TLS暗号化モードをFull (strict)に設定してください。独自のプロキシを実行している場合は、X-Forwarded-Portヘッダを送信するように設定してください。",
+    "user/pending_verification": "検証中",
+    "general/verify": "検証",
+    "general/olive": "オリーブ",
+    "general/green": "緑",
+    "user/nickname_maximum_20": "ニックネームは20文字以内である必要があります。",
+    "general/or": "OR",
+    "general/orange": "オレンジ",
+    "user/nickname_minimum_3": "ニックネームは3文字以上である必要があります。",
+    "user/not_connected": "未接続",
+    "user/overview": "概要",
+    "admin/debug_link_info": "重要 - このリンクは信頼できる人のみに共有してください！",
+    "general/toggle_dark_mode": "ダークモードに切り替え",
+    "admin/viewing_integrations_for_x": "{{user}} のユーザー連携を表示",
+    "admin/api_disabled": "APIが無効",
+    "general/internet_explorer_header": "Internet Explorer",
+    "general/internet_explorer_info": "Internet Explorerには対応していません。最新のブラウザにアップグレードしてください。",
+    "installer/not_upgrading": "アップグレードしない",
+    "installer/upgrade_error": "アップグレード中にエラーが発生しました。",
+    "moderator/staff_cp": "StaffCP",
+    "general/connect": "接続"
 }

From 90b660d69d2e13a7b012605cb68170bf83f08c2b Mon Sep 17 00:00:00 2001
From: snake <admin@viasnake.com>
Date: Sat, 18 Jun 2022 04:51:46 +0000
Subject: [PATCH 158/337] Translated using Weblate (Japanese)

Currently translated at 100.0% (11 of 11 strings)

Translation: NamelessMC/Website - Cookie Consent
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/cookie-consent/ja/
---
 modules/Cookie Consent/language/ja_JP.json | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/Cookie Consent/language/ja_JP.json b/modules/Cookie Consent/language/ja_JP.json
index 0967ef424b..1ded3e1b8d 100644
--- a/modules/Cookie Consent/language/ja_JP.json	
+++ b/modules/Cookie Consent/language/ja_JP.json	
@@ -1 +1,13 @@
-{}
+{
+    "cookie/configure_cookies": "Cookieの設定",
+    "cookie/cookie_notice": "Cookieに関する注意事項",
+    "cookie/cookie_notice_error": "Cookieに関する注意事項を最大10,000文字で入力してください。",
+    "cookie/cookie_notice_info": "このウィジェットにはCookiesが必要",
+    "cookie/cookie_notice_success": "Cookieに関する注意事項が正常に更新されました。",
+    "cookie/cookie_popup": "このウェブサイトでは、より快適に閲覧できるようCookieを使用しています。",
+    "cookie/cookie_popup_allow": "Cookieを許可",
+    "cookie/cookie_popup_disallow": "Cookieを拒否",
+    "cookie/cookie_popup_more_info": "詳細はこちら",
+    "cookie/cookies": "Cookie",
+    "cookie/update_settings": "Cookieポップアップを表示"
+}

From b25311ccdc16297c763096855a5021a36e5c9fbb Mon Sep 17 00:00:00 2001
From: Robin <robin+git@rkslot.nl>
Date: Mon, 20 Jun 2022 10:56:40 +0200
Subject: [PATCH 159/337] add defaults for captcha settings

---
 modules/Core/module.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/Core/module.php b/modules/Core/module.php
index ade8c0ee0d..b4b40fe38a 100644
--- a/modules/Core/module.php
+++ b/modules/Core/module.php
@@ -456,9 +456,9 @@ public function __construct(Language $language, Pages $pages, User $user, Naviga
         ]);
 
         // Captcha
-        $captchaPublicKey = Util::getSetting('recaptcha_key');
-        $captchaPrivateKey = Util::getSetting('recaptcha_secret');
-        $activeCaptcha = Util::getSetting('recaptcha_type');
+        $captchaPublicKey = Util::getSetting('recaptcha_key', '');
+        $captchaPrivateKey = Util::getSetting('recaptcha_secret', '');
+        $activeCaptcha = Util::getSetting('recaptcha_type', 'Recaptcha3');
 
         CaptchaBase::addProvider(new hCaptcha($captchaPrivateKey, $captchaPublicKey));
         CaptchaBase::addProvider(new Recaptcha2($captchaPrivateKey, $captchaPublicKey));

From 6d3b9d0d3d14b39b6102275c4072b755a410c24e Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Mon, 20 Jun 2022 20:31:10 +0200
Subject: [PATCH 160/337] Fix missing ROOT_PATH definition in phinx migration
 file

---
 core/migrations/phinx.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/migrations/phinx.php b/core/migrations/phinx.php
index 24c33c53a0..3c930dcdcd 100644
--- a/core/migrations/phinx.php
+++ b/core/migrations/phinx.php
@@ -1,5 +1,7 @@
 <?php
 
+define('ROOT_PATH', __DIR__ . '/../..');
+
 $config = Config::get('mysql');
 
 return [

From 14a0fb37c1cae27d0031bc5ed509a970775f9126 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Mon, 20 Jun 2022 21:00:10 +0200
Subject: [PATCH 161/337] Add module column to settings table

---
 core/classes/Core/Util.php                    | 68 +++++++++++++++----
 ...20620183016_add_module_settings_column.php | 16 +++++
 2 files changed, 70 insertions(+), 14 deletions(-)
 create mode 100644 core/migrations/20220620183016_add_module_settings_column.php

diff --git a/core/classes/Core/Util.php b/core/classes/Core/Util.php
index b75f130ab7..5a1e336aee 100644
--- a/core/classes/Core/Util.php
+++ b/core/classes/Core/Util.php
@@ -283,6 +283,22 @@ public static function replaceAnchorsWithText(string $data): string {
         return URL::replaceAnchorsWithText($data);
     }
 
+    private static function getSettingsCache(?string $module): ?array {
+        $cache_name = $module !== null ? $module : 'core';
+
+        if (self::$_cached_settings === null ||
+                !isset(self::$_cached_settings[$cache_name])) {
+            return null;
+        }
+
+        return self::$_cached_settings[$cache_name];
+    }
+
+    private static function setSettingsCache(?string $module, array $cache): void {
+        $cache_name = $module !== null ? $module : 'core';
+        self::$_cached_settings[$cache_name] = $cache;
+    }
+
     /**
      * Get a setting from the database table `nl2_settings`.
      *
@@ -294,18 +310,24 @@ public static function replaceAnchorsWithText(string $data): string {
      * @return ?string Setting from DB or $fallback.
      */
     public static function getSetting(string $setting, ?string $fallback = null, ?string $module = null): ?string {
-        $table_name = $module == null ? 'nl2_settings' : "nl2_${module}_settings";
+        $cache = self::getSettingsCache($module);
 
-        if (self::$_cached_settings == null) {
-            $result = DB::getInstance()->query('SELECT `name`, `value` FROM `' . $table_name. '`')->results();
-            // Store settings in dictionary format
-            self::$_cached_settings = [];
+        if ($cache === null) {
+            // Load all settings for this module and store it as a dictionary
+            if ($module === null) {
+                $result = DB::getInstance()->query('SELECT `name`, `value` FROM `nl2_settings` WHERE `module` IS NULL')->results();
+            } else {
+                $result = DB::getInstance()->query('SELECT `name`, `value` FROM `nl2_settings` WHERE `module` = ?', [$module])->results();
+            }
+
+            $cache = [];
             foreach ($result as $row) {
-                self::$_cached_settings[$row->name] = $row->value;
+                $cache[$row->name] = $row->value;
             }
+            self::setSettingsCache($module, $cache);
         }
 
-        return self::$_cached_settings[$setting] ?? null;
+        return $cache[$setting] ?? $fallback;
     }
 
     /**
@@ -318,17 +340,35 @@ public static function getSetting(string $setting, ?string $fallback = null, ?st
      *                        nl2_settings table.
      */
     public static function setSetting(string $setting, ?string $new_value, ?string $module = null): void {
-        $table_name = $module == null ? 'nl2_settings' : "nl2_${module}_settings";
-
         if ($new_value == null) {
-            DB::getInstance()->query('DELETE FROM `' . $table_name . '` WHERE `name` = ?', [$setting]);
+            if ($module === null) {
+                DB::getInstance()->query('DELETE FROM `nl2_settings` WHERE `name` = ? AND `module` IS NULL', [$setting]);
+            } else {
+                DB::getInstance()->query('DELETE FROM `nl2_settings` WHERE `name` = ? AND `module` = ?', [$setting, $module]);
+            }
         } else {
-            $query = 'INSERT INTO `' . $table_name . '` (`name`, `value`) VALUES (?, ?) ON DUPLICATE KEY UPDATE `value` = ?';
-            DB::getInstance()->query($query, [$setting, $new_value, $new_value]);
+            if ($module === null) {
+                DB::getInstance()->query('INSERT INTO `nl2_settings` (`name`, `value`)
+                                          VALUES (?, ?)
+                                          ON DUPLICATE KEY UPDATE `value` = ?',
+                                          [$setting, $new_value, $new_value]);
+            } else {
+                DB::getInstance()->query('INSERT INTO `nl2_settings` (`name`, `value`, `module`)
+                                          VALUES (?, ?, ?)
+                                          ON DUPLICATE KEY UPDATE `value` = ?',
+                                          [$setting, $new_value, $module, $new_value]);
+            }
+        }
+
+        $cache = self::getSettingsCache($module);
+        if ($cache === null) {
+            return;
         }
 
-        if (self::$_cached_settings != null) {
-            self::$_cached_settings[$setting] = $new_value;
+        if ($new_value === null && isset($cache[$setting])) {
+            unset($cache[$setting]);
+        } else if ($new_value !== null) {
+            $cache[$setting] = $new_value;
         }
     }
 
diff --git a/core/migrations/20220620183016_add_module_settings_column.php b/core/migrations/20220620183016_add_module_settings_column.php
new file mode 100644
index 0000000000..115a207711
--- /dev/null
+++ b/core/migrations/20220620183016_add_module_settings_column.php
@@ -0,0 +1,16 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class AddModuleSettingsColumn extends AbstractMigration {
+
+    public function change(): void {
+        $table = $this->table('nl2_settings');
+        $table->addColumn('module', 'string', ['length' => 32, 'null' => true, 'default' => null]);
+        $table->removeIndex(['name']);
+        $table->addIndex(['name', 'module'], ['unique' => true]);
+        $table->update();
+    }
+
+}

From 507c16f892d76ba494bc8ecc3950dd38449c75e5 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Mon, 20 Jun 2022 22:50:37 +0200
Subject: [PATCH 162/337] {{command}} already contains /verify

---
 custom/languages/da_DK.json  | 2 +-
 custom/languages/de_DE.json  | 2 +-
 custom/languages/es_419.json | 2 +-
 custom/languages/es_ES.json  | 2 +-
 custom/languages/it_IT.json  | 2 +-
 custom/languages/lt_LT.json  | 2 +-
 custom/languages/no_NO.json  | 2 +-
 custom/languages/ro_RO.json  | 2 +-
 custom/languages/sk_SK.json  | 2 +-
 custom/languages/sv_SE.json  | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/custom/languages/da_DK.json b/custom/languages/da_DK.json
index 43c4d27254..ca22cb6ab3 100644
--- a/custom/languages/da_DK.json
+++ b/custom/languages/da_DK.json
@@ -584,7 +584,7 @@
     "user/username_required": "Et brugernavn er påkrævet.",
     "user/users_to_required": "Indtast venligst nogle beskedmodtagere",
     "user/uuid_already_exists": "Dit UUID eksisterer allerede, hvilket betyder, at denne Minecraft-konto allerede er registreret.",
-    "user/validate_account_command": "For at fuldføre registreringen, skal du udføre kommandoen /verify {{command}} ingame.",
+    "user/validate_account_command": "For at fuldføre registreringen, skal du udføre kommandoen {{command}} ingame.",
     "user/validation_complete": "Din konto er blevet valideret, du kan nu logge ind.",
     "user/validation_error": "Der opstod en ukendt fejl under valideringen af din konto, kontakt venligst en webstedsadministrator.",
     "user/verification_failed": "Bekræftelse mislykkedes, forsøg venligst igen.",
diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index 1cadf27906..f4ff21818d 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -1057,7 +1057,7 @@
     "user/username_required": "Bitte gebe einen Nutzernamen an.",
     "user/users_to_required": "Bitte gib einige Empfänger ein",
     "user/uuid_already_exists": "Deine UUID existiert bereits, was bedeutet, dass dieser Minecraft-Account bereits registriert ist.",
-    "user/validate_account_command": "Um die Registrierung abzuschließen, führe bitte den Befehl /verify {{command}} ingame aus.",
+    "user/validate_account_command": "Um die Registrierung abzuschließen, führe bitte den Befehl {{command}} ingame aus.",
     "user/validation_complete": "Dein Account wurde verifiziert. Du kannst dich nun anmelden.",
     "user/validation_error": "Mit deinem Account stimmt etwas nicht. Bitte Benachrichtige einen Administrator.",
     "user/verification_failed": "Verifikation fehlgeschlagen.",
diff --git a/custom/languages/es_419.json b/custom/languages/es_419.json
index 1a03328dbc..e29f5f560f 100644
--- a/custom/languages/es_419.json
+++ b/custom/languages/es_419.json
@@ -1065,7 +1065,7 @@
     "user/username_required": "Se requiere un nombre de usuario.",
     "user/users_to_required": "Ingresa algunos destinatarios de mensajes",
     "user/uuid_already_exists": "Tu UUID ya existe, por lo tanto esa cuenta de Minecraft ya está registrada.",
-    "user/validate_account_command": "Para completar la validación, ejecute el comando /verify {{command}} en el servidor.",
+    "user/validate_account_command": "Para completar la validación, ejecute el comando {{command}} en el servidor.",
     "user/validation_complete": "Su cuenta ha sido validada, ahora puede iniciar sesión.",
     "user/validation_error": "Se ha producido un error desconocido al validar su cuenta, póngase en contacto con un administrador del sitio web.",
     "user/verification_failed": "Verificación fallida. Por favor intenta de nuevo.",
diff --git a/custom/languages/es_ES.json b/custom/languages/es_ES.json
index 57a775eed4..d2972ea972 100644
--- a/custom/languages/es_ES.json
+++ b/custom/languages/es_ES.json
@@ -1084,7 +1084,7 @@
     "user/username_required": "Se requiere un nombre de usuario.",
     "user/users_to_required": "Por favor, introduzca algunos destinatarios del mensaje",
     "user/uuid_already_exists": "Tu UUID ya existe, lo que significa que esta cuenta de Minecraft ya está registrada.",
-    "user/validate_account_command": "Para completar el registro, ejecuta el comando /verify {{command}} dentro del juego.",
+    "user/validate_account_command": "Para completar el registro, ejecuta el comando {{command}} dentro del juego.",
     "user/validation_complete": "Su cuenta ha sido validada, ahora puede conectarse.",
     "user/validation_error": "Se ha producido un error desconocido al validar su cuenta, por favor, póngase en contacto con un administrador del sitio web.",
     "user/verification_failed": "Verificación fallida, por favor, inténtelo de nuevo.",
diff --git a/custom/languages/it_IT.json b/custom/languages/it_IT.json
index 7aef94730c..816747a195 100644
--- a/custom/languages/it_IT.json
+++ b/custom/languages/it_IT.json
@@ -1006,7 +1006,7 @@
     "user/username_required": "È richiesto un username.",
     "user/users_to_required": "Si prega di inserire i destinatari del messaggio",
     "user/uuid_already_exists": "Il tuo UUID esiste già, ovvero questo account Minecraft è già stato registrato.",
-    "user/validate_account_command": "Per completare la registrazione, per favore esegui in gioco il comando /verify {{command}}.",
+    "user/validate_account_command": "Per completare la registrazione, per favore esegui in gioco il comando {{command}}.",
     "user/validation_complete": "Il tuo account è stato convalidato, ora puoi effettuare il login.",
     "user/validation_error": "Si è verificato un errore sconosciuto durante la convalida del tuo account, contatta l'amministratore del sito web.",
     "user/verification_failed": "Convalida fallita. Per favore provate di nuovo.",
diff --git a/custom/languages/lt_LT.json b/custom/languages/lt_LT.json
index 8bd3e4adc7..2fd4f800ab 100644
--- a/custom/languages/lt_LT.json
+++ b/custom/languages/lt_LT.json
@@ -910,7 +910,7 @@
     "user/username_required": "Vartotojo vardas yra privalomas.",
     "user/users_to_required": "Prašau įvesti žinutės gaveją(us)",
     "user/uuid_already_exists": "Jūsų UUID jau egzistuoja, tai reiškia, kad ši Minecraft paskyra jau užregistruota.",
-    "user/validate_account_command": "Norėdami užbaigti registraciją, rašykite komandą /verify {{command}} žaidime.",
+    "user/validate_account_command": "Norėdami užbaigti registraciją, rašykite komandą {{command}} žaidime.",
     "user/validation_complete": "Jūsų paskyra patvirtinta, dabar galite prisijungti.",
     "user/validation_error": "Patvirtinant jūsų paskyrą buvo nežinoma klaida, susisiekite su svetainės administratoriumi.",
     "user/verification_failed": "Patvirtinimas nepavyko, bandykite dar kartą.",
diff --git a/custom/languages/no_NO.json b/custom/languages/no_NO.json
index 14e1049d4e..1727e4332a 100644
--- a/custom/languages/no_NO.json
+++ b/custom/languages/no_NO.json
@@ -1026,7 +1026,7 @@
     "user/username_required": "Fyll inn et brukeravn.",
     "user/users_to_required": "Skriv inn minst én bruker i 'Til'-feltet",
     "user/uuid_already_exists": "Din UUID eksisterer allerede, som betyr at denne brukeren allerede har blitt registrert.",
-    "user/validate_account_command": "For å fullføre registeringen, skriv inn kommandoen /verify {{command}} ingame.",
+    "user/validate_account_command": "For å fullføre registeringen, skriv inn kommandoen {{command}} ingame.",
     "user/validation_complete": "Kontoen er nå bekreftet.",
     "user/validation_error": "Det oppstod en feil under bekreftelsen av kontoen din. Kontakt en administrator med en gang!",
     "user/verification_failed": "Verifisering feilet, prøv igjen.",
diff --git a/custom/languages/ro_RO.json b/custom/languages/ro_RO.json
index ef98d2a7f8..c2fe027879 100644
--- a/custom/languages/ro_RO.json
+++ b/custom/languages/ro_RO.json
@@ -929,7 +929,7 @@
     "user/username_required": "Este necesar un nume de utilizator.",
     "user/users_to_required": "Introduceți minim un destinatar al mesajului.",
     "user/uuid_already_exists": "UUID-ul dvs. există deja, ceea ce înseamnă că acest cont Minecraft este deja înregistrat.",
-    "user/validate_account_command": "Pentru a finaliza înregistrarea, vă rugăm să executați comanda /verify {{command}} in joc.",
+    "user/validate_account_command": "Pentru a finaliza înregistrarea, vă rugăm să executați comanda {{command}} in joc.",
     "user/validation_complete": "Contul dvs. a fost validat, acum vă puteți conecta.",
     "user/validation_error": "A apărut o eroare necunoscută în timpul validări contul dvs., vă rugăm să contactați un administrator de site web.",
     "user/verification_failed": "Verificare eșuată. Vă rugăm încercați din nou.",
diff --git a/custom/languages/sk_SK.json b/custom/languages/sk_SK.json
index 2b77686647..0a5781d7a9 100644
--- a/custom/languages/sk_SK.json
+++ b/custom/languages/sk_SK.json
@@ -1103,7 +1103,7 @@
     "user/username_required": "Meno je povinné.",
     "user/users_to_required": "Zadajte príjemcov správy",
     "user/uuid_already_exists": "Vaše UUID už existuje, čo znamená, že tento Minecraft účet je už zaregistrovaný.",
-    "user/validate_account_command": "Registráciu dokončíte vykonaním príkazu /verify {{command}} v hre.",
+    "user/validate_account_command": "Registráciu dokončíte vykonaním príkazu {{command}} v hre.",
     "user/validation_complete": "Váš účet bol overený. Teraz sa môžete prihlásiť.",
     "user/validation_error": "Pri overovaní vášho účtu sa vyskytla neznáma chyba. Prosím kontaktujte správcu webu.",
     "user/verification_failed": "Overenie zlyhalo, skúste to znova.",
diff --git a/custom/languages/sv_SE.json b/custom/languages/sv_SE.json
index 4cdcf30a94..b11156729d 100644
--- a/custom/languages/sv_SE.json
+++ b/custom/languages/sv_SE.json
@@ -1053,7 +1053,7 @@
     "user/username_required": "Ett användarnamn krävs.",
     "user/users_to_required": "Vänligen ange vissa meddelandemottagare",
     "user/uuid_already_exists": "Ditt UUID finns redan, vilket betyder att detta Minecraft-konto redan har registrerats.",
-    "user/validate_account_command": "För att slutföra registreringen, vänligen kör kommandot /verify {{command}} i spelet.",
+    "user/validate_account_command": "För att slutföra registreringen, vänligen kör kommandot {{command}} i spelet.",
     "user/validation_complete": "Ditt konto har validerats, du kan nu logga in.",
     "user/validation_error": "Ett okänt fell uppstod under valideringen av ditt konto, var god kontakta en webbplats administratör.",
     "user/verification_failed": "Verifiering misslyckades, vänligen försök igen.",

From 4ce6707ca07e057a87cedefc4b7b80d09fc465a3 Mon Sep 17 00:00:00 2001
From: Dominik Roman <dominikslk9@gmail.com>
Date: Mon, 20 Jun 2022 15:41:15 +0000
Subject: [PATCH 163/337] Translated using Weblate (Slovak)

Currently translated at 100.0% (11 of 11 strings)

Translation: NamelessMC/Website - Cookie Consent
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/cookie-consent/sk/
---
 modules/Cookie Consent/language/sk_SK.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/Cookie Consent/language/sk_SK.json b/modules/Cookie Consent/language/sk_SK.json
index b0c5cfbece..2a141737ab 100644
--- a/modules/Cookie Consent/language/sk_SK.json	
+++ b/modules/Cookie Consent/language/sk_SK.json	
@@ -1,13 +1,13 @@
 {
-    "cookie\/configure_cookies": "Konfigurovať cookies",
-    "cookie\/cookie_notice": "Oznámenie o cookies",
-    "cookie\/cookie_notice_error": "Zadajte prosím upozornenie o cookies s maximálne 10.000 znakmi.",
-    "cookie\/cookie_notice_info": "Tento widget vyžaduje cookies",
-    "cookie\/cookie_notice_success": "Oznámenie o cookies bolo úspešne aktualizované.",
-    "cookie\/cookie_popup": "Táto webstránka používa cookies na zlepšenie vášho zážitku z prehliadania.",
-    "cookie\/cookie_popup_allow": "Povoliť cookies",
-    "cookie\/cookie_popup_disallow": "Zakázať cookies",
-    "cookie\/cookie_popup_more_info": "Viac informácií",
-    "cookie\/cookies": "Cookies",
-    "cookie\/update_settings": "Zobraziť cookies vyskakovacie okno"
+    "cookie/configure_cookies": "Nastaviť cookies",
+    "cookie/cookie_notice": "Oznámenie o cookies",
+    "cookie/cookie_notice_error": "Zadajte prosím upozornenie o cookies s maximálne 10 000 znakmi.",
+    "cookie/cookie_notice_info": "Tento widget vyžaduje cookies",
+    "cookie/cookie_notice_success": "Oznámenie o cookies bolo úspešne aktualizované.",
+    "cookie/cookie_popup": "Táto webstránka používa cookies na zlepšenie vášho zážitku z prehliadania.",
+    "cookie/cookie_popup_allow": "Povoliť cookies",
+    "cookie/cookie_popup_disallow": "Zakázať cookies",
+    "cookie/cookie_popup_more_info": "Viac informácií",
+    "cookie/cookies": "Cookies",
+    "cookie/update_settings": "Zobraziť cookies vyskakovacie okno"
 }

From 29f9a5e2630e2a5b6248249d1c2d20d0b84a1970 Mon Sep 17 00:00:00 2001
From: snake <admin@viasnake.com>
Date: Sun, 19 Jun 2022 06:46:13 +0000
Subject: [PATCH 164/337] Translated using Weblate (Japanese)

Currently translated at 100.0% (1227 of 1227 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/ja/
---
 custom/languages/ja_JP.json | 212 +++++++++++++++++++-----------------
 1 file changed, 111 insertions(+), 101 deletions(-)

diff --git a/custom/languages/ja_JP.json b/custom/languages/ja_JP.json
index 45252200a3..70bf1fb4df 100644
--- a/custom/languages/ja_JP.json
+++ b/custom/languages/ja_JP.json
@@ -209,8 +209,8 @@
     "admin/favicon_reset_successfully": "ファビコンのリセットに成功しました。",
     "admin/favicon_updated_successfully": "ファビコンの更新に成功しました。",
     "admin/field_name": "フィールド名",
-    "admin/file_changed": "ファイルが変更されました。",
-    "admin/file_too_big": "ファイルサイズが大きすぎます。圧縮や画質を下げてもう一度お試しください。送信されたファイルは{{filesize}}です。上限は{{maxFilesize}}です。",
+    "admin/file_changed": "ファイル変更",
+    "admin/file_too_big": "ファイルが大きすぎます！あなたのファイルは{{filesize}}で、上限は{{maxFilesize}}です",
     "admin/find_modules": "モジュール検索",
     "admin/find_templates": "テンプレートを探す",
     "admin/force_https": "httpsを強制させますか？",
@@ -256,18 +256,18 @@
     "admin/homepage_type": "ホームページタイプ",
     "admin/hook_created": "ウェブフックの作成に成功しました。",
     "admin/hook_deleted": "ウェブフックの削除に成功しました。",
-    "admin/hook_edited": "ウェブフックの編集に成功しました。",
+    "admin/hook_edited": "フックの編集に成功",
     "admin/hook_events": "このウェブフックをトリガするイベント",
     "admin/hook_name": "ウェブフック名",
     "admin/hook_select_info": "イベントとして「新規トピック」または「トピックの返信」が選択されているフックのみ表示されます。",
     "admin/hook_type": "ウェブフックの種類",
     "admin/hook_url": "ウェブフックURL",
     "admin/hooks": "ウェブフック",
-    "admin/hooks_info": "ウェブフックでは、特定のイベントが発生したときに外部サービスに通知することができます。指定したイベントが発生したとき",
+    "admin/hooks_info": "ウェブフックは特定のイベントが発生したときに、外部サービスに通知することを可能にします。",
     "admin/host": "ホスト",
     "admin/html": "HTML",
-    "admin/html_maximum_255": "HTMLは255文字以内で指定してください。",
-    "admin/html_required": "HTMLは必須です。",
+    "admin/html_maximum_255": "HTMLは255文字以下である必要があります",
+    "admin/html_required": "HTMLは必須です",
     "admin/icon": "アイコン",
     "admin/identifier": "識別子",
     "admin/images": "背景画像",
@@ -275,12 +275,12 @@
     "admin/include_staff_in_user_widget": "スタッフウィジェットをユーザーウィジェットに含めますか？",
     "admin/ingame_group_maximum": "グループ名は64文字以下にする必要があります。",
     "admin/install": "インストール",
-    "admin/install_confirm": "パッケージをダウンロードし、含まれているファイルがアップロードされていることを確認してください。",
+    "admin/install_confirm": "パッケージをダウンロードし、含まれるファイルをアップロードしていることを確認してください！",
     "admin/install_language": "言語インストール",
     "admin/installed_languages": "言語が正常にインストールされました。",
     "admin/instructions": "指示",
     "admin/integrations": "連携",
-    "admin/invalid_file_type": "許可されていない拡張子または種類です。",
+    "admin/invalid_file_type": "無効なファイル形式です！",
     "admin/invalid_hook_events": "少なくとも1つのイベントを選択する必要があります",
     "admin/invalid_hook_name": "無効なウェブフック名",
     "admin/invalid_hook_url": "無効なウェブフックURL",
@@ -290,7 +290,7 @@
     "admin/keywords": "キーワード",
     "admin/layout": "レイアウト",
     "admin/leaderboard_settings": "リーダーボードの設定",
-    "admin/leave_port_empty_for_srv": "ポートが25565である場合、またはドメインがSRVレコードを使用している場合は、ポートを空のままにすることができます。",
+    "admin/leave_port_empty_for_srv": "ポートが25565の場合、またはドメインがSRVレコードを使用している場合、ポートを空にすることができます",
     "admin/left": "左",
     "admin/light": "ライト",
     "admin/link_location_required": "リンクの場所が必要です。",
@@ -312,7 +312,7 @@
     "admin/mcassoc_instance_help": "クリックしてインスタンスキーを生成する",
     "admin/mcassoc_key": "mcassoc共有キー",
     "admin/message": "メッセージ",
-    "admin/message_required": "メッセージは必須です。",
+    "admin/message_required": "メッセージは必須です",
     "admin/metadata_updated_successfully": "メタデータが正常に更新されました。",
     "admin/method": "メソッド",
     "admin/minecraft": "Minecraft",
@@ -329,13 +329,13 @@
     "admin/module": "モジュール",
     "admin/module_disabled": "モジュールを無効にしました。",
     "admin/module_enabled": "モジュールを有効にしました。",
-    "admin/module_outdated": "このモジュールは、NamelessMCバージョン {{intendedVersion}} を対象としています。現在、NamelessMCバージョン {{actualVersion}} を実行しています。",
+    "admin/module_outdated": "このモジュールはNamelessバージョン{{intendedVersion}}を対象としていますが、利用中のNamelessバージョンは{{actualVersion}}です",
     "admin/module_x": "モジュール: {{module}}",
     "admin/modules": "モジュール",
     "admin/modules_installed_successfully": "新しいモジュールが正常にインストールされました。",
     "admin/name": "名前",
-    "admin/name_maximum_16": "名前は16文字以内にする必要があります。",
-    "admin/name_required": "名前は必須です。",
+    "admin/name_maximum_16": "名前は16文字以内である必要があります",
+    "admin/name_required": "名前は必須です",
     "admin/nameless_news": "NamelessMC ニュース",
     "admin/navbar_colour": "ナビゲーションバーの色",
     "admin/navbar_icon": "ナビゲーションバーアイコン",
@@ -353,14 +353,14 @@
     "admin/new_page": "新しいページ",
     "admin/new_reaction": "新しいリアクション",
     "admin/new_rule": "新しいルール",
-    "admin/new_update_available": "利用可能な新しいアップデートがあります",
+    "admin/new_update_available": "新しいアップデートがあります。",
     "admin/new_urgent_update_available": "新しい緊急アップデートがあります。なるべく早くアップデートしてください！",
     "admin/new_version_x": "新しいバージョン: {{version}}",
     "admin/no_announcements": "まだお知らせはありません。",
     "admin/no_avatars_available": "デフォルトアバターがアップロードされていません。「画像アップロード」を選択後、デフォルトにするアバターを選択してください。",
     "admin/no_custom_fields": "カスタムフィールドが存在しません。",
     "admin/no_custom_pages": "ページはまだ作成されていません。",
-    "admin/no_default_server": "初期サーバーが存在しません。",
+    "admin/no_default_server": "既定値のサーバーが存在しません",
     "admin/no_email_errors": "ログに記録されたメールエラーはありません。",
     "admin/no_hooks_yet": "Webhooksはまだありません。",
     "admin/no_item_selected": "選択されている項目がありません",
@@ -368,10 +368,10 @@
     "admin/no_parent_server": "親サーバーなし",
     "admin/no_query_errors": "クエリエラーは記録されません。",
     "admin/no_reactions": "リアクションが設定されていません。",
-    "admin/no_servers_defined": "設定済みのサーバーは存在しません。",
+    "admin/no_servers_defined": "サーバーはまだ定義されていません",
     "admin/notice_log": "通知ログ",
     "admin/oauth": "OAuth",
-    "admin/oauth_info": "ユーザーがソーシャルネットワークのアカウントでログインできるように、OAuthプロバイダを設定します。{{docLinkStart}}詳しくはドキュメントをご覧ください。{{docLinkEnd}}",
+    "admin/oauth_info": "OAuthプロバイダを設定して、ユーザーがソーシャルネットワークアカウントでログインできるようにする。{{docLinkStart}}ヘルプが必要な場合は、ドキュメントをご確認ください{{docLinkEnd}}。",
     "admin/other_log": "その他ログ",
     "admin/outgoing_email": "送信メールアドレス",
     "admin/outgoing_email_info": "NamelessMCが電子メールの送信に使用する電子メールアドレスです。",
@@ -430,14 +430,14 @@
     "admin/placeholders_show_on_profile_info": "各ユーザーのプロフィールにプレースホルダーを表示するかどうか。",
     "admin/placeholders_value": "値",
     "admin/player_list_help": "有効にすると、ステータスページにログインしているユーザーのリストが表示されます。",
-    "admin/please_select_logs": "表示するログを選択してください。",
+    "admin/please_select_logs": "表示するログを選択してください",
     "admin/portal": "ポータル",
     "admin/positive": "ポジティブ",
     "admin/posts": "ポスト",
     "admin/pre_1_7": "1.7 より古いMinecraftを使用していますか？",
     "admin/privacy_and_terms": "規約設定",
     "admin/privacy_policy_error": "プライバシーポリシーが100000文字以下であることをご確認ください。",
-    "admin/private_profiles": "プライベートプロフィールをユーザーに許可しますか？",
+    "admin/private_profiles": "非公開プロフィール",
     "admin/profile_field_created_successfully": "プロフィールフィールドが正常に作成されました。",
     "admin/profile_field_deleted_successfully": "プロフィールフィールドが正常に削除されました。",
     "admin/profile_field_editable_help": "有効にすると、ユーザーはプロフィール設定でフィールドを編集することができるようになります。",
@@ -455,7 +455,7 @@
     "admin/query_errors_purged_successfully": "クエリエラーが正常にパージされました。",
     "admin/query_information": "クエリ情報",
     "admin/query_interval": "クエリ間隔 (分単位で、5~60でなければなりません)",
-    "admin/query_port_maximum": "クエリポートが5文字以下であることを確認してください。",
+    "admin/query_port_maximum": "クエリポートは5文字以内で入力してください",
     "admin/query_settings": "クエリ設定",
     "admin/rating_x": "評価: {{rating}}",
     "admin/re-authenticate": "StaffCPログイン",
@@ -494,23 +494,23 @@
     "admin/seo_settings_updated_successfully": "SEO設定の更新に成功しました。",
     "admin/server_address": "サーバーアドレス",
     "admin/server_address_help": "ポート番号を除くアドレスを入力してください。",
-    "admin/server_address_maximum": "サーバーアドレスが64文字以下であることを確認してください。",
-    "admin/server_address_minimum": "サーバーアドレスが1文字以上であることを確認してください。",
+    "admin/server_address_maximum": "サーバーアドレスが64文字以上であることを確認してください",
+    "admin/server_address_minimum": "サーバーアドレスが1文字以上であることを確認してください",
     "admin/server_address_required": "サーバーのアドレスを入力してください",
     "admin/server_banners": "サーバーバナー",
     "admin/server_compatibility": "サーバーの互換性",
     "admin/server_created": "サーバーが正常に作成されました。",
-    "admin/server_deleted": "サーバーが正常に削除されました。",
+    "admin/server_deleted": "サーバーが正常に削除されました",
     "admin/server_id_x": "サーバーID: {{serverId}}",
     "admin/server_information": "サーバー情報",
     "admin/server_name": "サーバー名",
-    "admin/server_name_maximum": "サーバー名が20文字以下であることを確認してください。",
-    "admin/server_name_minimum": "サーバー名が1文字以上であることを確認してください。",
-    "admin/server_name_required": "サーバー名を入力して下さい。",
-    "admin/server_parent_required": "親サーバーを選択して下さい。",
+    "admin/server_name_maximum": "サーバー名が最大20文字であることを確認してください",
+    "admin/server_name_minimum": "サーバー名が1文字以上であることを確認してください",
+    "admin/server_name_required": "サーバー名を入力してください",
+    "admin/server_parent_required": "親サーバーを選択してください",
     "admin/server_port": "サーバーポート",
-    "admin/server_port_maximum": "サーバーポートが5文字以下であることを確認してください。",
-    "admin/server_port_minimum": "サーバーポートが2文字以上であることを確認してください。",
+    "admin/server_port_maximum": "サーバーポートが5文字以下であることを確認してください",
+    "admin/server_port_minimum": "サーバーポートが2文字以上であることを確認してください",
     "admin/server_port_required": "サーバーポートを入力してください",
     "admin/server_query_information": "ウェブサイトにオンラインプレーヤーのリストを表示するには、サーバーのserver.propertiesファイルで「enable-query」オプションを有効にする必要があります",
     "admin/server_query_port": "サーバークエリポート",
@@ -523,10 +523,10 @@
     "admin/show_nickname_instead_of_username": "ユーザー名の代わりにユーザーのニックネームを表示しますか？",
     "admin/show_registration_link": "登録リンクを表示する",
     "admin/sitemap": "サイトマップ",
-    "admin/sitemap_generated": "サイトマップが正常に生成されました。",
-    "admin/sitemap_last_generated_x": "最終サイトマップ生成: {{generatedAt}}",
+    "admin/sitemap_generated": "サイトマップが正常に生成されました",
+    "admin/sitemap_last_generated_x": "サイトマップの最終生成日時は{{generatedAt}}です。",
     "admin/sitemap_link": "サイトマップリンク:",
-    "admin/sitemap_not_generated_yet": "生成済みのサイトマップが存在しません。",
+    "admin/sitemap_not_generated_yet": "サイトマップがまだ生成されていません！",
     "admin/sitemap_not_writable": "<strong>cache/sitemaps</strong>ディレクトリに書き込みができません。アクセス権限を確認してください。",
     "admin/sitename": "サイト名",
     "admin/social_media": "ソーシャルメディア",
@@ -537,7 +537,7 @@
     "admin/status_page": "ステータスページを表示しますか？",
     "admin/status_query_help": "有効にすると、ステータスページに接続上可能状況を表示できます。",
     "admin/styles": "スタイル",
-    "admin/successfully_updated": "正常に更新されました。",
+    "admin/successfully_updated": "正常に更新されました",
     "admin/support": "サポート",
     "admin/template": "テンプレート",
     "admin/template_activated": "テンプレートが有効になりました。",
@@ -547,16 +547,16 @@
     "admin/template_deactivated": "テンプレートが無効になりました。",
     "admin/template_deleted_successfully": "テンプレートが正常に削除されました。",
     "admin/template_not_supported": "NamelessMC 2.0.0-pr8では、デフォルトテンプレートはサポートされていません。サポートされているテンプレートを使用してください。",
-    "admin/template_outdated": "このテンプレートはNamelessMCバージョン {{intendedVersion}}を対象としています。現在、NamelessMCバージョン {{actualVersion}} を実行しています。",
+    "admin/template_outdated": "このテンプレートはNamelessバージョン{{intendedVersion}}を対象としていますが、利用中のNamelessバージョンは{{actualVersion}}です",
     "admin/template_updated": "テンプレートが正常に更新されました。",
     "admin/templates": "テンプレート",
     "admin/templates_installed_successfully": "新しいテンプレートが正常にインストールされました。",
     "admin/terms_error": "利用規約が2048文字以下であることをご確認ください。",
     "admin/terms_updated": "利用規約・プライバシーポリシーが正常に変更されました。",
-    "admin/test_email_success": "テストメールが正常に送信されました。",
+    "admin/test_email_success": "テストメールが正常に送信されました！",
     "admin/text": "テキスト",
     "admin/text_colour": "テキスト色",
-    "admin/text_colour_required": "テキスト色は必須です。",
+    "admin/text_colour_required": "テキスト色は必須です",
     "admin/textarea": "テキスト エリア",
     "admin/title": "ユーザータイトル",
     "admin/title_max_64": "ユーザーのタイトルが64文字以下であることをご確認ください。",
@@ -566,17 +566,17 @@
     "admin/twitter_dark_theme": "Twitterダークテーマを使用しますか？",
     "admin/twitter_url": "Twitter URL",
     "admin/type": "タイプ",
-    "admin/type_required": "タイプは必須です。",
-    "admin/unable_to_delete_group": "デフォルトのグループ、またはStaffCPを表示できるグループを削除できません。 グループ設定を更新してください。",
+    "admin/type_required": "タイプは必須です",
+    "admin/unable_to_delete_group": "デフォルトのグループ、またはStaffCPを閲覧できるグループの削除ができません。初めに、グループ設定を更新してください！",
     "admin/unable_to_delete_template": "テンプレートを完全に削除できませんでした。ファイルのアクセス許可を確認してください。",
     "admin/unable_to_disable_module": "モジュールを無効にすることができませんモジュール {{module}} はそれに依存しています。",
     "admin/unable_to_enable_module": "互換性のないモジュールを有効にすることはできません。",
     "admin/unable_to_enable_module_dependencies": "モジュール {{module}} に依存しているため、モジュールを有効にすることができませんでした。",
     "admin/unable_to_enable_template": "互換性のないテンプレートを有効にすることはできません。",
-    "admin/unable_to_load_sitemap_file_x": "サイトマップファイル {{file}} を読み込むことができませんでした。",
-    "admin/unable_to_retrieve_modules": "モジュールを取得できませんでした。",
-    "admin/unable_to_retrieve_nameless_news": "最新のニュースを取得できませんでした。",
-    "admin/unable_to_retrieve_templates": "テンプレートを取得できませんでした。",
+    "admin/unable_to_load_sitemap_file_x": "サイトマップファイル{{file}}を読み込むことができません",
+    "admin/unable_to_retrieve_modules": "モジュールの取得ができません",
+    "admin/unable_to_retrieve_nameless_news": "最新ニュースの取得ができません",
+    "admin/unable_to_retrieve_templates": "テンプレートの取得ができません",
     "admin/unable_to_write_email_config": "core/email.phpファイルに書き込みできません。ファイルアクセス権限を確認して下さい。",
     "admin/unknown": "不明",
     "admin/unlink": "連携を解除",
@@ -584,11 +584,11 @@
     "admin/unlink_account_success": "{{provider}} からアカウントの連携を解除することに成功しました。",
     "admin/unsafe_html": "安全でないHTMLを許可しますか？",
     "admin/unsafe_html_warning": "このオプションを有効にすると、危険なJavaScriptを含むHTMLをページで使用することを許可します。 HTMLが安全であると確認できた場合のみ、有効にしてください。",
-    "admin/up_to_date": "使用中のNamelessMCは最新です。",
+    "admin/up_to_date": "使用中のNamelessMCは最新版です！",
     "admin/update": "アップデート",
     "admin/update_mc_name": "Minecraftユーザー名更新",
     "admin/update_user_languages": "アップデートユーザー言語",
-    "admin/update_user_languages_warning": "この設定を実行すると、すでに別言語を指定しているユーザーも現在設定している言語(初期言語)に強制的に変更されます。",
+    "admin/update_user_languages_warning": "これによりウェブサイト上の全ユーザーの言語が、すでに選択されている場合でも更新されます！",
     "admin/update_uuid": "UUID更新",
     "admin/updated_mcassoc_successfully": "mcassoc設定が正常に更新されました。",
     "admin/updated_placeholder_settings": "プレースホルダーの設定を更新しました。",
@@ -633,19 +633,19 @@
     "admin/widgets": "ウィジェット",
     "admin/x_directory_not_writable": "{{directory}} ディレクトリは書き込み可能ではありません！",
     "admin/youtube_url": "YouTube URL",
-    "api/account_validated": "アカウントの検証が完了しました。",
+    "api/account_validated": "アカウント認証に成功しました",
     "api/finish_registration_email": "登録を完了するにはメールを確認して処理を完了してください。",
     "api/finish_registration_link": "登録を完了するには次のリンクをクリックしてください:",
-    "api/group_updated": "グループを正常に更新しました。",
-    "api/report_created": "レポートが正常に送信されました。",
-    "api/server_info_updated": "サーバー情報が更新されました。",
-    "api/unable_to_update_server_info": "サーバー情報を更新できませんでした。",
-    "api/unable_to_update_username": "ユーザー名を更新できませんでした。",
+    "api/group_updated": "グループが正常に更新されました",
+    "api/report_created": "通報が正常に作成されました",
+    "api/server_info_updated": "サーバー情報が正常に更新されました",
+    "api/unable_to_update_server_info": "サーバー情報の更新ができません",
+    "api/unable_to_update_username": "ユーザー名の更新ができません",
     "api/unknown_error": "不明なエラー",
     "api/user_already_active": "あなたのアカウントはすでに有効化されています。",
-    "api/username_updated": "ユーザー名が更新されました。",
+    "api/username_updated": "ユーザー名が正常に更新されました",
     "emails/change_password_message": "パスワードをリセットするには、次のリンクをクリックしてください。これを自分でリクエストしていない場合は、このメールを安全に削除できます。",
-    "emails/change_password_subject": "パスワードを忘れましたか？",
+    "emails/change_password_subject": "パスワードを忘れた",
     "emails/forum_topic_reply_message": "{{author}} がフォローしているトピックに返信しました。内容: {{content}}",
     "emails/forum_topic_reply_subject": "{{author}} は {{topic}} に返信しました",
     "emails/greeting": "こんにちは！",
@@ -659,7 +659,7 @@
     "errors/403_title": "申し訳ありません！",
     "errors/404_back": "戻る",
     "errors/404_content": "ページを発見できませんでした。",
-    "errors/404_error": "エラーと思われる場合は、管理者までご連絡ください。",
+    "errors/404_error": "エラーと思われる場合は、管理者までご連絡ください",
     "errors/404_home": "ホーム",
     "errors/404_title": "申し訳ありません！",
     "errors/fatal_error_message_admin": "ページの読み込み中に何らかの問題が発生しました。エラーの詳細:",
@@ -687,7 +687,7 @@
     "general/connect_with_ip_x": "IP {{address}} で今すぐ接続する",
     "general/content": "コンテンツ",
     "general/cookie_notice": "当ウェブサイトでは、より快適に閲覧していただくためにCookieを使用しています。当ウェブサイトに登録する、もしくはこの通知を閉じることにより、Cookieの使用に同意したことになります。",
-    "general/copied": "クリップボードにコピーしました。",
+    "general/copied": "クリップボードにコピーしました！",
     "general/currently_1_player_online": "現在1人のプレイヤーが参加しています。",
     "general/currently_x_players_online": "現在 {{count}} 人のプレイヤーが参加しています。",
     "general/date": "日付",
@@ -715,10 +715,10 @@
     "general/no_online_staff": "オンラインのスタッフはいません。",
     "general/no_online_users": "オンラインのユーザーはいません。",
     "general/no_players_online": "現在オンラインのプレイヤーはいません。",
-    "general/no_servers": "表示できるサーバーがありません。",
+    "general/no_servers": "表示できるサーバーがありません！",
     "general/none": "無し",
     "general/not_registered_yet": "まだ登録されていませんか？",
-    "general/oauth_message_continue": "続けて {{provider}} で登録する。",
+    "general/oauth_message_continue": "続けて{{provider}}で登録する",
     "general/offline": "オフライン",
     "general/online": "オンライン",
     "general/online_guests": "オンラインゲスト",
@@ -726,7 +726,7 @@
     "general/online_users": "オンラインユーザー",
     "general/origin_api": "API",
     "general/origin_website": "ウェブサイト",
-    "general/page_loaded_in": "このページは {{time}} 秒で読み込まれました。",
+    "general/page_loaded_in": "ページの読み込み時間 {{time}}秒",
     "general/page_x": "ページ {{page}}",
     "general/player_count": "{{onlinePlayers}}/{{totalPlayers}}",
     "general/previous": "前へ",
@@ -735,7 +735,7 @@
     "general/register": "登録",
     "general/remove": "削除",
     "general/report": "レポート",
-    "general/report_origin": "Origin",
+    "general/report_origin": "オリジン",
     "general/reported_by": "{{author}} による報告",
     "general/search": "検索",
     "general/server_offline": "現在サーバーはオフラインです。",
@@ -795,7 +795,7 @@
     "installer/general_configuration": "一般設定",
     "installer/host": "ホスト名",
     "installer/host_help": "ホスト名は、ウェブサイトの<strong>ベースURL</strong>です。インストールパス欄のサブフォルダや、http(s)://をここに入れないでください！",
-    "installer/hostname_error": "有効なホスト名を http:// または https:// を付けずに入力してください。",
+    "installer/hostname_error": "有効なホスト名を http:// または https:// を付けずに入力してください",
     "installer/initialising_database_and_cache": "データベースとキャッシュを初期化しています、しばらくお待ちください...",
     "installer/input_maximum": "ユーザー名は最大で{{maxUsername}}文字、メールアドレスは最大で{{maxEmail}}文字、パスワードは最大で{{maxPassword}}文字であることを確認してください。",
     "installer/input_minimum": "ユーザー名は{{minUsername}}文字以上、メールアドレスは{{minEmail}}文字以上、パスワードは{{minPassword}}文字以上であることを確認してください。",
@@ -817,7 +817,7 @@
     "installer/password": "パスワード",
     "installer/passwords_must_match": "パスワードが一致していません。",
     "installer/pre-release": "プレリリース",
-    "installer/pre-release_warning": "このプレリリースは、公開サイトでの使用を意図したものではありませんのでご注意ください",
+    "installer/pre-release_warning": "このプレリリースは、公開サイトでの利用を想定していません。",
     "installer/proceed": "続行",
     "installer/reload": "再読み込み",
     "installer/reload_page": "ページを再読み込み",
@@ -833,10 +833,10 @@
     "installer/step_home": "ホーム",
     "installer/step_requirements": "要件",
     "installer/step_site_config": "サイト設定",
-    "installer/support_message": "サポートが必要な場合は、{{websiteLinkStart}}私達のウェブサイト{{websiteLinkEnd}} をご覧ください。また、{{discordLinkStart}}Discordサーバー{{discordLinkEnd}} や {{githubLinkStart}}GitHubリポジトリ{{githubLinkEnd}} もご利用いただけます。",
+    "installer/support_message": "なにかサポートが必要な場合は、{{websiteLinkStart}}私達のウェブサイト{{websiteLinkEnd}} をご覧ください。また、{{discordLinkStart}}Discordサーバー{{discordLinkEnd}}や{{githubLinkStart}}GitHubリポジトリ{{githubLinkEnd}}もご利用いただけます。",
     "installer/template_cache_writable": "Template Cache 書き込み可能",
     "installer/terms_and_conditions": "継続することで、規約に同意することになります。",
-    "installer/unable_to_create_account": "アカウントを作成できません。",
+    "installer/unable_to_create_account": "アカウントの作成ができません",
     "installer/unable_to_load_converter": "変換を読み込めません！",
     "installer/unable_to_login": "ログインできません。",
     "installer/upgrade": "アップグレード",
@@ -845,24 +845,24 @@
     "installer/yes": "はい",
     "log/info_forums_lock": "ロック",
     "log/info_forums_unlock": "ロック解除",
-    "moderator/1_account_with_ip": "{{address}} のアカウントが1件見つかりました。",
-    "moderator/1_ip_with_name": "{{user}} のIPアドレスが1件見つかりました。",
+    "moderator/1_account_with_ip": "IP{{address}}のアカウントが1件見つかりました",
+    "moderator/1_ip_with_name": "{{user}}のIPアドレスが1件見つかりました",
     "moderator/acknowledged": "承認されました",
     "moderator/actions": "アクション",
     "moderator/ban": "Ban",
     "moderator/ban_ip": "Ban IP",
     "moderator/ban_user": "Ban ユーザー",
     "moderator/banned": "Ban済み",
-    "moderator/cant_ban_admin": "管理者を処罰することはできません。",
-    "moderator/cant_punish_admin": "管理者を処罰することはできません。",
+    "moderator/cant_ban_admin": "管理者をbanすることはできません！",
+    "moderator/cant_punish_admin": "管理者を処罰することはできません！",
     "moderator/close_report": "レポートを既読",
     "moderator/comment_created": "コメントが正常に作成されました。",
     "moderator/comments": "コメント",
-    "moderator/confirm_revoke_ban": "この処罰を取り消してもよろしいですか？指定処罰より最近の処罰がある場合は、指定ユーザーの禁止は続行されます。",
+    "moderator/confirm_revoke_ban": "本当にこのbanを取り消しますか？このユーザーは最近banがあったとしても、banが解除されます！",
     "moderator/confirm_revoke_warning": "この警告を取り消してもよろしいですか？",
-    "moderator/confirm_spam": "<p>指定ユーザーをスパムとして処罰してもよろしいですか？</p><p>指定ユーザーはIP Banされ、すべてのコンテンツが削除されます。</p>",
-    "moderator/count_accounts_with_ip": "{{address}} のアカウントが {{count}} 件見つかりました。",
-    "moderator/count_ips_with_name": "{{user}} のIPアドレスが {{count}} 件見つかりました。",
+    "moderator/confirm_spam": "本当にこのユーザーをスパムとしてマークしますか？このユーザーはIP banされ、すべてのコンテンツが削除されます。",
+    "moderator/count_accounts_with_ip": "IP{{address}}のアカウントが{{count}}件見つかりました",
+    "moderator/count_ips_with_name": "{{user}}のIPアドレスが{{count}}件見つかりました",
     "moderator/created": "作成者：",
     "moderator/enter_valid_punishment_reason": "処罰の正当な理由を、5~5000文字の間で入力してください。",
     "moderator/groups": "グループ",
@@ -876,7 +876,7 @@
     "moderator/no_comments": "コメントはありません",
     "moderator/no_ips_with_username": "指定したユーザーのIPアドレスは見つかりませんでした。",
     "moderator/no_open_reports": "未読のレポートはありません。",
-    "moderator/no_previous_punishments": "処罰履歴はありません。",
+    "moderator/no_previous_punishments": "過去に処罰を受けたことがありません",
     "moderator/no_punishments_found": "処罰は見つかりませんでした。",
     "moderator/no_users_or_ips_found": "ユーザーまたはIPアドレスが見つかりません。",
     "moderator/previous_punishments": "処罰履歴",
@@ -889,7 +889,7 @@
     "moderator/recent_registrations": "最近の登録",
     "moderator/recent_reports": "最新のレポート",
     "moderator/reopen_report": "レポートを未読",
-    "moderator/report_alert": "新しいレポートが送信されました。",
+    "moderator/report_alert": "新しい報告が送信されました",
     "moderator/report_closed": "レポートが正常に閉鎖されました。",
     "moderator/report_comment_invalid": "コメント内容が無効です。1~10000文字のコメントを入力してください。",
     "moderator/report_reopened": "レポートが正常に再開されました。",
@@ -906,14 +906,14 @@
     "moderator/type": "タイプ",
     "moderator/updated_by": "報告者",
     "moderator/user_marked_as_spam": "スパムとして指定されたユーザーを正常に処罰しました。",
-    "moderator/user_punished_alert": "{{staffUser}} がユーザー {{user}} を処罰しました。",
+    "moderator/user_punished_alert": "{{staffUser}}がユーザー{{user}}を処罰しました",
     "moderator/user_reported": "ユーザーレポート",
     "moderator/view_closed": "レポートを既読",
     "moderator/view_content": "報告されたコンテンツを表示する",
     "moderator/view_open": "レポートを未読",
     "moderator/view_user": "ユーザーを表示",
     "moderator/viewing_report": "レポートの表示",
-    "moderator/viewing_user_x": "ユーザー {{user}} を表示しています。",
+    "moderator/viewing_user_x": "ユーザー{{user}}を表示しています",
     "moderator/warn": "警告",
     "moderator/warn_user": "ユーザーに警告する",
     "moderator/warning": "警告",
@@ -921,7 +921,7 @@
     "moderator/when": "いつ",
     "moderator/x_closed_report": "{{user}} がレポートを閉鎖しました。",
     "moderator/x_reopened_report": "{{user}} がレポートを再開しました。",
-    "table/display_records_per_page": "1ページに_MENU_件のレコードを表示しています。",
+    "table/display_records_per_page": "1ページに_MENU_件のレコードを表示する",
     "table/filtered": "(_MAX_合計レコードからフィルタリングされました)",
     "table/no_records": "レコードがありません",
     "table/nothing_found": "結果が見つかりません",
@@ -937,8 +937,8 @@
     "time/about_1_year": "約1年前",
     "time/less_than_a_minute": "1分前",
     "time/over_x_years": "約 {{count}} 年前",
-    "user/1_new_alert": "1件の新しい通知があります。",
-    "user/1_new_message": "1件の新しいメッセージがあります。",
+    "user/1_new_alert": "1件の新しい通知があります",
+    "user/1_new_message": "{{count}}件の新しいメッセージがあります",
     "user/1_reaction": "1件の反応",
     "user/1_reply": "1件の返信",
     "user/about": "情報",
@@ -953,23 +953,23 @@
     "user/authme_email_help_1": "最後に、メールアドレスを入力してください。",
     "user/authme_email_help_2": "最後に、メールアドレスを入力し、アカウントの表示名を選択してください。",
     "user/authme_help": "ゲーム内のAuthMeのアカウント情報を入力してください。 まだゲーム内でアカウントを作成していない場合は、サーバーに参加し表示される指示に従ってください。",
-    "user/authme_username_exists": "指定されたAuthMeアカウントはすでにウェブサイトに接続されています。",
+    "user/authme_username_exists": "あなたのAuthMeアカウントはすでにウェブサイトに接続されています！",
     "user/avatar": "アバター",
     "user/block_user": "ユーザをブロック",
-    "user/cant_send_to_self": "自身にメッセージを送ることはできません。",
+    "user/cant_send_to_self": "自分にメッセージを送ることはできません！",
     "user/change_banner": "バナーを変更",
     "user/change_email_address": "メールアドレス変更",
     "user/change_password": "パスワード変更",
-    "user/click_here_to_view": "クリックして表示",
-    "user/confirm_block_user": "このユーザーをブロックしてもよろしいですか？このユーザーは、あなたにプライベートメッセージを送ったり、あなたをタグ付けして投稿することができなくなります",
+    "user/click_here_to_view": "クリックして表示。",
+    "user/confirm_block_user": "本当にこのユーザーをブロックしますか？このユーザーは、あなたにプライベートメッセージを送ったり、投稿にタグ付けしたりすることができなくなります。",
     "user/confirm_leave": "会話を退出しますか？",
     "user/confirm_new_password": "新しいパスワードを再入力",
     "user/confirm_password": "パスワードの確認",
     "user/confirm_unblock_user": "このユーザーのブロック解除してもよろしいですか？このユーザーは、あなたにプライベートメッセージを送ったり、投稿にタグ付けできるようになります。",
     "user/connect_with_authme": "アカウントをAuthMeと接続する",
-    "user/content_max_20480": "内容が20480文字以下であることをご確認ください。",
-    "user/content_min_2": "内容が2文字以上であることをご確認ください。",
-    "user/content_required": "内容を入力してください。",
+    "user/content_max_20480": "内容は20480文字以下である必要があります",
+    "user/content_min_2": "内容は2文字以上である必要があります",
+    "user/content_required": "内容を入力してください",
     "user/couldnt_find_that_user": "指定されたユーザーを見つけることができませんでした。",
     "user/create_an_account": "アカウント作成",
     "user/current_password": "現在のパスワード",
@@ -984,7 +984,7 @@
     "user/email_required": "メールアドレスは必須です。",
     "user/enable": "有効",
     "user/enabled": "有効",
-    "user/enter_new_password": "メールアドレスを確認して、以下に新しいパスワードを入力してください",
+    "user/enter_new_password": "メールアドレスを確認して、以下に新しいパスワードを入力してください。",
     "user/feed": "フィード",
     "user/field_is_required": "{{field}} は必須です。",
     "user/follow": "フォロー",
@@ -1012,12 +1012,12 @@
     "user/last_seen_x": "最終オンライン時: {{lastSeenAt}}",
     "user/latest_profile_posts": "最新のプロフィール投稿",
     "user/leave_conversation": "会話から退出",
-    "user/max_pm_10_users": "最大10人のユーザーにのみメッセージを送信できます。",
+    "user/max_pm_10_users": "最大10人のユーザーにしかメッセージを送信できません",
     "user/mcname_lookup_error": "Mojangのサーバーと通信してユーザー名を確認する際にエラーが発生しました。数分後にもう一度お試しください。",
     "user/mcname_maximum_20": "Minecraftユーザー名が20文字以下であることをご確認ください。",
     "user/mcname_minimum_3": "Minecraftユーザー名が3文字以上であることをご確認ください。",
     "user/mcname_required": "Minecraftユーザー名は必須です。",
-    "user/message_sent_successfully": "送信に成功しました。",
+    "user/message_sent_successfully": "メッセージの送信に成功しました",
     "user/message_title": "メッセージタイトル",
     "user/messages": "メッセージ",
     "user/messaging": "メッセージ",
@@ -1041,12 +1041,12 @@
     "user/no_messages_full": "メッセージが存在しません。",
     "user/no_placeholders": "プレースホルダーなし",
     "user/no_profile_posts": "プロフィール投稿はありません。",
-    "user/no_replies_yet": "返信がありません。",
+    "user/no_replies_yet": "返信がまだありません",
     "user/no_user_found_with_provider": "{{provider}} アカウントを持つユーザーは見つかりませんでした。",
     "user/no_wall_posts": "ユーザーの投稿は存在しません。",
     "user/oauth_already_linked": "{{provider}} アカウントには、別のNamelessMCユーザーが既に連携されています。",
     "user/oauth_link_confirm": "アカウント連携のため、{{provider}} ウェブサイトに移動します。",
-    "user/oauth_link_success": "あなたのアカウントと {{provider}} の連携に成功しました。",
+    "user/oauth_link_success": "あなたのアカウントと{{provider}}の連携に成功しました！",
     "user/oauth_login_success": "{{provider}} のアカウントでログインしています。",
     "user/oauth_unlink_confirm": "本当に {{provider}} からアカウントの連携を解除しますか？このアカウントでは今後ログインできなくなります。",
     "user/oauth_unlinked": "プロバイダーからアカウントの連携解除に成功しました。",
@@ -1060,7 +1060,7 @@
     "user/placeholders": "プレースホルダー",
     "user/post_on_wall": "{{user}} に投稿する",
     "user/private_profile": "プライベートプロフィール",
-    "user/private_profile_page": "表示しているユーザはプライベートプロファイルに設定されています。",
+    "user/private_profile_page": "これは非公開のプロフィールです！",
     "user/profile": "プロフィール",
     "user/profile_banner": "プロフィールバナー",
     "user/profile_settings": "プロフィール設定",
@@ -1071,8 +1071,8 @@
     "user/remember_me": "自動ログイン",
     "user/replies": "返信",
     "user/reply": "返信",
-    "user/report_created": "レポートが正常に作成されました。",
-    "user/report_post_content": "レポートの理由を入力してください。",
+    "user/report_created": "通報が正常に作成されました",
+    "user/report_post_content": "通報の理由を入力してください",
     "user/separate_users_with_commas": "ユーザーをカンマで区切る",
     "user/settings_updated_successfully": "設定が正常に更新されました。",
     "user/signature": "署名",
@@ -1085,9 +1085,9 @@
     "user/tfa_scan_code": "認証アプリ内で次のコードをスキャンしてください:",
     "user/tfa_successful": "二要素認証が正常に設定されました。今後はログインするたびに認証が必要になります。",
     "user/timezone": "タイムゾーン",
-    "user/title_max_64": "タイトルが64文字以下であることをご確認ください。",
-    "user/title_min_2": "タイトルが2文字以下であることをご確認ください。",
-    "user/title_required": "タイトルを入力してください。",
+    "user/title_max_64": "タイトルは64文字以下である必要があります",
+    "user/title_min_2": "タイトルが2文字以下である必要があります",
+    "user/title_required": "タイトルを入力してください",
     "user/to": "To",
     "user/topic_updates": "フォローしているトピックのメールを受け取る",
     "user/two_factor_auth": "二要素認証",
@@ -1102,14 +1102,14 @@
     "user/user_details": "ユーザー詳細",
     "user/user_tag_info": "{{author}} の投稿にタグがつけられました。",
     "user/user_unblocked": "ユーザーのブロックを解除しました。",
-    "user/user_x_has_registered": "{{user}} が {{siteName}} に登録しました。",
+    "user/user_x_has_registered": "{{user}}が{{siteName}}に登録しました！",
     "user/user_x_has_validated": "{{user}} がアカウントを認証しました！",
     "user/username": "ユーザー名",
     "user/username_maximum_20": "ユーザー名が20文字以下であることをご確認ください。",
     "user/username_mcname_email_exists": "指定されたのユーザー名または電子メールアドレスはすでに存在します。",
     "user/username_minimum_3": "ユーザー名が3文字以上であることをご確認ください。",
     "user/username_required": "ユーザー名は必須です。",
-    "user/users_to_required": "メッセージ受信者を入力してください。",
+    "user/users_to_required": "メッセージの受信者を入力してください",
     "user/uuid_already_exists": "指定されたのUUIDはすでに存在しています。このMinecraftアカウントはすでに登録されています。",
     "user/validate_account_command": "登録を完了するには、ゲーム内で{{command}}コマンドを実行してください。",
     "user/validation_complete": "アカウントが検証されました。ログインが可能です。",
@@ -1121,8 +1121,8 @@
     "user/view_alerts": "通知を表示",
     "user/view_messages": "メッセージを表示",
     "user/views": "プロフィールビュー:",
-    "user/x_new_alerts": "{{count}} 件の新しい通知があります。",
-    "user/x_new_messages": "{{count}} 件の新しいメッセージがあります。",
+    "user/x_new_alerts": "{{count}}件の新しい通知があります",
+    "user/x_new_messages": "{{count}}件の新しいメッセージがあります",
     "user/x_reactions": "{{count}} 件の反応",
     "user/x_replies": "{{count}} 件の返信",
     "user/you_have_been_banned": "あなたはBANされています！",
@@ -1167,7 +1167,7 @@
     "admin/verified": "検証",
     "admin/test_email_query": "受信トレイに届きませんか？以下をお試しください:",
     "admin/test_email_suggest_1": "数分待って、迷惑メールフォルダを確認してください。",
-    "admin/test_email_suggest_2": "ウェブサイトのDNSレコードを更新してください。（SPFとDKIMを確認）",
+    "admin/test_email_suggest_2": "サイトのDNSレコードを更新してください（SPFとDKIMを確認）。",
     "admin/test_email_suggest_3": "SMTPサーバーを設定する。{{docLinkStart}}続きを読む »{{docLinkEnd}}",
     "user/no_providers": "OAuthプロバイダが設定されていない。",
     "general/deleted_user": "削除されたユーザー",
@@ -1215,5 +1215,15 @@
     "installer/not_upgrading": "アップグレードしない",
     "installer/upgrade_error": "アップグレード中にエラーが発生しました。",
     "moderator/staff_cp": "StaffCP",
-    "general/connect": "接続"
+    "general/connect": "接続",
+    "admin/trusted_proxies_not_configured": "{{linkStart}}信頼できるプロキシ{{linkEnd}}が設定されていない場合、IP banが正しく機能しない可能性があります。",
+    "user/user_has_unlinked_integration": "{{user}}は{{integration}}のアカウントへのリンクを解除しました。",
+    "user/user_has_verified_integration": "{{user}}は{{integration}}のアカウントを認証しました。",
+    "api/integration_identifier_already_linked": "{{integration}}の識別子は、すでに他のユーザーとリンクしています。",
+    "user/user_has_linked_integration": "{{user}}は{{integration}}のアカウントへのリンクをしました。",
+    "user/integration_identifier_already_linked": "{{integration}}の識別子は、すでに他のユーザーとリンクしています。",
+    "user/integration_linked": "{{integration}}のアカウントは正常にリンクされました。",
+    "user/integration_unlinked": "{{integration}}のアカウントは正常にリンク解除されました。",
+    "user/integration_username_already_linked": "{{integration}}のユーザー名は、すでに他のユーザーとリンクしています。",
+    "api/integration_username_already_linked": "{{integration}}のユーザー名は、すでに他のユーザーとリンクしています。"
 }

From 33648223b95c82bde35a000fafa2e941e64a5051 Mon Sep 17 00:00:00 2001
From: Dominik Roman <dominikslk9@gmail.com>
Date: Mon, 20 Jun 2022 14:57:11 +0000
Subject: [PATCH 165/337] Translated using Weblate (Slovak)

Currently translated at 100.0% (1227 of 1227 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/sk/
---
 custom/languages/sk_SK.json | 77 +++++++++++++++++++++++++++++--------
 1 file changed, 61 insertions(+), 16 deletions(-)

diff --git a/custom/languages/sk_SK.json b/custom/languages/sk_SK.json
index 0a5781d7a9..9c79433d9d 100644
--- a/custom/languages/sk_SK.json
+++ b/custom/languages/sk_SK.json
@@ -7,7 +7,7 @@
     "admin/active": "Aktívny",
     "admin/add_server": "Pridať server",
     "admin/adding_server": "Pridanie serveru",
-    "admin/admin_dir_still_exists": "Varovanie! Adresár <strong>modules/Core/pages/admin</strong> stále existuje. Odstráňte tento adresár.",
+    "admin/admin_dir_still_exists": "Varovanie! Adresár modules/Core/pages/admin stále existuje. Odstráňte tento adresár.",
     "admin/administrator": "Administrátor",
     "admin/administrator_permission_info": "Členovia s týmto povolením budú mať všetky povolenia. Toto je nebezpečné povolenie na udelenie.",
     "admin/all_logs": "Všetky záznamy",
@@ -117,7 +117,7 @@
     "admin/default_avatar": "Predvolený avatar",
     "admin/default_group": "Je skupina predvolenou skupinou (pre nových užívateľov)?",
     "admin/default_language": "Hlavný jazyk",
-    "admin/default_language_help": "Užívatelia si budú môcť vybrať z ľubovoľných nainštalovaných jazykov.",
+    "admin/default_language_help": "Užívatelia si budú môcť vybrať z ľubovoľných nainštalovaných jazykov. {{docLinkStart}}\nViac informácií »{{docLinkEnd}}",
     "admin/default_server": "Predvolený server",
     "admin/default_template_set": "Predvolená šablóna bola úspešne nastavená na {{template}}.",
     "admin/default_timezone": "Predvolené časové pásmo",
@@ -182,7 +182,7 @@
     "admin/enable_api": "Povoliť API?",
     "admin/enable_authme": "Povoliť AuthMe integráciu?",
     "admin/enable_debug_mode": "Povoliť debug mód?",
-    "admin/enable_mailer_help": "Túto možnosť povoľte, ak sa emaily predvolene neposielajú. Používanie PHPMaileru vyžaduje, aby ste mali službu schopnú odosielať emaily, napríklad Gmail alebo SMTP poskytovateľ.",
+    "admin/enable_mailer_help": "Ak je povolené, e-maily sa budú odosielať pomocou PHPMailer namiesto predvoleného nastavenia systému. To môže pomôcť pri doručovaní, ale vyžaduje, aby ste nakonfigurovali poskytovateľa SMTP. {{docLinkStart}}Viac informácií »{{docLinkEnd}}",
     "admin/enable_maintenance_mode": "Povoliť režim údržby?",
     "admin/enable_minecraft_integration": "Povoliť Minecraft integráciu?",
     "admin/enable_nicknames_on_registration": "Povoliť prezývky pre registrujúcich užívateľov?",
@@ -192,7 +192,7 @@
     "admin/enable_registration": "Povoliť registráciu?",
     "admin/enable_status_query": "Povoliť query stav?",
     "admin/enable_username_sync": "Povoliť synchronizáciu užívateľského mena?",
-    "admin/enable_username_sync_info": "Ak je táto možnosť povolená, užívateľské mená na webstránke sa aktualizujú tak, aby sa zhodovali s užívateľskými menami v hre.",
+    "admin/enable_username_sync_info": "Ak je táto možnosť povolená, užívateľské mená na webstránke sa aktualizujú tak, aby sa zhodovali s užívateľskými menami v hre. Stáva sa to, keď plugin v hre odošle na webovú stránku zoznam UUID a používateľských mien pre online hráčov.",
     "admin/enabled": "Povolené",
     "admin/enter_authme_db_details": "Prosím zadajte platné údaje o databáze.",
     "admin/error_deleted_successfully": "Chyba bola úspešne odstránená.",
@@ -212,7 +212,7 @@
     "admin/find_modules": "Nájsť moduly",
     "admin/find_templates": "Nájsť šablóny",
     "admin/force_https": "Vynútiť https?",
-    "admin/force_https_help": "Ak je povolené, všetky požiadavky na vaše webstránky budú presmerované na https. Aby táto funkcia fungovala správne, musíte mať aktívny a platný SSL certifikát.",
+    "admin/force_https_help": "Ak je povolené, všetky požiadavky na vaše webstránky budú presmerované na https. Aby táto funkcia fungovala, musíte mať aktívny a platný SSL certifikát.",
     "admin/force_premium_accounts": "Vynútiť prémiové Minecraft účty?",
     "admin/force_tfa": "Vynútiť dvojfaktorovú autentifikáciu pre členov skupiny?",
     "admin/force_tfa_alert": "Vaša skupina vyžaduje, aby ste mali povolené dvojfaktorové overenie.",
@@ -256,7 +256,7 @@
     "admin/hook_edited": "Hook bol úspešne upravený",
     "admin/hook_events": "Udalosti na spustenie tohto webhooku",
     "admin/hook_name": "Názov webhooku",
-    "admin/hook_select_info": "Zobrazia sa iba hooky s udalosťou vybranou ako 'Nová téma'.",
+    "admin/hook_select_info": "Zobrazia sa iba hooky s vybratými udalosťami „Nová téma“ alebo „Odpoveď na tému“.",
     "admin/hook_type": "Typ webhooku",
     "admin/hook_url": "URL adresa webhooku",
     "admin/hooks": "Webhooky",
@@ -319,7 +319,7 @@
     "admin/minecraft_uuid": "Minecraft UUID",
     "admin/missing_contact_address": "Vložte kontaktnú emailovú adresu o dĺžke 3 až 255 znakov.",
     "admin/missing_sitename": "Vložte názov webu o dĺžke 2 až 64 znakov.",
-    "admin/mod_dir_still_exists": "Varovanie! Adresár <strong>modules/Core/pages/mod</strong> stále existuje. Odstráňte tento adresár.",
+    "admin/mod_dir_still_exists": "Varovanie! Adresár modules/Core/pages/mod stále existuje. Odstráňte tento adresár.",
     "admin/mode_toggle": "Tmavý režim",
     "admin/module": "Modul",
     "admin/module_disabled": "Modul zakázaný.",
@@ -336,7 +336,7 @@
     "admin/navbar_icon": "Ikona navigačnej lišty",
     "admin/navbar_icon_instructions": "Môžete tu tiež pridať ikonu ku každej položke navigačnej lišty, napríklad pomocou {{faLink}}, {{semLink}}.",
     "admin/navbar_order": "Poradie v navigačnej lište",
-    "admin/navbar_order_instructions": "Každej položke môžete dať číslo 0 k zoradeniu položiek v navigačnej lište, číslo 1 bude prvá položka navigačnej lišty a ďalšie čísla za 1 sa v nej budú ďalej zoraďovať.",
+    "admin/navbar_order_instructions": "Každej položke je možné priradiť kladné číslo, pričom najnižšie číslo sa v navigačnej lište zobrazí ako prvé a vyššie čísla budú nasledovať po ňom.",
     "admin/navigation": "Navigácia",
     "admin/navigation_settings_updated_successfully": "Nastavenia navigácie sa úspešne aktualizovali.",
     "admin/negative": "Negatívne",
@@ -507,7 +507,7 @@
     "admin/server_port_maximum": "Uistite sa, že port vášho servera má maximálne 5 znakov",
     "admin/server_port_minimum": "Uistite sa, že port vášho servera má minimálne 2 znaky",
     "admin/server_port_required": "Prosím zadajte port serveru",
-    "admin/server_query_information": "Ak chcete na svojej webstránke zobraziť zoznam online hráčov, musí váš server <strong>mať</strong> povolenú možnosť 'enable-query' v <strong>server.properties</strong> súbore vášho servera",
+    "admin/server_query_information": "Ak chcete na svojej webstránke zobraziť zoznam online hráčov, musí váš server mať povolenú možnosť 'enable-query' v server.properties súbore vášho servera",
     "admin/server_query_port": "Query port serveru",
     "admin/server_query_port_help": "Toto je query.port možnosť v súbore <strong>server.properties</strong> vášho servera za predpokladu, že je možnosť enable-query v rovnakom súbore nastavená na hodnotu true.",
     "admin/server_updated": "Server bol úspešne aktualizovaný.",
@@ -571,7 +571,7 @@
     "admin/unable_to_retrieve_modules": "Nepodarilo sa načítať moduly",
     "admin/unable_to_retrieve_nameless_news": "Nie je možné načítať najnovšie novinky",
     "admin/unable_to_retrieve_templates": "Šablóny sa nepodarilo načítať",
-    "admin/unable_to_write_email_config": "Nedá sa zapisovať do súboru <strong>core/email.php</strong>. Skontrolujte povolenia súborov.",
+    "admin/unable_to_write_email_config": "Nedá sa zapisovať do súboru core/email.php. Skontrolujte povolenia súborov.",
     "admin/unknown": "Neznáme",
     "admin/unlink": "Odpojiť",
     "admin/unlink_account_confirm": "Naozaj chcete násilne odpojiť tohto poskytovateľa od tohto používateľa?",
@@ -591,7 +591,7 @@
     "admin/upgrade_php_version": "Aktualizujte svoju PHP verziu aspoň na 7.4 – ďalšie Nameless vydanie už nebude podporovať verziu, ktorú používate.",
     "admin/upload_new_image": "Nahrať nový obrázok",
     "admin/use_friendly_urls": "Priateľské URL",
-    "admin/use_friendly_urls_help": "DÔLEŽITÉ: Aby to fungovalo, váš server musí byť nakonfigurovaný tak, aby umožňoval použitie mod_rewrite a .htaccess súboru.",
+    "admin/use_friendly_urls_help": "Ak je povolené, použijú sa čistejšie webové adresy. Aby to fungovalo, musíte povoliť použitie mod_rewrite a .htaccess súborov. {{docLinkStart}}Viac informácií »{{docLinkEnd}}",
     "admin/user": "Užívateľ",
     "admin/user_deleted": "Užívateľ úspešne zmazaný.",
     "admin/user_id": "ID užívateľa",
@@ -682,7 +682,7 @@
     "general/content": "Obsah",
     "general/cookie_notice": "Táto webstránka používa súbory cookie na zlepšenie vášho zážitku z prehliadania. Registráciou na našom webe alebo zatvorením tohto oznámenia súhlasíte s ich použitím.",
     "general/copied": "Skopírované!",
-    "general/currently_1_player_online": "Aktuálne je online <strong>1</strong> hráč.",
+    "general/currently_1_player_online": "Aktuálne je online 1 hráč.",
     "general/currently_x_players_online": "Aktuálne je {{count}} online hráčov.",
     "general/date": "Dátum",
     "general/delete": "Odstrániť",
@@ -789,8 +789,8 @@
     "installer/host_help": "Hostname je <strong>základná URL adresa</strong> vášho webu. Sem nezahŕňajte podpriečinky z poľa Cesta inštalácie ani http(s)://!",
     "installer/hostname_error": "Zadajte platný názov hostiteľa bez http:// alebo https://",
     "installer/initialising_database_and_cache": "Inicializuje sa databáza a cache, čakajte prosím...",
-    "installer/input_maximum": "Uistite sa, že vaše užívateľské meno má najviac 20 znakov a vaša emailová adresa a heslo majú maximálne 64 znakov.",
-    "installer/input_minimum": "Uistite sa, že vaše užívateľské meno má minimálne 3 znaky, vaša emailová adresa má minimálne 4 znaky a vaše heslo má minimálne 6 znakov.",
+    "installer/input_maximum": "Uistite sa, že vaše užívateľské meno má maximálne {{maxUsername}} znakov, vaša emailová adresa maximálne {{maxEmail}} znakov a heslo má maximálne {{maxPassword}} znakov.",
+    "installer/input_minimum": "Uistite sa, že vaše užívateľské meno má minimálne {{minUsername}} znaky, vaša emailová adresa má minimálne {{minEmail}} znaky a vaše heslo má minimálne {{minPassword}} znakov.",
     "installer/input_required": "Zadajte platné užívateľské meno, emailovú adresu a heslo.",
     "installer/input_v1_details": "Zadajte podrobnosti databázy pre vašu Nameless v1 inštaláciu.",
     "installer/install": "Inštalovať",
@@ -944,7 +944,7 @@
     "user/authme_account_linked": "Účet bol úspešne prepojený.",
     "user/authme_email_help_1": "Na záver zadajte svoju emailovú adresu.",
     "user/authme_email_help_2": "Nakoniec zadajte svoju emailovú adresu a tiež vyberte zobrazované meno pre svoj účet.",
-    "user/authme_help": "Zadajte podrobnosti svojho účtu AuthMe v hre. Ak ešte nemáte účet, pripojte sa k serveru a postupujte podľa uvedených pokynov.",
+    "user/authme_help": "Zadajte údaje svojho účtu AuthMe v hre. Ak ešte nemáte účet, pripojte sa k serveru a postupujte podľa uvedených pokynov.",
     "user/authme_username_exists": "Váš účet AuthMe už bol pripojený k webstránke!",
     "user/avatar": "Avatar",
     "user/block_user": "Blokovať užívateľa",
@@ -1180,5 +1180,50 @@
     "user/not_connected": "Nepripojené",
     "user/overview": "Prehľad",
     "user/user_has_unlinked_integration": "Používateľ {{user}} odpojil svoj {{integration}} účet.",
-    "user/user_has_verified_integration": "Používateľ {{user}} overil svoj {{integration}} účet."
+    "user/user_has_verified_integration": "Používateľ {{user}} overil svoj {{integration}} účet.",
+    "general/deleted_user": "Zmazaný užívateľ",
+    "admin/custom_content": "Vlastný obsah",
+    "admin/use_external_mail_server": "Použiť externý mailový server",
+    "installer/upgrade_error": "Pri aktualizácii sa vyskytli chyby.",
+    "installer/config_write_failed": "Nepodarilo sa zapísať do konfiguračného súboru:\n{{message}}",
+    "installer/database_connection_failed": "Nepodarilo sa pripojiť k databáze:\n<br>{{message}}",
+    "admin/debugging_enabled": "Ladenie je povolené, citlivé informácie môžu byť vystavené neautorizovaným návštevníkom. Ladenie by malo byť použité len pre vývoj, nie na verejných stránkach.",
+    "admin/not_set": "Nenastavené",
+    "admin/trusted_proxies_configured": "Dôveryhodné proxy servery",
+    "admin/page_url_contains_nameless_path": "Vaša vlastná stránka by prepísala stránku NamelessMC.",
+    "admin/https_port_80": "Vyzerá to, že používate HTTPS na porte 80, čo je určite nepravda. Ak používate Cloudflare, uistite sa že máte TLS encryption mód nastavený na Full (strict). Ak používate vlastný proxy server, nastavte ho aby posielal X-Forwarded-Port header.",
+    "general/auto_language": "Automatický jazyk",
+    "general/blue": "Modrá",
+    "general/violet": "Fialová",
+    "general/or": "ALEBO",
+    "admin/group_sync_no_results_warning": "Pravidlá synchronizácie skupín sú nastavené ale žiadne zmeny neboli nahlásené. Toto môže znamenať zlé nastavenie.",
+    "admin/test_email_query": "Nedostáva sa do vašej doručenej pošty? Skúste následovné:",
+    "admin/test_email_suggest_1": "Počkajte niekoľko minút a skontrolujte priečinok nevyžiadanej pošty.",
+    "admin/test_email_suggest_2": "Aktualizujte DNS záznamy vašej stránky (skontrolujte SPF a DKIM).",
+    "admin/test_email_suggest_3": "Nastavte SMTP server.\n{{docLinkStart}}Čítať viac »\n{{docLinkEnd}}",
+    "admin/trusted_proxies_not_configured": "{{linkStart}}Dôveryhodné proxy servery\n{{linkEnd}} nie sú nastavené, IP zákazy nemusia správne fungovať.",
+    "general/orange": "Oranžová",
+    "general/default": "Predvolené",
+    "general/red": "Červená",
+    "general/yellow": "Žltá",
+    "general/olive": "Olivová",
+    "installer/database_configured": "Databáza bola nastavená.",
+    "admin/api_disabled": "API je zakázané",
+    "general/teal": "Modrozelená",
+    "general/purple": "Fialová",
+    "general/pink": "Ružová",
+    "general/green": "Zelená",
+    "general/brown": "Hnedá",
+    "general/grey": "Sivá",
+    "user/nickname_required": "Prezývka je požadovaná.",
+    "user/no_providers_admin": "Administrátori stránky zatiaľ nenastavili žiadnych poskytovateľov OAuth.",
+    "user/nickname_maximum_20": "Vaša prezývka môže mať maximálne 20 znakov.",
+    "user/nickname_minimum_3": "Vaša prezývka musí mať minimálne 3 znaky.",
+    "admin/debug_link_info": "Doležité - tento odkaz zdieľaj len s ľuďmi, ktorým dôveruješ!",
+    "admin/home_custom_content": "Vlastný obsah domovskej stránky",
+    "admin/homepage_news": "Novinky",
+    "admin/updated": "Aktualizované",
+    "admin/user_group_added_hook_info": "Uživateľská skupina pridaná",
+    "admin/user_group_removed_hook_info": "Užívateľská skupina odstránená",
+    "admin/group_name": "Názov skupiny"
 }

From 781240ec0f8f54282cc985d714eeb81b96c1e1a7 Mon Sep 17 00:00:00 2001
From: snake <admin@viasnake.com>
Date: Sun, 19 Jun 2022 06:07:33 +0000
Subject: [PATCH 166/337] Translated using Weblate (Japanese)

Currently translated at 100.0% (51 of 51 strings)

Translation: NamelessMC/Website - Discord Integration
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-discord-integration/ja/
---
 .../Discord Integration/language/ja_JP.json   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/modules/Discord Integration/language/ja_JP.json b/modules/Discord Integration/language/ja_JP.json
index 9fc09c5189..db8583d3c2 100644
--- a/modules/Discord Integration/language/ja_JP.json	
+++ b/modules/Discord Integration/language/ja_JP.json	
@@ -2,7 +2,7 @@
     "discord_integration/discord": "Discord",
     "discord_integration/discord_already_pending": "すでに検証が保留されています。",
     "discord_integration/discord_bot_error_badparameter": "無効なリクエストボディです。",
-    "discord_integration/discord_bot_error_error": "ボットの内部エラーが発生しました。",
+    "discord_integration/discord_bot_error_error": "ボットで内部エラーが発生しました。",
     "discord_integration/discord_bot_error_invguild": "提供されたギルドIDが無効であるか、ボットが入っていません。",
     "discord_integration/discord_bot_error_invrole": "提供されたロールIDが無効です。",
     "discord_integration/discord_bot_error_invuser": "提供されたユーザーIDが無効であるか、指定されたギルドに入っていません。",
@@ -10,15 +10,15 @@
     "discord_integration/discord_bot_error_partsuccess": "Discordのロール階層の誤設定により、ボットが1つ以上のロールを編集できませんでした。",
     "discord_integration/discord_bot_error_unauthorized": "ウェブサイトのAPIキーが無効",
     "discord_integration/discord_bot_must_be_setup": "ボットを設定するまでは、Discord統合を有効にすることはできません。詳細については、{{linkStart}}ここをクリック{{linkEnd}} してください。",
-    "discord_integration/discord_bot_setup": "ボットの設定",
+    "discord_integration/discord_bot_setup": "ボットの設定ですか？",
     "discord_integration/discord_communication_error": "Discordボットとの通信中にエラーが発生しました。ボットが動作しているかどうか、ボットのURLが正しいかどうかを確認してください。",
     "discord_integration/discord_database_error": "Nameless Link データベースが現在ダウンしています。後でもう一度お試しください。",
     "discord_integration/discord_guild_id": "DiscordサーバーID",
     "discord_integration/discord_id_confirm": "Discordで「 \"/verify {{token}}\" {トークン}」というコマンドを実行して、Discordアカウントのリンクを完了させてください。",
     "discord_integration/discord_id_help": "Discord IDがどこにあるかについては、{{linkStart}}こちら{{linkEnd}} をご確認ください。",
-    "discord_integration/discord_id_length": "Discord IDは18文字以内にしてください。",
-    "discord_integration/discord_id_numeric": "Discord IDが数字であることを確認してください(数字のみ)",
-    "discord_integration/discord_id_set": "Discord IDの設定に成功しました。",
+    "discord_integration/discord_id_length": "Discord サーバーIDは18文字以内にしてください。",
+    "discord_integration/discord_id_numeric": "Discord サーバーIDが数字であることを確認してください（数字のみ）。",
+    "discord_integration/discord_id_set": "Discord IDの設定に成功しました",
     "discord_integration/discord_id_taken": "そのDiscord IDはすでに取られています。",
     "discord_integration/discord_id_unlinked": "Discord ユーザーIDのリンクを解除することに成功しました。",
     "discord_integration/discord_integration_disabled": "Discordの連携は無効になっています。",
@@ -37,9 +37,17 @@
     "discord_integration/not_linked": "リンクされていません",
     "discord_integration/pending_link": "保留中",
     "discord_integration/provide_one_discord_settings": "次の項目のうち、少なくとも1つをご記入ください: \"URL\"、\"guild_id\"",
-    "discord_integration/unable_to_set_discord_bot_url": "DiscordボットのURLが設定できません。",
+    "discord_integration/unable_to_set_discord_bot_url": "DiscordボットのURLが設定できません",
     "discord_integration/unable_to_set_discord_id": "Discord IDを設定できません。",
     "discord_integration/unable_to_update_discord_bot_username": "Discordボットのユーザー名を更新できません。",
     "discord_integration/unable_to_update_discord_roles": "Discordのロールリストを更新できません。",
-    "discord_integration/unable_to_update_discord_username": "Discordのユーザー名を更新できません。"
+    "discord_integration/unable_to_update_discord_username": "Discordのユーザー名を更新できません。",
+    "discord_integration/discord_id_required": "Discord サーバーIDを入力してください。",
+    "discord_integration/discord_settings_updated": "Discordの設定が正常に更新されました",
+    "discord_integration/discord_widget_error": "Discordウィジェットを取得する際にエラーが発生しました: {{error}}",
+    "discord_integration/get_link_code": "リンクコードを取得",
+    "discord_integration/discord_username": "Discord ユーザー名",
+    "discord_integration/discord_bot_check_logs": "StaffCP -> セキュリティ -> 全てのログで、より具体的なエラー（存在する場合）を確認する必要があります。",
+    "discord_integration/discord_user_id": "Discord ユーザーID",
+    "discord_integration/discord_widget_disabled": "指定されたDiscordサーバーでウィジェットが無効になっています。Discordのサーバー設定の'ウィジェット'タブを開き、Discordのウィジェットが有効になっているか、IDが正しいかを確認してください。"
 }

From e1e7efedb247b838f745e95752a201c8216a5da2 Mon Sep 17 00:00:00 2001
From: Dominik Roman <dominikslk9@gmail.com>
Date: Mon, 20 Jun 2022 15:45:36 +0000
Subject: [PATCH 167/337] Translated using Weblate (Slovak)

Currently translated at 100.0% (51 of 51 strings)

Translation: NamelessMC/Website - Discord Integration
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-discord-integration/sk/
---
 modules/Discord Integration/language/sk_SK.json | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/Discord Integration/language/sk_SK.json b/modules/Discord Integration/language/sk_SK.json
index 4ebff419e9..43698b1993 100644
--- a/modules/Discord Integration/language/sk_SK.json	
+++ b/modules/Discord Integration/language/sk_SK.json	
@@ -17,8 +17,8 @@
     "discord_integration/discord_guild_id": "ID Discord serveru",
     "discord_integration/discord_id_confirm": "Spustite príkaz \"/verify {{token}}\" v Discorde, aby ste dokončili prepojenie svojho Discord účtu.",
     "discord_integration/discord_id_help": "Informácie o tom, kde nájdete Discord ID, si prečítajte {{linkStart}}toto.{{linkEnd}}",
-    "discord_integration/discord_id_length": "Uistite sa, že vaše Discord ID má 18 znakov.",
-    "discord_integration/discord_id_numeric": "Uistite sa, že vaše Discord ID je číselné (iba čísla).",
+    "discord_integration/discord_id_length": "Uistite sa, že vaše ID discord servera má 18 znakov.",
+    "discord_integration/discord_id_numeric": "Uistite sa, že vaše ID discord servera je číselné (iba čísla).",
     "discord_integration/discord_id_set": "Discord ID bolo úspešne nastavené",
     "discord_integration/discord_id_taken": "Toto Discord ID už bolo použité.",
     "discord_integration/discord_id_unlinked": "Vaše Discord ID bolo úspešne odpojené.",
@@ -47,5 +47,7 @@
     "discord_integration/unable_to_set_discord_id": "Nepodarilo sa nastaviť Discord ID.",
     "discord_integration/unable_to_update_discord_bot_username": "Nepodarilo sa aktualizovať Discord užívateľské meno bota.",
     "discord_integration/unable_to_update_discord_roles": "Nepodarilo sa aktualizovať zoznam Discord rolí.",
-    "discord_integration/unable_to_update_discord_username": "Nepodarilo sa aktualizovať Discord užívateľské meno."
+    "discord_integration/unable_to_update_discord_username": "Nepodarilo sa aktualizovať Discord užívateľské meno.",
+    "discord_integration/discord_widget_error": "Pri získavaní widgetu Discord sa vyskytla chyba: {{error}}.",
+    "discord_integration/discord_id_required": "Zadajte ID vášho discord servera."
 }

From 860c42594d85f37296129f9bae63f69ceeb51069 Mon Sep 17 00:00:00 2001
From: Edem Myle <cameratestadi@gmail.com>
Date: Sat, 18 Jun 2022 09:13:22 +0000
Subject: [PATCH 168/337] Translated using Weblate (Hungarian)

Currently translated at 5.9% (73 of 1227 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/hu/
---
 custom/languages/hu_HU.json | 76 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 75 insertions(+), 1 deletion(-)

diff --git a/custom/languages/hu_HU.json b/custom/languages/hu_HU.json
index 0967ef424b..99e1af350a 100644
--- a/custom/languages/hu_HU.json
+++ b/custom/languages/hu_HU.json
@@ -1 +1,75 @@
-{}
+{
+    "admin/user_group_removed_hook_info": "Felhasználói csoport eltávolítva",
+    "admin/account_verification": "Minecraft fiók ellenőrzése",
+    "admin/acp_logins": "StaffCP bejelentkezések",
+    "admin/action": "Akció",
+    "admin/action_info": "Akció információ",
+    "admin/active": "Aktív",
+    "admin/add_server": "Szerver hozzáadása",
+    "admin/adding_server": "Szerver hozzáadása",
+    "admin/administrator": "Adminisztrátor",
+    "admin/administrator_permission_info": "Az ezzel az engedéllyel rendelkező tagok minden engedéllyel rendelkeznek. Ez egy veszélyes engedély.",
+    "admin/all_logs": "Minden napló",
+    "admin/allow_custom_avatars": "Engedélyezi az egyéni felhasználói avatárokat?",
+    "admin/announcement_info": "Hozz létre közleményeket, amelyek üzenetet jelenítenek meg bizonyos csoportok számára webhelye bizonyos oldalain.",
+    "admin/announcement_hook_info": "Közlemény létrehozása",
+    "admin/announcement_order": "Rendelés",
+    "admin/announcements": "Közlemények",
+    "admin/api": "API",
+    "admin/api_endpoints": "API-végpontok",
+    "admin/api_key": "API-Kulcs",
+    "admin/api_key_regenerated": "Az API-kulcs újragenerálása sikeresen megtörtént.",
+    "admin/api_registration_email": "API regisztrációs Email",
+    "admin/api_settings_updated_successfully": "Az API beállítások sikeresen frissítve lettek.",
+    "admin/api_url": "API URL",
+    "admin/api_verification": "Engedélyezi az API-ellenőrzést?",
+    "admin/at_least_one_external": "Adj meg legalább 1 külső csoportot (Minecraft vagy Discord)",
+    "admin/authme_db_address": "AuthMe adatbázis-cím",
+    "admin/authme_db_name": "AuthMe adatbázis neve",
+    "admin/authme_db_password": "AuthMe adatbázis jelszava",
+    "admin/authme_db_password_hidden": "Az AuthMe adatbázis jelszava biztonsági okokból rejtve van.",
+    "admin/authme_db_port": "AuthMe adatbázis-port",
+    "admin/authme_db_table": "AuthMe felhasználói táblázat",
+    "admin/authme_db_user": "AuthMe Database felhasználónév",
+    "admin/authme_hash_algorithm": "AuthMe kivonatolási algoritmus",
+    "admin/authme_integration": "AuthMe integráció",
+    "admin/authme_integration_info": "Ha az AuthMe integráció engedélyezve van, a felhasználók csak a játékon belül regisztrálhatnak.",
+    "admin/authme_password_sync": "Szinkronizálja az AuthMe jelszót?",
+    "admin/authme_password_sync_help": "Ha engedélyezve van, amikor egy felhasználó jelszavát frissítik a játékban, a jelszó a webhelyen is frissül.",
+    "admin/author": "Szerző:",
+    "admin/author_x": "Szerző: {{author}}",
+    "admin/avatar_settings_updated_successfully": "Az Avatar beállításai sikeresen frissítve.",
+    "admin/avatars": "Avatárok",
+    "admin/average_players": "Átlagos játékosok",
+    "admin/background_colour_required": "A Háttérszín kötelező",
+    "admin/ban_hook_info": "Felhasználó kitiltva",
+    "admin/banner_background": "Banner háttér",
+    "admin/banner_image_x": "Banner háttér: {{imageName}}",
+    "admin/basic_page": "Alapoldal?",
+    "admin/bedrock": "Bedrock?",
+    "admin/bedrock_help": "Válassza ezt a lehetőséget, ha a szerver egy Bedrock szerver.",
+    "admin/built_in_avatars": "Beépített avatár szolgáltatás",
+    "admin/bungee_instance": "BungeeCord példány?",
+    "admin/bungee_instance_help": "Válaszd ezt a lehetőséget, ha a kiszolgáló egy BungeeCord példány.",
+    "admin/bust": "mell",
+    "admin/cache_cleared": "A sablon gyorsítótára törölve",
+    "admin/cache_not_writable": "A cache-könyvtár nem írható.",
+    "admin/can_edit_own_group": "Szerkesztheted a saját csoport engedélyeid",
+    "admin/can_unlink": "Leválasztható",
+    "admin/can_unlink_integration": "A felhasználók leválaszthatják az integrációt?",
+    "admin/can_view_announcement": "Megtekintheti a Hirdetményt",
+    "admin/can_view_staffcp": "Megtekintheti a csoport a StaffCP-t?",
+    "admin/cant_modify_root_user": "A felhasználó főcsoportja nem módosítható!",
+    "admin/cant_write_to_template": "Nem lehet sablonfájlba írni! Kérjük, ellenőrizd a fájlengedélyeket.",
+    "admin/user_group_added_hook_info": "Felhasználói csoport hozzáadva",
+    "admin/activate": "Aktiváld",
+    "admin/admin_dir_still_exists": "Figyelem! A /modules/Core/pages/admin könyvtár továbbra is létezik. Kérjük, távolítsd el ezt a könyvtárat.",
+    "admin/announcement_icon_instructions": "Itt is hozzáadhatsz egy ikont minden közleményhez, például a {{faLink}} vagy a {{semLink}} használatával.",
+    "admin/api_endpoints_info": "Az API-végpontok lehetővé teszik a modulok számára, hogy módokat hozzanak létre a külső alkalmazások (például a Minecraft és a Discord) számára, hogy interakcióba lépjenek a NamelessMC webhelyeddel. Tekintse meg az API dokumentációját {{docLinkStart}}itt{{docLinkEnd}}",
+    "admin/api_info": "Az API lehetővé teszi, hogy a beépülő modulok és más szolgáltatások interakcióba lépjenek a webhelyével, mint például a {{pluginLinkStart}}hivatalos Nameless plugin{{pluginLinkEnd}} és a {{botLinkStart}}hivatalos NamelessMC Discord Bot{{botLinkEnd}}.",
+    "admin/api_verification_info": "Ha engedélyezve van, a fiókok csak az API-n keresztül ellenőrizhetők, például játékon belül a hivatalos Nameless bővítmény használatával. Ez az opció felülbírálja az e-mail-ellenőrzést, és a fiókok automatikusan aktiválódnak!\\nÁllítsd be az alapértelmezett csoportot, hogy korlátozott jogosultságokkal rendelkezz, majd frissítsd az ellenőrzés utáni csoportot a StaffCP -> Configuration -> Registration lapon a teljes tagcsoportra, normál engedélyekkel.",
+    "admin/background_colour": "Átlagos játékosok",
+    "admin/banner_updated_successfully": "A banner sikeresen frissítve. Eltarthat egy ideig, amíg a módosítások életbe lépnek.",
+    "admin/cant_edit_this_group": "Nem szerkesztheted ennek a csoportnak az engedélyeit!",
+    "admin/captcha_general": "Engedélyezed a Captchát a regisztrációs oldalon?"
+}

From e284654e8849d1d96ba55798ffd5cb06dca4b4d1 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Tue, 21 Jun 2022 22:13:40 -0600
Subject: [PATCH 169/337] Log phinx output to file

---
 core/classes/Database/PhinxAdapter.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/classes/Database/PhinxAdapter.php b/core/classes/Database/PhinxAdapter.php
index 5b7b8ca421..c5a91492cb 100644
--- a/core/classes/Database/PhinxAdapter.php
+++ b/core/classes/Database/PhinxAdapter.php
@@ -29,16 +29,21 @@ public static function ensureUpToDate(): void {
 
     /**
      * Runs any pending migrations. Used for installation and upgrades. Resource heavy, only call when needed.
+     * Logs output of Phinx to other-log.log file
      *
      * @return string Output of the migration command from Phinx as if it was executed in the console.
      */
     public static function migrate(): string {
-        return (new Phinx\Wrapper\TextWrapper(
+        $output = (new Phinx\Wrapper\TextWrapper(
             new Phinx\Console\PhinxApplication(),
             [
                 'configuration' => __DIR__ . '/../../migrations/phinx.php',
             ]
         ))->getMigrate();
+
+        ErrorHandler::logCustomError($output);
+
+        return $output;
     }
 
 }

From ff8d8b65ba2c92e2d2dd1fe5426b9da9cb033e55 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Tue, 21 Jun 2022 22:16:35 -0600
Subject: [PATCH 170/337] Move `run_mcassoc` file to Core module

---
 {core/integration => modules/Core/includes}/run_mcassoc.php | 0
 modules/Core/pages/register.php                             | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename {core/integration => modules/Core/includes}/run_mcassoc.php (100%)

diff --git a/core/integration/run_mcassoc.php b/modules/Core/includes/run_mcassoc.php
similarity index 100%
rename from core/integration/run_mcassoc.php
rename to modules/Core/includes/run_mcassoc.php
diff --git a/modules/Core/pages/register.php b/modules/Core/pages/register.php
index c3470f7679..f9ea4f5763 100644
--- a/modules/Core/pages/register.php
+++ b/modules/Core/pages/register.php
@@ -88,7 +88,7 @@
     $mcassoc = new MCAssoc($mcassoc_shared_secret, $mcassoc_site_id, $mcassoc_instance_secret);
     $mcassoc->enableInsecureMode();
 
-    require(ROOT_PATH . '/core/integration/run_mcassoc.php');
+    require('../includes/run_mcassoc.php');
     die();
 }
 
@@ -261,7 +261,7 @@
                         $mcassoc = new MCAssoc($mcassoc_shared_secret, $mcassoc_site_id, $mcassoc_instance_secret);
                         $mcassoc->enableInsecureMode();
 
-                        require(ROOT_PATH . '/core/integration/run_mcassoc.php');
+                        require('../includes/run_mcassoc.php');
 
                     } else {
                         // Disabled

From db4dece544758eba6b62052ce006be95450d5a7b Mon Sep 17 00:00:00 2001
From: Robin <robin+git@rkslot.nl>
Date: Wed, 22 Jun 2022 04:41:15 +0000
Subject: [PATCH 171/337] Move email settings to config.php (#2878)

Co-authored-by: Tadhg Boyle <tadhgsmboyle@gmail.com>
---
 core/classes/Core/Config.php                  | 22 +++++-
 core/classes/Core/Email.php                   | 14 ++--
 core/email.php                                | 11 ---
 ...20190645_move_email_settings_to_config.php | 36 ++++++++++
 core/migrations/phinx.php                     |  4 +-
 custom/languages/en_UK.json                   |  1 -
 modules/Core/pages/panel/emails.php           | 72 ++++---------------
 7 files changed, 80 insertions(+), 80 deletions(-)
 delete mode 100644 core/email.php
 create mode 100644 core/migrations/20220620190645_move_email_settings_to_config.php

diff --git a/core/classes/Core/Config.php b/core/classes/Core/Config.php
index 138a1beed0..5e7f5071f1 100644
--- a/core/classes/Core/Config.php
+++ b/core/classes/Core/Config.php
@@ -49,7 +49,7 @@ public static function all(): array {
      * @param array $config New config array to store.
      */
     public static function write(array $config): void {
-        $contents = '<?php' . PHP_EOL . '$conf = ' . var_export($config, true) . ';';
+        $contents = '<?php' . PHP_EOL . '$conf = ' . self::arrayToString($config) . ';';
         if (file_put_contents(ROOT_PATH . '/core/config.php', $contents) === false) {
             throw new RuntimeException('Failed to write to config file');
         }
@@ -63,11 +63,12 @@ public static function write(array $config): void {
      * Get a config value from `core/config.php` file.
      *
      * @param string $path `.` seperated path of key to get from config file.
+     * @param mixed $fallback Value to return if option is not present in config file. If set to null, false is returned.
      * @return false|mixed Returns false if key doesn't exist, otherwise returns the value.
      *
      * @throws RuntimeException If the config file is not found.
      */
-    public static function get(string $path) {
+    public static function get(string $path, $fallback = null) {
         $config = self::all();
 
         $parsed_path = self::parsePath($path);
@@ -88,7 +89,7 @@ public static function get(string $path) {
             return $config;
         }
 
-        return false;
+        return $fallback ?? false;
     }
 
     /**
@@ -160,4 +161,19 @@ private static function parsePath(string $path) {
 
         return $path;
     }
+
+    /**
+     * Converts an array to a string to be inserted into the config file, with shorthand array syntax.
+     *
+     * @link https://gist.github.com/Bogdaan/ffa287f77568fcbb4cffa0082e954022
+     * @param array $config Config array to convert to string.
+     * @return string PHP code for the config array
+     */
+    private static function arrayToString(array $config): string {
+        $export = var_export($config, true);
+        $export = preg_replace("/^(' '*)(.*)/m", '$1$1$2', $export);
+        $array = preg_split("/\r\n|\n|\r/", $export);
+        $array = preg_replace(["/\s*array\s\($/", "/\)(,)?$/", "/\s=>\s$/"], [null, ']$1', ' => ['], $array);
+        return implode(PHP_EOL, array_filter(["["] + ($array ?: [])));
+    }
 }
diff --git a/core/classes/Core/Email.php b/core/classes/Core/Email.php
index 5f7dac67ae..d6567a955f 100644
--- a/core/classes/Core/Email.php
+++ b/core/classes/Core/Email.php
@@ -106,15 +106,15 @@ private static function sendMailer(array $email) {
             $mail->Timeout = 15;
 
             // login to their smtp account
-            $mail->Host = $GLOBALS['email']['host'];
-            $mail->Port = $GLOBALS['email']['port'];
-            $mail->SMTPSecure = $GLOBALS['email']['secure'];
-            $mail->SMTPAuth = $GLOBALS['email']['smtp_auth'];
-            $mail->Username = $GLOBALS['email']['username'];
-            $mail->Password = $GLOBALS['email']['password'];
+            $mail->Host = Config::get('email.host', '');
+            $mail->Port = Config::get('email.port', 587);
+            $mail->SMTPSecure = Config::get('email.secure', 'tls');
+            $mail->SMTPAuth = Config::get('email.smtp_auth', true);
+            $mail->Username = Config::get('email.username', '');
+            $mail->Password = Config::get('email.password', '');
 
             // set from email ("outgoing email" seting)
-            $mail->setFrom($GLOBALS['email']['email'], $GLOBALS['email']['name']);
+            $mail->setFrom(Config::get('email.email', ''), Config::get('email.name', ''));
 
             // add a "to" address
             $mail->addAddress($email['to']['email'], $email['to']['name']);
diff --git a/core/email.php b/core/email.php
deleted file mode 100644
index 0c543f8771..0000000000
--- a/core/email.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-$GLOBALS['email'] = [
-    'email' => '',
-    'username' => '',
-    'password' => '',
-    'name' => '',
-    'host' => '',
-    'port' => 587,
-    'secure' => 'tls',
-    'smtp_auth' => true,
-];
diff --git a/core/migrations/20220620190645_move_email_settings_to_config.php b/core/migrations/20220620190645_move_email_settings_to_config.php
new file mode 100644
index 0000000000..0eb6c369c9
--- /dev/null
+++ b/core/migrations/20220620190645_move_email_settings_to_config.php
@@ -0,0 +1,36 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class MoveEmailSettingsToConfig extends AbstractMigration {
+
+    public function change(): void {
+        // New installations won't have the old email.php config file
+        if (!is_file(ROOT_PATH . '/core/email.php')) {
+            return;
+        }
+
+        // Migrate settings from core/email.php to core/config.php
+        require(ROOT_PATH . '/core/email.php');
+        $email_config = $GLOBALS['email'];
+
+        Config::set('email', [
+            'email' => $email_config['email'],
+            'username' => $email_config['username'],
+            'password' => $email_config['password'],
+            'name' => $email_config['name'],
+            'host' => $email_config['host'],
+            'port' => $email_config['port'],
+            'secure' => $email_config['secure'],
+            'smtp_auth' => $email_config['smtp_auth'],
+        ]);
+
+        try {
+            unlink(ROOT_PATH . '/core/email.php');
+        } catch (Exception $ignored) {
+            // Not a big problem if we can't delete the file, for example if it's not writable. It's not worth crashing the upgrader.
+        }
+    }
+
+}
diff --git a/core/migrations/phinx.php b/core/migrations/phinx.php
index 3c930dcdcd..88a22bce5b 100644
--- a/core/migrations/phinx.php
+++ b/core/migrations/phinx.php
@@ -1,6 +1,8 @@
 <?php
 
-define('ROOT_PATH', __DIR__ . '/../..');
+if (!defined('ROOT_PATH')) {
+    define('ROOT_PATH', __DIR__ . '/../..');
+}
 
 $config = Config::get('mysql');
 
diff --git a/custom/languages/en_UK.json b/custom/languages/en_UK.json
index c24e36e850..859602ad4a 100644
--- a/custom/languages/en_UK.json
+++ b/custom/languages/en_UK.json
@@ -616,7 +616,6 @@
     "admin/unable_to_retrieve_modules": "Unable to retrieve modules",
     "admin/unable_to_retrieve_nameless_news": "Unable to retrieve the latest news",
     "admin/unable_to_retrieve_templates": "Unable to retrieve templates",
-    "admin/unable_to_write_email_config": "Unable to write to file core\/email.php. Please check file permissions.",
     "admin/unknown": "Unknown",
     "admin/unlink": "Unlink",
     "admin/unlink_account_confirm": "Are you sure you want to forcibly unlink this provider from this user?",
diff --git a/modules/Core/pages/panel/emails.php b/modules/Core/pages/panel/emails.php
index e390fe7095..331299270c 100644
--- a/modules/Core/pages/panel/emails.php
+++ b/modules/Core/pages/panel/emails.php
@@ -170,59 +170,17 @@
 
                 if (!count($errors)) {
                     // Update config
-                    $config_path = ROOT_PATH . DIRECTORY_SEPARATOR . 'core' . DIRECTORY_SEPARATOR . 'email.php';
-                    if (file_exists($config_path)) {
-                        if (is_writable($config_path)) {
-                            require(ROOT_PATH . '/core/email.php');
-
-                            // Build new email config
-                            $config = '<?php' . PHP_EOL .
-                                '$GLOBALS[\'email\'] = array(' . PHP_EOL .
-                                '    \'email\' => \'' . (!empty($_POST['email']) ? addslashes($_POST['email']) : $GLOBALS['email']['email']) . '\',' . PHP_EOL .
-                                '    \'username\' => \'' . (!empty($_POST['username']) ? addslashes($_POST['username']) : $GLOBALS['email']['username']) . '\',' . PHP_EOL .
-                                '    \'password\' => \'' . (!empty($_POST['password']) ? addslashes($_POST['password']) : addslashes($GLOBALS['email']['password'])) . '\',' . PHP_EOL .
-                                '    \'name\' => \'' . (!empty($_POST['name']) ? addslashes($_POST['name']) : $GLOBALS['email']['name']) . '\',' . PHP_EOL .
-                                '    \'host\' => \'' . (!empty($_POST['host']) ? addslashes($_POST['host']) : $GLOBALS['email']['host']) . '\',' . PHP_EOL .
-                                '    \'port\' => ' . (!empty($_POST['port']) ? $_POST['port'] : $GLOBALS['email']['port']) . ',' . PHP_EOL .
-                                '    \'secure\' => \'' . $GLOBALS['email']['secure'] . '\',' . PHP_EOL .
-                                '    \'smtp_auth\' => ' . (($GLOBALS['email']['smtp_auth']) ? 'true' : 'false') . PHP_EOL .
-                                ');';
-
-                            $file = fopen($config_path, 'w');
-                            fwrite($file, $config);
-                            fclose($file);
-                        } else {
-                            // Permissions incorrect
-                            $errors[] = $language->get('admin', 'unable_to_write_email_config');
-                        }
-                    } else {
-                        // Create one now
-                        if (is_writable(ROOT_PATH . DIRECTORY_SEPARATOR . 'core')) {
-                            // Build new email config
-                            $config = '<?php' . PHP_EOL .
-                                '$GLOBALS[\'email\'] = array(' . PHP_EOL .
-                                '    \'email\' => \'' . (!empty($_POST['email']) ? addslashes($_POST['email']) : '') . '\',' . PHP_EOL .
-                                '    \'username\' => \'' . (!empty($_POST['username']) ? addslashes($_POST['username']) : '') . '\',' . PHP_EOL .
-                                '    \'password\' => \'' . (!empty($_POST['password']) ? addslashes($_POST['password']) : '') . '\',' . PHP_EOL .
-                                '    \'name\' => \'' . (!empty($_POST['name']) ? addslashes($_POST['name']) : '') . '\',' . PHP_EOL .
-                                '    \'host\' => \'' . (!empty($_POST['host']) ? addslashes($_POST['host']) : '') . '\',' . PHP_EOL .
-                                '    \'port\' => \'' . (!empty($_POST['port']) ? $_POST['port'] : 587) . ',' . PHP_EOL .
-                                '    \'secure\' => \'tls\',' . PHP_EOL .
-                                '    \'smtp_auth\' => true' . PHP_EOL .
-                                ');';
-                            $file = fopen($config_path, 'w');
-                            fwrite($file, $config);
-                            fclose($file);
-                        } else {
-                            $errors[] = $language->get('admin', 'unable_to_write_email_config');
-                        }
-                    }
-
-                    if (!count($errors)) {
-                        // Redirect to refresh config values
-                        Session::flash('emails_success', $language->get('admin', 'email_settings_updated_successfully'));
-                        Redirect::to(URL::build('/panel/core/emails'));
-                    }
+
+                    Config::set('email.email', !empty($_POST['email']) ? $_POST['email'] : Util::getSetting('email.email', ''));
+                    Config::set('email.username', !empty($_POST['username']) ? $_POST['username'] : Util::getSetting('email.username', ''));
+                    Config::set('email.password', !empty($_POST['password']) ? $_POST['password'] : Util::getSetting('email.password', ''));
+                    Config::set('email.name', !empty($_POST['name']) ? $_POST['name'] : Util::getSetting('email.name', ''));
+                    Config::set('email.host', !empty($_POST['host']) ? $_POST['host'] : Util::getSetting('email.host', ''));
+                    Config::set('email.port', !empty($_POST['port']) ? (int) $_POST['port'] : Util::getSetting('email.port', ''));
+
+                    // Redirect to refresh config values
+                    Session::flash('emails_success', $language->get('admin', 'email_settings_updated_successfully'));
+                    Redirect::to(URL::build('/panel/core/emails'));
                 }
             }
         } else {
@@ -259,15 +217,15 @@
         'OUTGOING_EMAIL_INFO' => $language->get('admin', 'outgoing_email_info'),
         'OUTGOING_EMAIL_VALUE' => Output::getClean(Util::getSetting('outgoing_email')),
         'USERNAME' => $language->get('user', 'username'),
-        'USERNAME_VALUE' => (!empty($GLOBALS['email']['username']) ? Output::getClean($GLOBALS['email']['username']) : ''),
+        'USERNAME_VALUE' => Output::getClean(Config::get('email.username', '')),
         'PASSWORD' => $language->get('user', 'password'),
         'PASSWORD_HIDDEN' => $language->get('admin', 'email_password_hidden'),
         'NAME' => $language->get('admin', 'name'),
-        'NAME_VALUE' => (!empty($GLOBALS['email']['name']) ? Output::getClean($GLOBALS['email']['name']) : ''),
+        'NAME_VALUE' => Output::getClean(Config::get('email.name', '')),
         'HOST' => $language->get('admin', 'host'),
-        'HOST_VALUE' => (!empty($GLOBALS['email']['host']) ? Output::getClean($GLOBALS['email']['host']) : ''),
+        'HOST_VALUE' => Output::getClean(Config::get('email.host', '')),
         'PORT' => $language->get('admin', 'email_port'),
-        'PORT_VALUE' => (!empty($GLOBALS['email']['port']) ? Output::getClean($GLOBALS['email']['port'] ?? 587) : 587),
+        'PORT_VALUE' => Output::getClean(Config::get('email.port', 587)),
         'SUBMIT' => $language->get('general', 'submit'),
         'TOKEN' => Token::get()
     ]);

From 27e0a80d5ec479dc881514d10e7bb16539114eed Mon Sep 17 00:00:00 2001
From: Robin <robin+git@rkslot.nl>
Date: Wed, 22 Jun 2022 04:41:34 +0000
Subject: [PATCH 172/337] Allow server to send correct verify command (#2881)

---
 .../classes/Integrations/MinecraftIntegration.php     | 11 ++++++++---
 .../Core/includes/endpoints/ServerInfoEndpoint.php    |  4 ++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/modules/Core/classes/Integrations/MinecraftIntegration.php b/modules/Core/classes/Integrations/MinecraftIntegration.php
index 8ea399cc88..af468aeb79 100644
--- a/modules/Core/classes/Integrations/MinecraftIntegration.php
+++ b/modules/Core/classes/Integrations/MinecraftIntegration.php
@@ -20,6 +20,12 @@ public function __construct(Language $language) {
         parent::__construct();
     }
 
+    private function flashVerifyCommand(string $verifaction_code): void {
+        $verification_command = Output::getClean(Util::getSetting('minecraft_verify_command', '/verify'));
+        $message = $this->_language->get('user', 'validate_account_command', ['command' => $verification_command . ' ' . $verification_code]);
+        Session::flash('connections_success', $message);
+    }
+
     public function onLinkRequest(User $user) {
         $username = $user->data()->username;
 
@@ -44,13 +50,12 @@ public function onLinkRequest(User $user) {
         $integrationUser = new IntegrationUser($this);
         $integrationUser->linkIntegration($user, $this->_uuid, $username, false, $code);
 
-        Session::flash('connections_success', $this->_language->get('user', 'validate_account_command', ['command' => Output::getClean('/verify ' . $code)]));
+        $this->flashVerifyCommand($code);
     }
 
     public function onVerifyRequest(User $user) {
         $integrationUser = new IntegrationUser($this, $user->data()->id, 'user_id');
-
-        Session::flash('connections_success', $this->_language->get('user', 'validate_account_command', ['command' => Output::getClean('/verify ' . $integrationUser->data()->code)]));
+        $this->flashVerifyCommand($integrationUser->data()->code);
     }
 
     public function onUnlinkRequest(User $user) {
diff --git a/modules/Core/includes/endpoints/ServerInfoEndpoint.php b/modules/Core/includes/endpoints/ServerInfoEndpoint.php
index 22880fad2c..4275b7c613 100644
--- a/modules/Core/includes/endpoints/ServerInfoEndpoint.php
+++ b/modules/Core/includes/endpoints/ServerInfoEndpoint.php
@@ -23,6 +23,10 @@ public function execute(Nameless2API $api): void {
             $api->throwError(CoreApiErrors::ERROR_INVALID_SERVER_ID, $serverId);
         }
 
+        if (isset($_POST['verify_command'])) {
+            Util::setSetting('minecraft_verify_command', $_POST['verify_command']);
+        }
+
         try {
             $api->getDb()->insert('query_results', [
                 'server_id' => $_POST['server-id'],

From 6ed111d0abdce5ffe385ac22a48922bd2b911978 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Tue, 21 Jun 2022 22:45:59 -0600
Subject: [PATCH 173/337] Remove random autoloader for constant

---
 core/autoload.php                         |  3 ---
 core/includes/constants/autoload.php      |  3 ---
 core/includes/constants/url.constants.php | 19 -------------------
 index.php                                 |  1 -
 modules/Forum/classes/Forum.php           |  9 ++++++++-
 5 files changed, 8 insertions(+), 27 deletions(-)
 delete mode 100644 core/autoload.php
 delete mode 100644 core/includes/constants/autoload.php
 delete mode 100644 core/includes/constants/url.constants.php

diff --git a/core/autoload.php b/core/autoload.php
deleted file mode 100644
index 2499ad2db8..0000000000
--- a/core/autoload.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-require_once ROOT_PATH . '/core/includes/constants/autoload.php';
diff --git a/core/includes/constants/autoload.php b/core/includes/constants/autoload.php
deleted file mode 100644
index 0981e00201..0000000000
--- a/core/includes/constants/autoload.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-require_once ROOT_PATH . '/core/includes/constants/url.constants.php';
diff --git a/core/includes/constants/url.constants.php b/core/includes/constants/url.constants.php
deleted file mode 100644
index 89c9460d66..0000000000
--- a/core/includes/constants/url.constants.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/*
- *  Made by Samerton
- *
- *  https://github.com/NamelessMC/Nameless/
- *  NamelessMC version 2.0.0-pr12
- *
- *  License: MIT
- *
- *  URL related constants
- */
-
-const URL_EXCLUDE_CHARS = [
-    '?',
-    '&',
-    '/',
-    '#',
-    '.',
-];
diff --git a/index.php b/index.php
index 7330a8b55e..ac8643e19e 100644
--- a/index.php
+++ b/index.php
@@ -46,7 +46,6 @@
 const ROOT_PATH = __DIR__;
 
 require_once __DIR__ . '/vendor/autoload.php';
-require_once __DIR__ . '/core/includes/constants/autoload.php';
 
 if (!Config::exists()) {
     if (is_file(ROOT_PATH . '/install.php')) {
diff --git a/modules/Forum/classes/Forum.php b/modules/Forum/classes/Forum.php
index 9d272ccf91..b04a5cce1c 100644
--- a/modules/Forum/classes/Forum.php
+++ b/modules/Forum/classes/Forum.php
@@ -12,6 +12,13 @@ class Forum {
     private DB $_db;
     private static array $_permission_cache = [];
     private static array $_count_cache = [];
+    private const URL_EXCLUDE_CHARS = [
+        '?',
+        '&',
+        '/',
+        '#',
+        '.',
+    ];
 
     public function __construct() {
         $this->_db = DB::getInstance();
@@ -169,7 +176,7 @@ private function hasPermission(int $forum_id, string $required_permission, array
 
     public function titleToURL(string $topic = null): string {
         if ($topic) {
-            $topic = str_replace(URL_EXCLUDE_CHARS, '', Util::cyrillicToLatin($topic));
+            $topic = str_replace(self::URL_EXCLUDE_CHARS, '', Util::cyrillicToLatin($topic));
             return Output::getClean(strtolower(urlencode(str_replace(' ', '-', $topic))));
         }
 

From 0bcc0cd7dbf90285b2646619ba82b259a91d26f2 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Tue, 21 Jun 2022 22:47:20 -0600
Subject: [PATCH 174/337] Use config dot syntax

---
 core/includes/updates/200-pr13.php            | 4 ++--
 core/installation/steps/finish.php            | 2 +-
 modules/Core/pages/panel/general_settings.php | 6 +++---
 modules/Core/pages/panel/registration.php     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/includes/updates/200-pr13.php b/core/includes/updates/200-pr13.php
index ddd0327b57..5c7f0bd62c 100644
--- a/core/includes/updates/200-pr13.php
+++ b/core/includes/updates/200-pr13.php
@@ -9,7 +9,7 @@ public function run(): void {
             // The core/trustedProxies option was mistakenly set during the installer for pr13. If we decide to
             // allow not configuring it, at least it must be in an "unconfigured" state by default so StaffCP
             // can display a warning until it is explicitly set to an empty or non-empty array by the user.
-            Config::set('core/trustedProxies', null);
+            Config::set('core.trustedProxies', null);
         }
 
         $trusted_proxies = Config::get('core.trustedProxies');
@@ -18,7 +18,7 @@ public function run(): void {
             // The core/trustedProxies option was mistakenly set during the installer for pr13. If we decide to
             // allow not configuring it, at least it must be in an "unconfigured" state by default so StaffCP
             // can display a warning until it is explicitly set to an empty or non-empty array by the user.
-            Config::set('core/trustedProxies', null);
+            Config::set('core.trustedProxies', null);
         }
 
         $this->runMigrations();
diff --git a/core/installation/steps/finish.php b/core/installation/steps/finish.php
index 44f37e17f0..edede002ae 100644
--- a/core/installation/steps/finish.php
+++ b/core/installation/steps/finish.php
@@ -5,7 +5,7 @@
 }
 
 try {
-    Config::set('core/installed', true);
+    Config::set('core.installed', true);
 
     unset($_SESSION['admin_setup'], $_SESSION['database_initialized'], $_SESSION['site_initialized']);
 
diff --git a/modules/Core/pages/panel/general_settings.php b/modules/Core/pages/panel/general_settings.php
index 5e1adb67c7..463c0aec7d 100644
--- a/modules/Core/pages/panel/general_settings.php
+++ b/modules/Core/pages/panel/general_settings.php
@@ -149,9 +149,9 @@
             // Update config
             if (is_writable(ROOT_PATH . '/' . implode(DIRECTORY_SEPARATOR, ['core', 'config.php']))) {
                 Config::setMultiple([
-                    'core/friendly' => $friendly,
-                    'core/force_https' => $https,
-                    'core/force_www' => $www
+                    'core.friendly' => $friendly,
+                    'core.force_https' => $https,
+                    'core.force_www' => $www
                 ]);
             } else {
                 $errors = [$language->get('admin', 'config_not_writable')];
diff --git a/modules/Core/pages/panel/registration.php b/modules/Core/pages/panel/registration.php
index 5b2ec1d6ef..04aef273a7 100644
--- a/modules/Core/pages/panel/registration.php
+++ b/modules/Core/pages/panel/registration.php
@@ -87,7 +87,7 @@
                     // Config value
                     if (Input::get('enable_recaptcha') == 1 || Input::get('enable_recaptcha_login') == 1) {
                         if (is_writable(ROOT_PATH . '/' . implode(DIRECTORY_SEPARATOR, ['core', 'config.php']))) {
-                            Config::set('core/captcha', true);
+                            Config::set('core.captcha', true);
                         } else {
                             $errors = [$language->get('admin', 'config_not_writable')];
                         }

From 7d315f53771b4c7e7f0c19504a885ff7e6734bf4 Mon Sep 17 00:00:00 2001
From: Jack <jackplayzxd@gmail.com>
Date: Tue, 21 Jun 2022 21:04:37 +0000
Subject: [PATCH 175/337] Translated using Weblate (French)

Currently translated at 79.5% (976 of 1227 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/fr/
---
 custom/languages/fr_FR.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/custom/languages/fr_FR.json b/custom/languages/fr_FR.json
index 1b5904ef68..d2bf68761b 100644
--- a/custom/languages/fr_FR.json
+++ b/custom/languages/fr_FR.json
@@ -46,7 +46,7 @@
     "admin/banner_image_x": "Image de la bannière: {{imageName}}",
     "admin/banner_updated_successfully": "Bannière mise à jour avec succès. Les changements peuvent prendre un certain temps avant de prendre effet.",
     "admin/bedrock": "Bedrock?",
-    "admin/bedrock_help": "Select this option if the server is a Bedrock server.",
+    "admin/bedrock_help": "Sélectionnez cette option si le serveur est un serveur Bedrock.",
     "admin/built_in_avatars": "Service d’avatar intégré",
     "admin/bungee_instance": "Instance BungeeCord?",
     "admin/bungee_instance_help": "Sélectionnez cette option si le serveur est une instance BungeeCord.",
@@ -159,7 +159,7 @@
     "admin/enable_minecraft_integration": "Activer l’intégration de Minecraft?",
     "admin/enable_nicknames_on_registration": "Activer les surnoms lors de l'enregistrement des utilisateurs ?",
     "admin/enable_page_load_timer": "Activer le minuteur de chargement de page ?",
-    "admin/enable_placeholders": "Enable Placeholders?",
+    "admin/enable_placeholders": "Activer les espaces réservés ?",
     "admin/enable_player_list": "Activer la liste des joueurs?",
     "admin/enable_registration": "Activer les enregistrements ?",
     "admin/enable_status_query": "Activer la requête de statut?",
@@ -174,8 +174,8 @@
     "admin/external_query_help": "Si la requête par défaut du serveur ne fonctionne pas, activez cette option.",
     "admin/face": "Visage",
     "admin/facebook_url": "URL Facebook",
-    "admin/fatal_log": "Fatal log",
-    "admin/favicon_image_x": "Favicon image: {{imageName}}",
+    "admin/fatal_log": "Protocole fatal",
+    "admin/favicon_image_x": "Image de la favicon : {{imageName}}",
     "admin/field_name": "Nom du champ",
     "admin/file_changed": "Fichier Changé",
     "admin/file_too_big": "Le dossier est trop gros! Votre fichier était {{filesize}} et la limite est {{maxFilesize}}}",
@@ -539,7 +539,7 @@
     "admin/views_x": "Vus: {{views}}",
     "admin/warning": "Attention",
     "admin/warning_editing_default_template": "Avertissement! Il est recommandé de ne pas modifier le modèle par défaut.",
-    "admin/warning_hook_info": "User warned",
+    "admin/warning_hook_info": "Utilisateur averti",
     "admin/warning_log": "Avertissement log",
     "admin/widget_disabled": "Widget désactivé.",
     "admin/widget_enabled": "Widget activé.",
@@ -582,7 +582,7 @@
     "errors/maintenance_retry": "Réessayer",
     "errors/maintenance_title": "En maintenance",
     "general/actions": "Actions",
-    "general/alerts": "Alerts",
+    "general/alerts": "Alertes",
     "general/already_registered": "Déjà enregistré ?",
     "general/and_x_more": "et {{count}} en plus",
     "general/are_you_sure": "Êtes-vous sûr ?",

From d5384ace07def1c545b6a7b44e11ca9b6afdac41 Mon Sep 17 00:00:00 2001
From: Jack <jackplayzxd@gmail.com>
Date: Tue, 21 Jun 2022 21:01:52 +0000
Subject: [PATCH 176/337] Translated using Weblate (French)

Currently translated at 100.0% (51 of 51 strings)

Translation: NamelessMC/Website - Discord Integration
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-discord-integration/fr/
---
 .../Discord Integration/language/fr_FR.json   | 54 ++++++++++++++-----
 1 file changed, 40 insertions(+), 14 deletions(-)

diff --git a/modules/Discord Integration/language/fr_FR.json b/modules/Discord Integration/language/fr_FR.json
index cb86b12e5c..22cdefe25a 100644
--- a/modules/Discord Integration/language/fr_FR.json	
+++ b/modules/Discord Integration/language/fr_FR.json	
@@ -1,19 +1,19 @@
 {
     "discord_integration/discord_already_pending": "Vous avez déjà une vérification en cours.",
-    "discord_integration/discord_bot_error_badparameter": "Contenu de la demande non valide.",
-    "discord_integration/discord_bot_error_error": "Une erreur interne du bot s'est produite.",
-    "discord_integration/discord_bot_error_invguild": "L'ID de la guilde fournie n'est pas valide, ou le bot n'en fait pas partie..",
+    "discord_integration/discord_bot_error_badparameter": "Corps de la demande non valide.",
+    "discord_integration/discord_bot_error_error": "Une erreur interne au bot s'est produite.",
+    "discord_integration/discord_bot_error_invguild": "L'ID de la guilde fournie n'est pas valide, ou le bot n'en fait pas partie.",
     "discord_integration/discord_bot_error_invrole": "L'ID de rôle fourni n'est pas valide.",
-    "discord_integration/discord_bot_error_invuser": "L'ID utilisateur fourni n'est pas valide, ou n'est pas dans la Guilde spécifiée..",
-    "discord_integration/discord_bot_error_notlinked": "Le bot n'est pas lié à ce site pour l'identifiant Guild fourni..",
+    "discord_integration/discord_bot_error_invuser": "L'ID utilisateur fourni n'est pas valide, ou n'est pas dans la Guilde spécifiée.",
+    "discord_integration/discord_bot_error_notlinked": "Le bot n'est pas lié à ce site pour l'identifiant Guild fourni.",
     "discord_integration/discord_bot_error_unauthorized": "La clé API du site web n'est pas valide",
-    "discord_integration/discord_bot_must_be_setup": "Vous ne pouvez pas activer l'intégration Discord avant d'avoir configuré le bot. Pour obtenir des informations, veuillez {{linkStart}}cliquez ici{{linkEnd}}.",
-    "discord_integration/discord_bot_setup": "Configuration du bot",
+    "discord_integration/discord_bot_must_be_setup": "Vous ne pouvez pas activer l'intégration Discord avant d'avoir configuré le robot. Pour plus d'informations, veuillez cliquer sur {{linkStart}}here{{linkEnd}}.",
+    "discord_integration/discord_bot_setup": "Le robot est installé ?",
     "discord_integration/discord_communication_error": "Une erreur s'est produite lors de la communication avec le robot Discord. Veuillez vous assurer que le robot est en cours d'exécution et que votre URL de robot est correcte.",
-    "discord_integration/discord_database_error": "La base de données du lien Nameless est actuellement en panne. Veuillez réessayer plus tard.",
-    "discord_integration/discord_guild_id": "ID du serveur discord",
-    "discord_integration/discord_id_help": "Pour savoir où trouver les identifiants Discord, veuillez lire le {{linkStart}}documen{{linkEnd}} suivant.",
-    "discord_integration/discord_id_taken": "Cet identifiant Discord a déjà été pris.",
+    "discord_integration/discord_database_error": "La base de données du Lien sans nom est actuellement en panne. Veuillez réessayer plus tard.",
+    "discord_integration/discord_guild_id": "ID du serveur Discord",
+    "discord_integration/discord_id_help": "Pour savoir où trouver les identifiants Discord, veuillez lire {{linkStart}}this.{{linkEnd}}",
+    "discord_integration/discord_id_taken": "Cet ID utilisateur Discord a déjà été pris.",
     "discord_integration/discord_id_unlinked": "Vous avez réussi à dissocier votre ID utilisateur Discord.",
     "discord_integration/discord_integration_not_setup": "L'intégration de Discord n'est pas configurée",
     "discord_integration/discord_invalid_id": "Cet ID utilisateur Discord n'est pas valide.",
@@ -21,7 +21,33 @@
     "discord_integration/discord_unknown_error": "Une erreur inconnue s'est produite lors de la synchronisation des rôles Discord. Veuillez contacter un administrateur.",
     "discord_integration/discord_usernames_updated": "Les noms d'utilisateur Discord ont été mis à jour avec succès",
     "discord_integration/discord_widget_theme": "Thème Discord Widget",
-    "discord_integration/linked": "Lié",
-    "discord_integration/not_linked": "Non lié",
-    "discord_integration/pending_link": "En attente"
+    "discord_integration/linked": "Lié à",
+    "discord_integration/not_linked": "Pas de lien",
+    "discord_integration/pending_link": "En attente",
+    "discord_integration/discord_widget_error": "Une erreur s'est produite lors de l'obtention du widget Discord : {{error}}.",
+    "discord_integration/discord_id_required": "Veuillez entrer votre ID de serveur Discord.",
+    "discord_integration/get_link_code": "Obtenir le code du lien",
+    "discord_integration/provide_one_discord_settings": "Veuillez fournir au moins un des éléments suivants : \"url\", \"guild_id\"",
+    "discord_integration/unable_to_set_discord_bot_url": "Impossible de définir l'URL du robot Discord",
+    "discord_integration/unable_to_set_discord_id": "Impossible de définir l'ID Discord.",
+    "discord_integration/unable_to_update_discord_roles": "Impossible de mettre à jour la liste des rôles Discord.",
+    "discord_integration/unable_to_update_discord_username": "Impossible de mettre à jour le nom d'utilisateur Discord.",
+    "discord_integration/discord_bot_error_partsuccess": "Le robot n'a pas pu modifier un ou plusieurs rôles en raison d'une mauvaise configuration de la hiérarchie Discord.",
+    "discord_integration/discord_id_confirm": "Veuillez exécuter la commande \"/verify {{token}}\" dans Discord pour terminer la liaison de votre compte Discord.",
+    "discord_integration/discord_id_length": "Veuillez vous assurer que votre ID de serveur Discord comporte 18 caractères.",
+    "discord_integration/discord_integration_disabled": "L'intégration de Discord est désactivée.",
+    "discord_integration/discord_role_id": "Discord Role ID",
+    "discord_integration/unable_to_update_discord_bot_username": "Impossible de mettre à jour le nom d'utilisateur du robot Discord.",
+    "discord_integration/discord": "Discord",
+    "discord_integration/discord_bot_check_logs": "Vous devez rechercher une erreur plus spécifique (si elle existe) dans StaffCP -> Sécurité -> Tous les journaux.",
+    "discord_integration/discord_id_numeric": "Veuillez vous assurer que votre ID de serveur Discord est numérique (uniquement des chiffres).",
+    "discord_integration/discord_id_set": "L'ID de Discord a été défini avec succès",
+    "discord_integration/discord_invite_info": "Pour inviter le bot Nameless Link sur votre serveur Discord, cliquez sur {{inviteLinkStart}} ici{{inviteLinkEnd}}. Ensuite, exécutez la commande {{command}} pour lier le robot à votre site Web. Vous pouvez également {{selfHostLinkStart}} héberger le robot vous-même{{selfHostLinkEnd}}.",
+    "discord_integration/discord_role_id_length": "L'identifiant de rôle Discord doit comporter 18 chiffres.",
+    "discord_integration/discord_role_id_numeric": "L'ID de rôle Discord doit être numérique.",
+    "discord_integration/discord_widget_disabled": "Le widget est désactivé pour le serveur Discord spécifié. Veuillez accéder à l'onglet \"Widget\" dans les paramètres de votre serveur Discord, et assurez-vous que le widget Discord est activé et que l'ID est correct.",
+    "discord_integration/no_pending_verification_for_token": "Il n'y a pas de vérifications en cours sous le jeton fourni.",
+    "discord_integration/discord_username": "Nom d'utilisateur Discord",
+    "discord_integration/discord_user_id": "ID utilisateur Discord",
+    "discord_integration/enable_discord_integration": "Activer l'intégration de Discord ?"
 }

From a7c78cc2f77f585905ace7b8ec7f371016dac670 Mon Sep 17 00:00:00 2001
From: Jack <jackplayzxd@gmail.com>
Date: Tue, 21 Jun 2022 20:48:29 +0000
Subject: [PATCH 177/337] Translated using Weblate (French)

Currently translated at 100.0% (11 of 11 strings)

Translation: NamelessMC/Website - Cookie Consent
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/cookie-consent/fr/
---
 modules/Cookie Consent/language/fr_FR.json | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/Cookie Consent/language/fr_FR.json b/modules/Cookie Consent/language/fr_FR.json
index 0967ef424b..fe344f3da2 100644
--- a/modules/Cookie Consent/language/fr_FR.json	
+++ b/modules/Cookie Consent/language/fr_FR.json	
@@ -1 +1,13 @@
-{}
+{
+    "cookie/configure_cookies": "Configurer les cookies",
+    "cookie/cookie_notice": "Avis sur les cookies",
+    "cookie/cookie_notice_error": "Veuillez saisir un avis de cookie de 10 000 caractères maximum.",
+    "cookie/cookie_notice_info": "Ce widget nécessite des cookies",
+    "cookie/cookie_notice_success": "L'avis de cookie a été mis à jour avec succès.",
+    "cookie/cookie_popup": "Ce site web utilise des cookies pour améliorer votre expérience de navigation.",
+    "cookie/cookie_popup_allow": "Autoriser les cookies",
+    "cookie/cookie_popup_disallow": "Refuser les cookies",
+    "cookie/cookie_popup_more_info": "Plus d'informations",
+    "cookie/cookies": "Cookies",
+    "cookie/update_settings": "Afficher la popup des cookies"
+}

From 57430373c2ec9096d156cb7dc385ec9cc61d6c34 Mon Sep 17 00:00:00 2001
From: namelessmc-bot <robin+namelessmc-bot-github@rkslot.nl>
Date: Wed, 22 Jun 2022 04:41:17 +0000
Subject: [PATCH 178/337] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/
---
 custom/languages/cs_CZ.json  | 1 -
 custom/languages/de_DE.json  | 1 -
 custom/languages/en_US.json  | 1 -
 custom/languages/es_419.json | 1 -
 custom/languages/es_ES.json  | 1 -
 custom/languages/fr_FR.json  | 1 -
 custom/languages/it_IT.json  | 1 -
 custom/languages/ja_JP.json  | 1 -
 custom/languages/lt_LT.json  | 1 -
 custom/languages/nl_NL.json  | 1 -
 custom/languages/no_NO.json  | 1 -
 custom/languages/pl_PL.json  | 1 -
 custom/languages/pt_BR.json  | 1 -
 custom/languages/ro_RO.json  | 1 -
 custom/languages/ru_RU.json  | 1 -
 custom/languages/sk_SK.json  | 1 -
 custom/languages/sv_SE.json  | 1 -
 custom/languages/th_TH.json  | 1 -
 custom/languages/tr_TR.json  | 1 -
 custom/languages/uk_UA.json  | 1 -
 custom/languages/zh_CN.json  | 1 -
 custom/languages/zh_TW.json  | 1 -
 22 files changed, 22 deletions(-)

diff --git a/custom/languages/cs_CZ.json b/custom/languages/cs_CZ.json
index edd4afd121..e6bd442f92 100644
--- a/custom/languages/cs_CZ.json
+++ b/custom/languages/cs_CZ.json
@@ -564,7 +564,6 @@
     "admin/unable_to_retrieve_modules": "Nepodařilo se získat doplňky",
     "admin/unable_to_retrieve_nameless_news": "Nepodařilo se získat novinky",
     "admin/unable_to_retrieve_templates": "Nepodařilo se získat šablony",
-    "admin/unable_to_write_email_config": "Nepodařilo se upravit soubor core/email.php. Zkontrolujte prosím oprávnění souboru.",
     "admin/unknown": "Neznámé",
     "admin/unsafe_html": "Povolit nebezpečné HTML?",
     "admin/unsafe_html_warning": "Povolením této možnosti lze na stránce použít jakékoli HTML, včetně potenciálně nebezpečného JavaScriptu. Tuto možnost povolte pouze pokud jste si jistí, že je vaše HTML bezpečné.",
diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index f4ff21818d..5203f9afe5 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -535,7 +535,6 @@
     "admin/unable_to_retrieve_modules": "Module können nicht abgerufen werden",
     "admin/unable_to_retrieve_nameless_news": "Die neuesten Nachrichten konnten nicht abgerufen werden",
     "admin/unable_to_retrieve_templates": "Templates können nicht abgerufen werden",
-    "admin/unable_to_write_email_config": "In die Datei core/email.php kann nicht geschrieben werden. Bitte überprüfe die Dateiberechtigungen.",
     "admin/unknown": "Unbekannt",
     "admin/unlink": "Unlink",
     "admin/unlink_account_confirm": "Bist du sicher, dass du diesen Anbieter zwangsweise von diesem Benutzer trennen willst?",
diff --git a/custom/languages/en_US.json b/custom/languages/en_US.json
index 7a852e4a3a..e6055d8c71 100644
--- a/custom/languages/en_US.json
+++ b/custom/languages/en_US.json
@@ -577,7 +577,6 @@
     "admin/unable_to_retrieve_modules": "Unable to retrieve modules",
     "admin/unable_to_retrieve_nameless_news": "Unable to retrieve the latest news",
     "admin/unable_to_retrieve_templates": "Unable to retrieve templates",
-    "admin/unable_to_write_email_config": "Unable to write to file core/email.php. Please check file permissions.",
     "admin/unknown": "Unknown",
     "admin/unlink": "Unlink",
     "admin/unlink_account_confirm": "Are you sure you want to forcibly unlink this provider from this user?",
diff --git a/custom/languages/es_419.json b/custom/languages/es_419.json
index e29f5f560f..2f4903648b 100644
--- a/custom/languages/es_419.json
+++ b/custom/languages/es_419.json
@@ -555,7 +555,6 @@
     "admin/unable_to_retrieve_modules": "No se pudo encontrar módulos",
     "admin/unable_to_retrieve_nameless_news": "No se pudieron obterner las últimas noticias",
     "admin/unable_to_retrieve_templates": "No se puedieron encontrar plantillas",
-    "admin/unable_to_write_email_config": "No se puede escribir en el archivo <strong>core/email.php</strong>. Por favor, compruebe los permisos del archivo.",
     "admin/unknown": "Desconocido",
     "admin/unsafe_html": "¿Permitir HTML inseguro?",
     "admin/unsafe_html_warning": "Activar esta opción significa que cualquier HTML puede ser utilizado en la página, incluyendo partes de codigo JavaScript potencialmente peligroso. Habilite esta opción sólo si está seguro de que su HTML es seguro.",
diff --git a/custom/languages/es_ES.json b/custom/languages/es_ES.json
index d2972ea972..0f1b3c6603 100644
--- a/custom/languages/es_ES.json
+++ b/custom/languages/es_ES.json
@@ -567,7 +567,6 @@
     "admin/unable_to_retrieve_modules": "No se pueden recuperar los módulos",
     "admin/unable_to_retrieve_nameless_news": "No se pueden recuperar las últimas noticias",
     "admin/unable_to_retrieve_templates": "No se pueden recuperar las plantillas",
-    "admin/unable_to_write_email_config": "No se puede escribir en el archivo core/email.php. Por favor, compruebe los permisos del archivo.",
     "admin/unknown": "Desconocido",
     "admin/unsafe_html": "¿Permitir código HTML inseguro?",
     "admin/unsafe_html_warning": "Activar esta opción significa que cualquier código HTML puede ser utilizado en la página, incluyendo el potencialmente peligroso JavaScript. Habilite esta opción sólo si está seguro de que su código HTML es seguro.",
diff --git a/custom/languages/fr_FR.json b/custom/languages/fr_FR.json
index d2bf68761b..fafc96bdfa 100644
--- a/custom/languages/fr_FR.json
+++ b/custom/languages/fr_FR.json
@@ -499,7 +499,6 @@
     "admin/unable_to_retrieve_modules": "Impossible de récupérer les modules",
     "admin/unable_to_retrieve_nameless_news": "Impossible de récupérer les dernières nouvelles",
     "admin/unable_to_retrieve_templates": "Impossible de récupérer des modèles",
-    "admin/unable_to_write_email_config": "Impossible d'écrire sur le fichier <strong>core/email.php</strong>. Veuillez vérifier les permissions du fichier.",
     "admin/unknown": "Inconnu",
     "admin/unsafe_html": "Permettre le HTML non sécurisé?",
     "admin/unsafe_html_warning": "Activer cette option signifie que tout HTML peut être utilisé sur la page, y compris le JavaScript potentiellement dangereux. N’activez ceci que si vous êtes sûr que votre HTML est sécurisé.",
diff --git a/custom/languages/it_IT.json b/custom/languages/it_IT.json
index 816747a195..9cbfd5b5c9 100644
--- a/custom/languages/it_IT.json
+++ b/custom/languages/it_IT.json
@@ -507,7 +507,6 @@
     "admin/unable_to_retrieve_modules": "Impossibile recuperare i moduli",
     "admin/unable_to_retrieve_nameless_news": "Impossibile recuperare le ultime notizie",
     "admin/unable_to_retrieve_templates": "Impossibile recuperare i modelli",
-    "admin/unable_to_write_email_config": "Il file <strong>core/email.php</strong> non è scrivibile. Per favore controlla i permessi sul file.",
     "admin/unknown": "Sconosciuto",
     "admin/unsafe_html": "Consentire HTML non sicuro?",
     "admin/unsafe_html_warning": "L'attivazione di questa opzione indica che qualsiasi codice HTML può essere utilizzato nella pagina, incluso il codice JavaScript potenzialmente pericoloso. Abilitalo solo se sei sicuro che il tuo codice HTML sia sicuro.",
diff --git a/custom/languages/ja_JP.json b/custom/languages/ja_JP.json
index 70bf1fb4df..a3d1737ce1 100644
--- a/custom/languages/ja_JP.json
+++ b/custom/languages/ja_JP.json
@@ -577,7 +577,6 @@
     "admin/unable_to_retrieve_modules": "モジュールの取得ができません",
     "admin/unable_to_retrieve_nameless_news": "最新ニュースの取得ができません",
     "admin/unable_to_retrieve_templates": "テンプレートの取得ができません",
-    "admin/unable_to_write_email_config": "core/email.phpファイルに書き込みできません。ファイルアクセス権限を確認して下さい。",
     "admin/unknown": "不明",
     "admin/unlink": "連携を解除",
     "admin/unlink_account_confirm": "プロバイダーとユーザーとの連携を強制的に解除してよろしいですか？",
diff --git a/custom/languages/lt_LT.json b/custom/languages/lt_LT.json
index 2fd4f800ab..92e9222803 100644
--- a/custom/languages/lt_LT.json
+++ b/custom/languages/lt_LT.json
@@ -429,7 +429,6 @@
     "admin/unable_to_retrieve_modules": "Neįmanoma nuskaityti modulių",
     "admin/unable_to_retrieve_nameless_news": "Nepavyko gauti naujausių naujienų.",
     "admin/unable_to_retrieve_templates": "Nepavyko gauti šablonų",
-    "admin/unable_to_write_email_config": "Nepavyko įrašyti į failą <strong>core/email.php</strong>. Patikrinkite failų leidimus.",
     "admin/unknown": "Nežinoma",
     "admin/unsafe_html": "Leisti nesaugius HTML?",
     "admin/unsafe_html_warning": "Įjungus šią parinktį, šiame puslapyje gali būti naudojamas bet koks HTML, įskaitant potencialiai pavojingą JavaScript. Įjunkite tik tai, jei esate tikri, kad jūsų HTML yra saugus.",
diff --git a/custom/languages/nl_NL.json b/custom/languages/nl_NL.json
index add2b9d994..5f7a721003 100644
--- a/custom/languages/nl_NL.json
+++ b/custom/languages/nl_NL.json
@@ -554,7 +554,6 @@
     "admin/unable_to_retrieve_modules": "Niet in staat om modules op te halen",
     "admin/unable_to_retrieve_nameless_news": "Niet in staat om het laatste nieuws op te halen",
     "admin/unable_to_retrieve_templates": "Kan sjablonen niet ophalen",
-    "admin/unable_to_write_email_config": "Kon niet naar het bestand core/email.php schrijven. Graag de bestandsrechten bekijken.",
     "admin/unknown": "Onbekend",
     "admin/unsafe_html": "Toestaan van onveilige HTML?",
     "admin/unsafe_html_warning": "Dit aanzetten betekent dat je HTML kan gebruiken op je pagina, inclusief potentieel gevaarlijke JavaScript. Alleen aanzetten als je weet dat je HTML veilig is.",
diff --git a/custom/languages/no_NO.json b/custom/languages/no_NO.json
index 1727e4332a..b847782d8c 100644
--- a/custom/languages/no_NO.json
+++ b/custom/languages/no_NO.json
@@ -517,7 +517,6 @@
     "admin/unable_to_retrieve_modules": "Kunne ikke finne moduler.",
     "admin/unable_to_retrieve_nameless_news": "Kunne ikke laste inn nyeste nytt",
     "admin/unable_to_retrieve_templates": "Kunne ikke finne malene",
-    "admin/unable_to_write_email_config": "Kunne ikke skrive til filen <strong>core/email.php</strong>. Vennligst sjekk filrettighetene.",
     "admin/unknown": "Ukjent",
     "admin/unsafe_html": "Tillatt usikker HTML?",
     "admin/unsafe_html_warning": "Ved å aktivere denne funksjonen vil all HTML kunne bli brukt på siden, også potensielt skadelig JavaScript. Bruk kun om du er sikker på at det er trygt.",
diff --git a/custom/languages/pl_PL.json b/custom/languages/pl_PL.json
index 9b782c8a66..825b15ccae 100644
--- a/custom/languages/pl_PL.json
+++ b/custom/languages/pl_PL.json
@@ -549,7 +549,6 @@
     "admin/unable_to_retrieve_modules": "Podczas pobierania modułów wystąpił błąd.",
     "admin/unable_to_retrieve_nameless_news": "Podczas pobierania newsów NamelessMC wystąpił błąd",
     "admin/unable_to_retrieve_templates": "Podczas pobierania szablonów wystąpił błąd.",
-    "admin/unable_to_write_email_config": "Nie można zapisać pliku <strong>core/email.php</strong>. Sprawdź uprawnienia plików.",
     "admin/unknown": "Nieznany",
     "admin/unsafe_html": "Zezwalać na niebezpieczne strony HTML?",
     "admin/unsafe_html_warning": "Włączenie tej opcji oznacza, że na stronie można użyć dowolnego kodu HTML, w tym potencjalnie niebezpiecznego kodu JavaScript. Włącz to tylko, jeśli masz pewność, że Twój kod HTML jest bezpieczny.",
diff --git a/custom/languages/pt_BR.json b/custom/languages/pt_BR.json
index c742579192..ad5b4ba601 100644
--- a/custom/languages/pt_BR.json
+++ b/custom/languages/pt_BR.json
@@ -567,7 +567,6 @@
     "admin/unable_to_retrieve_modules": "Não foi possível recuperar os módulos.",
     "admin/unable_to_retrieve_nameless_news": "Não foi possível recuperar as últimas notícias.",
     "admin/unable_to_retrieve_templates": "Não foi possível recuperar os modelos.",
-    "admin/unable_to_write_email_config": "Não é possível escrever no arquivo core/email.php. Por favor, verifique as permissões do arquivo.",
     "admin/unknown": "Desconhecido",
     "admin/unsafe_html": "Permitir tags HTML não seguras?",
     "admin/unsafe_html_warning": "Ativando está opção, siginifica que qualquer HTML pode ser usada nesta página, incluindo JavaScript potencialmente perigosos. Somente ativa esta opção se você está ciente que o seu HTML é seguro.",
diff --git a/custom/languages/ro_RO.json b/custom/languages/ro_RO.json
index c2fe027879..fa8ca15d45 100644
--- a/custom/languages/ro_RO.json
+++ b/custom/languages/ro_RO.json
@@ -443,7 +443,6 @@
     "admin/unable_to_retrieve_modules": "Imposibil de obținut module",
     "admin/unable_to_retrieve_nameless_news": "Nu se pot obține cele mai recente știri",
     "admin/unable_to_retrieve_templates": "Nu s-au putut obține șabloanele",
-    "admin/unable_to_write_email_config": "Imposibil de scris în fișierul <strong>core/email.php</strong>. Verificați permisiunile fișierelor.",
     "admin/unknown": "Necunoscut",
     "admin/unsafe_html": "Permiteți HTML (nesigur) ?",
     "admin/unsafe_html_warning": "Activarea acestei opțiuni înseamnă că orice HTML poate fi folosit pe pagină, incluzând JavaScript potențial periculos. Activați acest lucru numai dacă sunteți sigur că codul dvs. HTML este sigur.",
diff --git a/custom/languages/ru_RU.json b/custom/languages/ru_RU.json
index bbedcdcacb..73b018ff1d 100644
--- a/custom/languages/ru_RU.json
+++ b/custom/languages/ru_RU.json
@@ -576,7 +576,6 @@
     "admin/unable_to_retrieve_modules": "Невозможно получить модули",
     "admin/unable_to_retrieve_nameless_news": "Невозможно получить последние новости",
     "admin/unable_to_retrieve_templates": "Невозможно получить шаблоны",
-    "admin/unable_to_write_email_config": "Невозможно записать в файл core/email.php. Пожалуйста, проверьте права доступа к файлам.",
     "admin/unknown": "Неизвестно",
     "admin/unlink": "Развязать",
     "admin/unlink_account_confirm": "Вы уверены что хотите принудительно отвязать этот провайдер от этого пользователя?",
diff --git a/custom/languages/sk_SK.json b/custom/languages/sk_SK.json
index 9c79433d9d..53090388e1 100644
--- a/custom/languages/sk_SK.json
+++ b/custom/languages/sk_SK.json
@@ -571,7 +571,6 @@
     "admin/unable_to_retrieve_modules": "Nepodarilo sa načítať moduly",
     "admin/unable_to_retrieve_nameless_news": "Nie je možné načítať najnovšie novinky",
     "admin/unable_to_retrieve_templates": "Šablóny sa nepodarilo načítať",
-    "admin/unable_to_write_email_config": "Nedá sa zapisovať do súboru core/email.php. Skontrolujte povolenia súborov.",
     "admin/unknown": "Neznáme",
     "admin/unlink": "Odpojiť",
     "admin/unlink_account_confirm": "Naozaj chcete násilne odpojiť tohto poskytovateľa od tohto používateľa?",
diff --git a/custom/languages/sv_SE.json b/custom/languages/sv_SE.json
index b11156729d..41d7f76c87 100644
--- a/custom/languages/sv_SE.json
+++ b/custom/languages/sv_SE.json
@@ -536,7 +536,6 @@
     "admin/unable_to_enable_module": "Det går inte att aktivera inkompatibel modul.",
     "admin/unable_to_enable_module_dependencies": "Det går inte att aktivera modulen eftersom det behöver modulen {{module}}, som inte är aktiverad.",
     "admin/unable_to_retrieve_modules": "Kan inte hämta moduler",
-    "admin/unable_to_write_email_config": "Det går inte att skriva fil <strong>core/email.php</strong>. Vänligen kontrollera filbehörigheter.",
     "admin/unknown": "Okänd",
     "admin/unsafe_html": "Tillåt osäker HTML?",
     "admin/unsafe_html_warning": "Aktivering av det här alternativet innebär att alla HTML kan användas på sidan, inklusive potentiellt farlig JavaScript. Aktivera bara detta om du är säker på att din HTML är säker.",
diff --git a/custom/languages/th_TH.json b/custom/languages/th_TH.json
index 78e50b4681..cf4d58f722 100644
--- a/custom/languages/th_TH.json
+++ b/custom/languages/th_TH.json
@@ -548,7 +548,6 @@
     "admin/unable_to_retrieve_modules": "ไม่สามารถเรียก modules ",
     "admin/unable_to_retrieve_nameless_news": "ไม่สามารถเรียกข้อมูลข่าวสารล่าสุด",
     "admin/unable_to_retrieve_templates": "ไม่สามารถ Template",
-    "admin/unable_to_write_email_config": "ไม่สามารถเขียนไปยังไฟล์ <strong>core/email.php</strong>. กรุณาตรวจสอบสิทธิ์ของแฟ้ม",
     "admin/unknown": "ไม่ทราบ",
     "admin/unsafe_html": "อนุญาต HTML ที่ไม่ปลอดภัยหรือไม่",
     "admin/unsafe_html_warning": "การเปิดใช้งานตัวเลือกนี้หมายความว่าสามารถใช้ HTML ใดๆ ก็ได้บนหน้าเว็บ ซึ่งรวมถึง JavaScript ที่อาจเป็นอันตราย เปิดใช้งานสิ่งนี้เฉพาะเมื่อคุณแน่ใจว่า HTML ของคุณปลอดภัย",
diff --git a/custom/languages/tr_TR.json b/custom/languages/tr_TR.json
index ec1e69c2c6..b6ec3db51e 100644
--- a/custom/languages/tr_TR.json
+++ b/custom/languages/tr_TR.json
@@ -451,7 +451,6 @@
     "admin/unable_to_load_sitemap_file_x": "{{file}} site haritası dosyası yüklenemedi",
     "admin/unable_to_retrieve_modules": "Modüller alınamıyor",
     "admin/unable_to_retrieve_templates": "Şablonlar alınamıyor",
-    "admin/unable_to_write_email_config": "<strong>core/email.php</strong> dosyasına yazılamıyor. Lütfen dosya izinlerini kontrol edin.",
     "admin/unknown": "Bilinmeyen",
     "admin/unsafe_html": "Güvenli olmayan HTML'ye izin verilsin mi? ",
     "admin/unsafe_html_warning": "Bu seçeneğin etkinleştirilmesi, tehlikeli olabilecek JavaScript de dahil olmak üzere sayfada herhangi bir HTML'nin kullanılabileceği anlamına gelir. Bunu yalnızca HTML'nizin güvenli olduğundan eminseniz etkinleştirin.",
diff --git a/custom/languages/uk_UA.json b/custom/languages/uk_UA.json
index a47faf16f9..69f473e969 100644
--- a/custom/languages/uk_UA.json
+++ b/custom/languages/uk_UA.json
@@ -549,7 +549,6 @@
     "admin/unable_to_retrieve_modules": "Неможливо отримати модулі",
     "admin/unable_to_retrieve_nameless_news": "Неможливо отримати останні новини",
     "admin/unable_to_retrieve_templates": "Неможливо отримати шаблони",
-    "admin/unable_to_write_email_config": "Неможливо записати у файл core/email.php. Перевірте права доступу до файлів.",
     "admin/unknown": "Невідомо",
     "admin/unsafe_html": "Дозволити небезпечний HTML?",
     "admin/unsafe_html_warning": "Увімкнення цієї опції означає, що на сторінці можна використовувати будь-який HTML-код, включаючи потенційно небезпечний JavaScript. Увімкніть цю функцію лише в тому випадку, якщо ви впевнені, що ваш HTML є безпечним.",
diff --git a/custom/languages/zh_CN.json b/custom/languages/zh_CN.json
index e4b6fbe139..27102545e7 100644
--- a/custom/languages/zh_CN.json
+++ b/custom/languages/zh_CN.json
@@ -561,7 +561,6 @@
     "admin/unable_to_retrieve_modules": "无法检索模块",
     "admin/unable_to_retrieve_nameless_news": "无法获取最新新闻",
     "admin/unable_to_retrieve_templates": "无法检索模板",
-    "admin/unable_to_write_email_config": "无法写入 core/email.php。请检查文件权限。",
     "admin/unknown": "未知",
     "admin/unsafe_html": "是否允许不安全的 HTML?",
     "admin/unsafe_html_warning": "启用此选项意味着可以在页面上使用任何 HTML，包括有潜在危险的 JavaScript。仅当您确定 HTML 安全时才启用此功能。",
diff --git a/custom/languages/zh_TW.json b/custom/languages/zh_TW.json
index 1f14677a66..468460729b 100644
--- a/custom/languages/zh_TW.json
+++ b/custom/languages/zh_TW.json
@@ -262,7 +262,6 @@
     "admin/twitter_dark_theme": "使用Twitter黑主題?",
     "admin/twitter_url": "Twitter 網址",
     "admin/type": "類型",
-    "admin/unable_to_write_email_config": "無法寫入<strong>core/email.php</strong>，請檢查權限。",
     "admin/unknown": "未知",
     "admin/unsafe_html": "允許使用不安全的 HTML?",
     "admin/unsafe_html_warning": "啟用此選項表示你可以使用任何的HTML標籤，包括未加密的JavaScript，請確定HTML是安全的再開啟",

From dcb6e98ebf901aaa6fbad3fcf0e5d2c330821109 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Wed, 22 Jun 2022 11:58:20 +0200
Subject: [PATCH 179/337] Use config, not settings

---
 modules/Core/pages/panel/emails.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/Core/pages/panel/emails.php b/modules/Core/pages/panel/emails.php
index 331299270c..d4aca165cf 100644
--- a/modules/Core/pages/panel/emails.php
+++ b/modules/Core/pages/panel/emails.php
@@ -171,12 +171,12 @@
                 if (!count($errors)) {
                     // Update config
 
-                    Config::set('email.email', !empty($_POST['email']) ? $_POST['email'] : Util::getSetting('email.email', ''));
-                    Config::set('email.username', !empty($_POST['username']) ? $_POST['username'] : Util::getSetting('email.username', ''));
-                    Config::set('email.password', !empty($_POST['password']) ? $_POST['password'] : Util::getSetting('email.password', ''));
-                    Config::set('email.name', !empty($_POST['name']) ? $_POST['name'] : Util::getSetting('email.name', ''));
-                    Config::set('email.host', !empty($_POST['host']) ? $_POST['host'] : Util::getSetting('email.host', ''));
-                    Config::set('email.port', !empty($_POST['port']) ? (int) $_POST['port'] : Util::getSetting('email.port', ''));
+                    Config::set('email.email', !empty($_POST['email']) ? $_POST['email'] : Config::get('email.email', ''));
+                    Config::set('email.username', !empty($_POST['username']) ? $_POST['username'] : Config::get('email.username', ''));
+                    Config::set('email.password', !empty($_POST['password']) ? $_POST['password'] : Config::get('email.password', ''));
+                    Config::set('email.name', !empty($_POST['name']) ? $_POST['name'] : Config::get('email.name', ''));
+                    Config::set('email.host', !empty($_POST['host']) ? $_POST['host'] : Config::get('email.host', ''));
+                    Config::set('email.port', !empty($_POST['port']) ? (int) $_POST['port'] : Config::get('email.port', ''));
 
                     // Redirect to refresh config values
                     Session::flash('emails_success', $language->get('admin', 'email_settings_updated_successfully'));

From 142a3fb307404791e0935a955d74366e28cf0fcf Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Wed, 22 Jun 2022 19:50:19 +0200
Subject: [PATCH 180/337] Remove erroneous email related cleaning

---
 core/classes/Core/Email.php                          | 6 ++++--
 modules/Core/includes/emails/register.php            | 4 ++--
 modules/Core/includes/endpoints/RegisterEndpoint.php | 4 ++--
 modules/Core/pages/forgot_password.php               | 4 ++--
 modules/Core/pages/panel/emails.php                  | 2 +-
 modules/Core/pages/panel/emails_mass_message.php     | 6 +++---
 modules/Forum/pages/forum/view_topic.php             | 2 +-
 7 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/core/classes/Core/Email.php b/core/classes/Core/Email.php
index d6567a955f..2813ba5cd4 100644
--- a/core/classes/Core/Email.php
+++ b/core/classes/Core/Email.php
@@ -55,7 +55,7 @@ public static function send(array $recipient, string $subject, string $message,
      */
     public static function getReplyTo(): array {
         $contactemail = Util::getSetting('incoming_email');
-        return ['email' => $contactemail, 'name' => Output::getClean(SITE_NAME)];
+        return ['email' => $contactemail, 'name' => SITE_NAME];
     }
 
     /**
@@ -68,8 +68,10 @@ private static function sendPHP(array $email) {
         $outgoing_email = Util::getSetting('outgoing_email');
         $incoming_email = Util::getSetting('incoming_email');
 
+        // TODO Handle non-ascii in subject and headers (RFC 1342)
+
         if (mail($email['to']['email'], $email['subject'], $email['message'], [
-            'From' => Output::getClean(SITE_NAME) . ' ' . '<' . $outgoing_email . '>',
+            'From' => SITE_NAME . ' ' . '<' . $outgoing_email . '>',
             'Reply-To' => $incoming_email,
             'MIME-Version' => '1.0',
             'Content-type' => 'text/html; charset=UTF-8'
diff --git a/modules/Core/includes/emails/register.php b/modules/Core/includes/emails/register.php
index 7aa32fb3b4..99861465ba 100644
--- a/modules/Core/includes/emails/register.php
+++ b/modules/Core/includes/emails/register.php
@@ -13,8 +13,8 @@ function sendRegisterEmail(Language $language, string $email_address, string $us
     $link = rtrim(URL::getSelfURL(), '/') . URL::build('/validate/', 'c=' . urlencode($code));
 
     $sent = Email::send(
-        ['email' => Output::getClean($email_address), 'name' => Output::getClean($username)],
-        Output::getClean(SITE_NAME) . ' - ' . $language->get('emails', 'register_subject'),
+        ['email' => $email_address, 'name' => $username],
+        SITE_NAME . ' - ' . $language->get('emails', 'register_subject'),
         str_replace('[Link]', $link, Email::formatEmail('register', $language)),
         Email::getReplyTo()
     );
diff --git a/modules/Core/includes/endpoints/RegisterEndpoint.php b/modules/Core/includes/endpoints/RegisterEndpoint.php
index 983f4b5d8d..c60db288e6 100644
--- a/modules/Core/includes/endpoints/RegisterEndpoint.php
+++ b/modules/Core/includes/endpoints/RegisterEndpoint.php
@@ -204,8 +204,8 @@ private function sendRegistrationEmail(Nameless2API $api, string $username, stri
         $link = URL::getSelfURL() . ltrim(URL::build('/complete_signup/', 'c=' . urlencode($code)), '/');
 
         $sent = Email::send(
-            ['email' => Output::getClean($email), 'name' => Output::getClean($username)],
-            Output::getClean(SITE_NAME) . ' - ' . $api->getLanguage()->get('emails', 'register_subject'),
+            ['email' => $email, 'name' => $username],
+            SITE_NAME . ' - ' . $api->getLanguage()->get('emails', 'register_subject'),
             str_replace('[Link]', $link, Email::formatEmail('register', $api->getLanguage())),
             Email::getReplyTo()
         );
diff --git a/modules/Core/pages/forgot_password.php b/modules/Core/pages/forgot_password.php
index 6ba141d869..57f53c0528 100644
--- a/modules/Core/pages/forgot_password.php
+++ b/modules/Core/pages/forgot_password.php
@@ -36,8 +36,8 @@
                     $link = rtrim(URL::getSelfURL(), '/') . URL::build('/forgot_password/', 'c=' . urlencode($code));
 
                     $sent = Email::send(
-                        ['email' => Output::getClean($target_user->data()->email), 'name' => $target_user->getDisplayname()],
-                        Output::getClean(SITE_NAME) . ' - ' . $language->get('emails', 'change_password_subject'),
+                        ['email' => $target_user->data()->email, 'name' => $target_user->getDisplayname()],
+                        SITE_NAME . ' - ' . $language->get('emails', 'change_password_subject'),
                         str_replace('[Link]', $link, Email::formatEmail('change_password', $language)),
                         Email::getReplyTo()
                     );
diff --git a/modules/Core/pages/panel/emails.php b/modules/Core/pages/panel/emails.php
index d4aca165cf..113fcf942b 100644
--- a/modules/Core/pages/panel/emails.php
+++ b/modules/Core/pages/panel/emails.php
@@ -47,7 +47,7 @@
             $errors = [];
 
             $sent = Email::send(
-                ['email' => Output::getClean($user->data()->email), 'name' => Output::getClean($user->data()->nickname)],
+                ['email' => $user->data()->email, 'name' => $user->data()->nickname],
                 Output::getClean(SITE_NAME) . ' - Test Email',
                 Output::getClean(SITE_NAME) . ' - Test email successful!',
                 Email::getReplyTo()
diff --git a/modules/Core/pages/panel/emails_mass_message.php b/modules/Core/pages/panel/emails_mass_message.php
index f0fd725c1e..6d98117b7e 100644
--- a/modules/Core/pages/panel/emails_mass_message.php
+++ b/modules/Core/pages/panel/emails_mass_message.php
@@ -45,9 +45,9 @@
 
             foreach ($users as $email_user) {
                 $sent = Email::send(
-                    ['email' => Output::getClean($email_user->email), 'name' => Output::getClean($email_user->username)],
-                    Output::getClean(Input::get('subject')),
-                    Output::getClean(str_replace(['{username}', '{sitename}'], [$email_user->username, SITE_NAME], Input::get('content'))),
+                    ['email' => $email_user->email, 'name' => $email_user->username],
+                    Input::get('subject'),
+                    str_replace(['{username}', '{sitename}'], [$email_user->username, SITE_NAME], Output::getPurified(Input::get('content'))),
                     $reply_to
                 );
 
diff --git a/modules/Forum/pages/forum/view_topic.php b/modules/Forum/pages/forum/view_topic.php
index 0382718014..aebb101058 100644
--- a/modules/Forum/pages/forum/view_topic.php
+++ b/modules/Forum/pages/forum/view_topic.php
@@ -362,7 +362,7 @@
                 $reply_to = Email::getReplyTo();
                 foreach ($users_following_info as $user_info) {
                     $sent = Email::send(
-                        ['email' => Output::getClean($user_info['email']), 'name' => Output::getClean($user_info['username'])],
+                        ['email' => $user_info['email'], 'name' => $user_info['username']],
                         $subject,
                         $message,
                         $reply_to

From 6e023e7e4b83f156ac3ee84708e2f48c326d8446 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Wed, 22 Jun 2022 12:43:30 -0600
Subject: [PATCH 181/337] Remove old references to `core/email.php`

---
 .gitignore                                       | 1 -
 core/classes/Core/Email.php                      | 2 --
 core/classes/Misc/DebugBarHelper.php             | 2 +-
 core/init.php                                    | 2 +-
 modules/Core/pages/panel/emails.php              | 2 --
 modules/Core/pages/panel/emails_mass_message.php | 2 --
 6 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index b1ef35e508..5296f38dee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 /.idea/
 /core/config.php
-/core/email.php
 /cache
 /.vscode/
 **/.DS_STORE
diff --git a/core/classes/Core/Email.php b/core/classes/Core/Email.php
index 2813ba5cd4..58df65c77c 100644
--- a/core/classes/Core/Email.php
+++ b/core/classes/Core/Email.php
@@ -93,8 +93,6 @@ private static function sendPHP(array $email) {
      * @return array|bool Returns true if email sent, otherwise returns an array containing the error.
      */
     private static function sendMailer(array $email) {
-        require(ROOT_PATH . '/core/email.php');
-
         // Initialise PHPMailer
         $mail = new PHPMailer(true);
 
diff --git a/core/classes/Misc/DebugBarHelper.php b/core/classes/Misc/DebugBarHelper.php
index 2806cadd34..a192501600 100644
--- a/core/classes/Misc/DebugBarHelper.php
+++ b/core/classes/Misc/DebugBarHelper.php
@@ -32,7 +32,7 @@ public function enable(Smarty $smarty): void {
 
         $configCollector = new ConfigCollector();
         $configCollector->setData(array_filter(Config::all(), static function ($key) {
-            return $key !== 'mysql';
+            return $key !== 'mysql' && $key !== 'email';
         }, ARRAY_FILTER_USE_KEY));
         $debugbar->addCollector($configCollector);
 
diff --git a/core/init.php b/core/init.php
index 21030ca3be..df620581ec 100644
--- a/core/init.php
+++ b/core/init.php
@@ -34,7 +34,7 @@
     ROOT_PATH . '/cache/sitemaps',
     ROOT_PATH . '/cache/templates_c',
     ROOT_PATH . '/uploads',
-    ROOT_PATH . '/core/email.php'
+    ROOT_PATH . '/core/config.php'
 ];
 
 foreach ($writable_check_paths as $path) {
diff --git a/modules/Core/pages/panel/emails.php b/modules/Core/pages/panel/emails.php
index 113fcf942b..be586badcd 100644
--- a/modules/Core/pages/panel/emails.php
+++ b/modules/Core/pages/panel/emails.php
@@ -188,8 +188,6 @@
         }
     }
 
-    require(ROOT_PATH . '/core/email.php');
-
     if ($user->hasPermission('admincp.core.emails_mass_message')) {
         $smarty->assign([
             'MASS_MESSAGE' => $language->get('admin', 'emails_mass_message'),
diff --git a/modules/Core/pages/panel/emails_mass_message.php b/modules/Core/pages/panel/emails_mass_message.php
index 6d98117b7e..b51e6c30ea 100644
--- a/modules/Core/pages/panel/emails_mass_message.php
+++ b/modules/Core/pages/panel/emails_mass_message.php
@@ -74,8 +74,6 @@
 $php_mailer = Util::getSetting('phpmailer');
 $outgoing_email = Util::getSetting('outgoing_email');
 
-require(ROOT_PATH . '/core/email.php');
-
 $smarty->assign([
     'SENDING_MASS_MESSAGE' => $language->get('admin', 'sending_mass_message'),
     'EMAILS_MASS_MESSAGE' => $language->get('admin', 'emails_mass_message'),

From a6eb4194ee7c2102762e4c84ad1182663082fe00 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Wed, 22 Jun 2022 12:49:30 -0600
Subject: [PATCH 182/337] Open trusted proxies doc link in new tab

---
 modules/Core/pages/panel/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/Core/pages/panel/index.php b/modules/Core/pages/panel/index.php
index 819b6273d0..91c16a372a 100644
--- a/modules/Core/pages/panel/index.php
+++ b/modules/Core/pages/panel/index.php
@@ -191,7 +191,7 @@
         $compat_success[] = $language->get('admin', 'trusted_proxies_configured');
     } else {
         $compat_errors[] = $language->get('admin', 'trusted_proxies_not_configured', [
-            'linkStart' => '<a href="https://docs.namelessmc.com/trusted-proxies">',
+            'linkStart' => '<a href="https://docs.namelessmc.com/trusted-proxies" target="_blank">',
             'linkEnd' => '</a>',
         ]);
     }

From 2414fe462a994107ca9a59881dd0a5d689c6a335 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Wed, 22 Jun 2022 22:47:39 -0600
Subject: [PATCH 183/337] Use email placeholder methods in Core, use composer
 autoloader for widgets and hooks

---
 composer.json                                 |  8 +-
 core/classes/Core/Email.php                   | 36 ++++----
 .../core/emails_edit_messages_preview.tpl     | 89 +------------------
 modules/Core/module.php                       | 19 ++--
 modules/Core/pages/panel/emails.php           |  2 -
 modules/Discord Integration/module.php        |  5 --
 modules/Forum/module.php                      |  6 --
 7 files changed, 33 insertions(+), 132 deletions(-)

diff --git a/composer.json b/composer.json
index 3d084c920f..1f91dc9982 100644
--- a/composer.json
+++ b/composer.json
@@ -37,8 +37,14 @@
             "core/classes",
             "modules/Cookie Consent/classes",
             "modules/Core/classes",
+            "modules/Core/hooks",
+            "modules/Core/widgets",
             "modules/Discord Integration/classes",
-            "modules/Forum/classes"
+            "modules/Discord Integration/hooks",
+            "modules/Discord Integration/widgets",
+            "modules/Forum/classes",
+            "modules/Forum/hooks",
+            "modules/Forum/widgets"
         ]
     }
 }
diff --git a/core/classes/Core/Email.php b/core/classes/Core/Email.php
index 58df65c77c..91040bd6d0 100644
--- a/core/classes/Core/Email.php
+++ b/core/classes/Core/Email.php
@@ -54,8 +54,10 @@ public static function send(array $recipient, string $subject, string $message,
      * @return array Array with reply-to email address and name
      */
     public static function getReplyTo(): array {
-        $contactemail = Util::getSetting('incoming_email');
-        return ['email' => $contactemail, 'name' => SITE_NAME];
+        return [
+            'email' => Util::getSetting('incoming_email'),
+            'name' => SITE_NAME
+        ];
     }
 
     /**
@@ -145,12 +147,11 @@ private static function sendMailer(array $email) {
 
     /**
      * Add a custom placeholder/variable for email messages.
-     * Not used internally, but can be used by other modules.
      *
      * @param string $key The key to use for the placeholder, should be enclosed in square brackets.
-     * @param string $value The value to replace the placeholder with.
+     * @param string|Closure(Language, string): string $value The value to replace the placeholder with.
      */
-    public static function addPlaceholder(string $key, string $value): void {
+    public static function addPlaceholder(string $key, $value): void {
         self::$_message_placeholders[$key] = $value;
     }
 
@@ -162,19 +163,20 @@ public static function addPlaceholder(string $key, string $value): void {
      * @return string Formatted email.
      */
     public static function formatEmail(string $email, Language $viewing_language): string {
+        $placeholders = array_keys(self::$_message_placeholders);
+
+        $placeholder_values = [];
+        foreach (self::$_message_placeholders as $value) {
+            if (is_callable($value)) {
+                $placeholder_values[] = $value($viewing_language, $email);
+            } else {
+                $placeholder_values[] = $value;
+            }
+        }
+
         return str_replace(
-            array_merge([
-                '[Sitename]',
-                '[Greeting]',
-                '[Message]',
-                '[Thanks]',
-            ], array_keys(self::$_message_placeholders)),
-            array_merge([
-                Output::getClean(SITE_NAME),
-                $viewing_language->get('emails', 'greeting'),
-                $viewing_language->get('emails', $email . '_message'),
-                $viewing_language->get('emails', 'thanks'),
-            ], array_values(self::$_message_placeholders)),
+            $placeholders,
+            $placeholder_values,
             file_get_contents(implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'custom', 'templates', TEMPLATE, 'email', $email . '.html']))
         );
     }
diff --git a/custom/panel_templates/Default/core/emails_edit_messages_preview.tpl b/custom/panel_templates/Default/core/emails_edit_messages_preview.tpl
index d2c617f7b9..887ef479eb 100644
--- a/custom/panel_templates/Default/core/emails_edit_messages_preview.tpl
+++ b/custom/panel_templates/Default/core/emails_edit_messages_preview.tpl
@@ -1,88 +1 @@
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Email Preview</title>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-
-<body>
-
-    <style>
-        body {
-            font-family: arial;
-        }
-
-        .email {
-            font-size: 0.85em;
-            border: 1px solid #cfcfcf;
-        }
-
-        .email-top {
-            background: #404040;
-            color: #FFF;
-            font-weight: bold;
-            padding: 1em;
-        }
-
-        .email-icon {
-            float: right;
-            margin-left: 1em;
-            font-size: 1em;
-            color: #b3b3b3;
-        }
-
-        .email-body {
-            padding: 1em;
-            border-bottom: 1px solid #cfcfcf;
-        }
-
-        .email-bottom {
-            background: #F5F5F5;
-            color: #FFF;
-            font-weight: bold;
-            padding: 1em 1em;
-            border: 1px solid #cfcfcf;
-        }
-
-        .email-send {
-            background: #4d90fe;
-            border: 1px solid #3079ed;
-            border-radius: 3px;
-            padding: 0.4em 1.5em;
-        }
-
-        .email-info {
-            color: #888;
-            font-weight: bold;
-        }
-    </style>
-
-    <div class="email">
-        <div class="email-top">
-            New Message
-            <div class="email-icon">x</div>
-            <div class="email-icon">↕</div>
-            <div class="email-icon">_</div>
-        </div>
-        <div class=email-body>
-            <span class="email-info">To:</span> Samerton<br />
-            <br />
-            <span class="email-info">From:</span> {$USER_NAME}<br />
-        </div>
-        <div class=email-body>
-            <span class="email-info">Subject:</span> {$SUBJECT}
-        </div>
-        <div class="email-body">
-            {$MESSAGE}
-        </div>
-        <div class="email-bottom">
-            <span class="email-send">
-                Send
-            </span>
-        </div>
-    </div>
-
-</body>
-
-</html>
\ No newline at end of file
+{$MESSAGE}
diff --git a/modules/Core/module.php b/modules/Core/module.php
index b4b40fe38a..9af0477c4e 100644
--- a/modules/Core/module.php
+++ b/modules/Core/module.php
@@ -537,12 +537,10 @@ public function __construct(Language $language, Pages $pages, User $user, Naviga
 
         // Minecraft Integration
         if (defined('MINECRAFT') && MINECRAFT === true) {
-            require_once(ROOT_PATH . "/modules/{$this->getName()}/classes/Integrations/MinecraftIntegration.php");
             Integrations::getInstance()->registerIntegration(new MinecraftIntegration($language));
         }
 
-        require_once ROOT_PATH . '/modules/Core/hooks/ContentHook.php';
-
+        // TODO: Use [class, 'method'] callable syntax
         EventHandler::registerListener('renderPrivateMessage', 'ContentHook::purify');
         EventHandler::registerListener('renderPrivateMessage', 'ContentHook::codeTransform', false, 15);
         EventHandler::registerListener('renderPrivateMessage', 'ContentHook::decode', false, 20);
@@ -554,8 +552,12 @@ public function __construct(Language $language, Pages $pages, User $user, Naviga
         EventHandler::registerListener('renderPrivateMessageEdit', 'ContentHook::decode', false, 20);
         EventHandler::registerListener('renderPrivateMessageEdit', 'ContentHook::replaceAnchors', false, 15);
 
-        require_once(ROOT_PATH . '/modules/Core/hooks/CloneGroupHook.php');
         EventHandler::registerListener('cloneGroup', 'CloneGroupHook::execute');
+
+        Email::addPlaceholder('[Sitename]', Output::getClean(SITE_NAME));
+        Email::addPlaceholder('[Greeting]', static fn(Language $viewing_language) => $viewing_language->get('emails', 'greeting'));
+        Email::addPlaceholder('[Message]', static fn(Language $viewing_language, string $email) => $viewing_language->get('emails', $email . '_message'));
+        Email::addPlaceholder('[Thanks]', static fn(Language $viewing_language) => $viewing_language->get('emails', 'thanks'));
     }
 
     public static function getDashboardGraphs(): array {
@@ -679,7 +681,6 @@ public function onPageLoad(User $user, Pages $pages, Cache $cache, Smarty $smart
         // Widgets - only load if on a widget staffcp page or the frontend
         if (defined('FRONT_END') || (defined('PANEL_PAGE') && str_contains(PANEL_PAGE, 'widget'))) {
             // Facebook
-            require_once(ROOT_PATH . '/modules/Core/widgets/FacebookWidget.php');
             $cache->setCache('social_media');
             $fb_url = $cache->retrieve('facebook');
             if ($fb_url) {
@@ -687,7 +688,6 @@ public function onPageLoad(User $user, Pages $pages, Cache $cache, Smarty $smart
             }
 
             // Twitter
-            require_once(ROOT_PATH . '/modules/Core/widgets/TwitterWidget.php');
             $twitter = $cache->retrieve('twitter');
 
             if ($twitter) {
@@ -696,23 +696,18 @@ public function onPageLoad(User $user, Pages $pages, Cache $cache, Smarty $smart
             }
 
             // Profile Posts
-            require_once(ROOT_PATH . '/modules/Core/widgets/ProfilePostsWidget.php');
             $widgets->add(new ProfilePostsWidget($smarty, $language, $cache, $user, new TimeAgo(TIMEZONE)));
 
             // Online staff
-            require_once(ROOT_PATH . '/modules/Core/widgets/OnlineStaffWidget.php');
             $widgets->add(new OnlineStaffWidget($smarty, $language, $cache));
 
             // Online users
-            require_once(ROOT_PATH . '/modules/Core/widgets/OnlineUsersWidget.php');
             $widgets->add(new OnlineUsersWidget($cache, $smarty, $language));
 
             // Online users
-            require_once(ROOT_PATH . '/modules/Core/widgets/ServerStatusWidget.php');
             $widgets->add(new ServerStatusWidget($smarty, $language, $cache));
 
             // Statistics
-            require_once(ROOT_PATH . '/modules/Core/widgets/StatsWidget.php');
             $widgets->add(new StatsWidget($smarty, $language, $cache));
         }
 
@@ -721,7 +716,6 @@ public function onPageLoad(User $user, Pages $pages, Cache $cache, Smarty $smart
         $validate_action = json_decode($validate_action, true);
 
         if ($validate_action['action'] == 'promote') {
-            require_once(ROOT_PATH . '/modules/Core/hooks/ValidateHook.php');
             EventHandler::registerListener('validateUser', 'ValidateHook::execute');
             define('VALIDATED_DEFAULT', $validate_action['group']);
         }
@@ -1534,7 +1528,6 @@ public function onPageLoad(User $user, Pages $pages, Cache $cache, Smarty $smart
             }
         }
 
-        require_once(ROOT_PATH . '/modules/Core/hooks/DeleteUserHook.php');
         EventHandler::registerListener('deleteUser', 'DeleteUserHook::execute');
     }
 
diff --git a/modules/Core/pages/panel/emails.php b/modules/Core/pages/panel/emails.php
index be586badcd..c240a4b0ea 100644
--- a/modules/Core/pages/panel/emails.php
+++ b/modules/Core/pages/panel/emails.php
@@ -126,8 +126,6 @@
                 $viewing_language = new Language('core', Session::get('editing_language'));
 
                 $smarty->assign([
-                    'USER_NAME' => $user->data()->username,
-                    'SUBJECT' => $viewing_language->get('emails', $_GET['email'] . '_subject'),
                     'MESSAGE' => Email::formatEmail($_GET['email'], $viewing_language)
                 ]);
 
diff --git a/modules/Discord Integration/module.php b/modules/Discord Integration/module.php
index 63d9f7afc7..489b037700 100644
--- a/modules/Discord Integration/module.php	
+++ b/modules/Discord Integration/module.php	
@@ -28,14 +28,10 @@ public function __construct(Language $language, Pages $pages, Endpoints $endpoin
 
         $pages->add($this->getName(), '/panel/discord', 'pages/panel/discord.php');
 
-        require_once(ROOT_PATH . "/modules/{$this->getName()}/hooks/DiscordHook.php");
-
         $endpoints->loadEndpoints(ROOT_PATH . '/modules/Discord Integration/includes/endpoints');
 
         GroupSyncManager::getInstance()->registerInjector(new DiscordGroupSyncInjector);
 
-        // Discord Integration
-        require_once(ROOT_PATH . "/modules/{$this->getName()}/classes/DiscordIntegration.php");
         Integrations::getInstance()->registerIntegration(new DiscordIntegration($language));
     }
 
@@ -57,7 +53,6 @@ public function onPageLoad(User $user, Pages $pages, Cache $cache, Smarty $smart
         ]);
 
         if (defined('FRONT_END') || (defined('PANEL_PAGE') && str_contains(PANEL_PAGE, 'widget'))) {
-            require_once(ROOT_PATH . "/modules/{$this->getName()}/widgets/DiscordWidget.php");
             $widgets->add(new DiscordWidget($cache, $smarty));
         }
 
diff --git a/modules/Forum/module.php b/modules/Forum/module.php
index 824b0499a9..1e5a556716 100644
--- a/modules/Forum/module.php
+++ b/modules/Forum/module.php
@@ -157,12 +157,8 @@ public function __construct(Language $language, Language $forum_language, Pages
             ]
         );
 
-        require_once ROOT_PATH . '/modules/Forum/hooks/DeleteUserForumHook.php';
         EventHandler::registerListener('deleteUser', 'DeleteUserForumHook::execute');
 
-        require_once ROOT_PATH . '/modules/Core/hooks/ContentHook.php';
-        require_once ROOT_PATH . '/modules/Forum/hooks/MentionsHook.php';
-
         EventHandler::registerListener('prePostCreate', 'MentionsHook::preCreate');
         EventHandler::registerListener('prePostEdit', 'MentionsHook::preEdit');
         EventHandler::registerListener('preTopicCreate', 'MentionsHook::preCreate');
@@ -180,7 +176,6 @@ public function __construct(Language $language, Language $forum_language, Pages
         EventHandler::registerListener('renderPostEdit', 'ContentHook::decode', false, 20);
         EventHandler::registerListener('renderPostEdit', 'ContentHook::replaceAnchors', false, 15);
 
-        require_once(ROOT_PATH . '/modules/Forum/hooks/CloneGroupForumHook.php');
         EventHandler::registerListener('cloneGroup', 'CloneGroupForumHook::execute');
     }
 
@@ -251,7 +246,6 @@ public function onPageLoad($user, $pages, $cache, $smarty, $navs, $widgets, $tem
         // Widgets
         if (defined('FRONT_END') || (defined('PANEL_PAGE') && str_contains(PANEL_PAGE, 'widget'))) {
             // Latest posts
-            require_once(ROOT_PATH . '/modules/Forum/widgets/LatestPostsWidget.php');
             $widgets->add(new LatestPostsWidget($this->_forum_language->get('forum', 'latest_posts'), $this->_forum_language->get('forum', 'by'), $smarty, $cache, $user, $this->_language));
         }
 

From 2ba7ee420c762d72b4901159d718c336c45733fe Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Wed, 22 Jun 2022 22:48:05 -0600
Subject: [PATCH 184/337] Fix Debugging variables not set

---
 core/classes/Misc/Debugging.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/classes/Misc/Debugging.php b/core/classes/Misc/Debugging.php
index 3b966c4089..ce5be2e4d1 100644
--- a/core/classes/Misc/Debugging.php
+++ b/core/classes/Misc/Debugging.php
@@ -10,8 +10,8 @@
  */
 class Debugging {
 
-    private static bool $_can_view_detailed_error;
-    private static bool $_can_generate_debug_link;
+    private static bool $_can_view_detailed_error = false;
+    private static bool $_can_generate_debug_link = false;
 
     public static function canViewDetailedError(): bool {
         return self::$_can_view_detailed_error;

From 1720630dddae217570854529d25d622104fde001 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Wed, 22 Jun 2022 22:56:00 -0600
Subject: [PATCH 185/337] Fix exception when user id is null in email_error
 table

---
 modules/Core/pages/panel/emails_errors.php | 36 ++++++++++------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/modules/Core/pages/panel/emails_errors.php b/modules/Core/pages/panel/emails_errors.php
index 8f02117a8e..8cf07c0e48 100644
--- a/modules/Core/pages/panel/emails_errors.php
+++ b/modules/Core/pages/panel/emails_errors.php
@@ -89,7 +89,7 @@
             'CLOSE' => $language->get('general', 'close')
         ]);
 
-        if ($error->type == 1) {
+        if ($error->type == Email::REGISTRATION) {
             $user_validated = DB::getInstance()->get('users', ['id', $error->user_id])->results();
             if (count($user_validated)) {
                 $user_validated = $user_validated[0];
@@ -100,18 +100,16 @@
                     ]);
                 }
             }
-        } else {
-            if ($error->type == 4) {
-                $user_error = DB::getInstance()->get('users', ['id', $error->user_id])->results();
-                if (count($user_error)) {
-                    $user_error = $user_error[0];
-                    if ($user_error->active == 0 && !is_null($user_error->reset_code)) {
-                        $smarty->assign([
-                            'REGISTRATION_LINK' => $language->get('admin', 'registration_link'),
-                            'SHOW_REGISTRATION_LINK' => $language->get('admin', 'show_registration_link'),
-                            'REGISTRATION_LINK_VALUE' => rtrim(URL::getSelfURL(), '/') . URL::build('/complete_signup/', 'c=' . urlencode($user_error->reset_code))
-                        ]);
-                    }
+        } else if ($error->type == Email::API_REGISTRATION) {
+            $user_error = DB::getInstance()->get('users', ['id', $error->user_id])->results();
+            if (count($user_error)) {
+                $user_error = $user_error[0];
+                if ($user_error->active == 0 && !is_null($user_error->reset_code)) {
+                    $smarty->assign([
+                        'REGISTRATION_LINK' => $language->get('admin', 'registration_link'),
+                        'SHOW_REGISTRATION_LINK' => $language->get('admin', 'show_registration_link'),
+                        'REGISTRATION_LINK_VALUE' => rtrim(URL::getSelfURL(), '/') . URL::build('/complete_signup/', 'c=' . urlencode($user_error->reset_code))
+                    ]);
                 }
             }
         }
@@ -156,8 +154,8 @@
     if (count($email_errors)) {
         $template_errors = [];
 
-        foreach ($results->data as $nValue) {
-            switch ($nValue->type) {
+        foreach ($results->data as $error) {
+            switch ($error->type) {
                 case Email::REGISTRATION:
                     $type = $language->get('admin', 'registration_email');
                     break;
@@ -180,10 +178,10 @@
 
             $template_errors[] = [
                 'type' => $type,
-                'date' => date(DATE_FORMAT, $nValue->at),
-                'user' => Output::getClean($user->idToName($nValue->user_id)),
-                'view_link' => URL::build('/panel/core/emails/errors/', 'do=view&id=' . $nValue->id),
-                'id' => $nValue->id
+                'date' => date(DATE_FORMAT, $error->at),
+                'user' => $error->user_id ? Output::getClean($user->idToName($error->user_id)) : '',
+                'view_link' => URL::build('/panel/core/emails/errors/', 'do=view&id=' . $error->id),
+                'id' => $error->id
             ];
         }
 

From 75b5220801357949e1d95edb9126ab6e8178d26e Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Wed, 22 Jun 2022 22:59:20 -0600
Subject: [PATCH 186/337] Add deprecated note to Queries class (Closes #2885)

---
 core/classes/Database/Queries.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/classes/Database/Queries.php b/core/classes/Database/Queries.php
index 2fe207ae3e..ed3235c457 100644
--- a/core/classes/Database/Queries.php
+++ b/core/classes/Database/Queries.php
@@ -6,6 +6,7 @@
  * @author Samerton
  * @version 2.0.0-pr13
  * @license MIT
+ * @deprecated Use DB class. Will be removed in 2.1.0
  */
 class Queries {
 

From 7710435561f66e4714405bf967aca10f7958c42e Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Wed, 22 Jun 2022 23:19:55 -0600
Subject: [PATCH 187/337] Use `return` in config files instead of `$conf`

---
 core/classes/Core/Config.php                     | 16 ++++++++++------
 ...20620190645_move_email_settings_to_config.php |  1 +
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/core/classes/Core/Config.php b/core/classes/Core/Config.php
index 5e7f5071f1..f8814bb306 100644
--- a/core/classes/Core/Config.php
+++ b/core/classes/Core/Config.php
@@ -32,11 +32,15 @@ public static function all(): array {
             throw new RuntimeException('Config file does not exist');
         }
 
-        require(ROOT_PATH . '/core/config.php');
-
-        /** @phpstan-ignore-next-line  */
-        if (!isset($conf) || !is_array($conf)) {
-            throw new RuntimeException('Config file is invalid');
+        $config = require(ROOT_PATH . '/core/config.php');
+        if ($config === 1) {
+            // TODO: Legacy < 2.0.0 config file. Remove in 2.1.0
+            /** @phpstan-ignore-next-line  */
+            if (!isset($conf) || !is_array($conf)) {
+                throw new RuntimeException('Config file is invalid');
+            }
+        } else {
+            $conf = $config;
         }
 
         /** @phpstan-ignore-next-line  */
@@ -49,7 +53,7 @@ public static function all(): array {
      * @param array $config New config array to store.
      */
     public static function write(array $config): void {
-        $contents = '<?php' . PHP_EOL . '$conf = ' . self::arrayToString($config) . ';';
+        $contents = '<?php' . PHP_EOL . 'return ' . self::arrayToString($config) . ';';
         if (file_put_contents(ROOT_PATH . '/core/config.php', $contents) === false) {
             throw new RuntimeException('Failed to write to config file');
         }
diff --git a/core/migrations/20220620190645_move_email_settings_to_config.php b/core/migrations/20220620190645_move_email_settings_to_config.php
index 0eb6c369c9..09d6b21ff9 100644
--- a/core/migrations/20220620190645_move_email_settings_to_config.php
+++ b/core/migrations/20220620190645_move_email_settings_to_config.php
@@ -12,6 +12,7 @@ public function change(): void {
         }
 
         // Migrate settings from core/email.php to core/config.php
+        // This will also convert the file to the "new" `return [...]` format instead of `$conf = [...]`
         require(ROOT_PATH . '/core/email.php');
         $email_config = $GLOBALS['email'];
 

From 0c0c29e48be7b42d9cf4da223b291474549394ee Mon Sep 17 00:00:00 2001
From: samerton <samerton@users.noreply.github.com>
Date: Thu, 23 Jun 2022 20:30:39 +0100
Subject: [PATCH 188/337] Default Language::get $term to null

---
 core/classes/Core/Language.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/classes/Core/Language.php b/core/classes/Core/Language.php
index 888b25b570..66d52c004c 100644
--- a/core/classes/Core/Language.php
+++ b/core/classes/Core/Language.php
@@ -203,7 +203,7 @@ public function __construct(string $module = 'core', string $active_language = n
      * @param array $variables Any variables to pass through to the translation.
      * @return string Translated phrase.
      */
-    public function get(string $section, ?string $term, array $variables = []): string {
+    public function get(string $section, ?string $term = null, array $variables = []): string {
         if ($term) {
             $section .= '/' . $term;
         }

From 5eb5db163ed59a5a5a2ac61bc8c2e3977b9f62c8 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Thu, 23 Jun 2022 21:31:08 -0600
Subject: [PATCH 189/337] Fix label types page

---
 .../Default/forum/labels_types.tpl            | 44 +++++++++----------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/custom/panel_templates/Default/forum/labels_types.tpl b/custom/panel_templates/Default/forum/labels_types.tpl
index 191c39348e..b4bff89be4 100644
--- a/custom/panel_templates/Default/forum/labels_types.tpl
+++ b/custom/panel_templates/Default/forum/labels_types.tpl
@@ -44,32 +44,30 @@
                             {include file='includes/alerts.tpl'}
 
                             {if count($ALL_LABEL_TYPES)}
-                            {foreach from=$ALL_LABEL_TYPES item=label_type name=label_list}
-                            <div class="row">
-                                <div class="col-md-9">
-                                    {$label_type.name}
-                                </div>
-                                <div class="col-md-3">
-                                    <div class="float-md-right">
-                                        <a href="{$label_type.edit_link}" class="btn btn-info btn-sm">{$EDIT}</a>
-                                        <button {if $label_type.usages <
-                                            1}onclick="showDeleteModal('{$label_type.delete_link}')" {/if}
-                                            class="btn btn-danger btn-sm" {if $label_type.usages <
-                                            1}disabled{/if}>{$DELETE}</button>
+                                {foreach from=$ALL_LABEL_TYPES item=label_type name=label_list}
+                                <div class="row">
+                                    <div class="col-md-9">
+                                        {$label_type.name}
+                                    </div>
+                                    <div class="col-md-3">
+                                        <div class="float-md-right">
+                                            <a href="{$label_type.edit_link}" class="btn btn-info btn-sm">{$EDIT}</a>
+                                            <button {if $label_type.usages <
+                                                1}onclick="showDeleteModal('{$label_type.delete_link}')" {/if}
+                                                class="btn btn-danger btn-sm" {if $label_type.usages > 0}disabled{/if}>{$DELETE}</button>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                        </div>
-                        {if !$smarty.foreach.label_list.last}
-                        <hr />
-                        {/if}
-                        {/foreach}
-                        {else}
-                        <p>{$NO_LABEL_TYPES}</p>
-                        {/if}
 
+                                {if !$smarty.foreach.label_list.last}
+                                    <hr />
+                                {/if}
+                            {/foreach}
+                            {else}
+                                <p>{$NO_LABEL_TYPES}</p>
+                            {/if}
+                        </div>
                     </div>
-                </div>
 
                 <!-- Spacing -->
                 <div style="height:1rem;"></div>
@@ -122,4 +120,4 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>

From 6ffc956060eb35de2e2576b62bcb7f16649db63c Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Sat, 25 Jun 2022 09:37:09 +0200
Subject: [PATCH 190/337] Remove input cleaning

---
 .../Core/includes/endpoints/CreateReportEndpoint.php   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/Core/includes/endpoints/CreateReportEndpoint.php b/modules/Core/includes/endpoints/CreateReportEndpoint.php
index 110e8ffe9f..f2c123b2ca 100644
--- a/modules/Core/includes/endpoints/CreateReportEndpoint.php
+++ b/modules/Core/includes/endpoints/CreateReportEndpoint.php
@@ -32,7 +32,7 @@ public function execute(Nameless2API $api): void {
         }
 
         // Ensure user reporting has website account, and has not been banned
-        $user_reporting = $api->getUser('id', Output::getClean($_POST['reporter']));
+        $user_reporting = $api->getUser('id', $_POST['reporter']);
         $user_reporting_data = $user_reporting->data();
 
         if ($user_reporting_data->isbanned) {
@@ -59,7 +59,7 @@ public function execute(Nameless2API $api): void {
             }
             if ((
                 $report->reported_id != null && $report->reported_id == $user_reported_id)
-                || (isset($_POST['reported_uid']) && $report->reported_uuid == Output::getClean($_POST['reported_uid']))
+                || (isset($_POST['reported_uid']) && $report->reported_uuid == $_POST['reported_uid'])
             ) {
                 $api->throwError(CoreApiErrors::ERROR_OPEN_REPORT_ALREADY);
             }
@@ -77,10 +77,10 @@ public function execute(Nameless2API $api): void {
             'type' => Report::ORIGIN_API,
             'reporter_id' => $user_reporting_data->id,
             'reported_id' => $user_reported_id,
-            'report_reason' => Output::getClean($_POST['content']),
+            'report_reason' => $_POST['content'],
             'updated_by' => $user_reporting_data->id,
-            'reported_mcname' => $_POST['reported_username'] ? Output::getClean($_POST['reported_username']) : $reported_user->getDisplayname(),
-            'reported_uuid' => $_POST['reported_uid'] ? Output::getClean($_POST['reported_uid']) : $reported_uuid ?? 'none',
+            'reported_mcname' => $_POST['reported_username'] ? $_POST['reported_username'] : $reported_user->getDisplayname(),
+            'reported_uuid' => $_POST['reported_uid'] ? $_POST['reported_uid'] : $reported_uuid ?? 'none',
         ]);
 
         $api->returnArray(['message' => $api->getLanguage()->get('api', 'report_created')], 201);

From ba335333980422fd7c297304c69895db25cef8f7 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Sat, 25 Jun 2022 10:00:17 +0200
Subject: [PATCH 191/337] Case insensitive header handling

---
 core/classes/Endpoints/KeyAuthEndpoint.php |  6 +--
 core/classes/Misc/ErrorHandler.php         |  2 +-
 core/classes/Misc/HttpUtils.php            | 51 +++++++++++++++-------
 core/init.php                              | 25 ++++++-----
 4 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/core/classes/Endpoints/KeyAuthEndpoint.php b/core/classes/Endpoints/KeyAuthEndpoint.php
index d8eb9079d4..30d9f75456 100644
--- a/core/classes/Endpoints/KeyAuthEndpoint.php
+++ b/core/classes/Endpoints/KeyAuthEndpoint.php
@@ -16,13 +16,13 @@ class KeyAuthEndpoint extends EndpointBase {
      * @return bool Whether the API key is valid
      */
     final public function isAuthorised(Nameless2API $api): bool {
-        $headers = getallheaders();
+        $auth_header = HttpUtils::getHeader('Authorization');
 
-        if (!isset($headers['Authorization'])) {
+        if ($auth_header === null) {
             $api->throwError(Nameless2API::ERROR_MISSING_API_KEY, 'Missing authorization header');
         }
 
-        $exploded = explode(' ', trim($headers['Authorization']));
+        $exploded = explode(' ', trim($auth_header));
 
         if (count($exploded) !== 2 ||
             strcasecmp($exploded[0], 'Bearer') !== 0) {
diff --git a/core/classes/Misc/ErrorHandler.php b/core/classes/Misc/ErrorHandler.php
index 44a018a504..10df0fa307 100644
--- a/core/classes/Misc/ErrorHandler.php
+++ b/core/classes/Misc/ErrorHandler.php
@@ -148,7 +148,7 @@ public static function catchException(?Throwable $exception, ?string $error_stri
             'DEBUG_LINK_URL' => URL::build('/queries/debug_link'),
             // TODO: should we skip the 2 frames that are from the "new User()" above?
             'ERROR_SQL_STACK' => QueryRecorder::getInstance()->getSqlStack(),
-            'CURRENT_URL' => HttpUtils::getProtocol() . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'],
+            'CURRENT_URL' => HttpUtils::getProtocol() . '://' . HttpUtils::getHeader('Host') . $_SERVER['REQUEST_URI'],
             'FRAMES' => $frames,
             'SKIP_FRAMES' => $skip_frames,
             'BACK' => $language->get('general', 'back'),
diff --git a/core/classes/Misc/HttpUtils.php b/core/classes/Misc/HttpUtils.php
index ed76467573..8ce9f1cc18 100644
--- a/core/classes/Misc/HttpUtils.php
+++ b/core/classes/Misc/HttpUtils.php
@@ -19,21 +19,22 @@ class HttpUtils {
      */
     public static function getRemoteAddress(): ?string {
         if (!self::isTrustedProxy()) {
+            // Client is not a trusted proxy, we can only trust its actual remote address
             return $_SERVER['REMOTE_ADDR'];
         }
 
-        $headers = getallheaders();
-
         // Try the simple headers first that only contain an IP address...
 
         // Non-standard header that only contains the origin address
-        if (isset($headers['X-Real-Ip'])) {
-            return $headers['X-Real-Ip'];
+        $x_real_ip = self::getHeader('X-Real-IP');
+        if ($x_real_ip !== null) {
+            return $x_real_ip;
         }
 
         // Non-standard header sent by Cloudflare that only contains the origin address
-        if (isset($headers['Cf-Connecting-Ip'])) {
-            return $headers['Cf-Connecting-Ip'];
+        $cf_connecting_ip = self::getHeader('CF-Connecting-IP');
+        if ($cf_connecting_ip !== null) {
+            return $cf_connecting_ip;
         }
 
         // Now the more complicated (X-)Forwarded(-For) headers.
@@ -49,18 +50,20 @@ public static function getRemoteAddress(): ?string {
         // In case of a weirdly behaving proxy that sends an additional Forwarded header instead of appending to an
         // existing one, the worst that would happen is an IP ban affecting the proxy (every user). Under no
         // circumstance would a user be able to spoof their address.
-        if (isset($headers['X-Forwarded-For'])) {
+        $x_forwarded_for = self::getHeader('X-Forwarded-For');
+        if ($x_forwarded_for !== null) {
             $addresses = [];
-            foreach (explode(',', $headers['X-Forwarded-For']) as $part) {
+            foreach (explode(',', trim($x_forwarded_for)) as $part) {
                 $addresses[] = trim($part);
             }
 
             return self::firstNonProxyAddress($addresses);
         }
 
-        if (isset($headers['Forwarded'])) {
+        $forwarded = self::getHeader('Forwarded');
+        if ($forwarded !== null) {
             $addresses = [];
-            foreach (explode(',', $headers['Forwarded']) as $part1) {
+            foreach (explode(',', trim($forwarded)) as $part1) {
                 // Extract the optional 'for=<address>' bit
                 foreach (explode(';', trim($part1)) as $part2) {
                     $part2 = explode('=', $part2);
@@ -89,12 +92,12 @@ public static function getRemoteAddress(): ?string {
      * @return string 'http' if HTTP or 'https' if HTTPS. If the protocol is not known, for example when using the CLI, 'http' is always returned.
      */
     public static function getProtocol(): string {
-        if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
-            $proto = $_SERVER['HTTP_X_FORWARDED_PROTO'];
-            if ($proto !== 'http' && $proto !== 'https') {
+        $x_forwarded_proto = self::getHeader('X-Forwarded-Proto');
+        if ($x_forwarded_proto !== null) {
+            if ($x_forwarded_proto !== 'http' && $x_forwarded_proto !== 'https') {
                 die('Invalid X-Forwarded-Proto header, should be "http" or "https" but it is "' . Output::getClean($proto) . '".');
             }
-            return $proto;
+            return $x_forwarded_proto;
         }
 
         if (isset($_SERVER['HTTPS'])) {
@@ -110,8 +113,9 @@ public static function getProtocol(): string {
      * @return ?int Port number, or null when using the CLI
      */
     public static function getPort(): ?int {
-        if (isset($_SERVER['HTTP_X_FORWARDED_PORT'])) {
-            return (int) $_SERVER['HTTP_X_FORWARDED_PORT'];
+        $x_forwarded_port = self::getHeader('X-Forwarded-Port');
+        if ($x_forwarded_port !== null) {
+            return (int) $x_forwarded_port;
         }
 
         if (isset($_SERVER['SERVER_PORT'])) {
@@ -211,4 +215,19 @@ private static function firstNonProxyAddress(array $addresses): string {
         return $addresses[0];
     }
 
+    /**
+     * Get header value
+     * @param string $header_name Header name
+     * @return ?string Header value, or null if header is not present in request
+     */
+    public static function getHeader(string $header_name): ?string {
+        $headers = getallheaders();
+        foreach ($headers as $key => $value) {
+            if (strcasecmp($key, $header_name) === 0) {
+                return $value;
+            }
+        }
+        return null;
+    }
+
 }
diff --git a/core/init.php b/core/init.php
index df620581ec..a38733e108 100644
--- a/core/init.php
+++ b/core/init.php
@@ -82,18 +82,19 @@
         define('FORCE_WWW', true);
     }
 
-    if (defined('FORCE_SSL') && HttpUtils::getProtocol() === 'http') {
-        if (defined('FORCE_WWW') && !str_contains($_SERVER['HTTP_HOST'], 'www.')) {
-            header('Location: https://www.' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
-            die();
+    $host = HttpUtils::getHeader('Host');
+    // Only check force HTTPS and force www. when Host header is set
+    // These options don't make sense when making requests to IP addresses anyway
+    if ($host !== null) {
+        if (defined('FORCE_SSL') && HttpUtils::getProtocol() === 'http') {
+            if (defined('FORCE_WWW') && !str_contains(host, 'www.')) {
+                Redirect::to('https://www.' . $host . $_SERVER['REQUEST_URI']);
+            } else {
+                Redirect::to('https://.' . $host . $_SERVER['REQUEST_URI']);
+            }
+        } else if (defined('FORCE_WWW') && !str_contains($host, 'www.')) {
+            Redirect::to(HttpUtils::getProtocol() . '://www.' . $host . $_SERVER['REQUEST_URI']);
         }
-
-        header('Location: https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
-        die();
-    }
-
-    if (defined('FORCE_WWW') && !str_contains($_SERVER['HTTP_HOST'], 'www.')) {
-        header('Location: ' . HttpUtils::getProtocol() . '://www.' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
     }
 
     // Ensure database is up-to-date
@@ -194,7 +195,7 @@
     if (!$user->isLoggedIn() || !($user->data()->language_id)) {
         // Attempt to get the requested language from the browser if it exists
         // and if the user has enabled auto language detection
-        $automatic_locale = Language::acceptFromHttp($_SERVER['HTTP_ACCEPT_LANGUAGE'] ?? '');
+        $automatic_locale = Language::acceptFromHttp(HttpUtils::getHeader('Accept-Language') ?? '');
         if ($automatic_locale !== false && (!Cookie::exists('auto_language') || Cookie::get('auto_language') === 'true')) {
             $default_language = $automatic_locale;
         }

From 133496ba45521e43abd1ecda8578c2ab4b52b80f Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Sat, 25 Jun 2022 13:46:31 +0200
Subject: [PATCH 192/337] Add deprecation notice to Configuration

---
 core/classes/Core/Configuration.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/classes/Core/Configuration.php b/core/classes/Core/Configuration.php
index 82cec37be1..6b8b3933b0 100644
--- a/core/classes/Core/Configuration.php
+++ b/core/classes/Core/Configuration.php
@@ -6,6 +6,7 @@
  * @author Partydragen
  * @version 2.0.0-pr8
  * @license MIT
+ * @deprecated Use Util::getSetting and Util::setSetting with $module parameter instead
  */
 class Configuration {
 

From b07ecb21889c39d8faac90502aa88f1f9dd07253 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Sat, 25 Jun 2022 14:16:42 +0200
Subject: [PATCH 193/337] Fix indentation

---
 core/classes/Core/Util.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/core/classes/Core/Util.php b/core/classes/Core/Util.php
index 5a1e336aee..7e45621e0a 100644
--- a/core/classes/Core/Util.php
+++ b/core/classes/Core/Util.php
@@ -348,15 +348,19 @@ public static function setSetting(string $setting, ?string $new_value, ?string $
             }
         } else {
             if ($module === null) {
-                DB::getInstance()->query('INSERT INTO `nl2_settings` (`name`, `value`)
-                                          VALUES (?, ?)
-                                          ON DUPLICATE KEY UPDATE `value` = ?',
-                                          [$setting, $new_value, $new_value]);
+                DB::getInstance()->query(
+                    'INSERT INTO `nl2_settings` (`name`, `value`)
+                     VALUES (?, ?)
+                     ON DUPLICATE KEY UPDATE `value` = ?',
+                    [$setting, $new_value, $new_value]
+                );
             } else {
-                DB::getInstance()->query('INSERT INTO `nl2_settings` (`name`, `value`, `module`)
-                                          VALUES (?, ?, ?)
-                                          ON DUPLICATE KEY UPDATE `value` = ?',
-                                          [$setting, $new_value, $module, $new_value]);
+                DB::getInstance()->query(
+                    'INSERT INTO `nl2_settings` (`name`, `value`, `module`)
+                     VALUES (?, ?, ?)
+                     ON DUPLICATE KEY UPDATE `value` = ?',
+                    [$setting, $new_value, $module, $new_value]
+                );
             }
         }
 

From 942daba60c1ab7000ba9e438252ec5ef0e2409f1 Mon Sep 17 00:00:00 2001
From: Partydragen <adrian_kili@outlook.com>
Date: Sat, 25 Jun 2022 17:42:56 +0200
Subject: [PATCH 194/337] Update DiscordHook.php

---
 modules/Discord Integration/hooks/DiscordHook.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/Discord Integration/hooks/DiscordHook.php b/modules/Discord Integration/hooks/DiscordHook.php
index 961e60f7cd..4ef031197f 100644
--- a/modules/Discord Integration/hooks/DiscordHook.php	
+++ b/modules/Discord Integration/hooks/DiscordHook.php	
@@ -39,7 +39,7 @@ public static function execute(array $params = []): void {
             ]];
         }
 
-        if (isset($params['color'])) {
+        if (isset($params['color']) && $params['color'] != null) {
             $return['embeds'][0]['color'] = hexdec($params['color']);
         }
 

From 3a60992d5f7b0692135ed56511c15e2ba377b8d8 Mon Sep 17 00:00:00 2001
From: samerton <samerton@users.noreply.github.com>
Date: Sat, 25 Jun 2022 20:10:52 +0100
Subject: [PATCH 195/337] Add parameter to DB::query to explicitly state a
 query is select

---
 core/classes/Database/DB.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/classes/Database/DB.php b/core/classes/Database/DB.php
index 67822d6b1d..d5fe480e09 100644
--- a/core/classes/Database/DB.php
+++ b/core/classes/Database/DB.php
@@ -178,9 +178,10 @@ public function delete(string $table, array $where) {
      *
      * @param string $sql The SQL query string to execute.
      * @param array $params The parameters to bind to the query.
+     * @param bool $isSelect Whether the statement is a select, defaults to null
      * @return static This DB instance.
      */
-    public function query(string $sql, array $params = []) {
+    public function query(string $sql, array $params = [], bool $isSelect = null) {
         $this->_error = false;
         if ($this->_statement = $this->_pdo->prepare($sql)) {
             $x = 1;
@@ -200,7 +201,7 @@ public function query(string $sql, array $params = []) {
 
             if ($this->_statement->execute()) {
                 // Only fetch the results if this is a SELECT query.
-                if (str_starts_with(strtoupper($sql), 'SELECT')) {
+                if ($isSelect || str_starts_with(strtoupper($sql), 'SELECT')) {
                     $this->_results = $this->_statement->fetchAll(PDO::FETCH_OBJ);
                 }
                 $this->_count = $this->_statement->rowCount();

From bb58bd4f67117af65b21a076f7490ac3aacc18e8 Mon Sep 17 00:00:00 2001
From: Sam <samerton@users.noreply.github.com>
Date: Sat, 25 Jun 2022 21:14:42 +0100
Subject: [PATCH 196/337] Update security policy for 1.0.22

---
 SECURITY.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index 89e128f903..34f07d2fc7 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -10,8 +10,8 @@ The following NamelessMC releases are supported by the development team
 |---------------| ------------------ |
 | 2.0.0-pr13    | :white_check_mark: |
 | <= 2.0.0-pr12 | :x:                |
-| 1.0.21        | :white_check_mark: |
-| <= 1.0.20     | :x:                |
+| 1.0.22        | :white_check_mark: |
+| <= 1.0.21     | :x:                |
 
 ## Reporting a Vulnerability
 

From 4e02f185f2b0ad74332a2fc37e1caf27b6be6125 Mon Sep 17 00:00:00 2001
From: snake <admin@viasnake.com>
Date: Thu, 23 Jun 2022 14:41:14 +0000
Subject: [PATCH 197/337] Translated using Weblate (Japanese)

Currently translated at 100.0% (1226 of 1226 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/ja/
---
 custom/languages/ja_JP.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/custom/languages/ja_JP.json b/custom/languages/ja_JP.json
index a3d1737ce1..84b4f0fad3 100644
--- a/custom/languages/ja_JP.json
+++ b/custom/languages/ja_JP.json
@@ -19,7 +19,7 @@
     "admin/announcements": "お知らせ",
     "admin/api": "API",
     "admin/api_endpoints": "API エンドポイント",
-    "admin/api_endpoints_info": "APIエンドポイントは、モジュールが外部アプリケーション(MinecraftやDiscordなど)とNamelessMCのウェブサイトが対話するための方法を作成することを可能にします。 {{docLinkStart}}APIドキュメントはこちらをご確認ください。{{docLinkEnd}}",
+    "admin/api_endpoints_info": "APIエンドポイントは、モジュールが外部アプリケーション（MinecraftやDiscordなど）とNamelessMCのウェブサイトが対話するための方法を作成することを可能にします。 {{docLinkStart}}APIドキュメントはこちらをご確認ください。{{docLinkEnd}}",
     "admin/api_info": "このAPIは、{{pluginLinkStart}}公式Namelessプラグイン{{pluginLinkEnd}}や{{botLinkStart}}公式NamelessMC Discord Bot{{botLinkEnd}}などのプラグインや他のサービスがあなたのウェブサイトとやり取りできるようにするためのものです。",
     "admin/api_key": "API キー",
     "admin/api_key_regenerated": "APIキーが正常に再生成されました。",
@@ -238,7 +238,7 @@
     "admin/group_order": "グループ順番",
     "admin/group_staff": "スタッフグループに設定しますか？",
     "admin/group_sync": "グループ同期",
-    "admin/group_sync_info": "ゲーム(サーバー)内グループが変更されたときにユーザーのウェブサイトグループを自動的に更新するようにAPIを設定できます。ゲーム内のグループ名と同期するウェブサイトグループを入力してください。",
+    "admin/group_sync_info": "連携グループが変更されたときに、ユーザーのウェブサイトグループを自動的に更新するように、APIを設定することができます。連携グループ名/IDとウェブサイトグループを入力するだけで、以下のルールで同期されます。",
     "admin/group_sync_logs": "グループ同期の変更",
     "admin/group_sync_plugin_not_set_up": "ゲーム内のプラグインが設定されていません",
     "admin/group_sync_rule_created_successfully": "グループ同期ルールが正常に作成されました。",
@@ -387,11 +387,11 @@
     "admin/page_link_navbar": "ナビゲーションバー",
     "admin/page_link_none": "リンクなし",
     "admin/page_metadata": "ページメタデータ",
-    "admin/page_path": "ページパス(前に/を含める。例: /example)",
+    "admin/page_path": "ページパス（前に/を含める。例: /example）",
     "admin/page_permissions": "ページのアクセス権利",
     "admin/page_redirect": "ページをリダイレクトしますか？",
     "admin/page_redirect_link_maximum_512": "ページリダイレクトリンクは512文字以下にする必要があります。",
-    "admin/page_redirect_to": "リダイレクトリンク(http:// から入力してください)",
+    "admin/page_redirect_to": "リダイレクトリンク（http:// から入力してください）",
     "admin/page_target": "新しいタブでページを開きますか？",
     "admin/page_title": "ページタイトル",
     "admin/page_title_maximum_255": "ページタイトルは255文字以下にする必要があります。",
@@ -407,7 +407,7 @@
     "admin/parent_server_help": "親サーバーは、Bungeecordの場合主幹サーバーとなっているものを選択してください。",
     "admin/permissions": "権限",
     "admin/permissions_updated_successfully": "権限設定が正常に更新されました。",
-    "admin/placeholder_leaderboard_enable_info": "リーダーボードは、コイン、キル数、採掘したブロックなどの数値を表すプレースホルダーとの相性が抜群です。テキストベースのプレースホルダーでリーダーボードを有効にした場合、期待通りの順序で表示されるかどうかは分かりません。",
+    "admin/placeholder_leaderboard_enable_info": "リーダーボードは、数値のプレースホルダー（コイン、キル数、採掘したブロックなど）で最もよく機能します。もし、テキストベースのプレースホルダーでリーダーボードを有効にした場合、望むような順序になるとは限りません。",
     "admin/placeholder_leaderboard_enabled": "リーダーボードの有効化",
     "admin/placeholder_leaderboard_info": "リーダーボードプレースホルダーでは、サーバー上で任意のプレースホルダーに応じてランク付けされたプレイヤーを表示するリーダーボードを作成することができます。",
     "admin/placeholder_leaderboard_settings": "リーダーボードプレースホルダーの設定",
@@ -454,7 +454,7 @@
     "admin/query_errors": "クエリエラー",
     "admin/query_errors_purged_successfully": "クエリエラーが正常にパージされました。",
     "admin/query_information": "クエリ情報",
-    "admin/query_interval": "クエリ間隔 (分単位で、5~60でなければなりません)",
+    "admin/query_interval": "クエリ間隔（分、5～60の間である必要があります）",
     "admin/query_port_maximum": "クエリポートは5文字以内で入力してください",
     "admin/query_settings": "クエリ設定",
     "admin/rating_x": "評価: {{rating}}",
@@ -793,7 +793,7 @@
     "installer/friendly_urls_info": "フレンドリーURLは、ブラウザでのURLの読みやすさを向上させます。<br />例:<br /><code>example.com/index.php?route=/forum</code><br />は次のようになります:<br /><code>example.com/forum</code><br /><div class=\"ui inverted orange segment\"><i class=\"exclamation circle icon\"></i><strong>重要！</strong><br />この機能を有効にするには、サーバーが正しく設定されていなければなりません。このオプションを有効にできるかどうかは、<a href=\"./rewrite_test\" target=\"_blank\" style=\"color:#2185D0\">ここ</a>で確認できます。</div>",
     "installer/general_configuration": "一般設定",
     "installer/host": "ホスト名",
-    "installer/host_help": "ホスト名は、ウェブサイトの<strong>ベースURL</strong>です。インストールパス欄のサブフォルダや、http(s)://をここに入れないでください！",
+    "installer/host_help": "ホスト名は、ウェブサイトのベースURLです。インストールパス項目のサブフォルダーや、「http(s)://」をここに含めないでください！",
     "installer/hostname_error": "有効なホスト名を http:// または https:// を付けずに入力してください",
     "installer/initialising_database_and_cache": "データベースとキャッシュを初期化しています、しばらくお待ちください...",
     "installer/input_maximum": "ユーザー名は最大で{{maxUsername}}文字、メールアドレスは最大で{{maxEmail}}文字、パスワードは最大で{{maxPassword}}文字であることを確認してください。",
@@ -921,7 +921,7 @@
     "moderator/x_closed_report": "{{user}} がレポートを閉鎖しました。",
     "moderator/x_reopened_report": "{{user}} がレポートを再開しました。",
     "table/display_records_per_page": "1ページに_MENU_件のレコードを表示する",
-    "table/filtered": "(_MAX_合計レコードからフィルタリングされました)",
+    "table/filtered": "（_MAX_合計レコードからフィルタリングされました）",
     "table/no_records": "レコードがありません",
     "table/nothing_found": "結果が見つかりません",
     "table/page_x_of_y": "_PAGES_ページ中_PAGE_ページを表示しています",

From 653b5b9ad111c46fd81d942446cae6f312cae339 Mon Sep 17 00:00:00 2001
From: Dominik Roman <dominikslk9@gmail.com>
Date: Sat, 25 Jun 2022 06:11:37 +0000
Subject: [PATCH 198/337] Translated using Weblate (Slovak)

Currently translated at 100.0% (195 of 195 strings)

Translation: NamelessMC/Website - Forum
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-forum/sk/
---
 modules/Forum/language/sk_SK.json | 378 ++++++++++++++++--------------
 1 file changed, 196 insertions(+), 182 deletions(-)

diff --git a/modules/Forum/language/sk_SK.json b/modules/Forum/language/sk_SK.json
index e75bf67772..3bd2feb3c7 100644
--- a/modules/Forum/language/sk_SK.json
+++ b/modules/Forum/language/sk_SK.json
@@ -1,183 +1,197 @@
 {
-    "forum\/all_topics_unfollowed": "Bolo zrušené sledovanie všetkých tém.",
-    "forum\/available_hooks": "Dostupné hooky",
-    "forum\/average_posts": "Priemerný počet príspevkov užívateľov",
-    "forum\/by": "od",
-    "forum\/can_create_topic": "Môže vytvárať témy?",
-    "forum\/can_edit_topic": "Môže upravovať svoje témy?",
-    "forum\/can_moderate_forum": "Môže moderovať fórum?",
-    "forum\/can_post_reply": "Môže vytvárať odpovede?",
-    "forum\/can_view_forum": "Môže zobraziť fórum?",
-    "forum\/can_view_other_topics": "Môže zobraziť témy ostatných užívateľov?",
-    "forum\/confirm_delete_post": "Naozaj chcete odstrániť tento príspevok?",
-    "forum\/confirm_delete_short": "Potvrďte odstránenie",
-    "forum\/confirm_delete_topic": "Určite chcete túto tému vymazať?",
-    "forum\/confirm_unfollow_all_topics": "Naozaj chcete prestať sledovať všetky témy?",
-    "forum\/content_max_50000": "Obsah vášho príspevku nesmie mať viac ako 50 000 znakov",
-    "forum\/content_min_2": "Obsah vášho príspevku musí mať minimálne 2 znaky",
-    "forum\/content_required": "Zadajte obsah príspevku",
-    "forum\/creating_forum": "Vytváranie nového fóra",
-    "forum\/creating_label": "Vytváranie nového štítku",
-    "forum\/creating_label_type": "Vytváranie nového typu štítku",
-    "forum\/creating_topic_in_x": "Vytváranie témy v {{forum}}",
-    "forum\/default_labels": "Predvolené štítky",
-    "forum\/default_labels_info": "Budú priradené k novej téme vo fóre, pokiaľ nebudú počas vytvárania témy prepísané. Ctrl + kliknutím vyberiete viac",
-    "forum\/delete_forum": "Odstrániť fórum",
-    "forum\/delete_topic": "Odstrániť tému",
-    "forum\/delete_topics_and_posts": "Odstrániť témy a príspevky",
-    "forum\/discussion": "Diskusia",
-    "forum\/display_topics_as_news": "Zobraziť témy ako správy na úvodnej stránke?",
-    "forum\/edit": "Upraviť",
-    "forum\/edit_post": "Upraviť príspevok",
-    "forum\/editing_label": "Upravovanie štítku",
-    "forum\/editing_label_type": "Upravovanie typu štítku",
-    "forum\/error_quoting_posts": "Ľutujeme, pri citovaní týchto príspevkov sa vyskytla chyba.",
-    "forum\/error_rating_post": "Ľutujeme, pri hodnotení príspevku sa vyskytla chyba.",
-    "forum\/follow": "Sledovať",
-    "forum\/following_topics": "Sledované témy",
-    "forum\/forum": "Fórum",
-    "forum\/forum_created_successfully": "Fórum bolo úspešne vytvorené.",
-    "forum\/forum_deleted_successfully": "Fórum bolo úspešne odstránené.",
-    "forum\/forum_description": "Popis fóra",
-    "forum\/forum_description_maximum": "Popis fóra môže mať maximálne 255 znakov.",
-    "forum\/forum_description_minimum": "Popis fóra musí mať minimálne 2 znaky.",
-    "forum\/forum_icon": "Ikona fóra",
-    "forum\/forum_icon_maximum": "Ikona fóra môže mať maximálne 256 znakov.",
-    "forum\/forum_index": "Domov",
-    "forum\/forum_layout": "Rozloženie fóra",
-    "forum\/forum_name": "Názov fóra",
-    "forum\/forum_name_maximum": "Názov fóra môže mať maximálne 150 znakov.",
-    "forum\/forum_name_minimum": "Názov fóra musí mať minimálne 2 znaky.",
-    "forum\/forum_permissions": "Oprávnenia fóra",
-    "forum\/forum_redirect_warning": "Upozornenie: Chystáte sa opustiť túto stránku! Naozaj chcete pokračovať na stránku {{url}}?",
-    "forum\/forum_search": "Hľadanie na fóre",
-    "forum\/forum_type": "Typ fóra",
-    "forum\/forum_type_category": "Kategória",
-    "forum\/forum_type_forum": "Fórum",
-    "forum\/forum_updated_successfully": "Fórum bolo úspešne aktualizované.",
-    "forum\/forums": "Fóra",
-    "forum\/group": "Skupina",
-    "forum\/guests": "Hostia",
-    "forum\/has_no_parent": "Žiadne nadradené",
-    "forum\/in": "v",
-    "forum\/include_in_hook": "Chcete zahrnúť nové témy z tohto fóra do webhookov?",
-    "forum\/input_forum_description": "Zadajte popis fóra.",
-    "forum\/input_forum_title": "Zadajte názov fóra.",
-    "forum\/insert_quotes": "Vložiť úvodzovky",
-    "forum\/invalid_action": "Neplatná akcia",
-    "forum\/invalid_redirect_url": "Povolili ste presmerovanie fóra, ale nezadali ste platnú adresu URL medzi 1 a 512 znakmi.",
-    "forum\/invalid_search_query": "Zadajte vyhľadávací dotaz s dĺžkou od 3 do 128 znakov.",
-    "forum\/label": "Štítok",
-    "forum\/label_creation_error": "Chyba pri vytváraní štítka. Uistite sa, že názov nemá viac ako 32 znakov a či ste zadali typ.",
-    "forum\/label_creation_success": "Štítok bol úspešne vytvorený.",
-    "forum\/label_deleted_successfully": "Štítok bol úspešne odstránený.",
-    "forum\/label_edit_success": "Štítok bol úspešne upravený.",
-    "forum\/label_forums": "Štítky fóra",
-    "forum\/label_groups": "Skupiny štítkov",
-    "forum\/label_name": "Názov štítku",
-    "forum\/label_type": "Typ štítku",
-    "forum\/label_type_creation_error": "Chyba pri vytváraní typu štítka. Uistite sa, že názov nemá viac ako 32 znakov a HTML nemá viac ako 1024 znakov.",
-    "forum\/label_type_creation_success": "Typ štítku bol úspešne vytvorený.",
-    "forum\/label_type_deleted_successfully": "Typ štítku bol úspešne odstránený.",
-    "forum\/label_type_edit_success": "Typ štítku bol úspešne upravený.",
-    "forum\/label_type_html": "HTML typu štítku",
-    "forum\/label_type_html_help": "HTML musí obsahovať {x} ako placeholder pre názov štítku",
-    "forum\/label_type_name": "Názov typu štítku",
-    "forum\/label_types": "Typy štítkov",
-    "forum\/labels": "Štítky",
-    "forum\/last_7_days_posts": "Príspevky na fóre (posledných 7 dní)",
-    "forum\/last_edited": "Posledná úprava: {{lastEditedAt}}",
-    "forum\/last_reply": "Posledná odpoveď",
-    "forum\/latest_announcements": "Najnovšie oznámenia",
-    "forum\/latest_discussions": "Najnovšie diskusie",
-    "forum\/latest_discussions_view": "Zobrazenie najnovších diskusií",
-    "forum\/latest_posts": "Najnovšie príspevky",
-    "forum\/lock_topic": "Uzamknúť tému",
-    "forum\/merge_instructions": "Vlákno, ktoré sa má zlúčiť, musí <strong>byť<\/strong> v rovnakom fóre. V prípade potreby posuňte vlákno.",
-    "forum\/merge_topic": "Zlúčiť tému",
-    "forum\/merge_topics": "Zlúčiť témy",
-    "forum\/mod_actions": "Moderovanie",
-    "forum\/move_topic": "Presunúť tému",
-    "forum\/move_topic_to": "Presunúť tému do:",
-    "forum\/move_topics_and_posts_to": "Presunúť témy a príspevky do",
-    "forum\/new_forum": "<i class=\"fa fa-plus-circle\"><\/i> Nové fórum",
-    "forum\/new_label": "<i class=\"fa fa-plus-circle\"><\/i> Nový štítok",
-    "forum\/new_label_type": "<i class=\"fa fa-plus-circle\"><\/i> Nový typ štítku",
-    "forum\/new_reply": "Nová odpoveď",
-    "forum\/new_reply_in_topic": "{{author}} odpovedal\/a na {{topic}}",
-    "forum\/new_search": "Nové vyhľadávanie",
-    "forum\/new_topic": "Nová téma",
-    "forum\/new_topic_hook_info": "Nová téma",
-    "forum\/new_topic_text": "Téma vytvorená v {{forum}} od {{author}}",
-    "forum\/no_forums": "Žiadne fóra",
-    "forum\/no_label": "Bez štítku",
-    "forum\/no_label_types_defined": "Zatiaľ nie sú definované žiadne typy štítkov.",
-    "forum\/no_labels_defined": "Zatiaľ neboli definované žiadne štítky.",
-    "forum\/no_longer_following_topic": "Túto tému už nesledujete a nebudete dostávať oznámenia o nových odpovediach.",
-    "forum\/no_results_found": "Neboli nájdené žiadne výsledky.",
-    "forum\/no_topics": "Zatiaľ neboli vytvorené žiadne témy.",
-    "forum\/no_topics_short": "Žiadne témy",
-    "forum\/no_users_online": "Žiadni užívatelia online.",
-    "forum\/not_following_any_topics": "Nesledujete žiadne témy.",
-    "forum\/now_following_topic": "Teraz sledujete túto tému a budete informovaný o všetkých nových odpovediach.",
-    "forum\/online_users": "Online užívatelia",
-    "forum\/overview": "Prehľad",
-    "forum\/parent_forum": "Nadradené fórum",
-    "forum\/parent_forum_x": "Nadradené fórum: {{forum}}",
-    "forum\/post_already_reported": "Tento príspevok ste už nahlásili!",
-    "forum\/post_edited_successfully": "Príspevok bol úspešne upravený.",
-    "forum\/post_successful": "Príspevok bol úspešne pridaný.",
-    "forum\/posts": "príspevky",
-    "forum\/posts_title": "Príspevky",
-    "forum\/quote": "Citát",
-    "forum\/quoted_post": "Príspevok bol pridaný k citovaným príspevkom.",
-    "forum\/quoting_posts": "Vkladanie úvodzoviek..",
-    "forum\/re": "RE: ",
-    "forum\/read_full_post": "Prečítať celý príspevok",
-    "forum\/recent_posts": "Najnovšie príspevky",
-    "forum\/recent_topics": "Najnovšie témy",
-    "forum\/redirect_forum": "Presmerovať fórum?",
-    "forum\/redirect_url": "URL presmerovania",
-    "forum\/registered_x": "Pripojený\/á: {{registeredAt}}",
-    "forum\/removed_quoted_post": "Príspevok bol odstránený z citovaných príspevkov.",
-    "forum\/search_again_in_x_seconds": "Pred ďalším vyhľadávaním počkajte {{count}} sekúnd.",
-    "forum\/search_results": "Výsledky vyhľadávania",
-    "forum\/select_a_parent_forum": "Vyberte nadradené fórum",
-    "forum\/settings_updated_successfully": "Nastavenia sa úspešne aktualizovali.",
-    "forum\/share": "Zdieľať",
-    "forum\/share_facebook": "Zdieľať na Facebooku",
-    "forum\/share_twitter": "Zdieľať na Twitteri",
-    "forum\/spam_wait": "Pred opätovným uverejnením príspevku počkajte {{count}} sekúnd.",
-    "forum\/started_by_x": "Založil\/a {{author}}",
-    "forum\/stats": "Štatistiky",
-    "forum\/stick_topic": "Pripnúť tému",
-    "forum\/sticky_topics": "Pripnuté témy",
-    "forum\/subforum": "Sub fórum",
-    "forum\/subforums": "Sub fóra",
-    "forum\/table_view": "Tabuľkové zobrazenie",
-    "forum\/title_max_64": "Názov témy nesmie byť dlhší ako 64 znakov",
-    "forum\/title_min_2": "Názov vašej témy musí mať minimálne 2 znaky",
-    "forum\/title_required": "Zadajte názov témy",
-    "forum\/topic": "Téma",
-    "forum\/topic_locked": "Téma bola uzamknutá",
-    "forum\/topic_locked_notice": "Táto téma je zamknutá, ale vaše oprávnenia vám umožňujú vytvoriť odpoveď.",
-    "forum\/topic_placeholder": "Placeholder témy",
-    "forum\/topic_stuck": "Téma bola pripnutá.",
-    "forum\/topic_title": "Názov témy",
-    "forum\/topic_unstuck": "Téma bola odopnutá.",
-    "forum\/topics": "témy",
-    "forum\/topics_title": "Témy",
-    "forum\/total_posts": "Celkový počet príspevkov",
-    "forum\/unfollow": "Zrušiť sledovanie",
-    "forum\/unfollow_all_topics": "Zrušiť sledovanie všetkých tém",
-    "forum\/unlock_topic": "Odomknúť tému",
-    "forum\/unstick_topic": "Odopnúť tému",
-    "forum\/use_reactions": "Použiť reakcie?",
-    "forum\/user_no_posts": "Tento užívateľ zatiaľ nevytvoril žiadne príspevky na fóre.",
-    "forum\/user_tag": "Bol\/a si označený\/á v príspevku.",
-    "forum\/user_tag_info": "Bol\/a si označený\/á v príspevku od {{author}}.",
-    "forum\/views": "zobrazení",
-    "forum\/x_posts": "{{count}} príspevkov",
-    "forum\/x_topics": "{{count}} tém",
-    "forum\/your_posts": "Počet vašich príspevkov"
-}
\ No newline at end of file
+    "forum/all_topics_unfollowed": "Bolo zrušené sledovanie všetkých tém.",
+    "forum/available_hooks": "Dostupné hooky",
+    "forum/average_posts": "Priemerný počet príspevkov užívateľov",
+    "forum/by": "od",
+    "forum/can_create_topic": "Môže vytvárať témy?",
+    "forum/can_edit_topic": "Môže upravovať svoje témy?",
+    "forum/can_moderate_forum": "Môže moderovať fórum?",
+    "forum/can_post_reply": "Môže vytvárať odpovede?",
+    "forum/can_view_forum": "Môže zobraziť fórum?",
+    "forum/can_view_other_topics": "Môže zobraziť témy ostatných užívateľov?",
+    "forum/confirm_delete_post": "Naozaj chcete odstrániť tento príspevok?",
+    "forum/confirm_delete_short": "Potvrďte odstránenie",
+    "forum/confirm_delete_topic": "Určite chcete túto tému vymazať?",
+    "forum/confirm_unfollow_all_topics": "Naozaj chcete prestať sledovať všetky témy?",
+    "forum/content_max_50000": "Obsah vášho príspevku nesmie mať viac ako 50 000 znakov",
+    "forum/content_min_2": "Obsah vášho príspevku musí mať minimálne 2 znaky",
+    "forum/content_required": "Zadajte obsah príspevku",
+    "forum/creating_forum": "Vytváranie nového fóra",
+    "forum/creating_label": "Vytváranie nového štítku",
+    "forum/creating_label_type": "Vytváranie nového typu štítku",
+    "forum/creating_topic_in_x": "Vytváranie témy v {{forum}}",
+    "forum/default_labels": "Predvolené štítky",
+    "forum/default_labels_info": "Budú priradené k novej téme vo fóre, pokiaľ nebudú počas vytvárania témy prepísané. Ctrl + kliknutím vyberiete viac",
+    "forum/delete_forum": "Odstrániť fórum",
+    "forum/delete_topic": "Odstrániť tému",
+    "forum/delete_topics_and_posts": "Odstrániť témy a príspevky",
+    "forum/discussion": "Diskusia",
+    "forum/display_topics_as_news": "Zobraziť témy ako správy na úvodnej stránke?",
+    "forum/edit": "Upraviť",
+    "forum/edit_post": "Upraviť príspevok",
+    "forum/editing_label": "Upravovanie štítku",
+    "forum/editing_label_type": "Upravovanie typu štítku",
+    "forum/error_quoting_posts": "Ľutujeme, pri citovaní týchto príspevkov sa vyskytla chyba.",
+    "forum/error_rating_post": "Ľutujeme, pri hodnotení príspevku sa vyskytla chyba.",
+    "forum/follow": "Sledovať",
+    "forum/following_topics": "Sledované témy",
+    "forum/forum": "Fórum",
+    "forum/forum_created_successfully": "Fórum bolo úspešne vytvorené.",
+    "forum/forum_deleted_successfully": "Fórum bolo úspešne odstránené.",
+    "forum/forum_description": "Popis fóra",
+    "forum/forum_description_maximum": "Popis fóra môže mať maximálne 255 znakov.",
+    "forum/forum_description_minimum": "Popis fóra musí mať minimálne 2 znaky.",
+    "forum/forum_icon": "Ikona fóra",
+    "forum/forum_icon_maximum": "Ikona fóra môže mať maximálne 256 znakov.",
+    "forum/forum_index": "Domov",
+    "forum/forum_layout": "Rozloženie fóra",
+    "forum/forum_name": "Názov fóra",
+    "forum/forum_name_maximum": "Názov fóra môže mať maximálne 150 znakov.",
+    "forum/forum_name_minimum": "Názov fóra musí mať minimálne 2 znaky.",
+    "forum/forum_permissions": "Oprávnenia fóra",
+    "forum/forum_redirect_warning": "Upozornenie: Chystáte sa opustiť túto stránku! Naozaj chcete pokračovať na stránku {{url}}?",
+    "forum/forum_search": "Hľadanie na fóre",
+    "forum/forum_type": "Typ fóra",
+    "forum/forum_type_category": "Kategória",
+    "forum/forum_type_forum": "Fórum",
+    "forum/forum_updated_successfully": "Fórum bolo úspešne aktualizované.",
+    "forum/forums": "Fóra",
+    "forum/group": "Skupina",
+    "forum/guests": "Hostia",
+    "forum/has_no_parent": "Žiadne nadradené",
+    "forum/in": "v",
+    "forum/include_in_hook": "Zahrnúť udalosti z tohto fóra do webhookov?",
+    "forum/input_forum_description": "Zadajte popis fóra.",
+    "forum/input_forum_title": "Zadajte názov fóra.",
+    "forum/insert_quotes": "Vložiť úvodzovky",
+    "forum/invalid_action": "Neplatná akcia",
+    "forum/invalid_redirect_url": "Povolili ste presmerovanie fóra, ale nezadali ste platnú adresu URL medzi 1 a 512 znakmi.",
+    "forum/invalid_search_query": "Zadajte vyhľadávací dotaz s dĺžkou od 3 do 128 znakov.",
+    "forum/label": "Štítok",
+    "forum/label_creation_error": "Chyba pri vytváraní štítka. Uistite sa, že názov nemá viac ako 32 znakov a či ste zadali typ.",
+    "forum/label_creation_success": "Štítok bol úspešne vytvorený.",
+    "forum/label_deleted_successfully": "Štítok bol úspešne odstránený.",
+    "forum/label_edit_success": "Štítok bol úspešne upravený.",
+    "forum/label_forums": "Štítky fóra",
+    "forum/label_groups": "Skupiny štítkov",
+    "forum/label_name": "Názov štítku",
+    "forum/label_type": "Typ štítku",
+    "forum/label_type_creation_error": "Chyba pri vytváraní typu štítka. Uistite sa, že názov nemá viac ako 32 znakov a HTML nemá viac ako 1024 znakov.",
+    "forum/label_type_creation_success": "Typ štítku bol úspešne vytvorený.",
+    "forum/label_type_deleted_successfully": "Typ štítku bol úspešne odstránený.",
+    "forum/label_type_edit_success": "Typ štítku bol úspešne upravený.",
+    "forum/label_type_html": "HTML typu štítku",
+    "forum/label_type_html_help": "HTML musí obsahovať {x} ako placeholder pre názov štítku",
+    "forum/label_type_name": "Názov typu štítku",
+    "forum/label_types": "Typy štítkov",
+    "forum/labels": "Štítky",
+    "forum/last_7_days_posts": "Príspevky na fóre (posledných 7 dní)",
+    "forum/last_edited": "Posledná úprava: {{lastEditedAt}}",
+    "forum/last_reply": "Posledná odpoveď",
+    "forum/latest_announcements": "Najnovšie oznámenia",
+    "forum/latest_discussions": "Najnovšie diskusie",
+    "forum/latest_discussions_view": "Zobrazenie najnovších diskusií",
+    "forum/latest_posts": "Najnovšie príspevky",
+    "forum/lock_topic": "Uzamknúť tému",
+    "forum/merge_instructions": "Vlákno, ktoré sa má zlúčiť, musí <strong>byť</strong> v rovnakom fóre. V prípade potreby posuňte vlákno.",
+    "forum/merge_topic": "Zlúčiť tému",
+    "forum/merge_topics": "Zlúčiť témy",
+    "forum/mod_actions": "Moderovanie",
+    "forum/move_topic": "Presunúť tému",
+    "forum/move_topic_to": "Presunúť tému do:",
+    "forum/move_topics_and_posts_to": "Presunúť témy a príspevky do",
+    "forum/new_forum": "<i class=\"fa fa-plus-circle\"></i> Nové fórum",
+    "forum/new_label": "<i class=\"fa fa-plus-circle\"></i> Nový štítok",
+    "forum/new_label_type": "<i class=\"fa fa-plus-circle\"></i> Nový typ štítku",
+    "forum/new_reply": "Nová odpoveď",
+    "forum/new_reply_in_topic": "{{author}} odpovedal/a na {{topic}}",
+    "forum/new_search": "Nové vyhľadávanie",
+    "forum/new_topic": "Nová téma",
+    "forum/new_topic_hook_info": "Nová téma",
+    "forum/new_topic_text": "Téma vytvorená v {{forum}} od {{author}}",
+    "forum/no_forums": "Žiadne fóra",
+    "forum/no_label": "Bez štítku",
+    "forum/no_label_types_defined": "Zatiaľ nie sú definované žiadne typy štítkov.",
+    "forum/no_labels_defined": "Zatiaľ neboli definované žiadne štítky.",
+    "forum/no_longer_following_topic": "Túto tému už nesledujete a nebudete dostávať oznámenia o nových odpovediach.",
+    "forum/no_results_found": "Neboli nájdené žiadne výsledky.",
+    "forum/no_topics": "Zatiaľ neboli vytvorené žiadne témy.",
+    "forum/no_topics_short": "Žiadne témy",
+    "forum/no_users_online": "Žiadni užívatelia online.",
+    "forum/not_following_any_topics": "Nesledujete žiadne témy.",
+    "forum/now_following_topic": "Teraz sledujete túto tému a budete informovaný o všetkých nových odpovediach.",
+    "forum/online_users": "Online užívatelia",
+    "forum/overview": "Prehľad",
+    "forum/parent_forum": "Nadradené fórum",
+    "forum/parent_forum_x": "Nadradené fórum: {{forum}}",
+    "forum/post_already_reported": "Tento príspevok ste už nahlásili!",
+    "forum/post_edited_successfully": "Príspevok bol úspešne upravený.",
+    "forum/post_successful": "Príspevok bol úspešne pridaný.",
+    "forum/posts": "príspevky",
+    "forum/posts_title": "Príspevky",
+    "forum/quote": "Citát",
+    "forum/quoted_post": "Príspevok bol pridaný k citovaným príspevkom.",
+    "forum/quoting_posts": "Vkladanie úvodzoviek..",
+    "forum/re": "RE: ",
+    "forum/read_full_post": "Prečítať celý príspevok",
+    "forum/recent_posts": "Najnovšie príspevky",
+    "forum/recent_topics": "Najnovšie témy",
+    "forum/redirect_forum": "Presmerovať fórum?",
+    "forum/redirect_url": "URL presmerovania",
+    "forum/registered_x": "Pripojený/á: {{registeredAt}}",
+    "forum/removed_quoted_post": "Príspevok bol odstránený z citovaných príspevkov.",
+    "forum/search_again_in_x_seconds": "Pred ďalším vyhľadávaním počkajte {{count}} sekúnd.",
+    "forum/search_results": "Výsledky vyhľadávania",
+    "forum/select_a_parent_forum": "Vyberte nadradené fórum",
+    "forum/settings_updated_successfully": "Nastavenia sa úspešne aktualizovali.",
+    "forum/share": "Zdieľať",
+    "forum/share_facebook": "Zdieľať na Facebooku",
+    "forum/share_twitter": "Zdieľať na Twitteri",
+    "forum/spam_wait": "Pred opätovným uverejnením príspevku počkajte {{count}} sekúnd.",
+    "forum/started_by_x": "Založil/a {{author}}",
+    "forum/stats": "Štatistiky",
+    "forum/stick_topic": "Pripnúť tému",
+    "forum/sticky_topics": "Pripnuté témy",
+    "forum/subforum": "Sub fórum",
+    "forum/subforums": "Sub fóra",
+    "forum/table_view": "Tabuľkové zobrazenie",
+    "forum/title_max_64": "Názov témy nesmie byť dlhší ako 64 znakov",
+    "forum/title_min_2": "Názov vašej témy musí mať minimálne 2 znaky",
+    "forum/title_required": "Zadajte názov témy",
+    "forum/topic": "Téma",
+    "forum/topic_locked": "Téma bola uzamknutá",
+    "forum/topic_locked_notice": "Táto téma je zamknutá, ale vaše oprávnenia vám umožňujú vytvoriť odpoveď.",
+    "forum/topic_placeholder": "Placeholder témy",
+    "forum/topic_stuck": "Téma bola pripnutá.",
+    "forum/topic_title": "Názov témy",
+    "forum/topic_unstuck": "Téma bola odopnutá.",
+    "forum/topics": "témy",
+    "forum/topics_title": "Témy",
+    "forum/total_posts": "Celkový počet príspevkov",
+    "forum/unfollow": "Zrušiť sledovanie",
+    "forum/unfollow_all_topics": "Zrušiť sledovanie všetkých tém",
+    "forum/unlock_topic": "Odomknúť tému",
+    "forum/unstick_topic": "Odopnúť tému",
+    "forum/use_reactions": "Použiť reakcie?",
+    "forum/user_no_posts": "Tento užívateľ zatiaľ nevytvoril žiadne príspevky na fóre.",
+    "forum/user_tag": "Bol/a si označený/á v príspevku.",
+    "forum/user_tag_info": "Bol/a si označený/á v príspevku od {{author}}.",
+    "forum/views": "zobrazení",
+    "forum/x_posts": "{{count}} príspevkov",
+    "forum/x_topics": "{{count}} tém",
+    "forum/your_posts": "Počet vašich príspevkov",
+    "forum/no_news": "Neexistujú žiadne nové príspevky.",
+    "forum/post_id": "ID príspevku",
+    "forum/pre_post_create_hook_info": "Pred vytvorením príspevku",
+    "forum/pre_post_edit_hook_info": "Pred upravením príspevku",
+    "forum/pre_topic_create_hook_info": "Pred vytvorením témy",
+    "forum/pre_topic_edit_hook_info": "Pred upravením témy",
+    "forum/topic_reply": "Odpoveď k téme",
+    "forum/label_type_in_use": "Typ štítka sa používa, nemožno ho odstrániť.",
+    "forum/new_topic_reply_text": "Odpoveď na tému bola vytvorená vo {{forum}} od {{author}}",
+    "forum/topic_id": "ID témy",
+    "forum/topic_author_uuid": "ID autora témy",
+    "forum/topic_author_username": "Používateľské meno autora témy",
+    "forum/topic_author_nickname": "Prezývka autora témy",
+    "forum/user_object": "Používateľský objekt"
+}

From 5ed418f5e0e7b4021f8769ba4caedd36ee7530dc Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Mon, 27 Jun 2022 20:08:51 -0600
Subject: [PATCH 199/337] Fix #2895

---
 error.tpl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/error.tpl b/error.tpl
index 3205f2ded1..4fbf8a3d60 100644
--- a/error.tpl
+++ b/error.tpl
@@ -150,6 +150,7 @@
 
     </div>
 
+    {if $CAN_GENERATE_DEBUG}
     <!-- Debug link modal -->
     <div class="modal fade" id="debug_link_modal" tabindex="-1" role="dialog">
         <div class="modal-dialog" role="document">
@@ -168,6 +169,7 @@
             </div>
         </div>
     </div>
+    {/if}
 </body>
 
 <style>

From 08e740193fe4386e34cb62479397c80082612e7d Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Mon, 27 Jun 2022 20:10:46 -0600
Subject: [PATCH 200/337] Fix removal version

---
 core/classes/Core/Config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/classes/Core/Config.php b/core/classes/Core/Config.php
index f8814bb306..b291e826a2 100644
--- a/core/classes/Core/Config.php
+++ b/core/classes/Core/Config.php
@@ -34,7 +34,7 @@ public static function all(): array {
 
         $config = require(ROOT_PATH . '/core/config.php');
         if ($config === 1) {
-            // TODO: Legacy < 2.0.0 config file. Remove in 2.1.0
+            // TODO: Legacy < 2.0.0 config file. Remove in 2.0.1, all sites will have been updated or installed with this syntax by then
             /** @phpstan-ignore-next-line  */
             if (!isset($conf) || !is_array($conf)) {
                 throw new RuntimeException('Config file is invalid');

From 221572ffeffe489ff963ae9ce83c0bb513e105d6 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Mon, 27 Jun 2022 20:32:05 -0600
Subject: [PATCH 201/337] Fix editing posts comparison

---
 modules/Forum/pages/forum/edit.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/Forum/pages/forum/edit.php b/modules/Forum/pages/forum/edit.php
index d5d8d554cc..cf36af39d2 100644
--- a/modules/Forum/pages/forum/edit.php
+++ b/modules/Forum/pages/forum/edit.php
@@ -69,11 +69,11 @@
 $user_groups = $user->getAllGroupIds();
 
 // Check permissions before proceeding
-if ($user->data()->id === $post_editing[0]->post_creator && !$forum->canEditTopic($forum_id, $user_groups) && !$forum->canModerateForum($forum_id, $user_groups)) {
+if ($user->data()->id == $post_editing[0]->post_creator && !$forum->canEditTopic($forum_id, $user_groups) && !$forum->canModerateForum($forum_id, $user_groups)) {
     Redirect::to(URL::build('/forum/topic/' . urlencode($post_id)));
 }
 
-if ($user->data()->id !== $post_editing[0]->post_creator && !($forum->canModerateForum($forum_id, $user_groups))) {
+if ($user->data()->id != $post_editing[0]->post_creator && !($forum->canModerateForum($forum_id, $user_groups))) {
     Redirect::to(URL::build('/forum/topic/' . urlencode($post_id)));
 }
 

From 44ffb99ce09fa4a6589cd3689a9bb74230426af5 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Mon, 27 Jun 2022 20:41:41 -0600
Subject: [PATCH 202/337] Fix seeder

---
 scripts/seeder/db_seeder.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/seeder/db_seeder.php b/scripts/seeder/db_seeder.php
index 509864371d..a208749dbe 100644
--- a/scripts/seeder/db_seeder.php
+++ b/scripts/seeder/db_seeder.php
@@ -27,7 +27,8 @@
 
 /** @var Seeder[] $seeders */
 $seeders = array_map(static function (string $class) {
-    return new (explode('.', $class)[0]);
+    $class = explode('.', $class)[0];
+    return new $class();
 }, array_slice($classes, 1));
 
 $faker = Faker\Factory::create();

From 7f85de192b11d9e49462c486d089769e7d3bc204 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Mon, 27 Jun 2022 20:50:38 -0600
Subject: [PATCH 203/337] Less HTML in seeded forum posts

---
 scripts/seeder/ForumPostSeeder.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/seeder/ForumPostSeeder.php b/scripts/seeder/ForumPostSeeder.php
index fb02b47763..fed0015a54 100644
--- a/scripts/seeder/ForumPostSeeder.php
+++ b/scripts/seeder/ForumPostSeeder.php
@@ -17,7 +17,7 @@ protected function run(DB $db, \Faker\Generator $faker): void {
                 'forum_id' => $topic->forum_id,
                 'topic_id' => $topic->id,
                 'post_creator' => $topic->topic_creator,
-                'post_content' => $faker->randomHtml(),
+                'post_content' => $faker->boolean(40) ? $faker->randomHtml() : $faker->sentences($faker->numberBetween(3, 30), true),
                 'post_date' => $created->format('Y-m-d H:i:s'),
                 'created' => $created->format('U'),
             ]);
@@ -30,7 +30,7 @@ protected function run(DB $db, \Faker\Generator $faker): void {
                     'forum_id' => $topic->forum_id,
                     'topic_id' => $topic->id,
                     'post_creator' => $user->id,
-                    'post_content' => $faker->randomHtml(),
+                    'post_content' => $faker->boolean(40) ? $faker->randomHtml() : $faker->sentences($faker->numberBetween(3, 30), true),
                     'post_date' => $created->format('Y-m-d H:i:s'),
                     'created' => $created->format('U'),
                 ]);

From 3cb6ecaa69bd6bf902a930a54019ea8b1fd3c032 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Mon, 27 Jun 2022 20:56:14 -0600
Subject: [PATCH 204/337] Fix #2890

---
 core/init.php | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/core/init.php b/core/init.php
index a38733e108..57c0cc920c 100644
--- a/core/init.php
+++ b/core/init.php
@@ -360,29 +360,6 @@
     // Widgets
     $widgets = new Widgets($cache);
 
-    // Maintenance mode?
-    if (Util::getSetting('maintenance') === '1') {
-        // Enabled
-        // Admins only beyond this point
-        if (!$user->isLoggedIn() || !$user->canViewStaffCP()) {
-            // Maintenance mode
-            if (isset($_GET['route']) && (
-                rtrim($_GET['route'], '/') == '/login'
-                || rtrim($_GET['route'], '/') == '/forgot_password'
-                || str_contains($_GET['route'], '/api/')
-                || str_contains($_GET['route'], 'queries')
-            )) {
-                // Can continue as normal
-            } else {
-                require(ROOT_PATH . '/maintenance.php');
-                die();
-            }
-        } else {
-            // Display notice to admin stating maintenance mode is enabled
-            $smarty->assign('MAINTENANCE_ENABLED', $language->get('admin', 'maintenance_enabled'));
-        }
-    }
-
     // Minecraft integration?
     define('MINECRAFT', Util::getSetting('mc_integration', '0') === '1');
 
@@ -467,6 +444,29 @@
         }
     }
 
+    // Maintenance mode?
+    if (Util::getSetting('maintenance') === '1') {
+        // Enabled
+        // Admins only beyond this point
+        if (!$user->isLoggedIn() || !$user->canViewStaffCP()) {
+            // Maintenance mode
+            if (isset($_GET['route']) && (
+                    rtrim($_GET['route'], '/') == '/login'
+                    || rtrim($_GET['route'], '/') == '/forgot_password'
+                    || str_contains($_GET['route'], '/api/')
+                    || str_contains($_GET['route'], 'queries')
+                )) {
+                // Can continue as normal
+            } else {
+                require(ROOT_PATH . '/maintenance.php');
+                die();
+            }
+        } else {
+            // Display notice to admin stating maintenance mode is enabled
+            $smarty->assign('MAINTENANCE_ENABLED', $language->get('admin', 'maintenance_enabled'));
+        }
+    }
+
     // Webhooks
     $hook_array = [];
     if (Util::isModuleEnabled('Discord Integration')) {

From ca71e9b8bd24b7a44b464d8cecc32ab2f9847b44 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Mon, 27 Jun 2022 21:07:42 -0600
Subject: [PATCH 205/337] Fix #2888

---
 modules/Forum/front_page.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/Forum/front_page.php b/modules/Forum/front_page.php
index 37f2b83be3..bc106181c7 100644
--- a/modules/Forum/front_page.php
+++ b/modules/Forum/front_page.php
@@ -14,7 +14,6 @@
     $news = $cache->retrieve('news');
 } else {
     $forum = new Forum();
-    $timeago = new TimeAgo(TIMEZONE);
 
     $latest_news = $forum->getLatestNews(); // Get latest 5 items
 
@@ -27,7 +26,7 @@
             'id' => $item['topic_id'],
             'url' => URL::build('/forum/topic/' . urlencode($item['topic_id']) . '-' . $forum->titleToURL($item['topic_title'])),
             'date' => date(DATE_FORMAT, strtotime($item['topic_date'])),
-            'time_ago' => $timeago->inWords($item['topic_date'], $language),
+            'time_ago' => $item['topic_date'], $language,
             'title' => Output::getClean($item['topic_title']),
             'views' => $item['topic_views'],
             'replies' => $item['replies'],
@@ -48,6 +47,11 @@
     $cache->store('news', $news, 60);
 }
 
+$timeago = new TimeAgo(TIMEZONE);
+foreach ($news as $key => $item) {
+    $news[$key]['time_ago'] = $timeago->inWords($item['time_ago'], $language);
+}
+
 $smarty->assign('LATEST_ANNOUNCEMENTS', $forum_language->get('forum', 'latest_announcements'));
 $smarty->assign('READ_FULL_POST', $forum_language->get('forum', 'read_full_post'));
 $smarty->assign('NEWS', $news);

From a1a8efb748bbc62009a227850d954bb9a4a8807b Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Mon, 27 Jun 2022 21:16:06 -0600
Subject: [PATCH 206/337] Ignore args in QueryRecorder back traces

---
 core/classes/Database/QueryRecorder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/classes/Database/QueryRecorder.php b/core/classes/Database/QueryRecorder.php
index aa167f4517..96b5521d99 100644
--- a/core/classes/Database/QueryRecorder.php
+++ b/core/classes/Database/QueryRecorder.php
@@ -50,7 +50,7 @@ public function pushQuery(string $sql, array $params): void {
      * @return array debug_backtrace entry
      */
     private function lastReleventBacktrace(): array {
-        $backtrace = debug_backtrace();
+        $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
 
         $current_file = $last_file = $backtrace[0]['file'];
         $i = 1;

From 6351d4c3e19515cab4d0b574503883039d38fdfd Mon Sep 17 00:00:00 2001
From: Partydragen <adrian_kili@outlook.com>
Date: Tue, 28 Jun 2022 16:16:35 +0200
Subject: [PATCH 207/337] Remove language variable

---
 modules/Forum/front_page.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/Forum/front_page.php b/modules/Forum/front_page.php
index bc106181c7..222ad27736 100644
--- a/modules/Forum/front_page.php
+++ b/modules/Forum/front_page.php
@@ -2,7 +2,7 @@
 /*
  *  Made by Samerton
  *  https://github.com/NamelessMC/Nameless/
- *  NamelessMC version 2.0.0-pr8
+ *  NamelessMC version 2.0.0
  *
  *  License: MIT
  *
@@ -26,7 +26,7 @@
             'id' => $item['topic_id'],
             'url' => URL::build('/forum/topic/' . urlencode($item['topic_id']) . '-' . $forum->titleToURL($item['topic_title'])),
             'date' => date(DATE_FORMAT, strtotime($item['topic_date'])),
-            'time_ago' => $item['topic_date'], $language,
+            'time_ago' => $item['topic_date'],
             'title' => Output::getClean($item['topic_title']),
             'views' => $item['topic_views'],
             'replies' => $item['replies'],

From 45c08469f0c4265bb60de068f0f8a418c2ea9b12 Mon Sep 17 00:00:00 2001
From: enno123 <admin@enno123.de>
Date: Sat, 25 Jun 2022 19:49:30 +0000
Subject: [PATCH 208/337] Translated using Weblate (German)

Currently translated at 100.0% (1226 of 1226 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/
---
 custom/languages/de_DE.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index 5203f9afe5..b4e4f26461 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -611,7 +611,7 @@
     "errors/403_title": "Entschuldige!",
     "errors/404_back": "Zurück",
     "errors/404_content": "Wir konnten diese Seite nicht finden.",
-    "errors/404_error": "Wenn du glaubst das dies ein Fehler ist, Kontaktieren einen Administrator",
+    "errors/404_error": "Wenn du glaubst das dies ein Fehler ist, kontaktiere einen Administrator",
     "errors/404_home": "Startseite",
     "errors/404_title": "Entschuldige!",
     "errors/fatal_error": "Fataler Fehler",

From 642a03f8b234dda04683e118aeadcbc20ae744a1 Mon Sep 17 00:00:00 2001
From: Marcos <marckos03br@gmail.com>
Date: Sun, 26 Jun 2022 12:22:07 +0000
Subject: [PATCH 209/337] Translated using Weblate (Spanish)

Currently translated at 100.0% (1226 of 1226 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/es/
---
 custom/languages/es_ES.json | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/custom/languages/es_ES.json b/custom/languages/es_ES.json
index 0f1b3c6603..b21343933c 100644
--- a/custom/languages/es_ES.json
+++ b/custom/languages/es_ES.json
@@ -191,7 +191,7 @@
     "admin/enable_registration": "¿Permitir el registro?",
     "admin/enable_status_query": "¿Activar la consulta de estado?",
     "admin/enable_username_sync": "¿Activar la sincronización del nombre de usuario?",
-    "admin/enable_username_sync_info": "Si se activa, los nombres de usuario del sitio web se actualizarán para que coincidan con los del juego.",
+    "admin/enable_username_sync_info": "Si se activa, los nombres de usuario del sitio web se actualizarán para que coincidan con los del juego. Esto ocurre cuando el plugin del juego envía una lista de UUIDs y nombres de usuario, para los jugadores online, a la página web.",
     "admin/enabled": "Activado",
     "admin/enter_authme_db_details": "Por favor, introduzca detalles válidos de la base de datos.",
     "admin/error_deleted_successfully": "El error ha sido eliminado con éxito.",
@@ -778,8 +778,8 @@
     "installer/host": "Nombre del host",
     "installer/host_help": "El nombre de host es la URL base de su sitio web. ¡No incluya las subcarpetas del campo \"Ruta de instalación\", ni http(s):// aquí!",
     "installer/initialising_database_and_cache": "Iniciando base de datos y caché, por favor espere...",
-    "installer/input_maximum": "Asegúrese de que su nombre de usuario tenga un máximo de 20 caracteres, y que su dirección de correo electrónico y su contraseña tengan un máximo de 64 caracteres.",
-    "installer/input_minimum": "Asegúrese de que su nombre de usuario tenga un mínimo de 3 caracteres, su dirección de correo electrónico tenga un mínimo de 4 caracteres y su contraseña tenga un mínimo de {{minPassword}} caracteres.",
+    "installer/input_maximum": "Asegúrate de que tu nombre de usuario tenga un máximo de {{maxUsername}} caracteres, que tu dirección de correo electrónico tenga un máximo de {{maxEmail}} caracteres y que tu contraseña tenga un máximo de {{maxPassword}} caracteres.",
+    "installer/input_minimum": "Asegúrese de que su nombre de usuario tenga un mínimo de {{minUsername}} caracteres, que su dirección de correo electrónico tenga un mínimo de {{minEmail}} caracteres y que su contraseña tenga un mínimo de {{minPassword}} caracteres.",
     "installer/input_required": "Introduzca un nombre de usuario, una dirección de correo electrónico y una contraseña válidos.",
     "installer/input_v1_details": "Introduzca los datos de la base de datos de su instalación de Nameless versión 1.",
     "installer/install": "Instalar",
@@ -1215,5 +1215,14 @@
     "admin/api_disabled": "La API está desactivada",
     "installer/database_configured": "La base de datos ha sido configurada.",
     "installer/upgrade_error": "Se han producido errores durante la actualización.",
-    "user/no_providers_admin": "Los administradores del sitio aún no han configurado ningún proveedor de OAuth."
+    "user/no_providers_admin": "Los administradores del sitio aún no han configurado ningún proveedor de OAuth.",
+    "general/deleted_user": "Usuario eliminado",
+    "installer/database_connection_failed": "No se pudo conectar a la base de datos:<br>{{message}}",
+    "installer/config_write_failed": "Fallo al escribir en el archivo de configuración: {{message}}",
+    "admin/use_external_mail_server": "Utilizar un servidor de correo externo",
+    "admin/debugging_enabled": "Si la depuración está activada, la información sensible puede quedar expuesta a visitantes no autorizados. La depuración sólo debe utilizarse para el desarrollo, no en sitios públicos.",
+    "admin/trusted_proxies_configured": "Proxies de confianza",
+    "admin/trusted_proxies_not_configured": "{{linkStart}}Proxies de confianza{{linkEnd}} no están configurados, las prohibiciones de IP pueden no funcionar correctamente.",
+    "admin/https_port_80": "Parece como si estuvieras usando HTTPS en el puerto 80, lo que casi definitivamente no es cierto. Si usas Cloudflare, asegúrate de configurar el modo de encriptación TLS en Full (estricto). Si ejecuta su propio proxy, configúrelo para que envíe la cabecera X-Forwarded-Port.",
+    "admin/group_sync_no_results_warning": "Las reglas de sincronización de grupos están configuradas pero no se ha informado de ningún cambio. Esto podría indicar una configuración errónea."
 }

From 37259dde8a1b22ead9351734cb42b46d1fd2d29d Mon Sep 17 00:00:00 2001
From: Supercrafter100 <58982133+supercrafter100@users.noreply.github.com>
Date: Wed, 29 Jun 2022 00:22:30 +0200
Subject: [PATCH 210/337] Use png instead of svg (#2900)

---
 core/classes/Avatars/AvatarSource.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/classes/Avatars/AvatarSource.php b/core/classes/Avatars/AvatarSource.php
index 68971c3e22..18ac0f0e7e 100644
--- a/core/classes/Avatars/AvatarSource.php
+++ b/core/classes/Avatars/AvatarSource.php
@@ -89,7 +89,7 @@ public static function getAvatarFromUserData(object $data, bool $allow_gifs = fa
             }
         }
 
-        return "https://avatars.dicebear.com/api/initials/{$data->username}.svg?size={$size}";
+        return "https://avatars.dicebear.com/api/initials/{$data->username}.png?size={$size}";
     }
 
     /**

From f780dd92b509d5e8a37c7931fe67a355f8055ed7 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Tue, 28 Jun 2022 19:23:33 -0600
Subject: [PATCH 211/337] Fix #2902

---
 custom/templates/DefaultRevamp/login.tpl | 4 ++--
 modules/Core/pages/login.php             | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/custom/templates/DefaultRevamp/login.tpl b/custom/templates/DefaultRevamp/login.tpl
index 513f698b5b..c7997169d2 100755
--- a/custom/templates/DefaultRevamp/login.tpl
+++ b/custom/templates/DefaultRevamp/login.tpl
@@ -57,7 +57,7 @@
                     <a class="ui negative button right floated" href="{$FORGOT_PASSWORD_URL}">{$FORGOT_PASSWORD}</a>
                 </form>
                 {if $OAUTH_AVAILABLE}
-                <div class="ui horizontal divider">OR</div>
+                <div class="ui horizontal divider">{$OR}</div>
                 <div class="ui equal width grid">
                     {foreach $OAUTH_PROVIDERS as $name => $meta}
                     <div class="column">
@@ -80,4 +80,4 @@
     </div>
 </div>
 
-{include file='footer.tpl'}
\ No newline at end of file
+{include file='footer.tpl'}
diff --git a/modules/Core/pages/login.php b/modules/Core/pages/login.php
index 784d4fd9c7..28f9a29f4a 100644
--- a/modules/Core/pages/login.php
+++ b/modules/Core/pages/login.php
@@ -291,6 +291,7 @@
     'NOT_REGISTERED_YET' => $language->get('general', 'not_registered_yet'),
     'OAUTH_AVAILABLE' => NamelessOAuth::getInstance()->isAvailable(),
     'OAUTH_PROVIDERS' => NamelessOAuth::getInstance()->getProvidersAvailable(),
+    'OR' => $language->get('general', 'or'),
 ]);
 
 if (Session::exists('oauth_error')) {

From 4716099bfeab90a5b889cfbb4d5544dfe19dd3a7 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Tue, 28 Jun 2022 19:29:13 -0600
Subject: [PATCH 212/337] Clear last PHP error so `error_get_last` is accurate
 for email errors

---
 core/classes/Core/Email.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/classes/Core/Email.php b/core/classes/Core/Email.php
index 91040bd6d0..f64e3d9c03 100644
--- a/core/classes/Core/Email.php
+++ b/core/classes/Core/Email.php
@@ -67,6 +67,8 @@ public static function getReplyTo(): array {
      * @return array|bool Returns true if email sent, otherwise returns an array containing the error.
      */
     private static function sendPHP(array $email) {
+        error_clear_last();
+
         $outgoing_email = Util::getSetting('outgoing_email');
         $incoming_email = Util::getSetting('incoming_email');
 

From 0a7d1edc02c310a941235bf91799d085a0fbe487 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Tue, 28 Jun 2022 19:52:25 -0600
Subject: [PATCH 213/337] Fix overflow of signatures (ie: large images)

---
 custom/templates/DefaultRevamp/forum/view_topic.tpl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/custom/templates/DefaultRevamp/forum/view_topic.tpl b/custom/templates/DefaultRevamp/forum/view_topic.tpl
index 49546840d0..e6c917d189 100755
--- a/custom/templates/DefaultRevamp/forum/view_topic.tpl
+++ b/custom/templates/DefaultRevamp/forum/view_topic.tpl
@@ -208,7 +208,9 @@
                     {/if}
                     {if !empty($reply.signature)}
                     <div class="ui divider"></div>
-                    {$reply.signature}
+                    <div style="overflow: scroll; max-height: 500px;">
+                        {$reply.signature}
+                    </div>
                     {/if}
                 </div>
             </div>
@@ -393,4 +395,4 @@
 </div>
 {/if}
 
-{include file='footer.tpl'}
\ No newline at end of file
+{include file='footer.tpl'}

From dbb94a297d639e2e71fb929cc9aa2655ab4d41b2 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Tue, 28 Jun 2022 19:57:14 -0600
Subject: [PATCH 214/337] Delete unused `upload_image.php` file

---
 uploads/upload_image.php | 53 ----------------------------------------
 1 file changed, 53 deletions(-)
 delete mode 100644 uploads/upload_image.php

diff --git a/uploads/upload_image.php b/uploads/upload_image.php
deleted file mode 100644
index b1fea25bdb..0000000000
--- a/uploads/upload_image.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/*
- *  Made by Samerton
- *  https://github.com/NamelessMC/Nameless/
- *  NamelessMC version 2.0.0-pr8
- *
- *  License: MIT
- *
- *  Image upload handler
- */
-
-define('ROOT_PATH', dirname(__DIR__) . '');
-$page = 'image_upload';
-
-require('../core/init.php');
-
-if ($user->isLoggedIn()) {
-
-    if (!is_dir(ROOT_PATH . '/uploads/images')) {
-        mkdir(ROOT_PATH . '/uploads/images');
-    }
-
-    $image = new \Bulletproof\Image($_FILES);
-
-    $image->setSize(1000, 2 * 1048576)
-        ->setMime(['jpeg', 'png', 'gif'])
-        ->setDimension(2000, 2000)
-        ->setLocation(ROOT_PATH . '/uploads/images/' . $user->data()->id, 0777);
-
-    if ($image['upload']) {
-        $upload = $image->upload();
-
-        if ($upload) {
-            $url = ((defined('CONFIG_PATH')) ? CONFIG_PATH : '/uploads/images/' . $user->data()->id . '/' . $image->getName() . '.' . $image->getMime());
-
-            echo json_encode([
-                'uploaded' => '1',
-                'fileName' => $image->getName() . $image->getMime(),
-                'url' => $url
-            ]);
-        } else {
-            echo json_encode([
-                'uploaded' => '0',
-                'error' => ['message' => $image->getError() . ' ' . $image->getMime()]
-            ]);
-        }
-    }
-} else {
-    echo json_encode([
-        'uploaded' => '0',
-        'error' => ['You are not logged in']
-    ]);
-}

From 042a0517763f837b24bd78dacd0b8e59d3235e26 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Wed, 29 Jun 2022 22:24:16 -0600
Subject: [PATCH 215/337] Fix Oauth login when maintenance mode is enabled

---
 core/init.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/init.php b/core/init.php
index 57c0cc920c..dd735d2961 100644
--- a/core/init.php
+++ b/core/init.php
@@ -451,10 +451,11 @@
         if (!$user->isLoggedIn() || !$user->canViewStaffCP()) {
             // Maintenance mode
             if (isset($_GET['route']) && (
-                    rtrim($_GET['route'], '/') == '/login'
-                    || rtrim($_GET['route'], '/') == '/forgot_password'
+                    rtrim($_GET['route'], '/') === '/login'
+                    || rtrim($_GET['route'], '/') === '/forgot_password'
                     || str_contains($_GET['route'], '/api/')
                     || str_contains($_GET['route'], 'queries')
+                    || str_contains($_GET['route'], 'oauth/')
                 )) {
                 // Can continue as normal
             } else {

From 4a8bc4013d0df15f522736916154681d41b7a154 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Wed, 29 Jun 2022 23:19:43 -0600
Subject: [PATCH 216/337] Misc fixes about image uploading, better error
 handling and logging

---
 core/classes/Misc/ErrorHandler.php            |  11 +-
 core/includes/image_upload.php                | 206 +++++++++---------
 custom/languages/en_UK.json                   |   1 +
 modules/Core/pages/panel/avatars.php          |   4 +-
 modules/Core/queries/tinymce_image_upload.php |  27 ++-
 5 files changed, 127 insertions(+), 122 deletions(-)

diff --git a/core/classes/Misc/ErrorHandler.php b/core/classes/Misc/ErrorHandler.php
index 10df0fa307..120a7228b9 100644
--- a/core/classes/Misc/ErrorHandler.php
+++ b/core/classes/Misc/ErrorHandler.php
@@ -30,6 +30,7 @@ public static function catchError(int $error_number, string $error_string, strin
             return false;
         }
 
+        $log_entry = $error_file . '(' . $error_line . ') ' . $error_number . ': ' . $error_string;
         switch ($error_number) {
             case E_USER_ERROR:
                 // Pass execution to new error handler.
@@ -39,15 +40,15 @@ public static function catchError(int $error_number, string $error_string, strin
                 break;
 
             case E_USER_WARNING:
-                self::logError('warning', '[' . date('Y-m-d, H:i:s') . '] ' . $error_file . '(' . $error_line . ') ' . $error_number . ': ' . $error_string);
+                self::logError('warning', $log_entry);
                 break;
 
             case E_USER_NOTICE:
-                self::logError('notice', '[' . date('Y-m-d, H:i:s') . '] ' . $error_file . '(' . $error_line . ') ' . $error_number . ': ' . $error_string);
+                self::logError('notice', $log_entry);
                 break;
 
             default:
-                self::logError('other', '[' . date('Y-m-d, H:i:s') . '] ' . $error_file . '(' . $error_line . ') ' . $error_number . ': ' . $error_string);
+                self::logError('other', $log_entry);
                 break;
         }
 
@@ -71,7 +72,7 @@ public static function catchException(?Throwable $exception, ?string $error_stri
         $error_line = is_null($exception) ? (int)$error_line : $exception->getLine();
 
         // Create a log entry for viewing in staffcp
-        self::logError('fatal', '[' . date('Y-m-d, H:i:s') . '] ' . $error_file . '(' . $error_line . '): ' . $error_string);
+        self::logError('fatal', $error_file . '(' . $error_line . '): ' . $error_string);
 
         // If this is an API request, print the error in plaintext and dont render the whole error trace page
         if (self::shouldUsePlainText()) {
@@ -188,7 +189,7 @@ private static function logError(string $type, string $contents): void {
             }
 
             if ($dir_exists) {
-                file_put_contents(implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'cache', 'logs', $type . '-log.log']), $contents . PHP_EOL, FILE_APPEND);
+                file_put_contents(implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'cache', 'logs', $type . '-log.log']), '[' . date('Y-m-d, H:i:s') . '] ' . $contents . PHP_EOL, FILE_APPEND);
             }
         } catch (Exception $ignored) {
         }
diff --git a/core/includes/image_upload.php b/core/includes/image_upload.php
index fca8307df6..6796f67c66 100644
--- a/core/includes/image_upload.php
+++ b/core/includes/image_upload.php
@@ -17,141 +17,141 @@
 $directory = $_SERVER['REQUEST_URI'];
 $directories = explode('/', $directory);
 
+require(ROOT_PATH . '/vendor/autoload.php');
 require(ROOT_PATH . '/core/init.php');
 
 if (!$user->isLoggedIn()) {
-    die();
+    die('Not logged in');
+}
+
+if (!Input::exists()) {
+    die('Invalid input');
+}
+
+if ($_FILES['file']['error'] === UPLOAD_ERR_NO_FILE) {
+    Redirect::back();
+}
+
+if (!Token::check()) {
+    if (Input::get('type') === 'background') {
+        Session::flash('admin_images', '<div class="alert alert-danger">' . $language->get('general', 'invalid_token') . '</div>');
+    }
+
+    die('Invalid token');
 }
 
 $image_extensions = ['jpg', 'png', 'jpeg'];
-$delete_extensions = array_merge($image_extensions, ['gif']);
 
 if ($user->hasPermission('usercp.gif_avatar')) {
     $image_extensions[] = 'gif';
 }
 
-if ($_POST['type'] == 'favicon') {
+if ($_POST['type'] === 'favicon') {
     $image_extensions[] = 'ico';
 }
 
-// Deal with input
-if (Input::exists()) {
-    // Check token
-    if (Token::check()) {
-        // Token valid
-        $image = new \Bulletproof\Image($_FILES);
-        $image->setSize(1, 2097152); // between 1b and 2mb
-        $image->setDimension(2000, 2000); // 2k x 2k pixel maximum
-        $image->setMime($image_extensions);
-
-        switch ($_POST['type']) {
-            case 'background':
-                $image->setLocation(implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'uploads', 'backgrounds']));
-                break;
-
-            case 'template_banner':
-                $image->setLocation(implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'uploads', 'template_banners']));
-                break;
-
-            case 'logo':
-                $image->setLocation(implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'uploads', 'logos']));
-                break;
-
-            case 'favicon':
-                $image->setLocation(implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'uploads', 'favicons']));
-                break;
-
-            case 'default_avatar':
-                $image->setLocation(implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'uploads', 'avatars', 'defaults']));
-                break;
-
-            case 'profile_banner':
-                if (!$user->hasPermission('usercp.profile_banner')) {
-                    Redirect::to(URL::build('/profile/' . urlencode($user->data()->username)));
-                }
+$image = (new \Bulletproof\Image($_FILES))
+        ->setSize(1, 2097152 /* 2MB */)
+        ->setDimension(2000, 2000) // 2k x 2k pixel maximum
+        ->setMime($image_extensions);
 
-                if (
-                    !is_dir(implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'uploads', 'profile_images', $user->data()->id]))
-                    && !mkdir(implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'uploads', 'profile_images', $user->data()->id]))
-                ) {
-                    die('uploads/profile_images folder not writable! <a href="' . URL::build('/profile/' . urlencode($user->data()->username)) . '">Back</a>');
-                }
+$folder = null;
 
-                $image->setLocation(implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'uploads', 'profile_images', $user->data()->id]));
-                break;
+switch ($_POST['type']) {
+    case 'background':
+        $folder = 'backgrounds';
+        break;
 
-            default:
-                // Default to normal avatar upload
-                if (!defined('CUSTOM_AVATARS')) {
-                    die('Custom avatar uploading is disabled');
-                }
+    case 'template_banner':
+        $folder = 'template_banners';
+        break;
+
+    case 'logo':
+        $folder = 'logos';
+        break;
+
+    case 'favicon':
+        $folder = 'favicons';
+        break;
+
+    case 'default_avatar':
+        $folder = implode(DIRECTORY_SEPARATOR, ['avatars', 'defaults']);
+        break;
 
-                $image->setLocation(implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'uploads', 'avatars']));
-                $image->setName($user->data()->id);
-                break;
+    case 'profile_banner':
+        if (!$user->hasPermission('usercp.profile_banner')) {
+            Redirect::to(URL::build('/profile/' . urlencode($user->data()->username)));
         }
 
-        if ($image['file']) {
-            try {
-                $upload = $image->upload();
+        $folder = implode(DIRECTORY_SEPARATOR, ['profile_images', $user->data()->id]);
+        break;
 
-                if (!$upload) {
-                    if (Input::get('type') == 'profile_banner') {
-                        Session::flash('profile_banner_error', $image->getError());
-                        Redirect::to(URL::build('/profile/' . urlencode($user->data()->username)));
-                    }
+    default:
+        // Default to normal avatar upload
+        if (!defined('CUSTOM_AVATARS')) {
+            die('Custom avatar uploading is disabled');
+        }
 
-                    http_response_code(400);
-                    die($image->getError());
-                }
+        $folder = 'avatars';
+        $image->setName($user->data()->id);
+        break;
+}
 
-                // OK
-                // Avatar?
-                if (Input::get('type') == 'avatar') {
-                    // Need to delete any other avatars
-                    $diff = array_diff($delete_extensions, [strtolower($upload->getMime())]);
+$image->setLocation(implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'uploads', $folder]));
 
-                    $to_remove = [];
-                    foreach ($diff as $extension) {
-                        $to_remove += glob(ROOT_PATH . '/uploads/avatars/' . $user->data()->id . '.' . $extension);
-                    }
+if ($image['file']) {
+    try {
+        if (!$image->upload()) {
+            if (Input::get('type') === 'profile_banner') {
+                Session::flash('profile_banner_error', $image->getError());
+                Redirect::to(URL::build('/profile/' . urlencode($user->data()->username)));
+            }
 
-                    foreach ($to_remove as $item) {
-                        unlink($item);
-                    }
+            http_response_code(500);
+            $error = $e->getMessage() ?: 'Unknown error, check logs for more details';
+            ErrorHandler::logWarning('Image upload error: ' . $error);
+            die($error);
+        }
 
-                    $user->update([
-                        'has_avatar' => true,
-                        'avatar_updated' => date('U')
-                    ]);
+        if (Input::get('type') === 'avatar') {
+            // Need to delete any other avatars
+            $diff = array_diff(array_merge($image_extensions, ['gif', 'ico']), [strtolower($image->getMime())]);
 
-                    Redirect::to(URL::build('/user/settings'));
+            foreach ($diff as $extension) {
+                $to_remove = glob(ROOT_PATH . '/uploads/avatars/' . $user->data()->id . '.' . $extension);
+                foreach ($to_remove as $file) {
+                    unlink($file);
                 }
+            }
 
-                if (Input::get('type') == 'profile_banner') {
-                    $user->update([
-                        'banner' => Output::getClean($user->data()->id . '/' . $upload->getName() . '.' . $upload->getMime())
-                    ]);
+            $user->update([
+                'has_avatar' => true,
+                'avatar_updated' => date('U')
+            ]);
 
-                    Redirect::to(URL::build('/profile/' . urlencode($user->data()->username)));
-                }
+            Session::flash('settings_success', $language->get('user', 'avatar_set_successfully'));
+            Redirect::to(URL::build('/user/settings'));
+        }
 
-                die('OK');
-            } catch (Exception $e) {
-                // Error
-                http_response_code(400);
-                die($e->getMessage());
-            }
-        } else {
-            if (Input::get('type') == 'avatar') {
-                Redirect::to(URL::build('/user/settings'));
-            }
+        if (Input::get('type') === 'profile_banner') {
+            $user->update([
+                'banner' => Output::getClean($user->data()->id . '/' . $image->getName() . '.' . $image->getMime())
+            ]);
 
-            die('No image selected');
+            Redirect::to(URL::build('/profile/' . urlencode($user->data()->username)));
         }
-    } else if (Input::get('type') == 'background') {
-        Session::flash('admin_images', '<div class="alert alert-danger">' . $language->get('general', 'invalid_token') . '</div>');
+
+        die('OK');
+    } catch (Exception $e) {
+        http_response_code(500);
+        $error = $e->getMessage() ?: 'Unknown error, check logs for more details';
+        ErrorHandler::logWarning('Image upload exception: ' . $error);
+        die($error);
+    }
+} else {
+    if (Input::get('type') === 'avatar') {
+        Redirect::to(URL::build('/user/settings'));
     }
-}
 
-die('Invalid input');
+    die('No image selected');
+}
diff --git a/custom/languages/en_UK.json b/custom/languages/en_UK.json
index 859602ad4a..0ebf157daa 100644
--- a/custom/languages/en_UK.json
+++ b/custom/languages/en_UK.json
@@ -1035,6 +1035,7 @@
     "user/authme_help": "Please enter your in-game AuthMe account details. If you don't already have an account in-game, join the server now and follow the instructions provided.",
     "user/authme_username_exists": "Your Authme account has already been connected to the website!",
     "user/avatar": "Avatar",
+    "user/avatar_set_successfully": "Avatar set successfully.",
     "user/block_user": "Block User",
     "user/cant_send_to_self": "You can't send a message to yourself!",
     "user/change_banner": "Change Banner",
diff --git a/modules/Core/pages/panel/avatars.php b/modules/Core/pages/panel/avatars.php
index cdea863dc0..158c720d95 100644
--- a/modules/Core/pages/panel/avatars.php
+++ b/modules/Core/pages/panel/avatars.php
@@ -25,7 +25,7 @@
     if (Token::check()) {
         if (isset($_POST['avatar_source'])) {
             try {
-                Util::setSetting('user_avatars', (isset($_POST['custom_avatars']) && $_POST['custom_avatars']) ? '1' : '0');
+                Util::setSetting('user_avatars', $custom_avatars = (isset($_POST['custom_avatars']) && $_POST['custom_avatars']) ? '1' : '0');
                 Util::setSetting('default_avatar_type', Input::get('default_avatar'));
                 Util::setSetting('avatar_site', Input::get('avatar_source'));
                 Util::setSetting('avatar_type', Input::get('avatar_perspective'));
@@ -112,7 +112,7 @@
     'TOKEN' => Token::get(),
     'SUBMIT' => $language->get('general', 'submit'),
     'CUSTOM_AVATARS' => $language->get('admin', 'allow_custom_avatars'),
-    'CUSTOM_AVATARS_VALUE' => Util::getSetting('users_avatars'),
+    'CUSTOM_AVATARS_VALUE' => defined('CUSTOM_AVATARS'),
     'DEFAULT_AVATAR' => $language->get('admin', 'default_avatar'),
     'DEFAULT_AVATAR_VALUE' => Util::getSetting('default_avatar_type'),
     'MINECRAFT_AVATAR' => $language->get('admin', 'minecraft_avatar'),
diff --git a/modules/Core/queries/tinymce_image_upload.php b/modules/Core/queries/tinymce_image_upload.php
index d8c107611e..615604228e 100644
--- a/modules/Core/queries/tinymce_image_upload.php
+++ b/modules/Core/queries/tinymce_image_upload.php
@@ -1,28 +1,31 @@
 <?php
 
 if (!$user->isLoggedIn()) {
-    die();
+    http_response_code(400);
+    die('Not logged in');
 }
 
 if (!Token::check()) {
-    die();
+    http_response_code(400);
+    die('Invalid token');
 }
 
-$image = new \Bulletproof\Image($_FILES);
-$image->setLocation(implode(DIRECTORY_SEPARATOR, array(ROOT_PATH, 'uploads', 'post_images')));
-$image->setDimension(10000, 10000);
-$image->setSize(10, 10000000 /* 10MB */);
-$image->setName($user->data()->id . '-' . time());
+$image = (new \Bulletproof\Image($_FILES))
+    ->setLocation(implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'uploads', 'post_images']))
+    ->setSize(10, 10000000 /* 10MB */)
+    ->setDimension(10000, 10000)
+    ->setName($user->data()->id . '-' . time());
 
 if ($image['file']) {
-    $upload = $image->upload();
-    if (!$upload) {
-        http_response_code(400);
-        die($image->getError());
+    if (!$image->upload()) {
+        http_response_code(500);
+        $error = $e->getMessage() ?: 'Unknown error, check logs for more details';
+        ErrorHandler::logWarning('TinyMCE image upload error: ' . $error);
+        die($error);
     }
 
     die(json_encode([
-        'location' => (defined('CONFIG_PATH') ? CONFIG_PATH : '') . '/uploads/post_images/' . $image->getName().'.'.$image->getMime(),
+        'location' => (defined('CONFIG_PATH') ? CONFIG_PATH : '') . '/uploads/post_images/' . $image->getName() . '.' . $image->getMime(),
     ]));
 }
 

From dfd1db38f841adb67464952b4d472597443d09dc Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Thu, 30 Jun 2022 22:31:47 -0600
Subject: [PATCH 217/337] Fix #2907

---
 core/classes/Misc/Announcements.php               |  3 ++-
 modules/Core/module.php                           |  3 ++-
 modules/Discord Integration/hooks/DiscordHook.php | 15 ++++++++++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/core/classes/Misc/Announcements.php b/core/classes/Misc/Announcements.php
index ae2f11a287..42739a0c6a 100644
--- a/core/classes/Misc/Announcements.php
+++ b/core/classes/Misc/Announcements.php
@@ -185,9 +185,10 @@ public function create(User $user, array $pages, array $groups, string $text_col
 
         EventHandler::executeEvent('createAnnouncement', [
             'announcement_id' => DB::getInstance()->lastId(),
-            'created_by' => $user->data()->id,
+            'username' => $user->data()->username,
             'header' => $header,
             'message' => $message,
+            'avatar_url' => $user->getAvatar(128, true),
         ]);
 
         return true;
diff --git a/modules/Core/module.php b/modules/Core/module.php
index 9af0477c4e..0067d2eda0 100644
--- a/modules/Core/module.php
+++ b/modules/Core/module.php
@@ -332,9 +332,10 @@ public function __construct(Language $language, Pages $pages, User $user, Naviga
             $language->get('admin', 'announcement_hook_info'),
             [
                 'announcement_id' => $language->get('admin', 'announcement_id'),
-                'created_by' => $language->get('admin', 'user_id'),
+                'username' => $language->get('user', 'username'),
                 'header' => $language->get('admin', 'header'),
                 'message' => $language->get('admin', 'message'),
+                'avatar_url' => $language->get('user', 'avatar'),
             ]
         );
 
diff --git a/modules/Discord Integration/hooks/DiscordHook.php b/modules/Discord Integration/hooks/DiscordHook.php
index 4ef031197f..c57cdcdb55 100644
--- a/modules/Discord Integration/hooks/DiscordHook.php	
+++ b/modules/Discord Integration/hooks/DiscordHook.php	
@@ -7,6 +7,7 @@
  *  Discord webhook handler class
  */
 
+// TODO: Let events define a function to build a discord embed for the webhook
 class DiscordHook {
 
     public static function execute(array $params = []): void {
@@ -23,6 +24,18 @@ public static function execute(array $params = []): void {
                 ],
                 'description' => $params['language']->get('user', 'user_x_has_registered', ['user' => Output::getClean($params['username']), 'siteName' => SITE_NAME])
             ]];
+        } else if ($params['event'] == 'createAnnouncement') {
+            $content = html_entity_decode(str_replace(['&nbsp;', '&bull;'], [' ', ''], $params['message']));
+            if (mb_strlen($content) > 512) {
+                $content = mb_substr($content, 0, 512) . '...';
+            }
+
+            $return['username'] = $params['username'] . ' | ' . SITE_NAME;
+            $return['avatar_url'] = $params['avatar_url'];
+            $return['embeds'] = [[
+                'title' => 'New Announcement: ' . $params['header'],
+                'description' => $content,
+            ]];
         } else {
             $content = html_entity_decode(str_replace(['&nbsp;', '&bull;'], [' ', ''], $params['content_full']));
             if (mb_strlen($content) > 512) {
@@ -32,8 +45,8 @@ public static function execute(array $params = []): void {
             $return['username'] = $params['username'] . ' | ' . SITE_NAME;
             $return['avatar_url'] = $params['avatar_url'];
             $return['embeds'] = [[
-                'description' => $content,
                 'title' => $params['title'],
+                'description' => $content,
                 'url' => $params['url'],
                 'footer' => ['text' => $params['content']]
             ]];

From 27aac803232b5a039176fdbb2fcd9a3867fb98b6 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Thu, 30 Jun 2022 22:43:39 -0600
Subject: [PATCH 218/337] Fix #2896

---
 modules/Discord Integration/classes/Discord.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/Discord Integration/classes/Discord.php b/modules/Discord Integration/classes/Discord.php
index 8ff012e918..a0b2367223 100644
--- a/modules/Discord Integration/classes/Discord.php	
+++ b/modules/Discord Integration/classes/Discord.php	
@@ -15,9 +15,9 @@ class Discord {
     private static bool $_is_bot_setup;
 
     /**
-     * @var int|null The ID of this website's Discord server
+     * @var string|null The ID of this website's Discord server
      */
-    private static ?int $_guild_id;
+    private static ?string $_guild_id;
 
     /**
      * @var Language Instance of Language class for translations
@@ -147,11 +147,11 @@ private static function assembleJson(int $user_id, array $change_arr): string {
     }
 
     /**
-     * @return int|null Discord guild ID for this site
+     * @return string|null Discord guild ID for this site
      */
-    public static function getGuildId(): ?int {
+    public static function getGuildId(): ?string {
         if (!isset(self::$_guild_id)) {
-            self::$_guild_id = (int) Util::getSetting('discord');
+            self::$_guild_id = (string) Util::getSetting('discord');
         }
 
         return self::$_guild_id;

From 8e7e98deaa7dc34a504e2ce719ab863dc3cb37b5 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Thu, 30 Jun 2022 23:24:28 -0600
Subject: [PATCH 219/337] Add font size selector to TinyMCE

---
 core/classes/Core/Input.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/classes/Core/Input.php b/core/classes/Core/Input.php
index ae17529b56..3cf23a70aa 100644
--- a/core/classes/Core/Input.php
+++ b/core/classes/Core/Input.php
@@ -126,7 +126,7 @@ public static function createTinyEditor(Language $language, string $name, ?strin
               external_plugins: {
                 'spoiler': '" . (defined('CONFIG_PATH') ? CONFIG_PATH : '') . "/core/assets/plugins/tinymce_spoiler/plugin.min.js',
               },
-              toolbar: 'undo redo | bold italic underline strikethrough formatselect forecolor backcolor ltr rtl emoticons | alignleft aligncenter alignright alignjustify | codesample code hr image link numlist bullist | spoiler-add spoiler-remove',
+              toolbar: 'undo redo | bold italic underline strikethrough formatselect fontsizeselect forecolor backcolor ltr rtl emoticons | alignleft aligncenter alignright alignjustify | codesample code hr image link numlist bullist | spoiler-add spoiler-remove',
               spoiler_caption: '{$language->get('general', 'spoiler')}',
               default_link_target: '_blank',
               skin: '$skin'," .

From a503a8c1ea66038c60180bc8a74cea0e1123af91 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Thu, 30 Jun 2022 23:27:14 -0600
Subject: [PATCH 220/337] Fix PHPStan

---
 modules/Discord Integration/widgets/DiscordWidget.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/Discord Integration/widgets/DiscordWidget.php b/modules/Discord Integration/widgets/DiscordWidget.php
index 388b441509..bb6cfa2fea 100644
--- a/modules/Discord Integration/widgets/DiscordWidget.php	
+++ b/modules/Discord Integration/widgets/DiscordWidget.php	
@@ -14,7 +14,7 @@
 class DiscordWidget extends WidgetBase {
 
     private Cache $_cache;
-    private ?int $_guild_id;
+    private ?string $_guild_id;
 
     public function __construct(Cache $cache, Smarty $smarty) {
         $this->_cache = $cache;

From 3d25e844edc5965c6564f6c4bd912b88c07c2e70 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Thu, 30 Jun 2022 23:49:48 -0600
Subject: [PATCH 221/337] Rehaul changelog

boredom is dangerous
---
 CHANGELOG.md | 1203 ++++++++++++++++++++++++++------------------------
 1 file changed, 638 insertions(+), 565 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4868c15d0..5d8db5f409 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,244 +1,514 @@
-NamelessMC version 2 Changelog
+# NamelessMC v2 Changelog
 
-2.0.0 pr-1
-- Initial release
+## [Unreleased](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr13...v2)
+> [Milestone](https://github.com/NamelessMC/Nameless/milestone/17)
+
+### Added
+
+### Changed
+
+### Fixed
+
+
+## [2.0.0 pr-13](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr12...v2.0.0-pr13) - 2022-06-04
+> [Milestone](https://github.com/NamelessMC/Nameless/milestone/14)
+
+### Added
+- Discord + Google OAuth support
+- New user verification system
+- New cookie consent module
+- New hook system for forum/private message post rendering, including better codeblock + mentions support
+- Automatic user language detection
+- Custom date format support
+- Webhook for reports, announcements, bans, warnings
+- API additions including new ban user endpoint
+
+### Changed
+- Contact page removed
+- Update to Font Awesome 6
+- Use Guzzle for HTTP requests
+- Migration to Composer + Yarn
+- Database migration system + new upgrade class
+- Improved database indexing
+- Show unsupported banner to Internet Explorer users
+- ListUsers API endpoint pagination
+- Replace API error codes with namespaced strings
+- Removed CKEditor
+
+### Fixed
+- PHP 8 improvements
+- Fix issue using certain characters in URLs
+- Frontend and backend template updates
+- Many more bugfixes
+
+
+## [2.0.0 pr-12](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr11...v2.0.0-pr12) - 2021-09-10
+> [Milestone](https://github.com/NamelessMC/Nameless/milestone/16)
+
+### Added
+- Add Thai translation
+- Add new administrator permission for full access
+- Add new forum settings page including link location option
+- Add ability to log in with either username or email
+- Allow disabling placeholders feature
+- Add notice to StaffCP update tab if not using PHP 7.4+
+- Add per-user dark mode toggle
+- Add `reported_username` and `reported_uid` fields to createReport endpoint
+
+### Changed
+- Increase max length of custom pages URL + title
+- Convert many GET requests to POST
+- Discord sync rework
+- In-game sync rework
+- Remove legacy X-UA-Compatible header
+- API verification command renamed from `/validate` to `/verify`
+- Make hook fire even if no hooks are there
+- Remove password length limit
+- Translation updates
+- Default panel template dark mode improvements
+- Default Revamp dark mode improvements
+- Convert forum queries to DB query()
+
+### Fixed
+- Display non-alphanumeric characters in forum URLs
+- General placeholder fixes
+- General Authme fixes
+- Fix legacy panel template update alert style
+- Only send password reset email if user is already active
+- PHPMailer autoloader PHP 8 compatibility
+- Fix warning modal not showing
+- Prevent IP banning yourself
+- Prevent showing validate message when API verification is disabled
+- Update strings for Discord slash commands
+- Change installer DB password field to password type
+- Fix latest profile posts link
+- Fix duplicate `rel=""` attribute when using `rel="preload"`
+- Only clear 2fa state when not on 404 page
+- Fix StaffCP redirect after re-authentication
+- Exclude `.DS_Store` files from endpoint scan
+- PHP 8 improvements
+
+
+## [2.0.0 pr-11](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr10...v2.0.0-pr11) - 2021-06-27
+> [Milestone](https://github.com/NamelessMC/Nameless/milestone/15)
+
+### Added
+- Add Danish translation
+- Add support for upward dropdowns in Default Revamp template
+- Add Default Revamp dark mode support for top attached headers
+- Add setting to initialise charset
+- Add environment variables to hide options in general configuration
+- Add method to set multiple config values at once
+
+### Changed
+- Validate email port before updating config in StaffCP
+- Remove extra column from nl2_query_results
+- Change placeholder tables primary keys
+- Improve placeholder error message
+- Translation updates
+- Add index on `nl2_posts.topic_id` column
+
+### Fixed
+- Fix StaffCP Minecraft integration section
+- Fix invalid language during installation
+- Add SSL check before activating secure cookies
+- Fix missing favicons directory
+- Fix invalid token with AuthMe login
+- Fix profile settings when forum is disabled
+
+
+## [2.0.0 pr-10](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr9...v2.0.0-pr10) - 2021-08-25
+> [Milestone](https://github.com/NamelessMC/Nameless/milestone/13)
+
+- Add ability to upload favicon
+- Add Smarty security policy
+- Add support for environment variable based debugging
+- Auto detect user timezone when registering
+- Avatar rework and add Crafthead support
+- Captcha rework including Recaptcha v3 invisible support
+- Ensure cookie_secure is set in PHP config
+- Error handling revamp
+- Increase label HTML length
+- Move captcha/https/www configuration to config.php
+- Placeholder API integration
+- Remove unsafe tags when editing posts
+- Validation revamp
+- API updates - including group sync fixes
+- Default Revamp and Default panel template fixes
+- htaccess fixes and improvements
+- MCAssoc fixes
+- Server status widget fixes
+- Translation updates
+- PHP 8 improvements
+
+
+## [2.0.0 pr-9](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr8...v2.0.0-pr9) - 2020-12-30
+> [Milestone](https://github.com/NamelessMC/Nameless/milestone/12)
+
+### Added
+- Add new panel template
+- Add Default Revamp settings including dark mode
+- Add player heads to server status widget
+- Add ability to re-order servers in play tab
+- Add announcement HTML support
+- Add ability to search for users by email address in StaffCP
+- Add ability to resend validation email
+- Add ability to set default labels for forums
+- Add option to use Gravatar
+- Add concept of module dependencies
+- Add getActivePage method
+- Add new SEO page including Google Analytics integration
+- Add drag ordering for groups and Minecraft servers
+- Translation updates
+
+### Changed
+- Make groups field in serverInfo endpoint optional
+
+### Fixed
+- Fix multibyte character string length checks
+- Fix widgets intended for homepage showing on all pages
+- Fix validateUser hook sending empty Discord message
+- Fix API endpoints
+- Fix latest profile posts widget profile links
+- Fix API URL adding two http prefixes
+- Fix StaffCP Registration settings not submitting
+- Fix webhooks listing twice
+- Fix API URL in StaffCP API tab having leading/trailing whitespace
+- Fix `group_id` column error upon registration and AuthMe linking
+- Fix StaffCP sidebar link conflicts
+- Fix error if user has no group
+- PHP 8 improvements
+
+
+## [2.0.0 pr-8](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr7...v2.0.0-pr8) - 2020-12-25
+> [Milestone](https://github.com/NamelessMC/Nameless/milestone/4)
+
+### Added
+- Add Discord rank sync
+- Add Chinese (Simplified), French, Russian, Spanish (ES) and Turkish translations
+- Update existing translations
+- New user/group systems - mostly backend changes
+- API rework - modules can now register custom endpoints
+- New widget location - can choose between left or right hand side
+- Add basic custom page feature - no navbar/footer
+- Add ability to open custom page in new tab
+- Add "topics following" page
+- Add email content editor
+- Add mass emailing
+- Add ability to receive emails for followed topic updates
+- Add required custom profile fields to registration page
+- Add announcement system
+- Add ability to specify rel, as, onload attributes for CSS and defer, async attributes for JS
+- Add server status widget
+- Add latest profile post widget
+- Add ability to change "More" dropdown message
+- Add force 2FA option
+- Multiple webhook support
+- Add highlighting to profile post links
+- Add ability to add CSS to group usernames
+- Allow specifying "Can view other users' topics" forum permission for guests
+- Add hCaptcha
+
+### Changed
+- Remove legacy v1 API
+- Remove old Default template
+- New installer
+- Update StaffCP users list table to be async
+- Discord topic webhook improvements
+- Remove dropdowns from DefaultRevamp template mobile sidebar
+- Start PHP 8 compatibility - still a work in progress
+
+### Fixed
+- Many bugfixes
+- Fix same-site redirect forums showing redirect warning
+- Fix MCAssoc integration
+
+
+## [2.0.0 pr-7](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr6...v2.0.0-pr7) - 2020-01-05
+
+### Added
+- Add Italian translation
+- Add support for custom plural forms in languages
+- Add API method to return list of usernames + their UUIDs
+- Add reCAPTCHA to login screen
+- Add 403 page
+- Add more variables to Statistics widget
+- Add ability for template to define a settings page
+- Add per-user template support
+- Add login link to maintenance mode page
+- Add view all panel templates link variable
+- Add support for Twitter cards
+- Allow changing group username colour from text input
+- Add ability to use multiple webhooks
+- Add last seen, online to view topic and subforum descriptions to view forum
+
+### Changed
+- Update Czech translation
+- Update Dutch translation
+- Update German translation
+- Update Lithuanian translation
+- Update Norwegian translation
+- Update Polish translation
+- Update Portuguese translation
+- Update Romanian translation
+- Update Spanish translation
+- Default Revamp template CSS tweaks
+- Remove unused condition in Default Revamp navbar template file
+- Add missing panel template creation to updater
+- Navbar icons updated to Font Awesome 5
+- Default Revamp navbar updates
+- Update Default Revamp remember me label
+- Update Default template thumbtack icon
+- Update Discord widget description
+- Switch Default Revamp authme templates around
+- Remove API debug line
+- Switch registration validation around
+- Hide staff groups for "post validation group"
+- Allow redirect custom pages to be accessed directly
+- Allow use of forgot password in maintenance mode
+- Editor updates
+- Allow editing root user's secondary groups
+- Assign logged-in user title
+- Add www to getSelfURL if force www is enabled and www is not in hostname
+- Add multiple groups to the profile page
+- Change topic cancellation buttons to yes/no
+- Remove Default Revamp template credits
+- Redirect to StaffCP Forums overview when updating a forum
+- Add categories to move topic dropdown
+- Change API URL to non-friendly URL
+- Add UUID to forum post variables
+- Remove old code
+
+### Fixed
+- Fix search bar showing in wrong place if no topics in forum
+- Fix Default Revamp delete post button
+- Fix Default Revamp delete profile post button
+- Fix broken topic breadcrumb link
+- Fix incorrect last online date for users registered through the legacy v1 API
+- Remove : appearing after server IP if port is empty
+- Prevent infinite parent forum configuration loop
+- Fix plural form not working in some cases for time phrases
+- Fix Default template broken edit button icon
+- Fix pre setup widgets and banner on new installations
+- Fix Default Revamp alerts page title
+- Fix recaptcha not showing in Default Revamp template
+- Fix latest posts sometimes showing duplicates
+- Fix timezones for reports
+- Add terms + conditions to complete signup
+- Fix guests not being able to view redirect pages directly
+- Add banned and active to listUsers response
+- Prevent editor modifying inserted URLs automatically
+- Fix non-friendly URL sitemap generation
+- Fix widget configuration alignment and text
+- Prevent fatal error if Mojang API query returns null
+- Bring forum search in line with forum title
+- Add option to display IP address for each server on status page
+- Fixed fids and gids being too small in forum_topic_labels table
+- Add support for Twitter cards in Default Revamp template
+- Inline item content in online staff widget
+- Make avatar clickable in view topic template
+- Don't show topic count/latest topic info for redirect forums
+- Include subforums in move topic dropdown
+- Fix MentionsParser
+- Remove avatars with different extensions and add timestamp to prevent caching issues
+- Escape avatar updated variable just in case
+- Fix default group potentially breaking when creating a new group
+- Fix API verification issue
+- Prevent re-querying for permission checks
+- Fix Default Theme nav style issue
+- Fix names with special characters having no avatar
+- Sort groups in order
+- Add int check to DB Custom bind param
+- Allow explicitly setting pagination values
+- Only show email notice in StaffCP with permission
+- Stop cookie notice automatically closing
+- Fix More dropdown only showing if a custom page is adding to it
+- Prevent fatal error with insufficient forum permissions
+
+
+## [2.0.0 pr-6](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr5...v2.0.0-pr6) - 2019-03-10
+
+### Added
+- Add Lithuanian and Polish languages
+- Allow popover hover in StaffCP
+- Add forum drag reordering
+- Add subforum indentations in StaffCP
+- Add $template object to all loadPage calls
+- Add topic + post counts as global variables
+- Add topic label to news posts
+- New default template
+- Add installer converter support
+- Add ability to switch panel template
+- Add ability to upload custom profile banners
+- Add "Show nickname instead of username" option to online users widget
+- Add statistics widget
+- Add ability to upload + choose new homepage banner
+- Add user title variable to online staff + users widgets
+- Add author IDs to messaging template variables
+
+### Changed
+- Translation updates
+- Update nav ordering
+- Rename UserCP to Account
+- Add indentation to panel sidebar child links
+- Shorten Debugging + Maintenance in sidebar to Maintenance
+- Update user list date sort
+- Change exif to full requirement
+- Improve registration nickname label
+- Improve login username label
+- Auto enable some widgets on installation
+- Change front end editor
+
+### Fixed
+- Fix panel user edit Markdown issue
+- Fixed install language
+- Fix v1 upgrader issue
+- Fix apostrophes not showing when editing posts
+- Add timeout to dashboard player count graph
+- Fix sidebar links not expanding on iOS
+- Fix terms page footer
+- Fix error when deleting user
+- Fix users not being promoted after validating
+- Fix users table width sometimes being too large
+- Fix post validation group not updating
+- Update login username title if Minecraft is disabled
+- Show normal avatar if Minecraft is disabled on profile pages
+- Fix non-friendly URL subfolder login redirect
+- Replace &nbsp and &bull in Discord hook
+- Fix post link potentially being incorrect
+- Fix nickname not updating in StaffCP if disabled
+- Move MCAssoc JS to after include
+- Fix disabling reactions
+- Fix custom page editor not having Source tab
+- Fix registration username required message in some situations
+- Use generic Minecraft query exception
+- Fix date issue when updating forum latest post/topic
+- Prevent editing own secondary groups without permission
+- Don't save last page if maintenance mode is disabled
+- Don't set register page as last page
+- Fix subdirectory profile page banner issue
+- Fix online users widget issue
+- Fix registration nicknames not working
+- Add topic placeholders
+- Use new external server query
+- Fix user punishment alert
+- Remove config path issues on user settings page
+- Fix navigation error
+- Fix rewrite test in installer
+- Add forum title variable to view topic template
+- Fix error when replying to a topic that at least 1 user is following
+- Remove unneeded panel template files
+- Update CKEditor
+- Update getSelfURL to detect HTTPS more reliably
+- Order parent forum dropdown
+- Allow switching a forum between forum + category
+- Fix broken icon
+- Fix incorrect last online date for users registered through the API
+- Only show PM suggested user list after 3 characters typed
 
-2.0.0 pr-2
-- Fix issue with editing user in AdminCP
-- Prevent non-moderators replying to locked topics
-- Prevent signature image overflow
-- Remove unnecessary header template file
-- Fix registration issue
-- Fix recaptcha issues in upgrade script
-- Minor forum updates
-- Update Mojang API URL
-- Fix incorrect "last user" information in PMs
-- Redirect to previous page after login
-- Allow use of HTML in report content
-- Add forum labels
-- Update panels in AdminCP night theme
-- Small AdminCP label fixes
-- Update default template Bootstrap version
-- Update core Bootstrap version
-- Update profile template
-- Fix signin issue with numeric usernames
-- Fix negative reactions not creating
-- Allow creating new instances of custom DB class
-- Update AdminCP registrations graph
-- Change popover placement in AdminCP
-- Increase query interval
-- Display success message upon sending PM reply
-- Update installer and configuration methods
-- Display errors if unable to create config + cache
-- Update htaccess
-- Fix installation detection
-- Separate core JS into templates
-- Add maintenance mode
-- Allow logging in whilst in maintenance mode
-- Prevent admin account switch in AdminCP
-- Fix installer not loading
-- Allow installer translations
-- Add default database address to installer
-- Update admin auth screen layout
-- Remove deprecated mcrypt requirement, along with a now unused function
-- Fix permission check for configuration file
-- Add AuthMe integration and Minecraft service status
-- Fix invalid charset in installer
-- Fix AdminCP mobile navbar toggler not showing
-- Update cp_dark.css
-- Fix AdminCP auth + password changing
-- Add switch to toggle error reporting
-- Fix error in 404 page
-- Update PasswordHash class
-- Update form tokens
-- Allow per-user timezones
-- Add topics and posts to AdminCP overview stats graph
-- Fix potentially incorrect news ordering
-- Add card colour for Minecraft service status "Slow"
-- Define page on register page
-- Update post editor
-- Fix minor login/logout issues
-- Apply GeSHi to new topics and edited posts
-- Fix AdminCP security log sorting
-- Add force-HTTPS option to AdminCP
-- Fix post word wrapping and temporarily disable the code editor
-- Add Minecraft server query to homepage
-- Allow editing + deleting Minecraft servers
-- Fix sub-server queries
-- Fix invalid MySQL column default value
-- Fix timezone offsets not displaying minutes correctly
-- Minor forum SEO improvements
-- Add contact page, new email class and email errors + testing
-- Add registration email verification toggle in AdminCP
-- Add Minecraft server query error logging
-- Add Minecraft server banners
-- Allow purging Minecraft query errors
-- Complete mcassoc integration
-- Add terms and conditions page, and the ability to modify them
-- Update installer
-- Add avatar configuration, including the ability to upload a default avatar
-- Fix AdminCP -> Minecraft PHP notice
-- Add forgot password functionality
-- Add forum topic label permissions
-- Add forum search
-- Update Font Awesome
 
-2.0.0 pr-3
-- Update existing translations
-- Add Romanian and Swedish translations
-- Add missing profile post term to all languages
-- Update Bootstrap version to v4 alpha 6
-- Fix server banner issues
-- Add missing font file
-- Fix white screen if no avatar is uploaded
-- Only display 5 forum posts on profile pages
-- Fix AdminCP forums page navbar
-- Fix potentially broken AdminCP link with non-friendly URLs
-- Update Minecraft server banners and allow custom backgrounds
-- Allow dismissing maintenance mode alert
-- Check if username already exists in Authme connector
-- Update installer requirements
-- Fix banner issues with PHP < 7.0
-- Fix issue with maintenance mode message editor
-- Fix incorrect forum order
-- Fix login page in maintenance mode without friendly URLs
-- Fix avatar size in news section
-- Update DataTables Bootstrap plugin to v4
-- Fix potential overflow in user dropdown
-- Add port field to email configuration
-- Update forum module, fixing installation check
-- Fix no forums showing for guests
-- Display module author
-- Add template alert language entries
-- Fix navbar issue
-- Update email content type to html
-- Update group tags within installer to use badges instead of labels
-- Tidy installer language file includes
-- Create default label types
-- Add back button to edit group page
-- Add widget system, along with Twitter and Facebook widgets
-- Add latest post widget
-- Add header to latest posts widget template
-- Track topic views via session if cookies are disabled
-- Update .nav-list CSS
-- Add function to get avatar from UUID
-- Add friendlier forum URLs
-- Fix editor Emoji icon and tabs
-- Add secondary user groups
-- Fix pagination issue with no non-sticky topics in forum
-- Allow deleting templates
-- Fix widget issue with maintenance mode for non-admins
-- Add Discord widget
-- Add user doesn't exist page
-- Add missing language files
-- Allow blocking users
-- Fix error display issue in change password template
-- Fix match password for forgot password page
-- Fix potential undefined offset issue
-- Add player count graphs
-- Add rel="nofollow noopener" and target="_blank" to every external link
-- Update NamelessMC footer link
-- Fix potential undefined variable error
-- Update server query internal
-- Add blocked users table to installation, and update infractions table
-- Add background-size: cover; to background image
-- Fix expired Discord invite
-- Fix successful login alert
-- Add user related variables
-- Update Paginator class, allowing for custom pagination CSS
-- Update site name in two factor authentication
-- Add missing include to user messaging file
-- Add extra template variables to ModCP reports
-- Reshuffle view topic buttons
-- Add user punishments
-- Update server player count query
-- Update punishment link in AdminCP
-- Prevent viewing template files
-- Fix incorrect banner URL
-- Remove port 443 from getSelfURL() if https is enabled
-- Fix issue with custom pagination classes
-- Create htaccess in cache directory
-- Add custom page system
-- Fix custom page icons
-- Add ability to re-order navbar
-- Fix spoilers + emojis on custom pages
-- Add module name to widget list
-- Add option to enable page load timer
-- Add missing view to ModCP punishments
-- Fix incorrect pagination link
-- Add signature to UserCP settings
-- Move AdminCP navbar contents into container
-- Allow editing/deleting profile wall posts
-- Update updater URL
+## [2.0.0 pr-5](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr4...v2.0.0-pr5) - 2018-10-08
+
+### Added
+- New staff panel
+- RTL language support
+- API rank sync
+- Full multi language alert support
+- Follow topics
+- Click-to-copy IP
+- Sitemap generator
+- Ability for templates to toggle editor dark mode
+- Other minor additions
+- Minecraft server status page
+- Navbar + forum icons
+- User popovers
+
+### Changed
+- Template + module system changes
+- Translation updates
+
+### Fixed
+- Many bugfixes
+- Auto close spoilers
+
 
-2.0.0 pr-4
+## [2.0.0 pr-4](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr3...v2.0.0-pr4) - 2018-05-30
+
+### Added
 - Update + add new translations
+- Add new core permission system
+- Add missing permissions to installer update script
+- Add functionality to "Can view other users' topics?" permissions
+- Add reCAPTCHA configuration
+- Add default 25565 port to banner query
+- Add user avatar to navbar
+- Add stringToURL function to Util class
+- Add view count to profile pages
+- Add private profiles
+- Bypass private profile permission in Users & Groups
+- Allow a custom message when registration is disabled
+- Add redirect forums
+- Add option to change MySQL storage engine
+- Add author's group to latest announcements
+- Add default server IP variable to index page
+- Add permission to nicknames
+- Allow viewing sticky topics in only view own topic forums
+- Add email field to contact form
+- Allow custom HTML lang attribute on 404 pages
+- Add forum post graph to UserCP
+- Add custom error handler
+
+### Changed
 - Update route check
 - Update DataTables
+- Allow spaces in alphanumeric check
+- Prevent changing own group in AdminCP -> Users tab without permission
+- Update default template to Bootstrap 4 beta 2
+- Add `.idea` to gitignore
+- Automatically remove template if it doesn't exist
+- Update AdminCP users private profile query
+- Update external query API
+- Display dropzone debugging info in console
+- Update AdminCP user creation
+- Default request scheme to http if not set
+- Add root path constant to all file includes
+- Update AdminCP modules file check
+
+### Fixed
 - Fix ' in database details not being entered into config correctly
 - Remove non-alphanumeric characters from forum URLs
-- Allow spaces in alphanumeric check
 - Fix subforums not loading
 - Fix image overflow in homepage news posts
 - Fix issues with Minecraft banner MOTD colours
-- Add default 25565 port to banner query
-- Add new core permission system
-- Add missing permissions to installer update script
-- Add functionality to "Can view other users' topics?" permissions
-- Add reCAPTCHA configuration
 - Fix AdminCP overview chart issue
-- Prevent changing own group in AdminCP -> Users tab without permission
-- Update default template to Bootstrap 4 beta 2
 - Add line break between forum posts
 - Add missing Javascript files to template
-- Add stringToURL function to Util class
-- Add user avatar to navbar
-- Add .idea to gitignore
 - Fix incorrect last reply in forum index
 - Fix broken pagination in forum view
 - Fix Discord widget size
 - Add legacy v1 API
 - Add 6h, 12h, 1d, 15d to graph options
-- Automatically remove template if it doesn't exist
 - Set port to 25565 if none is specified
 - Fix homepage server offline message
 - Fix API reports alert, and order reports by last update time
-- Add view count to profile pages
 - Fix nickname changing in AdminCP not working
 - Fix broken "Remember Me" button on login page
-- Add private profiles
 - Fix unique username check in UserCP, and minor profile changes
 - Preserve private profile setting value when private profiles are disabled
 - Remove container inside container
-- Bypass private profile permission in Users & Groups
-- Update AdminCP users private profile query
 - Reset permissions variables in AdminCP forum permission editing
 - Fix share dropdown overflow
 - Fix timezone related forum post date issue
 - Fix issue on profile page
 - Fix new topic post timezone
 - Fix maintenance login link
-- Display dropzone debugging info in console
-- Update external query API
 - Fix URL for reports from API
 - Fix AdminCP night mode editor text colour
-- Allow a custom message when registration is disabled
-- Add root path constant to all file includes
 - Check for mysql/mysqlnd PHP extensions
 - Fix missing database setting
-- Update AdminCP user creation
-- Default request scheme to http if not set
 - Fix new topic anti spam check
-- Add option to change MySQL storage engine
-- Add author's group to latest announcements
-- Add default server IP variable to index page
 - Fix card body on homepage
-- Add permission to nicknames
-- Allow viewing sticky topics in only view own topic forums
-- Add email field to contact form
-- Update AdminCP modules file check
 - Add error message for sending emails too quickly
-- Allow custom HTML lang attribute on 404 pages
 - Fix default language for root user
 - Allow languages to specify their own meta charset content
 - Fix broken topics with "banner" or "profile" in title
@@ -254,15 +524,12 @@ NamelessMC version 2 Changelog
 - Update navbar template
 - Update timeline on profile pages
 - Replace panels in AdminCP with cards
-- Add redirect forums
 - Fix fatal error if $ping doesn't exist
 - Make default server query variables available on all pages
 - Add example v2 nginx config
 - Fix : sometimes showing after server IP on homepage
 - Add SET NAMES command to custom DB class
 - Fix broken "Minecraft Service Status"
-- Add forum post graph to UserCP
-- Add custom error handler
 - Disable server banners if exif_imagetype isn't installed
 - Allow viewing error logs in AdminCP
 - Add extra user related variables to topic view
@@ -318,369 +585,175 @@ NamelessMC version 2 Changelog
 - Remove more user data upon account deletion
 - Fix update execute issues
 
-2.0.0 pr-5
-- Full list https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr4...v2.0.0-pr5
-- Many bugfixes
-- Translation updates
-- New staff panel
-- RTL language support
-- User popovers
-- Template + module system changes
-- API rank sync
-- Ability for templates to toggle editor dark mode
-- Navbar + forum icons
-- Full multi language alert support
-- Follow topics
-- Sitemap generator
-- Click-to-copy IP
-- Minecraft server status page
-- Auto close spoilers
-- Other minor additions
-
-2.0.0 pr-6
-- Translation updates
-- Add Lithuanian and Polish languages
-- Update nav ordering
-- Rename UserCP to Account
-- Fix panel user edit Markdown issue
-- Fixed install language
-- Fix v1 upgrader issue
-- Fix apostrophes not showing when editing posts
-- Add indentation to panel sidebar child links
-- Shorten Debugging + Maintenance in sidebar to Maintenance
-- Allow popover hover in StaffCP
-- Add timeout to dashboard player count graph
-- Update user list date sort
-- Fix sidebar links not expanding on iOS
-- Fix terms page footer
-- Fix error when deleting user
-- Fix users not being promoted after validating
-- Fix users table width sometimes being too large
-- Fix post validation group not updating
-- Update login username title if Minecraft is disabled
-- Add forum drag reordering
-- Add subforum indentations in StaffCP
-- Add $template object to all loadPage calls
-- Show normal avatar if Minecraft is disabled on profile pages
-- Fix non-friendly URL subfolder login redirect
-- Replace &nbsp and &bull in Discord hook
-- Fix post link potentially being incorrect
-- Fix nickname not updating in StaffCP if disabled
-- Move MCAssoc JS to after include
-- Fix disabling reactions
-- Fix custom page editor not having Source tab
-- Change exif to full requirement
-- Fix registration username required message in some situations
-- Use generic Minecraft query exception
-- Fix date issue when updating forum latest post/topic
-- Prevent editing own secondary groups without permission
-- Add topic + post counts as global variables
-- Add topic label to news posts
-- Don't save last page if maintenance mode is disabled
-- Don't set register page as last page
-- Fix subdirectory profile page banner issue
-- Fix online users widget issue
-- Improve registration nickname label
-- Improve login username label
-- Fix registration nicknames not working
-- Add topic placeholders
-- Use new external server query
-- Add "Show nickname instead of username" option to online users widget
-- Add statistics widget
-- Fix user punishment alert
-- Remove config path issues on user settings page
-- Fix navigation error
-- Fix rewrite test in installer
-- Add forum title variable to view topic template
-- Fix error when replying to a topic that at least 1 user is following
-- Remove unneeded panel template files
-- Update CKEditor
-- Add user title variable to online staff + users widgets
-- Change front end editor
-- Add author IDs to messaging template variables
-- Auto enable some widgets on installation
-- Update getSelfURL to detect HTTPS more reliably
-- Add ability to upload + choose new homepage banner
-- Order parent forum dropdown
-- Allow switching a forum between forum + category
-- Add installer converter support
-- Add ability to switch panel template
-- Fix broken icon
-- Add ability to upload custom profile banners
-- Fix incorrect last online date for users registered through the API
-- New default template
-- Only show PM suggested user list after 3 characters typed
-
-2.0.0 pr-7
-- Add Italian translation
-- Update Czech translation
-- Update Dutch translation
-- Update German translation
-- Update Lithuanian translation
-- Update Norwegian translation
-- Update Polish translation
-- Update Portuguese translation
-- Update Romanian translation
-- Update Spanish translation
-- Fix search bar showing in wrong place if no topics in forum
-- Default Revamp template CSS tweaks
-- Remove unused condition in Default Revamp navbar template file
-- Fix Default Revamp delete post button
-- Fix Default Revamp delete profile post button
-- Fix broken topic breadcrumb link
-- Add missing panel template creation to updater
-- Navbar icons updated to Font Awesome 5
-- Default Revamp navbar updates
-- Fix incorrect last online date for users registered through the legacy v1 API
-- Update Default Revamp remember me label
-- Update Default template thumbtack icon
-- Add support for custom plural forms in languages
-- Remove : appearing after server IP if port is empty
-- Prevent infinite parent forum configuration loop
-- Fix plural form not working in some cases for time phrases
-- Fix Default template broken edit button icon
-- Update Discord widget description
-- Fix pre setup widgets and banner on new installations
-- Fix Default Revamp alerts page title
-- Fix recaptcha not showing in Default Revamp template
-- Fix latest posts sometimes showing duplicates
-- Switch Default Revamp authme templates around
-- Remove API debug line
-- Switch registration validation around
-- Fix timezones for reports
-- Hide staff groups for "post validation group"
-- Add terms + conditions to complete signup
-- Allow redirect custom pages to be accessed directly
-- Fix guests not being able to view redirect pages directly
-- Add API method to return list of usernames + their UUIDs
-- Add banned and active to listUsers response
-- Allow use of forgot password in maintenance mode
-- Editor updates
-- Prevent editor modifying inserted URLs automatically
-- Assign logged-in user title
-- Add view all panel templates link variable
-- Add www to getSelfURL if force www is enabled and www is not in hostname
-- Allow editing root user's secondary groups
-- Fix non-friendly URL sitemap generation
-- Fix widget configuration alignment and text
-- Add multiple groups to the profile page
-- Prevent fatal error if Mojang API query returns null
-- Remove Default Revamp template credits
-- Add support for Twitter cards
-- Change topic cancellation buttons to yes/no
-- Redirect to StaffCP Forums overview when updating a forum
-- Bring forum search in line with forum title
-- Add categories to move topic dropdown
-- Change API URL to non-friendly URL
-- Add option to display IP address for each server on status page
-- Fixed fids and gids being too small in forum_topic_labels table
-- Add support for Twitter cards in Default Revamp template
-- Inline item content in online staff widget
-- Make avatar clickable in view topic template
-- Don't show topic count/latest topic info for redirect forums
-- Include subforums in move topic dropdown
-- Add UUID to forum post variables
-- Remove old code
-- Add ability to use multiple webhooks
-- Add last seen, online to view topic and subforum descriptions to view forum
-- Fix MentionsParser
-- Remove avatars with different extensions and add timestamp to prevent caching issues
-- Escape avatar updated variable just in case
-- Fix default group potentially breaking when creating a new group
-- Fix API verification issue
-- Prevent re-querying for permission checks
-- Fix Default Theme nav style issue
-- Fix names with special characters having no avatar
-- Sort groups in order
-- Add int check to DB Custom bind param
-- Allow explicitly setting pagination values
-- Only show email notice in StaffCP with permission
-- Stop cookie notice automatically closing
-- Add reCAPTCHA to login screen
-- Add 403 page
-- Add more variables to Statistics widget
-- Fix More dropdown only showing if a custom page is adding to it
-- Add ability for template to define a settings page
-- Add per-user template support
-- Prevent fatal error with insufficient forum permissions
-- Allow changing group username colour from text input
-- Add login link to maintenance mode page
-
-2.0.0 pr-8
-- Many bugfixes
-- Add Discord rank sync
-- Add Chinese (Simplified), French, Russian, Spanish (ES) and Turkish translations
-- Update existing translations
-- New user/group systems - mostly backend changes
-- API rework - modules can now register custom endpoints
-- New widget location - can choose between left + right hand side
-- Remove legacy v1 API
-- Add basic custom page feature - no navbar/footer
-- Add ability to open custom page in new tab
-- Remove old Default template
-- Fix same-site redirect forums showing redirect warning
-- Add "topics following" page
-- Add email content editor
-- Add mass emailing
-- Add ability to receive emails for followed topic updates
-- Add required custom profile fields to registration page
-- Add announcement system
-- New installer
-- Update StaffCP users list table to be async
-- Add ability to specify rel, as, onload attributes for CSS and defer, async attributes for JS
-- Discord topic webhook improvements
-- Remove dropdowns from DefaultRevamp template mobile sidebar
-- Start PHP 8 compatibility - still a work in progress
-- Fix MCAssoc integration
-- Add server status widget
-- Add latest profile post widget
-- Add ability to change "More" dropdown message
-- Add force 2FA option
-- Multiple webhook support
-- Add highlighting to profile post links
-- Add ability to add CSS to group usernames
-- Allow specifying "Can view other users' topics" forum permission for guests
-- Add hCaptcha
-
-2.0.0 pr-9
-- Add new panel template
-- Add Default Revamp settings including dark mode
-- Add player heads to server status widget
-- Add ability to re-order servers in play tab
-- Add announcement HTML support
-- Add ability to search for users by email address in StaffCP
-- Add ability to resend validation email
-- Add ability to set default labels for forums
-- Add option to use Gravatar
-- Add concept of module dependencies
-- Add getActivePage method
-- Add new SEO page including Google Analytics integration
-- Add drag ordering for groups and Minecraft servers
-- Translation updates
-- Fix multibyte character string length checks
-- Fix widgets intended for homepage showing on all pages
-- Fix validateUser hook sending empty Discord message
-- Fix API endpoints
-- Fix latest profile posts widget profile links
-- Fix API URL adding two http prefixes
-- Fix StaffCP Registration settings not submitting
-- Fix webhooks listing twice
-- Fix API URL in StaffCP API tab having leading/trailing whitespace
-- Fix group_id column error upon registration and AuthMe linking
-- Fix StaffCP sidebar link conflicts
-- Fix error if user has no group
-- Make groups field in serverInfo endpoint optional
-- PHP 8 improvements
-- Full changeset https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr8...v2.0.0-pr9
 
-2.0.0 pr-10
-- Add ability to upload favicon
-- Add Smarty security policy
-- Add support for environment variable based debugging
-- Auto detect user timezone when registering
-- Avatar rework and add Crafthead support
-- Captcha rework including Recaptcha v3 invisible support
-- Ensure cookie_secure is set in PHP config
-- Error handling revamp
-- Increase label HTML length
-- Move captcha/https/www configuration to config.php
-- Placeholder API integration
-- Remove unsafe tags when editing posts
-- Validation revamp
-- API updates - including group sync fixes
-- Default Revamp and Default panel template fixes
-- htaccess fixes and improvements
-- MCAssoc fixes
-- Server status widget fixes
-- Translation updates
-- PHP 8 improvements
-- Full changeset https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr9...v2.0.0-pr10
+## [2.0.0 pr-3](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr2...v2.0.0-pr3) - 2017-10-06
+- Update existing translations
+- Add Romanian and Swedish translations
+- Add missing profile post term to all languages
+- Update Bootstrap version to v4 alpha 6
+- Fix server banner issues
+- Add missing font file
+- Fix white screen if no avatar is uploaded
+- Only display 5 forum posts on profile pages
+- Fix AdminCP forums page navbar
+- Fix potentially broken AdminCP link with non-friendly URLs
+- Update Minecraft server banners and allow custom backgrounds
+- Allow dismissing maintenance mode alert
+- Check if username already exists in Authme connector
+- Update installer requirements
+- Fix banner issues with PHP < 7.0
+- Fix issue with maintenance mode message editor
+- Fix incorrect forum order
+- Fix login page in maintenance mode without friendly URLs
+- Fix avatar size in news section
+- Update DataTables Bootstrap plugin to v4
+- Fix potential overflow in user dropdown
+- Add port field to email configuration
+- Update forum module, fixing installation check
+- Fix no forums showing for guests
+- Display module author
+- Add template alert language entries
+- Fix navbar issue
+- Update email content type to html
+- Update group tags within installer to use badges instead of labels
+- Tidy installer language file includes
+- Create default label types
+- Add back button to edit group page
+- Add widget system, along with Twitter and Facebook widgets
+- Add latest post widget
+- Add header to latest posts widget template
+- Track topic views via session if cookies are disabled
+- Update .nav-list CSS
+- Add function to get avatar from UUID
+- Add friendlier forum URLs
+- Fix editor Emoji icon and tabs
+- Add secondary user groups
+- Fix pagination issue with no non-sticky topics in forum
+- Allow deleting templates
+- Fix widget issue with maintenance mode for non-admins
+- Add Discord widget
+- Add user doesn't exist page
+- Add missing language files
+- Allow blocking users
+- Fix error display issue in change password template
+- Fix match password for forgot password page
+- Fix potential undefined offset issue
+- Add player count graphs
+- Add rel="nofollow noopener" and target="_blank" to every external link
+- Update NamelessMC footer link
+- Fix potential undefined variable error
+- Update server query internal
+- Add blocked users table to installation, and update infractions table
+- Add background-size: cover; to background image
+- Fix expired Discord invite
+- Fix successful login alert
+- Add user related variables
+- Update Paginator class, allowing for custom pagination CSS
+- Update site name in two factor authentication
+- Add missing include to user messaging file
+- Add extra template variables to ModCP reports
+- Reshuffle view topic buttons
+- Add user punishments
+- Update server player count query
+- Update punishment link in AdminCP
+- Prevent viewing template files
+- Fix incorrect banner URL
+- Remove port 443 from getSelfURL() if https is enabled
+- Fix issue with custom pagination classes
+- Create htaccess in cache directory
+- Add custom page system
+- Fix custom page icons
+- Add ability to re-order navbar
+- Fix spoilers + emojis on custom pages
+- Add module name to widget list
+- Add option to enable page load timer
+- Add missing view to ModCP punishments
+- Fix incorrect pagination link
+- Add signature to UserCP settings
+- Move AdminCP navbar contents into container
+- Allow editing/deleting profile wall posts
+- Update updater URL
 
-2.0.0 pr-11
-- Add Danish translation
-- Fix StaffCP Minecraft integration section
-- Add support for upward dropdowns in Default Revamp template
-- Add Default Revamp dark mode support for top attached headers
-- Fix invalid language during installation
-- Add SSL check before activating secure cookies
-- Fix missing favicons directory
-- Fix invalid token with AuthMe login
-- Add setting to initialise charset
-- Add environment variables to hide options in general configuration
-- Validate email port before updating config in StaffCP
-- Add method to set multiple config values at once
-- Temporarily disable auto timezone detection until #2355 is resolved
-- Change placeholder tables primary keys
-- Fix profile settings when forum is disabled
-- Add index on nl2_posts topic_id column
-- Remove extra column from nl2_query_results
-- Improve placeholder error message
-- Translation updates
-- PHP 8 improvements
-- Full changeset https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr10...v2.0.0-pr11
+## [2.0.0 pr-2](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr1...v2.0.0-pr2) - 2017-06-07
+- Fix issue with editing user in AdminCP
+- Prevent non-moderators replying to locked topics
+- Prevent signature image overflow
+- Remove unnecessary header template file
+- Fix registration issue
+- Fix recaptcha issues in upgrade script
+- Minor forum updates
+- Update Mojang API URL
+- Fix incorrect "last user" information in PMs
+- Redirect to previous page after login
+- Allow use of HTML in report content
+- Add forum labels
+- Update panels in AdminCP night theme
+- Small AdminCP label fixes
+- Update default template Bootstrap version
+- Update core Bootstrap version
+- Update profile template
+- Fix signin issue with numeric usernames
+- Fix negative reactions not creating
+- Allow creating new instances of custom DB class
+- Update AdminCP registrations graph
+- Change popover placement in AdminCP
+- Increase query interval
+- Display success message upon sending PM reply
+- Update installer and configuration methods
+- Display errors if unable to create config + cache
+- Update htaccess
+- Fix installation detection
+- Separate core JS into templates
+- Add maintenance mode
+- Allow logging in whilst in maintenance mode
+- Prevent admin account switch in AdminCP
+- Fix installer not loading
+- Allow installer translations
+- Add default database address to installer
+- Update admin auth screen layout
+- Remove deprecated mcrypt requirement, along with a now unused function
+- Fix permission check for configuration file
+- Add AuthMe integration and Minecraft service status
+- Fix invalid charset in installer
+- Fix AdminCP mobile navbar toggler not showing
+- Update cp_dark.css
+- Fix AdminCP auth + password changing
+- Add switch to toggle error reporting
+- Fix error in 404 page
+- Update PasswordHash class
+- Update form tokens
+- Allow per-user timezones
+- Add topics and posts to AdminCP overview stats graph
+- Fix potentially incorrect news ordering
+- Add card colour for Minecraft service status "Slow"
+- Define page on register page
+- Update post editor
+- Fix minor login/logout issues
+- Apply GeSHi to new topics and edited posts
+- Fix AdminCP security log sorting
+- Add force-HTTPS option to AdminCP
+- Fix post word wrapping and temporarily disable the code editor
+- Add Minecraft server query to homepage
+- Allow editing + deleting Minecraft servers
+- Fix sub-server queries
+- Fix invalid MySQL column default value
+- Fix timezone offsets not displaying minutes correctly
+- Minor forum SEO improvements
+- Add contact page, new email class and email errors + testing
+- Add registration email verification toggle in AdminCP
+- Add Minecraft server query error logging
+- Add Minecraft server banners
+- Allow purging Minecraft query errors
+- Complete mcassoc integration
+- Add terms and conditions page, and the ability to modify them
+- Update installer
+- Add avatar configuration, including the ability to upload a default avatar
+- Fix AdminCP -> Minecraft PHP notice
+- Add forgot password functionality
+- Add forum topic label permissions
+- Add forum search
+- Update Font Awesome
 
-2.0.0 pr-12
-- Add Thai translation
-- Increase max length of custom pages URL + title
-- Display non-alphanumeric characters in forum URLs
-- General placeholder fixes
-- General Authme fixes
-- Convert many GET requests to POST #2033
-- Add new administrator permission for full access
-- Add new forum settings page including link location option
-- Add ability to log in with either username or email
-- Discord sync rework
-- In-game sync rework
-- Fix legacy panel template update alert style
-- Only send password reset email if user is already active
-- PHPMailer autoloader PHP 8 compatibility
-- Fix warning modal not showing
-- Prevent IP banning yourself
-- Allow disabling placeholders feature
-- Remove legacy X-UA-Compatible header
-- Prevent showing validate message when API verification is disabled
-- Update strings for Discord slash commands
-- API verification command renamed from /validate to /verify
-- Change installer DB password field to password type
-- Fix latest profile posts link
-- Fix duplicate rel="" attribute when using rel="preload"
-- Make hook fire even if no hooks are there
-- Remove password length limit
-- Convert forum queries to DB query()
-- Add notice to StaffCP update tab if not using PHP 7.4+
-- Add per-user dark mode toggle
-- Only clear 2fa state when not on 404 page
-- Fix StaffCP redirect after re-authentication
-- Add reported_username and reported_uid fields to createReport endpoint
-- Exclude .DS_Store files from endpoint scan
-- Default Revamp dark mode improvements
-- Default panel template dark mode improvements
-- Translation updates
-- PHP 8 improvements
-- Full changeset https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr11...v2.0.0-pr12
 
-2.0.0 pr-13
-- Discord + Google OAuth support
-- New user verification system
-- New cookie consent module
-- Migration to Composer + Yarn
-- Database migration system + new upgrade class
-- Improved database indexing
-- New hook system for forum/private message post rendering, including better codeblock + mentions support
-- Automatic user language detection
-- Show unsupported banner to Internet Explorer users
-- Contact page removed
-- Webhook for reports, announcements, bans, warnings
-- API additions including new ban user endpoint
-- ListUsers API endpoint pagination
-- Update to Font Awesome 6
-- Use Guzzle for HTTP requests
-- Custom date format support
-- Replace API error codes with namespaced strings
-- Fix issue using certain characters in URLs
-- Removed CKEditor
-- Frontend and backend template updates
-- PHP 8 improvements
-- Many more features + bugfixes!
-- Milestone: https://github.com/NamelessMC/Nameless/issues?page=1&q=is%3Aissue+milestone%3A2.0.0-pr13+is%3Aclosed
-- Full changeset https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr12...v2.0.0-pr13
\ No newline at end of file
+## [2.0.0 pr-1](https://github.com/NamelessMC/Nameless/compare/v1.0.15...v2.0.0-pr1) - 2016-12-30
+- Initial release

From e234000cdcf8d82d7851f640a61d31554ded2d3b Mon Sep 17 00:00:00 2001
From: YaoSiQian <admin@yaosiqian.cn>
Date: Wed, 29 Jun 2022 06:37:15 +0000
Subject: [PATCH 222/337] Translated using Weblate (Chinese (Simplified))

Currently translated at 96.4% (1182 of 1226 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/zh_Hans/
---
 custom/languages/zh_CN.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/languages/zh_CN.json b/custom/languages/zh_CN.json
index 27102545e7..41a84610c1 100644
--- a/custom/languages/zh_CN.json
+++ b/custom/languages/zh_CN.json
@@ -113,7 +113,7 @@
     "admin/default_avatar": "默认头像",
     "admin/default_group": "这个权限组是否为默认组 (对于新用户来说)?",
     "admin/default_language": "默认语言",
-    "admin/default_language_help": "用户可从已安装的语言中选择。",
+    "admin/default_language_help": "用户可从已安装的语言中选择 {{docLinkStart}}阅读更多 »{{docLinkEnd}}",
     "admin/default_server": "默认服务器",
     "admin/default_template_set": "将默认模板设置为 {{template}} 的操作已成功",
     "admin/default_timezone": "默认时区",

From a8a240fee1b3bfcc9143cc75ad3e3fe12716cacf Mon Sep 17 00:00:00 2001
From: enno123 <admin@enno123.de>
Date: Thu, 30 Jun 2022 18:07:25 +0000
Subject: [PATCH 223/337] Translated using Weblate (German)

Currently translated at 100.0% (1227 of 1227 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/
---
 custom/languages/de_DE.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index b4e4f26461..684e6e4028 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -598,7 +598,7 @@
     "api/username_updated": "Benutzername erfolgreich aktualisiert",
     "emails/change_password_message": "Um dein Passwort zurückzusetzen, klicke bitte auf den folgenden Link. Wenn du dies nicht selbst angefordert haben, kannst du diese E-Mail bedenkenlos löschen.",
     "emails/change_password_subject": "Passwort vergessen",
-    "emails/forum_topic_reply_message": "{{author}} hat auf ein Thema geantwortet, dem Sie folgen. Content: {{content}}",
+    "emails/forum_topic_reply_message": "{{author}} hat auf ein Thema geantwortet, dem du folgst. Content: {{content}}",
     "emails/forum_topic_reply_subject": "{{author}} hat geantwortet {{topic}}",
     "emails/greeting": "Hey,",
     "emails/register_message": "Danke für deine Registration! Um deine Registration abzuschließen klicke auf folgenden Link:",
@@ -1224,5 +1224,6 @@
     "installer/database_connection_failed": "Verbindung zur Datenbank fehlgeschlagen:<br>{{message}}",
     "admin/debugging_enabled": "Wenn Debugging aktiviert ist, können sensible Informationen für unbefugte Besucher zugänglich sein. Debugging sollte nur für die Entwicklung verwendet werden, nicht auf öffentlichen Seiten.",
     "admin/https_port_80": "Es sieht so aus, als ob du HTTPS auf Port 80 verwendest, was mit ziemlicher Sicherheit nicht der Fall ist. Wenn du Cloudflare verwendest, stelle sicher, dass du den TLS-Verschlüsselungsmodus auf Full (strict) gesetzt hast. Wenndu deine eigene Proxy verwendest, konfiguriere ihn bitte so, dass er den X-Forwarded-Port-Header sendet.",
-    "admin/group_sync_no_results_warning": "Gruppensynchronisierungsregeln sind eingerichtet, aber es wurden keine Änderungen gemeldet. Dies könnte auf eine Fehlkonfiguration hindeuten."
+    "admin/group_sync_no_results_warning": "Gruppensynchronisierungsregeln sind eingerichtet, aber es wurden keine Änderungen gemeldet. Dies könnte auf eine Fehlkonfiguration hindeuten.",
+    "user/avatar_set_successfully": "Avatar erfolgreich gesetzt."
 }

From 1eae2f280521c367142324da21862e923cd0ee2d Mon Sep 17 00:00:00 2001
From: Dominik Roman <dominikslk9@gmail.com>
Date: Thu, 30 Jun 2022 17:39:38 +0000
Subject: [PATCH 224/337] Translated using Weblate (Slovak)

Currently translated at 100.0% (1227 of 1227 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/sk/
---
 custom/languages/sk_SK.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/custom/languages/sk_SK.json b/custom/languages/sk_SK.json
index 53090388e1..b86a172f30 100644
--- a/custom/languages/sk_SK.json
+++ b/custom/languages/sk_SK.json
@@ -1224,5 +1224,6 @@
     "admin/updated": "Aktualizované",
     "admin/user_group_added_hook_info": "Uživateľská skupina pridaná",
     "admin/user_group_removed_hook_info": "Užívateľská skupina odstránená",
-    "admin/group_name": "Názov skupiny"
+    "admin/group_name": "Názov skupiny",
+    "user/avatar_set_successfully": "Avatar bol úspešne nastavený."
 }

From 8b195431964b68c579b26a041af14a0f8da07a1d Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Thu, 30 Jun 2022 23:49:48 -0600
Subject: [PATCH 225/337] Rehaul changelog

---
 CHANGELOG.md | 1238 +++++++++++++++++++++++++++-----------------------
 1 file changed, 658 insertions(+), 580 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4868c15d0..65c3e763dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,251 +1,537 @@
-NamelessMC version 2 Changelog
+# NamelessMC v2 Changelog
 
-2.0.0 pr-1
-- Initial release
+## [Unreleased](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr13...v2)
+> [Milestone](https://github.com/NamelessMC/Nameless/milestone/17)
+
+### Added
+
+### Changed
+
+### Fixed
+
+
+## [2.0.0 pr-13](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr12...v2.0.0-pr13) - 2022-06-04
+> [Milestone](https://github.com/NamelessMC/Nameless/milestone/14)
+
+### Added
+- Discord + Google OAuth support
+- New user verification system
+- New cookie consent module
+- New hook system for forum/private message post rendering, including better codeblock + mentions support
+- Automatic user language detection
+- Custom date format support
+- Webhook for reports, announcements, bans, warnings
+- API additions including new ban user endpoint
+
+### Changed
+- Contact page removed
+- Update to Font Awesome 6
+- Use Guzzle for HTTP requests
+- Migration to Composer + Yarn
+- Database migration system + new upgrade class
+- Improved database indexing
+- Show unsupported banner to Internet Explorer users
+- ListUsers API endpoint pagination
+- Replace API error codes with namespaced strings
+- Removed CKEditor
+
+### Fixed
+- PHP 8 improvements
+- Fix issue using certain characters in URLs
+- Frontend and backend template updates
+- Many more bugfixes
+
+
+## [2.0.0 pr-12](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr11...v2.0.0-pr12) - 2021-09-10
+> [Milestone](https://github.com/NamelessMC/Nameless/milestone/16)
+
+### Added
+- Add Thai translation
+- Add new administrator permission for full access
+- Add new forum settings page including link location option
+- Add ability to log in with either username or email
+- Allow disabling placeholders feature
+- Add notice to StaffCP update tab if not using PHP 7.4+
+- Add per-user dark mode toggle
+- Add `reported_username` and `reported_uid` fields to createReport endpoint
+
+### Changed
+- Increase max length of custom pages URL + title
+- Convert many GET requests to POST
+- Discord sync rework
+- In-game sync rework
+- Remove legacy X-UA-Compatible header
+- API verification command renamed from `/validate` to `/verify`
+- Make hook fire even if no hooks are there
+- Remove password length limit
+- Translation updates
+- Default panel template dark mode improvements
+- Default Revamp dark mode improvements
+- Convert forum queries to DB query()
+
+### Fixed
+- Display non-alphanumeric characters in forum URLs
+- General placeholder fixes
+- General Authme fixes
+- Fix legacy panel template update alert style
+- Only send password reset email if user is already active
+- PHPMailer autoloader PHP 8 compatibility
+- Fix warning modal not showing
+- Prevent IP banning yourself
+- Prevent showing validate message when API verification is disabled
+- Update strings for Discord slash commands
+- Change installer DB password field to password type
+- Fix latest profile posts link
+- Fix duplicate `rel=""` attribute when using `rel="preload"`
+- Only clear 2fa state when not on 404 page
+- Fix StaffCP redirect after re-authentication
+- Exclude `.DS_Store` files from endpoint scan
+- PHP 8 improvements
+
+
+## [2.0.0 pr-11](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr10...v2.0.0-pr11) - 2021-06-27
+> [Milestone](https://github.com/NamelessMC/Nameless/milestone/15)
+
+### Added
+- Add Danish translation
+- Add support for upward dropdowns in Default Revamp template
+- Add Default Revamp dark mode support for top attached headers
+- Add setting to initialise charset
+- Add environment variables to hide options in general configuration
+- Add method to set multiple config values at once
+
+### Changed
+- Validate email port before updating config in StaffCP
+- Remove extra column from nl2_query_results
+- Change placeholder tables primary keys
+- Improve placeholder error message
+- Translation updates
+- Add index on `nl2_posts.topic_id` column
+
+### Fixed
+- Fix StaffCP Minecraft integration section
+- Fix invalid language during installation
+- Add SSL check before activating secure cookies
+- Fix missing favicons directory
+- Fix invalid token with AuthMe login
+- Fix profile settings when forum is disabled
+
+
+## [2.0.0 pr-10](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr9...v2.0.0-pr10) - 2021-08-25
+> [Milestone](https://github.com/NamelessMC/Nameless/milestone/13)
+
+- Add ability to upload favicon
+- Add Smarty security policy
+- Add support for environment variable based debugging
+- Auto detect user timezone when registering
+- Avatar rework and add Crafthead support
+- Captcha rework including Recaptcha v3 invisible support
+- Ensure cookie_secure is set in PHP config
+- Error handling revamp
+- Increase label HTML length
+- Move captcha/https/www configuration to config.php
+- Placeholder API integration
+- Remove unsafe tags when editing posts
+- Validation revamp
+- API updates - including group sync fixes
+- Default Revamp and Default panel template fixes
+- htaccess fixes and improvements
+- MCAssoc fixes
+- Server status widget fixes
+- Translation updates
+- PHP 8 improvements
+
+
+## [2.0.0 pr-9](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr8...v2.0.0-pr9) - 2020-12-30
+> [Milestone](https://github.com/NamelessMC/Nameless/milestone/12)
+
+### Added
+- Add new panel template
+- Add Default Revamp settings including dark mode
+- Add player heads to server status widget
+- Add ability to re-order servers in play tab
+- Add announcement HTML support
+- Add ability to search for users by email address in StaffCP
+- Add ability to resend validation email
+- Add ability to set default labels for forums
+- Add option to use Gravatar
+- Add concept of module dependencies
+- Add getActivePage method
+- Add new SEO page including Google Analytics integration
+- Add drag ordering for groups and Minecraft servers
+- Translation updates
+
+### Changed
+- Make groups field in serverInfo endpoint optional
+
+### Fixed
+- Fix multibyte character string length checks
+- Fix widgets intended for homepage showing on all pages
+- Fix validateUser hook sending empty Discord message
+- Fix API endpoints
+- Fix latest profile posts widget profile links
+- Fix API URL adding two http prefixes
+- Fix StaffCP Registration settings not submitting
+- Fix webhooks listing twice
+- Fix API URL in StaffCP API tab having leading/trailing whitespace
+- Fix `group_id` column error upon registration and AuthMe linking
+- Fix StaffCP sidebar link conflicts
+- Fix error if user has no group
+- PHP 8 improvements
+
+
+## [2.0.0 pr-8](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr7...v2.0.0-pr8) - 2020-12-25
+> [Milestone](https://github.com/NamelessMC/Nameless/milestone/4)
+
+### Added
+- Add Discord rank sync
+- Add Chinese (Simplified), French, Russian, Spanish (ES) and Turkish translations
+- Update existing translations
+- New user/group systems - mostly backend changes
+- API rework - modules can now register custom endpoints
+- New widget location - can choose between left or right hand side
+- Add basic custom page feature - no navbar/footer
+- Add ability to open custom page in new tab
+- Add "topics following" page
+- Add email content editor
+- Add mass emailing
+- Add ability to receive emails for followed topic updates
+- Add required custom profile fields to registration page
+- Add announcement system
+- Add ability to specify rel, as, onload attributes for CSS and defer, async attributes for JS
+- Add server status widget
+- Add latest profile post widget
+- Add ability to change "More" dropdown message
+- Add force 2FA option
+- Multiple webhook support
+- Add highlighting to profile post links
+- Add ability to add CSS to group usernames
+- Allow specifying "Can view other users' topics" forum permission for guests
+- Add hCaptcha
+
+### Changed
+- Remove legacy v1 API
+- Remove old Default template
+- New installer
+- Update StaffCP users list table to be async
+- Discord topic webhook improvements
+- Remove dropdowns from DefaultRevamp template mobile sidebar
+- Start PHP 8 compatibility - still a work in progress
+
+### Fixed
+- Many bugfixes
+- Fix same-site redirect forums showing redirect warning
+- Fix MCAssoc integration
+
+
+## [2.0.0 pr-7](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr6...v2.0.0-pr7) - 2020-01-05
+
+### Added
+- Add Italian translation
+- Add support for custom plural forms in languages
+- Add API method to return list of usernames + their UUIDs
+- Add reCAPTCHA to login screen
+- Add 403 page
+- Add more variables to Statistics widget
+- Add ability for template to define a settings page
+- Add per-user template support
+- Add login link to maintenance mode page
+- Add view all panel templates link variable
+- Add support for Twitter cards
+- Allow changing group username colour from text input
+- Add ability to use multiple webhooks
+- Add last seen, online to view topic and subforum descriptions to view forum
+
+### Changed
+- Update Czech translation
+- Update Dutch translation
+- Update German translation
+- Update Lithuanian translation
+- Update Norwegian translation
+- Update Polish translation
+- Update Portuguese translation
+- Update Romanian translation
+- Update Spanish translation
+- Default Revamp template CSS tweaks
+- Remove unused condition in Default Revamp navbar template file
+- Add missing panel template creation to updater
+- Navbar icons updated to Font Awesome 5
+- Default Revamp navbar updates
+- Update Default Revamp remember me label
+- Update Default template thumbtack icon
+- Update Discord widget description
+- Switch Default Revamp authme templates around
+- Remove API debug line
+- Switch registration validation around
+- Hide staff groups for "post validation group"
+- Allow redirect custom pages to be accessed directly
+- Allow use of forgot password in maintenance mode
+- Editor updates
+- Allow editing root user's secondary groups
+- Assign logged-in user title
+- Add www to getSelfURL if force www is enabled and www is not in hostname
+- Add multiple groups to the profile page
+- Change topic cancellation buttons to yes/no
+- Remove Default Revamp template credits
+- Redirect to StaffCP Forums overview when updating a forum
+- Add categories to move topic dropdown
+- Change API URL to non-friendly URL
+- Add UUID to forum post variables
+- Remove old code
+
+### Fixed
+- Fix search bar showing in wrong place if no topics in forum
+- Fix Default Revamp delete post button
+- Fix Default Revamp delete profile post button
+- Fix broken topic breadcrumb link
+- Fix incorrect last online date for users registered through the legacy v1 API
+- Remove : appearing after server IP if port is empty
+- Prevent infinite parent forum configuration loop
+- Fix plural form not working in some cases for time phrases
+- Fix Default template broken edit button icon
+- Fix pre setup widgets and banner on new installations
+- Fix Default Revamp alerts page title
+- Fix recaptcha not showing in Default Revamp template
+- Fix latest posts sometimes showing duplicates
+- Fix timezones for reports
+- Add terms + conditions to complete signup
+- Fix guests not being able to view redirect pages directly
+- Add banned and active to listUsers response
+- Prevent editor modifying inserted URLs automatically
+- Fix non-friendly URL sitemap generation
+- Fix widget configuration alignment and text
+- Prevent fatal error if Mojang API query returns null
+- Bring forum search in line with forum title
+- Add option to display IP address for each server on status page
+- Fixed fids and gids being too small in forum_topic_labels table
+- Add support for Twitter cards in Default Revamp template
+- Inline item content in online staff widget
+- Make avatar clickable in view topic template
+- Don't show topic count/latest topic info for redirect forums
+- Include subforums in move topic dropdown
+- Fix MentionsParser
+- Remove avatars with different extensions and add timestamp to prevent caching issues
+- Escape avatar updated variable just in case
+- Fix default group potentially breaking when creating a new group
+- Fix API verification issue
+- Prevent re-querying for permission checks
+- Fix Default Theme nav style issue
+- Fix names with special characters having no avatar
+- Sort groups in order
+- Add int check to DB Custom bind param
+- Allow explicitly setting pagination values
+- Only show email notice in StaffCP with permission
+- Stop cookie notice automatically closing
+- Fix More dropdown only showing if a custom page is adding to it
+- Prevent fatal error with insufficient forum permissions
+
+
+## [2.0.0 pr-6](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr5...v2.0.0-pr6) - 2019-03-10
+
+### Added
+- Add Lithuanian and Polish languages
+- Allow popover hover in StaffCP
+- Add forum drag reordering
+- Add subforum indentations in StaffCP
+- Add $template object to all loadPage calls
+- Add topic + post counts as global variables
+- Add topic label to news posts
+- New default template
+- Add installer converter support
+- Add ability to switch panel template
+- Add ability to upload custom profile banners
+- Add "Show nickname instead of username" option to online users widget
+- Add statistics widget
+- Add ability to upload + choose new homepage banner
+- Add user title variable to online staff + users widgets
+- Add author IDs to messaging template variables
+
+### Changed
+- Translation updates
+- Update nav ordering
+- Rename UserCP to Account
+- Add indentation to panel sidebar child links
+- Shorten Debugging + Maintenance in sidebar to Maintenance
+- Update user list date sort
+- Change exif to full requirement
+- Improve registration nickname label
+- Improve login username label
+- Auto enable some widgets on installation
+- Change front end editor
+
+### Fixed
+- Fix panel user edit Markdown issue
+- Fixed install language
+- Fix v1 upgrader issue
+- Fix apostrophes not showing when editing posts
+- Add timeout to dashboard player count graph
+- Fix sidebar links not expanding on iOS
+- Fix terms page footer
+- Fix error when deleting user
+- Fix users not being promoted after validating
+- Fix users table width sometimes being too large
+- Fix post validation group not updating
+- Update login username title if Minecraft is disabled
+- Show normal avatar if Minecraft is disabled on profile pages
+- Fix non-friendly URL subfolder login redirect
+- Replace &nbsp and &bull in Discord hook
+- Fix post link potentially being incorrect
+- Fix nickname not updating in StaffCP if disabled
+- Move MCAssoc JS to after include
+- Fix disabling reactions
+- Fix custom page editor not having Source tab
+- Fix registration username required message in some situations
+- Use generic Minecraft query exception
+- Fix date issue when updating forum latest post/topic
+- Prevent editing own secondary groups without permission
+- Don't save last page if maintenance mode is disabled
+- Don't set register page as last page
+- Fix subdirectory profile page banner issue
+- Fix online users widget issue
+- Fix registration nicknames not working
+- Add topic placeholders
+- Use new external server query
+- Fix user punishment alert
+- Remove config path issues on user settings page
+- Fix navigation error
+- Fix rewrite test in installer
+- Add forum title variable to view topic template
+- Fix error when replying to a topic that at least 1 user is following
+- Remove unneeded panel template files
+- Update CKEditor
+- Update getSelfURL to detect HTTPS more reliably
+- Order parent forum dropdown
+- Allow switching a forum between forum + category
+- Fix broken icon
+- Fix incorrect last online date for users registered through the API
+- Only show PM suggested user list after 3 characters typed
+
+
+## [2.0.0 pr-5](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr4...v2.0.0-pr5) - 2018-10-08
+
+### Added
+- New staff panel
+- RTL language support
+- API rank sync
+- Full multi language alert support
+- Follow topics
+- Click-to-copy IP
+- Sitemap generator
+- Ability for templates to toggle editor dark mode
+- Other minor additions
+- Minecraft server status page
+- Navbar + forum icons
+- User popovers
 
-2.0.0 pr-2
-- Fix issue with editing user in AdminCP
-- Prevent non-moderators replying to locked topics
-- Prevent signature image overflow
-- Remove unnecessary header template file
-- Fix registration issue
-- Fix recaptcha issues in upgrade script
-- Minor forum updates
-- Update Mojang API URL
-- Fix incorrect "last user" information in PMs
-- Redirect to previous page after login
-- Allow use of HTML in report content
-- Add forum labels
-- Update panels in AdminCP night theme
-- Small AdminCP label fixes
-- Update default template Bootstrap version
-- Update core Bootstrap version
-- Update profile template
-- Fix signin issue with numeric usernames
-- Fix negative reactions not creating
-- Allow creating new instances of custom DB class
-- Update AdminCP registrations graph
-- Change popover placement in AdminCP
-- Increase query interval
-- Display success message upon sending PM reply
-- Update installer and configuration methods
-- Display errors if unable to create config + cache
-- Update htaccess
-- Fix installation detection
-- Separate core JS into templates
-- Add maintenance mode
-- Allow logging in whilst in maintenance mode
-- Prevent admin account switch in AdminCP
-- Fix installer not loading
-- Allow installer translations
-- Add default database address to installer
-- Update admin auth screen layout
-- Remove deprecated mcrypt requirement, along with a now unused function
-- Fix permission check for configuration file
-- Add AuthMe integration and Minecraft service status
-- Fix invalid charset in installer
-- Fix AdminCP mobile navbar toggler not showing
-- Update cp_dark.css
-- Fix AdminCP auth + password changing
-- Add switch to toggle error reporting
-- Fix error in 404 page
-- Update PasswordHash class
-- Update form tokens
-- Allow per-user timezones
-- Add topics and posts to AdminCP overview stats graph
-- Fix potentially incorrect news ordering
-- Add card colour for Minecraft service status "Slow"
-- Define page on register page
-- Update post editor
-- Fix minor login/logout issues
-- Apply GeSHi to new topics and edited posts
-- Fix AdminCP security log sorting
-- Add force-HTTPS option to AdminCP
-- Fix post word wrapping and temporarily disable the code editor
-- Add Minecraft server query to homepage
-- Allow editing + deleting Minecraft servers
-- Fix sub-server queries
-- Fix invalid MySQL column default value
-- Fix timezone offsets not displaying minutes correctly
-- Minor forum SEO improvements
-- Add contact page, new email class and email errors + testing
-- Add registration email verification toggle in AdminCP
-- Add Minecraft server query error logging
-- Add Minecraft server banners
-- Allow purging Minecraft query errors
-- Complete mcassoc integration
-- Add terms and conditions page, and the ability to modify them
-- Update installer
-- Add avatar configuration, including the ability to upload a default avatar
-- Fix AdminCP -> Minecraft PHP notice
-- Add forgot password functionality
-- Add forum topic label permissions
-- Add forum search
-- Update Font Awesome
+### Changed
+- Template + module system changes
+- Translation updates
 
-2.0.0 pr-3
-- Update existing translations
-- Add Romanian and Swedish translations
-- Add missing profile post term to all languages
-- Update Bootstrap version to v4 alpha 6
-- Fix server banner issues
-- Add missing font file
-- Fix white screen if no avatar is uploaded
-- Only display 5 forum posts on profile pages
-- Fix AdminCP forums page navbar
-- Fix potentially broken AdminCP link with non-friendly URLs
-- Update Minecraft server banners and allow custom backgrounds
-- Allow dismissing maintenance mode alert
-- Check if username already exists in Authme connector
-- Update installer requirements
-- Fix banner issues with PHP < 7.0
-- Fix issue with maintenance mode message editor
-- Fix incorrect forum order
-- Fix login page in maintenance mode without friendly URLs
-- Fix avatar size in news section
-- Update DataTables Bootstrap plugin to v4
-- Fix potential overflow in user dropdown
-- Add port field to email configuration
-- Update forum module, fixing installation check
-- Fix no forums showing for guests
-- Display module author
-- Add template alert language entries
-- Fix navbar issue
-- Update email content type to html
-- Update group tags within installer to use badges instead of labels
-- Tidy installer language file includes
-- Create default label types
-- Add back button to edit group page
-- Add widget system, along with Twitter and Facebook widgets
-- Add latest post widget
-- Add header to latest posts widget template
-- Track topic views via session if cookies are disabled
-- Update .nav-list CSS
-- Add function to get avatar from UUID
-- Add friendlier forum URLs
-- Fix editor Emoji icon and tabs
-- Add secondary user groups
-- Fix pagination issue with no non-sticky topics in forum
-- Allow deleting templates
-- Fix widget issue with maintenance mode for non-admins
-- Add Discord widget
-- Add user doesn't exist page
-- Add missing language files
-- Allow blocking users
-- Fix error display issue in change password template
-- Fix match password for forgot password page
-- Fix potential undefined offset issue
-- Add player count graphs
-- Add rel="nofollow noopener" and target="_blank" to every external link
-- Update NamelessMC footer link
-- Fix potential undefined variable error
-- Update server query internal
-- Add blocked users table to installation, and update infractions table
-- Add background-size: cover; to background image
-- Fix expired Discord invite
-- Fix successful login alert
-- Add user related variables
-- Update Paginator class, allowing for custom pagination CSS
-- Update site name in two factor authentication
-- Add missing include to user messaging file
-- Add extra template variables to ModCP reports
-- Reshuffle view topic buttons
-- Add user punishments
-- Update server player count query
-- Update punishment link in AdminCP
-- Prevent viewing template files
-- Fix incorrect banner URL
-- Remove port 443 from getSelfURL() if https is enabled
-- Fix issue with custom pagination classes
-- Create htaccess in cache directory
-- Add custom page system
-- Fix custom page icons
-- Add ability to re-order navbar
-- Fix spoilers + emojis on custom pages
-- Add module name to widget list
-- Add option to enable page load timer
-- Add missing view to ModCP punishments
-- Fix incorrect pagination link
-- Add signature to UserCP settings
-- Move AdminCP navbar contents into container
-- Allow editing/deleting profile wall posts
-- Update updater URL
+### Fixed
+- Many bugfixes
+- Auto close spoilers
 
-2.0.0 pr-4
+
+## [2.0.0 pr-4](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr3...v2.0.0-pr4) - 2018-05-30
+
+### Added
 - Update + add new translations
+- Add new core permission system
+- Add missing permissions to installer update script
+- Add functionality to "Can view other users' topics?" permissions
+- Add reCAPTCHA configuration
+- Add default 25565 port to banner query
+- Add user avatar to navbar
+- Add stringToURL function to Util class
+- Add view count to profile pages
+- Add private profiles
+- Bypass private profile permission in Users & Groups
+- Allow a custom message when registration is disabled
+- Add redirect forums
+- Add option to change MySQL storage engine
+- Add author's group to latest announcements
+- Add default server IP variable to index page
+- Add permission to nicknames
+- Allow viewing sticky topics in only view own topic forums
+- Add email field to contact form
+- Allow custom HTML lang attribute on 404 pages
+- Add forum post graph to UserCP
+- Add custom error handler
+- Add cookie notice
+- Update log class
+- Add online staff + online members widgets
+- Add privacy policy page + default policy
+- Add card to view topic template
+- Add example v2 nginx config
+- Add option to test and set friendly URLs in installer
+- Add missing editor emoji file
+
+### Changed
 - Update route check
 - Update DataTables
+- Allow spaces in alphanumeric check
+- Prevent changing own group in AdminCP -> Users tab without permission
+- Update default template to Bootstrap 4 beta 2
+- Add `.idea` to gitignore
+- Automatically remove template if it doesn't exist
+- Update AdminCP users private profile query
+- Update external query API
+- Display dropzone debugging info in console
+- Update AdminCP user creation
+- Default request scheme to http if not set
+- Add root path constant to all file includes
+- Update AdminCP modules file check
+- Update installer login
+- Allow templates to add <style> tags to head
+- Show all groups in post validation group dropdown
+- Update getLatestNews function
+- Update module installation
+- Update editor emojis
+- Update 404/error back buttons to work on Safari
+- Check for mysql/mysqlnd PHP extensions
+- Add all user groups to Smarty variable on profile page
+- Optimise images
+- Update nginx example config
+
+### Fixed
 - Fix ' in database details not being entered into config correctly
 - Remove non-alphanumeric characters from forum URLs
-- Allow spaces in alphanumeric check
 - Fix subforums not loading
 - Fix image overflow in homepage news posts
 - Fix issues with Minecraft banner MOTD colours
-- Add default 25565 port to banner query
-- Add new core permission system
-- Add missing permissions to installer update script
-- Add functionality to "Can view other users' topics?" permissions
-- Add reCAPTCHA configuration
 - Fix AdminCP overview chart issue
-- Prevent changing own group in AdminCP -> Users tab without permission
-- Update default template to Bootstrap 4 beta 2
 - Add line break between forum posts
 - Add missing Javascript files to template
-- Add stringToURL function to Util class
-- Add user avatar to navbar
-- Add .idea to gitignore
 - Fix incorrect last reply in forum index
 - Fix broken pagination in forum view
 - Fix Discord widget size
 - Add legacy v1 API
 - Add 6h, 12h, 1d, 15d to graph options
-- Automatically remove template if it doesn't exist
 - Set port to 25565 if none is specified
 - Fix homepage server offline message
 - Fix API reports alert, and order reports by last update time
-- Add view count to profile pages
 - Fix nickname changing in AdminCP not working
 - Fix broken "Remember Me" button on login page
-- Add private profiles
 - Fix unique username check in UserCP, and minor profile changes
 - Preserve private profile setting value when private profiles are disabled
 - Remove container inside container
-- Bypass private profile permission in Users & Groups
-- Update AdminCP users private profile query
 - Reset permissions variables in AdminCP forum permission editing
 - Fix share dropdown overflow
 - Fix timezone related forum post date issue
 - Fix issue on profile page
 - Fix new topic post timezone
 - Fix maintenance login link
-- Display dropzone debugging info in console
-- Update external query API
 - Fix URL for reports from API
 - Fix AdminCP night mode editor text colour
-- Allow a custom message when registration is disabled
-- Add root path constant to all file includes
-- Check for mysql/mysqlnd PHP extensions
 - Fix missing database setting
-- Update AdminCP user creation
-- Default request scheme to http if not set
 - Fix new topic anti spam check
-- Add option to change MySQL storage engine
-- Add author's group to latest announcements
-- Add default server IP variable to index page
 - Fix card body on homepage
-- Add permission to nicknames
-- Allow viewing sticky topics in only view own topic forums
-- Add email field to contact form
-- Update AdminCP modules file check
 - Add error message for sending emails too quickly
-- Allow custom HTML lang attribute on 404 pages
 - Fix default language for root user
 - Allow languages to specify their own meta charset content
 - Fix broken topics with "banner" or "profile" in title
 - Update mcassoc return link
 - Prevent saving 404 not found page as last page
-- Add all user groups to Smarty variable on profile page
-- Optimise images
 - Add homepage URL as Smarty variable
 - Fix potential AuthMe connector issues
 - Move CSS from core to default template
@@ -254,15 +540,11 @@ NamelessMC version 2 Changelog
 - Update navbar template
 - Update timeline on profile pages
 - Replace panels in AdminCP with cards
-- Add redirect forums
 - Fix fatal error if $ping doesn't exist
 - Make default server query variables available on all pages
-- Add example v2 nginx config
 - Fix : sometimes showing after server IP on homepage
 - Add SET NAMES command to custom DB class
 - Fix broken "Minecraft Service Status"
-- Add forum post graph to UserCP
-- Add custom error handler
 - Disable server banners if exif_imagetype isn't installed
 - Allow viewing error logs in AdminCP
 - Add extra user related variables to topic view
@@ -270,13 +552,10 @@ NamelessMC version 2 Changelog
 - Update admin group permissions within installer upgrade
 - Add initial, untested API implementation
 - Allow API to be accessed when maintenance mode is enabled
-- Update getLatestNews function
 - Start on hook system, add Discord webhook
 - Change "inputted" to "entered" to make phrase clearer
 - Fix issue with enabling the first forum web hook
-- Update module installation
 - Allow adding class to <html> via template
-- Update nginx example config
 - Fix issue with incorrect API key
 - Update default template initialisation
 - Update route check in default template
@@ -287,400 +566,199 @@ NamelessMC version 2 Changelog
 - Fix incorrect login redirect for non-friendly URLs in a subdirectory
 - Fix API registration default group
 - Fix AdminCP night mode table font colour
-- Show all groups in post validation group dropdown
 - Add JS/CSS/subdirectory support to template editor
 - Change unicode charset to utf8mb4
 - Fix debugging being permanently disabled
 - Allow disabling mcassoc integration once enabled
 - Fix last IP being reset when editing users in the AdminCP
-- Add card to view topic template
 - Temporarily remove reset password link in AdminCP
-- Add cookie notice
 - Allow switching between usernames + emails for logins
 - Add username sync option to API using serverInfo method
 - Fix wrong translation showing for forum stats
-- Update installer login
 - Fix signin details being remembered if tfa is cancelled
 - Change update zip obtained for updater
-- Add logging implementation
-- Allow templates to add <style> tags to head
-- Update editor emojis
-- Update 404/error back buttons to work on Safari
 - Fix login issue
 - Allow changing path within installer
-- Add option to test and set friendly URLs in installer
-- Add missing editor emoji file
-- Update log class
-- Add online staff + online members widgets
 - Remove built-in forum online user list
-- Add privacy policy page + default policy
 - Remove user logs upon account deletion
 - Remove more user data upon account deletion
 - Fix update execute issues
 
-2.0.0 pr-5
-- Full list https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr4...v2.0.0-pr5
-- Many bugfixes
-- Translation updates
-- New staff panel
-- RTL language support
-- User popovers
-- Template + module system changes
-- API rank sync
-- Ability for templates to toggle editor dark mode
-- Navbar + forum icons
-- Full multi language alert support
-- Follow topics
-- Sitemap generator
-- Click-to-copy IP
-- Minecraft server status page
-- Auto close spoilers
-- Other minor additions
 
-2.0.0 pr-6
-- Translation updates
-- Add Lithuanian and Polish languages
-- Update nav ordering
-- Rename UserCP to Account
-- Fix panel user edit Markdown issue
-- Fixed install language
-- Fix v1 upgrader issue
-- Fix apostrophes not showing when editing posts
-- Add indentation to panel sidebar child links
-- Shorten Debugging + Maintenance in sidebar to Maintenance
-- Allow popover hover in StaffCP
-- Add timeout to dashboard player count graph
-- Update user list date sort
-- Fix sidebar links not expanding on iOS
-- Fix terms page footer
-- Fix error when deleting user
-- Fix users not being promoted after validating
-- Fix users table width sometimes being too large
-- Fix post validation group not updating
-- Update login username title if Minecraft is disabled
-- Add forum drag reordering
-- Add subforum indentations in StaffCP
-- Add $template object to all loadPage calls
-- Show normal avatar if Minecraft is disabled on profile pages
-- Fix non-friendly URL subfolder login redirect
-- Replace &nbsp and &bull in Discord hook
-- Fix post link potentially being incorrect
-- Fix nickname not updating in StaffCP if disabled
-- Move MCAssoc JS to after include
-- Fix disabling reactions
-- Fix custom page editor not having Source tab
-- Change exif to full requirement
-- Fix registration username required message in some situations
-- Use generic Minecraft query exception
-- Fix date issue when updating forum latest post/topic
-- Prevent editing own secondary groups without permission
-- Add topic + post counts as global variables
-- Add topic label to news posts
-- Don't save last page if maintenance mode is disabled
-- Don't set register page as last page
-- Fix subdirectory profile page banner issue
-- Fix online users widget issue
-- Improve registration nickname label
-- Improve login username label
-- Fix registration nicknames not working
-- Add topic placeholders
-- Use new external server query
-- Add "Show nickname instead of username" option to online users widget
-- Add statistics widget
-- Fix user punishment alert
-- Remove config path issues on user settings page
-- Fix navigation error
-- Fix rewrite test in installer
-- Add forum title variable to view topic template
-- Fix error when replying to a topic that at least 1 user is following
-- Remove unneeded panel template files
-- Update CKEditor
-- Add user title variable to online staff + users widgets
-- Change front end editor
-- Add author IDs to messaging template variables
-- Auto enable some widgets on installation
-- Update getSelfURL to detect HTTPS more reliably
-- Add ability to upload + choose new homepage banner
-- Order parent forum dropdown
-- Allow switching a forum between forum + category
-- Add installer converter support
-- Add ability to switch panel template
-- Fix broken icon
-- Add ability to upload custom profile banners
-- Fix incorrect last online date for users registered through the API
-- New default template
-- Only show PM suggested user list after 3 characters typed
+## [2.0.0 pr-3](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr2...v2.0.0-pr3) - 2017-10-06
 
-2.0.0 pr-7
-- Add Italian translation
-- Update Czech translation
-- Update Dutch translation
-- Update German translation
-- Update Lithuanian translation
-- Update Norwegian translation
-- Update Polish translation
-- Update Portuguese translation
-- Update Romanian translation
-- Update Spanish translation
-- Fix search bar showing in wrong place if no topics in forum
-- Default Revamp template CSS tweaks
-- Remove unused condition in Default Revamp navbar template file
-- Fix Default Revamp delete post button
-- Fix Default Revamp delete profile post button
-- Fix broken topic breadcrumb link
-- Add missing panel template creation to updater
-- Navbar icons updated to Font Awesome 5
-- Default Revamp navbar updates
-- Fix incorrect last online date for users registered through the legacy v1 API
-- Update Default Revamp remember me label
-- Update Default template thumbtack icon
-- Add support for custom plural forms in languages
-- Remove : appearing after server IP if port is empty
-- Prevent infinite parent forum configuration loop
-- Fix plural form not working in some cases for time phrases
-- Fix Default template broken edit button icon
-- Update Discord widget description
-- Fix pre setup widgets and banner on new installations
-- Fix Default Revamp alerts page title
-- Fix recaptcha not showing in Default Revamp template
-- Fix latest posts sometimes showing duplicates
-- Switch Default Revamp authme templates around
-- Remove API debug line
-- Switch registration validation around
-- Fix timezones for reports
-- Hide staff groups for "post validation group"
-- Add terms + conditions to complete signup
-- Allow redirect custom pages to be accessed directly
-- Fix guests not being able to view redirect pages directly
-- Add API method to return list of usernames + their UUIDs
-- Add banned and active to listUsers response
-- Allow use of forgot password in maintenance mode
-- Editor updates
-- Prevent editor modifying inserted URLs automatically
-- Assign logged-in user title
-- Add view all panel templates link variable
-- Add www to getSelfURL if force www is enabled and www is not in hostname
-- Allow editing root user's secondary groups
-- Fix non-friendly URL sitemap generation
-- Fix widget configuration alignment and text
-- Add multiple groups to the profile page
-- Prevent fatal error if Mojang API query returns null
-- Remove Default Revamp template credits
-- Add support for Twitter cards
-- Change topic cancellation buttons to yes/no
-- Redirect to StaffCP Forums overview when updating a forum
-- Bring forum search in line with forum title
-- Add categories to move topic dropdown
-- Change API URL to non-friendly URL
-- Add option to display IP address for each server on status page
-- Fixed fids and gids being too small in forum_topic_labels table
-- Add support for Twitter cards in Default Revamp template
-- Inline item content in online staff widget
-- Make avatar clickable in view topic template
-- Don't show topic count/latest topic info for redirect forums
-- Include subforums in move topic dropdown
-- Add UUID to forum post variables
-- Remove old code
-- Add ability to use multiple webhooks
-- Add last seen, online to view topic and subforum descriptions to view forum
-- Fix MentionsParser
-- Remove avatars with different extensions and add timestamp to prevent caching issues
-- Escape avatar updated variable just in case
-- Fix default group potentially breaking when creating a new group
-- Fix API verification issue
-- Prevent re-querying for permission checks
-- Fix Default Theme nav style issue
-- Fix names with special characters having no avatar
-- Sort groups in order
-- Add int check to DB Custom bind param
-- Allow explicitly setting pagination values
-- Only show email notice in StaffCP with permission
-- Stop cookie notice automatically closing
-- Add reCAPTCHA to login screen
-- Add 403 page
-- Add more variables to Statistics widget
-- Fix More dropdown only showing if a custom page is adding to it
-- Add ability for template to define a settings page
-- Add per-user template support
-- Prevent fatal error with insufficient forum permissions
-- Allow changing group username colour from text input
-- Add login link to maintenance mode page
+### Added
+- Add Romanian and Swedish translations
+- Add missing profile post term to all languages
+- Update Minecraft server banners and allow custom backgrounds
+- Allow dismissing maintenance mode alert
+- Add port field to email configuration
+- Add template alert language entries
+- Create default label types
+- Add back button to edit group page
+- Add widget system, along with Twitter and Facebook widgets
+- Add latest post widget
+- Add header to latest posts widget template
+- Add player count graphs
+- Add function to get avatar from UUID
+- Add friendlier forum URLs
+- Allow deleting templates
+- Add Discord widget
+- Add user doesn't exist page
+- Add missing language files
+- Allow blocking users
+- Add signature to UserCP settings
+- Add secondary user groups
+- Update server query internal
+- Add user punishments
+- Allow editing/deleting profile wall posts
 
-2.0.0 pr-8
-- Many bugfixes
-- Add Discord rank sync
-- Add Chinese (Simplified), French, Russian, Spanish (ES) and Turkish translations
+### Changed
 - Update existing translations
-- New user/group systems - mostly backend changes
-- API rework - modules can now register custom endpoints
-- New widget location - can choose between left + right hand side
-- Remove legacy v1 API
-- Add basic custom page feature - no navbar/footer
-- Add ability to open custom page in new tab
-- Remove old Default template
-- Fix same-site redirect forums showing redirect warning
-- Add "topics following" page
-- Add email content editor
-- Add mass emailing
-- Add ability to receive emails for followed topic updates
-- Add required custom profile fields to registration page
-- Add announcement system
-- New installer
-- Update StaffCP users list table to be async
-- Add ability to specify rel, as, onload attributes for CSS and defer, async attributes for JS
-- Discord topic webhook improvements
-- Remove dropdowns from DefaultRevamp template mobile sidebar
-- Start PHP 8 compatibility - still a work in progress
-- Fix MCAssoc integration
-- Add server status widget
-- Add latest profile post widget
-- Add ability to change "More" dropdown message
-- Add force 2FA option
-- Multiple webhook support
-- Add highlighting to profile post links
-- Add ability to add CSS to group usernames
-- Allow specifying "Can view other users' topics" forum permission for guests
-- Add hCaptcha
+- Update Bootstrap version to v4 alpha 6
+- Only display 5 forum posts on profile pages
+- Update installer requirements
+- Update DataTables Bootstrap plugin to v4
+- Update .nav-list CSS
+- Add rel="nofollow noopener" and target="_blank" to every external link
+- Update updater URL
+- Update email content type to html
+- Update group tags within installer to use badges instead of labels
+- Update NamelessMC footer link
+- Add background-size: cover; to background image
+- Add user related variables
+- Display module author
+- Update Paginator class, allowing for custom pagination CSS
+- Update site name in two factor authentication
+- Prevent viewing template files
+- Create htaccess in cache directory
+- Tidy installer language file includes
+- Track topic views via session if cookies are disabled
 
-2.0.0 pr-9
-- Add new panel template
-- Add Default Revamp settings including dark mode
-- Add player heads to server status widget
-- Add ability to re-order servers in play tab
-- Add announcement HTML support
-- Add ability to search for users by email address in StaffCP
-- Add ability to resend validation email
-- Add ability to set default labels for forums
-- Add option to use Gravatar
-- Add concept of module dependencies
-- Add getActivePage method
-- Add new SEO page including Google Analytics integration
-- Add drag ordering for groups and Minecraft servers
-- Translation updates
-- Fix multibyte character string length checks
-- Fix widgets intended for homepage showing on all pages
-- Fix validateUser hook sending empty Discord message
-- Fix API endpoints
-- Fix latest profile posts widget profile links
-- Fix API URL adding two http prefixes
-- Fix StaffCP Registration settings not submitting
-- Fix webhooks listing twice
-- Fix API URL in StaffCP API tab having leading/trailing whitespace
-- Fix group_id column error upon registration and AuthMe linking
-- Fix StaffCP sidebar link conflicts
-- Fix error if user has no group
-- Make groups field in serverInfo endpoint optional
-- PHP 8 improvements
-- Full changeset https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr8...v2.0.0-pr9
+### Fixed
+- Fix server banner issues
+- Add missing font file
+- Fix white screen if no avatar is uploaded
+- Fix AdminCP forums page navbar
+- Fix potentially broken AdminCP link with non-friendly URLs
+- Check if username already exists in Authme connector
+- Fix banner issues with PHP < 7.0
+- Fix issue with maintenance mode message editor
+- Fix incorrect forum order
+- Fix login page in maintenance mode without friendly URLs
+- Fix avatar size in news section
+- Fix potential overflow in user dropdown
+- Update forum module, fixing installation check
+- Fix no forums showing for guests
+- Fix navbar issue
+- Fix editor Emoji icon and tabs
+- Fix pagination issue with no non-sticky topics in forum
+- Fix widget issue with maintenance mode for non-admins
+- Fix error display issue in change password template
+- Fix match password for forgot password page
+- Fix potential undefined offset issue
+- Fix potential undefined variable error
+- Fix expired Discord invite
+- Fix successful login alert
+- Add missing include to user messaging file
+- Add extra template variables to ModCP reports
+- Reshuffle view topic buttons
+- Update server player count query
+- Update punishment link in AdminCP
+- Fix incorrect banner URL
+- Remove port 443 from getSelfURL() if https is enabled
+- Fix issue with custom pagination classes
+- Add custom page system
+- Fix custom page icons
+- Add ability to re-order navbar
+- Fix spoilers + emojis on custom pages
+- Add module name to widget list
+- Add option to enable page load timer
+- Add missing view to ModCP punishments
+- Fix incorrect pagination link
+- Move AdminCP navbar contents into container
 
-2.0.0 pr-10
-- Add ability to upload favicon
-- Add Smarty security policy
-- Add support for environment variable based debugging
-- Auto detect user timezone when registering
-- Avatar rework and add Crafthead support
-- Captcha rework including Recaptcha v3 invisible support
-- Ensure cookie_secure is set in PHP config
-- Error handling revamp
-- Increase label HTML length
-- Move captcha/https/www configuration to config.php
-- Placeholder API integration
-- Remove unsafe tags when editing posts
-- Validation revamp
-- API updates - including group sync fixes
-- Default Revamp and Default panel template fixes
-- htaccess fixes and improvements
-- MCAssoc fixes
-- Server status widget fixes
-- Translation updates
-- PHP 8 improvements
-- Full changeset https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr9...v2.0.0-pr10
 
-2.0.0 pr-11
-- Add Danish translation
-- Fix StaffCP Minecraft integration section
-- Add support for upward dropdowns in Default Revamp template
-- Add Default Revamp dark mode support for top attached headers
-- Fix invalid language during installation
-- Add SSL check before activating secure cookies
-- Fix missing favicons directory
-- Fix invalid token with AuthMe login
-- Add setting to initialise charset
-- Add environment variables to hide options in general configuration
-- Validate email port before updating config in StaffCP
-- Add method to set multiple config values at once
-- Temporarily disable auto timezone detection until #2355 is resolved
-- Change placeholder tables primary keys
-- Fix profile settings when forum is disabled
-- Add index on nl2_posts topic_id column
-- Remove extra column from nl2_query_results
-- Improve placeholder error message
-- Translation updates
-- PHP 8 improvements
-- Full changeset https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr10...v2.0.0-pr11
+## [2.0.0 pr-2](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr1...v2.0.0-pr2) - 2017-06-07
+- Fix issue with editing user in AdminCP
+- Prevent non-moderators replying to locked topics
+- Prevent signature image overflow
+- Remove unnecessary header template file
+- Fix registration issue
+- Fix recaptcha issues in upgrade script
+- Minor forum updates
+- Update Mojang API URL
+- Fix incorrect "last user" information in PMs
+- Redirect to previous page after login
+- Allow use of HTML in report content
+- Add forum labels
+- Update panels in AdminCP night theme
+- Small AdminCP label fixes
+- Update default template Bootstrap version
+- Update core Bootstrap version
+- Update profile template
+- Fix signin issue with numeric usernames
+- Fix negative reactions not creating
+- Allow creating new instances of custom DB class
+- Update AdminCP registrations graph
+- Change popover placement in AdminCP
+- Increase query interval
+- Display success message upon sending PM reply
+- Update installer and configuration methods
+- Display errors if unable to create config + cache
+- Update htaccess
+- Fix installation detection
+- Separate core JS into templates
+- Add maintenance mode
+- Allow logging in whilst in maintenance mode
+- Prevent admin account switch in AdminCP
+- Fix installer not loading
+- Allow installer translations
+- Add default database address to installer
+- Update admin auth screen layout
+- Remove deprecated mcrypt requirement, along with a now unused function
+- Fix permission check for configuration file
+- Add AuthMe integration and Minecraft service status
+- Fix invalid charset in installer
+- Fix AdminCP mobile navbar toggler not showing
+- Update cp_dark.css
+- Fix AdminCP auth + password changing
+- Add switch to toggle error reporting
+- Fix error in 404 page
+- Update PasswordHash class
+- Update form tokens
+- Allow per-user timezones
+- Add topics and posts to AdminCP overview stats graph
+- Fix potentially incorrect news ordering
+- Add card colour for Minecraft service status "Slow"
+- Define page on register page
+- Update post editor
+- Fix minor login/logout issues
+- Apply GeSHi to new topics and edited posts
+- Fix AdminCP security log sorting
+- Add force-HTTPS option to AdminCP
+- Fix post word wrapping and temporarily disable the code editor
+- Add Minecraft server query to homepage
+- Allow editing + deleting Minecraft servers
+- Fix sub-server queries
+- Fix invalid MySQL column default value
+- Fix timezone offsets not displaying minutes correctly
+- Minor forum SEO improvements
+- Add contact page, new email class and email errors + testing
+- Add registration email verification toggle in AdminCP
+- Add Minecraft server query error logging
+- Add Minecraft server banners
+- Allow purging Minecraft query errors
+- Complete mcassoc integration
+- Add terms and conditions page, and the ability to modify them
+- Update installer
+- Add avatar configuration, including the ability to upload a default avatar
+- Fix AdminCP -> Minecraft PHP notice
+- Add forgot password functionality
+- Add forum topic label permissions
+- Add forum search
+- Update Font Awesome
 
-2.0.0 pr-12
-- Add Thai translation
-- Increase max length of custom pages URL + title
-- Display non-alphanumeric characters in forum URLs
-- General placeholder fixes
-- General Authme fixes
-- Convert many GET requests to POST #2033
-- Add new administrator permission for full access
-- Add new forum settings page including link location option
-- Add ability to log in with either username or email
-- Discord sync rework
-- In-game sync rework
-- Fix legacy panel template update alert style
-- Only send password reset email if user is already active
-- PHPMailer autoloader PHP 8 compatibility
-- Fix warning modal not showing
-- Prevent IP banning yourself
-- Allow disabling placeholders feature
-- Remove legacy X-UA-Compatible header
-- Prevent showing validate message when API verification is disabled
-- Update strings for Discord slash commands
-- API verification command renamed from /validate to /verify
-- Change installer DB password field to password type
-- Fix latest profile posts link
-- Fix duplicate rel="" attribute when using rel="preload"
-- Make hook fire even if no hooks are there
-- Remove password length limit
-- Convert forum queries to DB query()
-- Add notice to StaffCP update tab if not using PHP 7.4+
-- Add per-user dark mode toggle
-- Only clear 2fa state when not on 404 page
-- Fix StaffCP redirect after re-authentication
-- Add reported_username and reported_uid fields to createReport endpoint
-- Exclude .DS_Store files from endpoint scan
-- Default Revamp dark mode improvements
-- Default panel template dark mode improvements
-- Translation updates
-- PHP 8 improvements
-- Full changeset https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr11...v2.0.0-pr12
 
-2.0.0 pr-13
-- Discord + Google OAuth support
-- New user verification system
-- New cookie consent module
-- Migration to Composer + Yarn
-- Database migration system + new upgrade class
-- Improved database indexing
-- New hook system for forum/private message post rendering, including better codeblock + mentions support
-- Automatic user language detection
-- Show unsupported banner to Internet Explorer users
-- Contact page removed
-- Webhook for reports, announcements, bans, warnings
-- API additions including new ban user endpoint
-- ListUsers API endpoint pagination
-- Update to Font Awesome 6
-- Use Guzzle for HTTP requests
-- Custom date format support
-- Replace API error codes with namespaced strings
-- Fix issue using certain characters in URLs
-- Removed CKEditor
-- Frontend and backend template updates
-- PHP 8 improvements
-- Many more features + bugfixes!
-- Milestone: https://github.com/NamelessMC/Nameless/issues?page=1&q=is%3Aissue+milestone%3A2.0.0-pr13+is%3Aclosed
-- Full changeset https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr12...v2.0.0-pr13
\ No newline at end of file
+## [2.0.0 pr-1](https://github.com/NamelessMC/Nameless/compare/v1.0.15...v2.0.0-pr1) - 2016-12-30
+- Initial release

From eba6364b090c4b1fa6df676e7f8320fa8c222159 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Fri, 1 Jul 2022 00:11:56 -0600
Subject: [PATCH 226/337] Rehaul changelog

---
 CHANGELOG.md | 104 +++++++++++++++++++++++++++------------------------
 1 file changed, 55 insertions(+), 49 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65c3e763dc..076feb2634 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -680,84 +680,90 @@
 
 
 ## [2.0.0 pr-2](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr1...v2.0.0-pr2) - 2017-06-07
+
+### Added
+- Add forum labels
+- Add maintenance mode
+- Allow installer translations
+- Add Minecraft server query to homepage
+- Allow editing + deleting Minecraft servers
+- Add forgot password functionality
+- Add forum topic label permissions
+- Add forum search
+- Add contact page, new email class and email errors + testing
+- Add registration email verification toggle in AdminCP
+- Add Minecraft server query error logging
+- Add Minecraft server banners
+- Allow purging Minecraft query errors
+- Add avatar configuration, including the ability to upload a default avatar
+- Add force-HTTPS option to AdminCP
+- Add switch to toggle error reporting
+- Add card colour for Minecraft service status "Slow"
+- Add topics and posts to AdminCP overview stats graph
+- Allow per-user timezones
+- Add AuthMe integration and Minecraft service status
+- Add default database address to installer
+- Allow logging in whilst in maintenance mode
+
+### Changed
+- Remove unnecessary header template file
+- Minor forum updates
+- Update Mojang API URL
+- Update panels in AdminCP night theme
+- Redirect to previous page after login
+- Update profile template
+- Update core Bootstrap version
+- Update default template Bootstrap version
+- Update htaccess
+- Allow use of HTML in report content
+- Separate core JS into templates
+- Change popover placement in AdminCP
+- Allow creating new instances of custom DB class
+- Update AdminCP registrations graph
+- Update PasswordHash class
+- Update form tokens
+- Update Font Awesome
+- Apply GeSHi to new topics and edited posts
+- Remove deprecated mcrypt requirement, along with a now unused function
+- Increase query interval
+- Update admin auth screen layout
+- Minor forum SEO improvements
+- Define page on register page
+- Update post editor
+- Update cp_dark.css
+- Prevent admin account switch in AdminCP
+- Update installer and configuration methods
+
+### Fixed
 - Fix issue with editing user in AdminCP
 - Prevent non-moderators replying to locked topics
 - Prevent signature image overflow
-- Remove unnecessary header template file
 - Fix registration issue
 - Fix recaptcha issues in upgrade script
-- Minor forum updates
-- Update Mojang API URL
 - Fix incorrect "last user" information in PMs
-- Redirect to previous page after login
-- Allow use of HTML in report content
-- Add forum labels
-- Update panels in AdminCP night theme
 - Small AdminCP label fixes
-- Update default template Bootstrap version
-- Update core Bootstrap version
-- Update profile template
 - Fix signin issue with numeric usernames
 - Fix negative reactions not creating
-- Allow creating new instances of custom DB class
-- Update AdminCP registrations graph
-- Change popover placement in AdminCP
-- Increase query interval
 - Display success message upon sending PM reply
-- Update installer and configuration methods
 - Display errors if unable to create config + cache
-- Update htaccess
 - Fix installation detection
-- Separate core JS into templates
-- Add maintenance mode
-- Allow logging in whilst in maintenance mode
-- Prevent admin account switch in AdminCP
 - Fix installer not loading
-- Allow installer translations
-- Add default database address to installer
-- Update admin auth screen layout
-- Remove deprecated mcrypt requirement, along with a now unused function
 - Fix permission check for configuration file
-- Add AuthMe integration and Minecraft service status
 - Fix invalid charset in installer
 - Fix AdminCP mobile navbar toggler not showing
-- Update cp_dark.css
 - Fix AdminCP auth + password changing
-- Add switch to toggle error reporting
 - Fix error in 404 page
-- Update PasswordHash class
-- Update form tokens
-- Allow per-user timezones
-- Add topics and posts to AdminCP overview stats graph
 - Fix potentially incorrect news ordering
-- Add card colour for Minecraft service status "Slow"
-- Define page on register page
-- Update post editor
 - Fix minor login/logout issues
-- Apply GeSHi to new topics and edited posts
 - Fix AdminCP security log sorting
-- Add force-HTTPS option to AdminCP
 - Fix post word wrapping and temporarily disable the code editor
-- Add Minecraft server query to homepage
-- Allow editing + deleting Minecraft servers
 - Fix sub-server queries
 - Fix invalid MySQL column default value
 - Fix timezone offsets not displaying minutes correctly
-- Minor forum SEO improvements
-- Add contact page, new email class and email errors + testing
-- Add registration email verification toggle in AdminCP
-- Add Minecraft server query error logging
-- Add Minecraft server banners
-- Allow purging Minecraft query errors
 - Complete mcassoc integration
 - Add terms and conditions page, and the ability to modify them
 - Update installer
-- Add avatar configuration, including the ability to upload a default avatar
 - Fix AdminCP -> Minecraft PHP notice
-- Add forgot password functionality
-- Add forum topic label permissions
-- Add forum search
-- Update Font Awesome
 
 
 ## [2.0.0 pr-1](https://github.com/NamelessMC/Nameless/compare/v1.0.15...v2.0.0-pr1) - 2016-12-30

From 45fe41af10c7be1d687d2d76bc4a823dcb53a44c Mon Sep 17 00:00:00 2001
From: Partydragen <admin@partydragen.com>
Date: Sun, 3 Jul 2022 01:00:51 +0200
Subject: [PATCH 227/337] Re-add format uuid function and relocate
 getOfflineModeUuid

---
 core/classes/Minecraft/ProfileUtils.php       | 33 +++++++++++++++++++
 .../Integrations/MinecraftIntegration.php     | 19 +----------
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/core/classes/Minecraft/ProfileUtils.php b/core/classes/Minecraft/ProfileUtils.php
index 4592442fc5..ac04cce645 100644
--- a/core/classes/Minecraft/ProfileUtils.php
+++ b/core/classes/Minecraft/ProfileUtils.php
@@ -64,4 +64,37 @@ private static function getUUIDFromUsername(string $username): ?array {
 
         return null;
     }
+
+    /**
+     * Generate an offline minecraft UUID v3 based on the case sensitive player name.
+     *
+     * @param string $username
+     * @return array
+     */
+    public static function getOfflineModeUuid(string $username): array {
+        $data = hex2bin(md5("OfflinePlayer:" . $username));
+        $data[6] = chr(ord($data[6]) & 0x0f | 0x30);
+        $data[8] = chr(ord($data[8]) & 0x3f | 0x80);
+
+        return [
+            'uuid' => bin2hex($data),
+            'username' => $username
+        ];
+    }
+
+    /**
+    * Add dashes to UUID
+    *
+    * @param $uuid string UUID to format
+    * @return string Properly formatted UUID (According to UUID v4 Standards xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx WHERE y = 8,9,A,or B and x = random digits.)
+    */
+    public static function formatUUID($uuid): string {
+        $uid = "";
+        $uid .= substr($uuid, 0, 8)."-";
+        $uid .= substr($uuid, 8, 4)."-";
+        $uid .= substr($uuid, 12, 4)."-";
+        $uid .= substr($uuid, 16, 4)."-";
+        $uid .= substr($uuid, 20);
+        return $uid;
+    }
 }
diff --git a/modules/Core/classes/Integrations/MinecraftIntegration.php b/modules/Core/classes/Integrations/MinecraftIntegration.php
index af468aeb79..99983ee066 100644
--- a/modules/Core/classes/Integrations/MinecraftIntegration.php
+++ b/modules/Core/classes/Integrations/MinecraftIntegration.php
@@ -200,7 +200,7 @@ public function getUuidByUsername(string $username): array {
         if (Util::getSetting('uuid_linking')) {
             return $this->getOnlineModeUuid($username);
         } else {
-            return $this->getOfflineModeUuid($username);
+            return ProfileUtils::getOfflineModeUuid($username);
         }
     }
 
@@ -229,21 +229,4 @@ public function getOnlineModeUuid(string $username): array {
 
         return [];
     }
-
-    /**
-     * Generate an offline minecraft UUID v3 based on the case sensitive player name.
-     *
-     * @param string $username
-     * @return array
-     */
-    public function getOfflineModeUuid(string $username): array {
-        $data = hex2bin(md5("OfflinePlayer:" . $username));
-        $data[6] = chr(ord($data[6]) & 0x0f | 0x30);
-        $data[8] = chr(ord($data[8]) & 0x3f | 0x80);
-
-        return [
-            'uuid' => bin2hex($data),
-            'username' => $username
-        ];
-    }
 }

From 7fe5282c064ac249d809bd587afa386418c637ca Mon Sep 17 00:00:00 2001
From: Partydragen <admin@partydragen.com>
Date: Sun, 3 Jul 2022 01:03:52 +0200
Subject: [PATCH 228/337] Fix phpstan

---
 core/classes/Minecraft/ProfileUtils.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/classes/Minecraft/ProfileUtils.php b/core/classes/Minecraft/ProfileUtils.php
index ac04cce645..607e07c615 100644
--- a/core/classes/Minecraft/ProfileUtils.php
+++ b/core/classes/Minecraft/ProfileUtils.php
@@ -85,10 +85,10 @@ public static function getOfflineModeUuid(string $username): array {
     /**
     * Add dashes to UUID
     *
-    * @param $uuid string UUID to format
+    * @param string $uuid string UUID to format
     * @return string Properly formatted UUID (According to UUID v4 Standards xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx WHERE y = 8,9,A,or B and x = random digits.)
     */
-    public static function formatUUID($uuid): string {
+    public static function formatUUID(string $uuid): string {
         $uid = "";
         $uid .= substr($uuid, 0, 8)."-";
         $uid .= substr($uuid, 8, 4)."-";

From 3b3efa6b310e3d0022160161dda79f2217a84e4d Mon Sep 17 00:00:00 2001
From: Sam <samerton@users.noreply.github.com>
Date: Sun, 3 Jul 2022 18:16:20 +0100
Subject: [PATCH 229/337] Escape custom profile field value in user settings
 page

---
 modules/Core/pages/user/settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/Core/pages/user/settings.php b/modules/Core/pages/user/settings.php
index f95fb7db7d..3d0097e709 100644
--- a/modules/Core/pages/user/settings.php
+++ b/modules/Core/pages/user/settings.php
@@ -512,7 +512,7 @@
 
         $custom_fields_template[$field->name] = [
             'name' => Output::getClean($field->name),
-            'value' => $field->value,
+            'value' => Output::getClean($field->value),
             'id' => $field->id,
             'type' => $type,
             'required' => $field->required,

From d22df9f72595d389323fa16e1b1e51b4367f46ee Mon Sep 17 00:00:00 2001
From: Sam <samerton@users.noreply.github.com>
Date: Sun, 3 Jul 2022 18:28:27 +0100
Subject: [PATCH 230/337] Add link to huntr to security policy

---
 SECURITY.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SECURITY.md b/SECURITY.md
index 34f07d2fc7..48392339c2 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -17,5 +17,5 @@ The following NamelessMC releases are supported by the development team
 
 Currently, the best place to report a vulnerability is either via email or Discord.
 
-- Email address: samerton7@gmail.com (temporary - we'll get a fancy one set up in the near future)
+- huntr.dev - https://huntr.dev/repos/namelessmc/nameless
 - Discord server: https://discord.gg/nameless -> Samerton#9433

From f155d865f7adfcad973274e9efc295a960404acd Mon Sep 17 00:00:00 2001
From: samerton <samerton@users.noreply.github.com>
Date: Sun, 3 Jul 2022 19:26:10 +0100
Subject: [PATCH 231/337] Add form token to announcement order change

---
 custom/panel_templates/Default/core/announcements.tpl | 6 +++++-
 modules/Core/pages/panel/announcements.php            | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/custom/panel_templates/Default/core/announcements.tpl b/custom/panel_templates/Default/core/announcements.tpl
index c3c568dbc5..a0ce68aa6a 100644
--- a/custom/panel_templates/Default/core/announcements.tpl
+++ b/custom/panel_templates/Default/core/announcements.tpl
@@ -163,10 +163,14 @@
                     type: "GET",
                     data: {
                         action: "order",
-                        {literal}announcements: JSON.stringify({"announcements": toSubmit}){/literal}
+                        {literal}announcements: JSON.stringify({"announcements": toSubmit}){/literal},
+                        token: "{$TOKEN}"
                     },
                     success: function (response) {
                         // Success
+                        if (response === 'Invalid Token') {
+                            window.location.reload();
+                        }
                     },
                     error: function (xhr) {
                         // Error
diff --git a/modules/Core/pages/panel/announcements.php b/modules/Core/pages/panel/announcements.php
index e93d8a3b15..46706f9413 100644
--- a/modules/Core/pages/panel/announcements.php
+++ b/modules/Core/pages/panel/announcements.php
@@ -254,6 +254,11 @@
 
         case 'order':
             if (isset($_GET['announcements'])) {
+                if (!Token::check()) {
+                    Session::flash('announcement_error', $language->get('general', 'invalid_token'));
+                    die('Invalid Token');
+                }
+
                 $announcements_list = json_decode($_GET['announcements'])->announcements;
 
                 $i = 1;

From 9de500467ee0d973e373eb73e8b1d30a82966876 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Sun, 3 Jul 2022 20:56:15 +0200
Subject: [PATCH 232/337] Use strict equality for null checking

---
 core/classes/Avatars/AvatarSource.php                     | 2 +-
 core/classes/Core/Language.php                            | 2 +-
 core/classes/Core/Log.php                                 | 2 +-
 core/classes/Core/Output.php                              | 4 ++--
 core/classes/Core/Token.php                               | 2 +-
 core/classes/Core/User.php                                | 6 +++---
 core/classes/Core/Util.php                                | 8 ++++----
 core/classes/Core/Validate.php                            | 2 +-
 core/classes/Endpoints/KeyAuthEndpoint.php                | 2 +-
 core/classes/Group_Sync/GroupSyncManager.php              | 4 ++--
 core/classes/Minecraft/ProfileUtils.php                   | 2 +-
 core/classes/Misc/ErrorHandler.php                        | 2 +-
 core/classes/Templates/AssetResolver.php                  | 4 ++--
 core/init.php                                             | 2 +-
 core/templates/frontend_init.php                          | 2 +-
 custom/panel_templates/Default/template.php               | 2 +-
 .../classes/Group_Sync/MinecraftGroupSyncInjector.php     | 2 +-
 modules/Core/includes/endpoints/AddGroupsEndpoint.php     | 2 +-
 modules/Core/includes/endpoints/InfoEndpoint.php          | 2 +-
 modules/Core/includes/endpoints/RegisterEndpoint.php      | 2 +-
 modules/Core/includes/endpoints/UserInfoEndpoint.php      | 2 +-
 .../Core/includes/endpoints/VerifyIntegrationEndpoint.php | 2 +-
 modules/Core/pages/leaderboards.php                       | 2 +-
 modules/Core/pages/panel/integrations.php                 | 2 +-
 modules/Core/pages/panel/templates.php                    | 2 +-
 modules/Core/pages/panel/users_integrations.php           | 8 ++++----
 modules/Core/pages/panel/users_reports.php                | 2 +-
 modules/Core/pages/panel/widgets.php                      | 2 +-
 modules/Core/pages/user/connections.php                   | 2 +-
 modules/Core/queries/servers.php                          | 2 +-
 modules/Discord Integration/classes/Discord.php           | 2 +-
 .../endpoints/UpdateDiscordBotSettingsEndpoint.php        | 2 +-
 modules/Discord Integration/module.php                    | 4 ++--
 modules/Forum/pages/forum/new_topic.php                   | 2 +-
 modules/Forum/pages/forum/view_topic.php                  | 2 +-
 35 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/core/classes/Avatars/AvatarSource.php b/core/classes/Avatars/AvatarSource.php
index 18ac0f0e7e..9c8d5402f7 100644
--- a/core/classes/Avatars/AvatarSource.php
+++ b/core/classes/Avatars/AvatarSource.php
@@ -137,7 +137,7 @@ public static function getActiveSource(): AvatarSourceBase {
      */
     public static function setActiveSource(string $name): void {
         $source = self::getSourceByName($name);
-        if ($source == null) {
+        if ($source === null) {
             $source = self::getSourceByName('cravatar');
         }
 
diff --git a/core/classes/Core/Language.php b/core/classes/Core/Language.php
index 66d52c004c..7f05235deb 100644
--- a/core/classes/Core/Language.php
+++ b/core/classes/Core/Language.php
@@ -170,7 +170,7 @@ public function __construct(string $module = 'core', string $active_language = n
         $this->_activeLanguage = $active_language ?? LANGUAGE ?? 'en_UK';
 
         // Require file
-        if ($module == null || $module === 'core') {
+        if ($module === null || $module === 'core') {
             $path = implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'custom', 'languages', '__lng__.json']);
         } else {
             $path = str_replace('/', DIRECTORY_SEPARATOR, $module) . DIRECTORY_SEPARATOR . '__lng__.json';
diff --git a/core/classes/Core/Log.php b/core/classes/Core/Log.php
index b44aa20780..37eef015ba 100644
--- a/core/classes/Core/Log.php
+++ b/core/classes/Core/Log.php
@@ -209,7 +209,7 @@ public static function Action(string $path) {
      * @return bool Return true or false if inserted into the database.
      */
     public function log(string $action, string $info = '', ?int $user = null): bool {
-        if ($user == null) {
+        if ($user === null) {
             $userTemp = new User();
             $user = ($userTemp->isLoggedIn() ? $userTemp->data()->id : 0);
         }
diff --git a/core/classes/Core/Output.php b/core/classes/Core/Output.php
index 4c8e85ae25..e2f74210d9 100644
--- a/core/classes/Core/Output.php
+++ b/core/classes/Core/Output.php
@@ -22,7 +22,7 @@ class Output {
      * @return ?string Cleaned version of string.
      */
     public static function getClean(?string $input): ?string {
-        return $input == null ? null : htmlspecialchars(self::getDecoded($input), ENT_QUOTES);
+        return $input === null ? null : htmlspecialchars(self::getDecoded($input), ENT_QUOTES);
     }
 
     /**
@@ -32,7 +32,7 @@ public static function getClean(?string $input): ?string {
      * @return ?string Decoded string.
      */
     public static function getDecoded(?string $input): ?string {
-        return $input == null ? null : htmlspecialchars_decode($input, ENT_QUOTES);
+        return $input === null ? null : htmlspecialchars_decode($input, ENT_QUOTES);
     }
 
     /**
diff --git a/core/classes/Core/Token.php b/core/classes/Core/Token.php
index 44e9350334..d7f1e43049 100644
--- a/core/classes/Core/Token.php
+++ b/core/classes/Core/Token.php
@@ -45,7 +45,7 @@ public static function generate(): void {
      * @throws Exception
      */
     public static function check(string $token = null): bool {
-        if ($token == null) {
+        if ($token === null) {
             $token = Input::get('token');
         }
 
diff --git a/core/classes/Core/User.php b/core/classes/Core/User.php
index 39f61001bb..5a0415c834 100644
--- a/core/classes/Core/User.php
+++ b/core/classes/Core/User.php
@@ -172,7 +172,7 @@ public function addGroup(int $group_id, int $expire = 0, $group_data = null): bo
             ]
         );
 
-        if ($group_data == null) {
+        if ($group_data === null) {
             $group = Group::find($group_id);
             if ($group) {
                 $this->_groups[$group_id] = $group;
@@ -674,7 +674,7 @@ public function setGroup(int $group_id, int $expire = 0, array $group_data = nul
         );
 
         $this->_groups = [];
-        if ($group_data == null) {
+        if ($group_data === null) {
             $group = Group::find($group_id);
             if ($group) {
                 $this->_groups[$group_id] = $group;
@@ -1043,7 +1043,7 @@ public function getUserTemplates(): array {
      */
     public function savePlaceholders(int $server_id, array $placeholders): void {
         $integrationUser = $this->getIntegration('Minecraft');
-        if ($integrationUser == null || !$integrationUser->getIntegration()->isEnabled()) {
+        if ($integrationUser === null || !$integrationUser->getIntegration()->isEnabled()) {
             return;
         }
 
diff --git a/core/classes/Core/Util.php b/core/classes/Core/Util.php
index b75f130ab7..b4768f542c 100644
--- a/core/classes/Core/Util.php
+++ b/core/classes/Core/Util.php
@@ -294,9 +294,9 @@ public static function replaceAnchorsWithText(string $data): string {
      * @return ?string Setting from DB or $fallback.
      */
     public static function getSetting(string $setting, ?string $fallback = null, ?string $module = null): ?string {
-        $table_name = $module == null ? 'nl2_settings' : "nl2_${module}_settings";
+        $table_name = $module === null ? 'nl2_settings' : "nl2_${module}_settings";
 
-        if (self::$_cached_settings == null) {
+        if (self::$_cached_settings === null) {
             $result = DB::getInstance()->query('SELECT `name`, `value` FROM `' . $table_name. '`')->results();
             // Store settings in dictionary format
             self::$_cached_settings = [];
@@ -318,9 +318,9 @@ public static function getSetting(string $setting, ?string $fallback = null, ?st
      *                        nl2_settings table.
      */
     public static function setSetting(string $setting, ?string $new_value, ?string $module = null): void {
-        $table_name = $module == null ? 'nl2_settings' : "nl2_${module}_settings";
+        $table_name = $module === null ? 'nl2_settings' : "nl2_${module}_settings";
 
-        if ($new_value == null) {
+        if ($new_value === null) {
             DB::getInstance()->query('DELETE FROM `' . $table_name . '` WHERE `name` = ?', [$setting]);
         } else {
             $query = 'INSERT INTO `' . $table_name . '` (`name`, `value`) VALUES (?, ?) ON DUPLICATE KEY UPDATE `value` = ?';
diff --git a/core/classes/Core/Validate.php b/core/classes/Core/Validate.php
index c3cfe34cf7..b7e3f57fae 100644
--- a/core/classes/Core/Validate.php
+++ b/core/classes/Core/Validate.php
@@ -383,7 +383,7 @@ public function errors(): array {
 
             // If there is no generic `message()` set or the translated message is not equal to generic message
             // we can continue without worrying about duplications
-            if ($this->_message == null || ($message != $this->_message && !in_array($message, $this->_errors))) {
+            if ($this->_message === null || ($message != $this->_message && !in_array($message, $this->_errors))) {
                 $this->_errors[] = $message;
                 continue;
             }
diff --git a/core/classes/Endpoints/KeyAuthEndpoint.php b/core/classes/Endpoints/KeyAuthEndpoint.php
index 30d9f75456..cced8c8ced 100644
--- a/core/classes/Endpoints/KeyAuthEndpoint.php
+++ b/core/classes/Endpoints/KeyAuthEndpoint.php
@@ -43,7 +43,7 @@ final public function isAuthorised(Nameless2API $api): bool {
      */
     private function validateKey(Nameless2API $api, string $api_key): bool {
         $correct_key = Util::getSetting('mc_api_key');
-        if ($correct_key == null) {
+        if ($correct_key === null) {
             die('API key is null');
         }
 
diff --git a/core/classes/Group_Sync/GroupSyncManager.php b/core/classes/Group_Sync/GroupSyncManager.php
index 9f4d7b77f0..cf9d82c400 100644
--- a/core/classes/Group_Sync/GroupSyncManager.php
+++ b/core/classes/Group_Sync/GroupSyncManager.php
@@ -149,7 +149,7 @@ private function compileValidatorMessages(Language $language): array {
     public function broadcastChange(User $user, string $sending_injector_class, array $group_ids): array {
         $sending_injector = $this->getInjectorByClass($sending_injector_class);
 
-        if ($sending_injector == null) {
+        if ($sending_injector === null) {
             return [];
         }
 
@@ -180,7 +180,7 @@ public function broadcastChange(User $user, string $sending_injector_class, arra
                 $nameless_group_id = $rule->{$namelessmc_column};
 
                 // Skip this injector if it doesn't have a group id setup for this rule
-                if ($injector_group_id == null) {
+                if ($injector_group_id === null) {
                     continue;
                 }
 
diff --git a/core/classes/Minecraft/ProfileUtils.php b/core/classes/Minecraft/ProfileUtils.php
index 607e07c615..e5d8750e38 100644
--- a/core/classes/Minecraft/ProfileUtils.php
+++ b/core/classes/Minecraft/ProfileUtils.php
@@ -20,7 +20,7 @@ class ProfileUtils {
     public static function getProfile(string $identifier): ?MinecraftProfile {
         if (strlen($identifier) <= 16) {
             $result = self::getUUIDFromUsername($identifier);
-            if ($result == null) {
+            if ($result === null) {
                 return null;
             }
             $uuid = $result['uuid'];
diff --git a/core/classes/Misc/ErrorHandler.php b/core/classes/Misc/ErrorHandler.php
index 120a7228b9..26fe7c0861 100644
--- a/core/classes/Misc/ErrorHandler.php
+++ b/core/classes/Misc/ErrorHandler.php
@@ -251,7 +251,7 @@ private static function parseFile($lines, int $error_line): string {
     public static function catchShutdownError(): void {
         $error = error_get_last();
 
-        if ($error == null) {
+        if ($error === null) {
             return;
         }
 
diff --git a/core/classes/Templates/AssetResolver.php b/core/classes/Templates/AssetResolver.php
index b94a3e558c..1e56a18411 100644
--- a/core/classes/Templates/AssetResolver.php
+++ b/core/classes/Templates/AssetResolver.php
@@ -27,7 +27,7 @@ public function include($assets): void {
         }
 
         foreach ($assets as $asset) {
-            if ($asset == null) {
+            if ($asset === null) {
                 throw new InvalidArgumentException("Attempted to register null asset");
             }
 
@@ -35,7 +35,7 @@ public function include($assets): void {
 
             $this->_assets[$asset] = parent::ASSET_TREE[$asset];
 
-            if ($this->_assets[$asset] == null) {
+            if ($this->_assets[$asset] === null) {
                 throw new InvalidArgumentException("Asset missing in asset tree");
             }
         }
diff --git a/core/init.php b/core/init.php
index dd735d2961..1465d41ea5 100644
--- a/core/init.php
+++ b/core/init.php
@@ -216,7 +216,7 @@
 
     // Site name
     $sitename = Util::getSetting('sitename');
-    if ($sitename == null) {
+    if ($sitename === null) {
         die('No sitename in settings table');
     }
     define('SITE_NAME', $sitename);
diff --git a/core/templates/frontend_init.php b/core/templates/frontend_init.php
index 5734e580fd..34ede5e3c0 100644
--- a/core/templates/frontend_init.php
+++ b/core/templates/frontend_init.php
@@ -37,7 +37,7 @@
     foreach (Integrations::getInstance()->getEnabledIntegrations() as $integration) {
         if ($integration->data()->required) {
             $integrationUser = $user->getIntegration($integration->getName());
-            if ($integrationUser == null || !$integrationUser->isVerified()) {
+            if ($integrationUser === null || !$integrationUser->isVerified()) {
                 Session::flash('connections_error', $language->get('user', 'integration_required_to_continue'));
                 Redirect::to(URL::build('/user/connections'));
             }
diff --git a/custom/panel_templates/Default/template.php b/custom/panel_templates/Default/template.php
index 3de3e4022f..d521be449a 100644
--- a/custom/panel_templates/Default/template.php
+++ b/custom/panel_templates/Default/template.php
@@ -51,7 +51,7 @@ public function __construct(Smarty $smarty, Language $language) {
                 // Dark and light theme switch
                 var currentPanelTheme = $.cookie("nmc_panel_theme");
 
-                if (currentPanelTheme == null) {
+                if (currentPanelTheme === null) {
                     $.cookie("nmc_panel_theme", "light", { path: "/" });
                 } else {
                     if (currentPanelTheme == "dark") {
diff --git a/modules/Core/classes/Group_Sync/MinecraftGroupSyncInjector.php b/modules/Core/classes/Group_Sync/MinecraftGroupSyncInjector.php
index 86d2f394c5..268ebdc67f 100644
--- a/modules/Core/classes/Group_Sync/MinecraftGroupSyncInjector.php
+++ b/modules/Core/classes/Group_Sync/MinecraftGroupSyncInjector.php
@@ -32,7 +32,7 @@ public function shouldEnable(): bool {
     public function getSelectionOptions(): array {
         $row = DB::getInstance()->query('SELECT `groups` FROM `nl2_query_results` ORDER BY `id` DESC LIMIT 1')->first();
 
-        if ($row == null) {
+        if ($row === null) {
             // Plugin is not set up
             return [];
         }
diff --git a/modules/Core/includes/endpoints/AddGroupsEndpoint.php b/modules/Core/includes/endpoints/AddGroupsEndpoint.php
index c94ef9e51e..971d8c1d94 100644
--- a/modules/Core/includes/endpoints/AddGroupsEndpoint.php
+++ b/modules/Core/includes/endpoints/AddGroupsEndpoint.php
@@ -17,7 +17,7 @@ public function __construct() {
 
     public function execute(Nameless2API $api, User $user): void {
         $groups = $_POST['groups'];
-        if ($groups == null || !count($groups)) {
+        if ($groups === null || !count($groups)) {
             $api->throwError(CoreApiErrors::ERROR_UNABLE_TO_FIND_GROUP, 'No groups provided');
         }
 
diff --git a/modules/Core/includes/endpoints/InfoEndpoint.php b/modules/Core/includes/endpoints/InfoEndpoint.php
index 236199a331..1e7ed5bbc0 100644
--- a/modules/Core/includes/endpoints/InfoEndpoint.php
+++ b/modules/Core/includes/endpoints/InfoEndpoint.php
@@ -18,7 +18,7 @@ public function execute(Nameless2API $api): void {
 
         $site_id = Util::getSetting('unique_id');
 
-        if ($site_id == null) {
+        if ($site_id === null) {
             $api->throwError(Nameless2API::ERROR_NO_SITE_UID);
         }
 
diff --git a/modules/Core/includes/endpoints/RegisterEndpoint.php b/modules/Core/includes/endpoints/RegisterEndpoint.php
index c60db288e6..47a2b520fd 100644
--- a/modules/Core/includes/endpoints/RegisterEndpoint.php
+++ b/modules/Core/includes/endpoints/RegisterEndpoint.php
@@ -150,7 +150,7 @@ private function createUser(Nameless2API $api, string $username, string $email,
                     }
 
                     $integration = $integrations->getIntegration($integration_name);
-                    if ($integration == null) {
+                    if ($integration === null) {
                         continue;
                     }
 
diff --git a/modules/Core/includes/endpoints/UserInfoEndpoint.php b/modules/Core/includes/endpoints/UserInfoEndpoint.php
index 864f08e0bb..a57966558e 100644
--- a/modules/Core/includes/endpoints/UserInfoEndpoint.php
+++ b/modules/Core/includes/endpoints/UserInfoEndpoint.php
@@ -68,7 +68,7 @@ public function execute(Nameless2API $api, User $user): void {
 
         $integrations_array = [];
         foreach ($user->getIntegrations() as $key => $integrationUser) {
-            if ($integrationUser->data()->identifier == null && $integrationUser->data()->username == null) {
+            if ($integrationUser->data()->identifier === null && $integrationUser->data()->username === null) {
                 continue;
             }
 
diff --git a/modules/Core/includes/endpoints/VerifyIntegrationEndpoint.php b/modules/Core/includes/endpoints/VerifyIntegrationEndpoint.php
index 2880b6652d..27fd078683 100644
--- a/modules/Core/includes/endpoints/VerifyIntegrationEndpoint.php
+++ b/modules/Core/includes/endpoints/VerifyIntegrationEndpoint.php
@@ -21,7 +21,7 @@ public function execute(Nameless2API $api): void {
         $api->validateParams($_POST, ['integration', 'code', 'identifier', 'username']);
 
         $integration = Integrations::getInstance()->getIntegration($_POST['integration']);
-        if ($integration == null) {
+        if ($integration === null) {
             $api->throwError(CoreApiErrors::ERROR_INVALID_INTEGRATION);
         }
 
diff --git a/modules/Core/pages/leaderboards.php b/modules/Core/pages/leaderboards.php
index 0da1e2088d..551193c235 100644
--- a/modules/Core/pages/leaderboards.php
+++ b/modules/Core/pages/leaderboards.php
@@ -78,7 +78,7 @@
 
     function showTable(name, server_id, first = false) {
 
-        if (name == null) {
+        if (name === null) {
             name = $(".leaderboard_tab").first().attr("name");
             server_id = $(".leaderboard_tab").first().attr("server_id");
         }
diff --git a/modules/Core/pages/panel/integrations.php b/modules/Core/pages/panel/integrations.php
index ab0dce73a9..89ec00fa74 100644
--- a/modules/Core/pages/panel/integrations.php
+++ b/modules/Core/pages/panel/integrations.php
@@ -48,7 +48,7 @@
 } else {
     // View integration settings
     $integration = $integrations->getIntegration($_GET['integration']);
-    if ($integration == null) {
+    if ($integration === null) {
         Redirect::to(URL::build('/panel/core/integrations'));
     }
 
diff --git a/modules/Core/pages/panel/templates.php b/modules/Core/pages/panel/templates.php
index 9a9a758718..b5562cc8b4 100644
--- a/modules/Core/pages/panel/templates.php
+++ b/modules/Core/pages/panel/templates.php
@@ -633,7 +633,7 @@
                             }
                         }
 
-                        if ($file_type == null) {
+                        if ($file_type === null) {
                             Redirect::to(URL::build('/panel/core/templates'));
                         }
 
diff --git a/modules/Core/pages/panel/users_integrations.php b/modules/Core/pages/panel/users_integrations.php
index 8b714e8da6..a133f28c13 100644
--- a/modules/Core/pages/panel/users_integrations.php
+++ b/modules/Core/pages/panel/users_integrations.php
@@ -43,7 +43,7 @@
 
     $user_integrations_list = [];
     foreach ($view_user->getIntegrations() as $key => $integrationUser) {
-        if ($integrationUser->data()->username == null && $integrationUser->data()->identifier == null) {
+        if ($integrationUser->data()->username === null && $integrationUser->data()->identifier === null) {
             continue;
         }
 
@@ -82,7 +82,7 @@
         case 'link':
             // Manual linking to integration (Integration User might already exist due of pending completion)
             $integration = Integrations::getInstance()->getIntegration($_GET['integration']);
-            if ($integration == null) {
+            if ($integration === null) {
                 Redirect::to(URL::build('/panel/users/integrations/', 'id=' . $view_user->data()->id));
             }
 
@@ -96,7 +96,7 @@
 
                 if (Token::check()) {
                     if ($integration->validateUsername(Input::get('username')) && $integration->validateIdentifier(Input::get('identifier'))) {
-                        if ($integrationUser == null) {
+                        if ($integrationUser === null) {
                             // Register new integration user
                             $code = uniqid('', true);
 
@@ -145,7 +145,7 @@
         case 'edit':
             // Edit integration user details
             $integrationUser = $view_user->getIntegration($_GET['integration']);
-            if ($integrationUser == null) {
+            if ($integrationUser === null) {
                 Redirect::to(URL::build('/panel/users/integrations/', 'id=' . $view_user->data()->id));
             }
 
diff --git a/modules/Core/pages/panel/users_reports.php b/modules/Core/pages/panel/users_reports.php
index f081961844..31d6e24a65 100644
--- a/modules/Core/pages/panel/users_reports.php
+++ b/modules/Core/pages/panel/users_reports.php
@@ -102,7 +102,7 @@
                 }
             }
 
-            if ($user_reported == null) {
+            if ($user_reported === null) {
                 // Reported user doesn't exist, use their username and uuid
                 $user_reported = Output::getClean($report->reported_mcname);
                 $user_profile = URL::build('/panel/user/' . urlencode($report->reported_id . '-' . $report->reported_mcname));
diff --git a/modules/Core/pages/panel/widgets.php b/modules/Core/pages/panel/widgets.php
index 8e8e6d9a5a..eab79f60d3 100644
--- a/modules/Core/pages/panel/widgets.php
+++ b/modules/Core/pages/panel/widgets.php
@@ -231,7 +231,7 @@
             $widget = $widget[0];
 
             if (
-                $widgets->getWidget($widget->name)->getSettings() == null
+                $widgets->getWidget($widget->name)->getSettings() === null
                 || !file_exists($widgets->getWidget($widget->name)->getSettings())
             ) {
                 Redirect::to(URL::build('/admin/widgets'));
diff --git a/modules/Core/pages/user/connections.php b/modules/Core/pages/user/connections.php
index 2fa27f3f53..6af0b5d4d8 100644
--- a/modules/Core/pages/user/connections.php
+++ b/modules/Core/pages/user/connections.php
@@ -24,7 +24,7 @@
 
         // Get Integration
         $integration = Integrations::getInstance()->getIntegration(Input::get('integration'));
-        if ($integration == null) {
+        if ($integration === null) {
             Redirect::to(URL::build('/user/connections'));
         }
 
diff --git a/modules/Core/queries/servers.php b/modules/Core/queries/servers.php
index b9643c2cba..be7b0d963c 100644
--- a/modules/Core/queries/servers.php
+++ b/modules/Core/queries/servers.php
@@ -21,7 +21,7 @@
 if (isset($_GET['key'])) {
     // Get key from database - check it matches
     $key = Util::getSetting('unique_id');
-    if ($key == null || $_GET['key'] != $key) {
+    if ($key === null || $_GET['key'] != $key) {
         die();
     }
 } else {
diff --git a/modules/Discord Integration/classes/Discord.php b/modules/Discord Integration/classes/Discord.php
index a0b2367223..74913f3431 100644
--- a/modules/Discord Integration/classes/Discord.php	
+++ b/modules/Discord Integration/classes/Discord.php	
@@ -52,7 +52,7 @@ public static function updateDiscordRoles(User $user, array $added, array $remov
         }
 
         $integrationUser = $user->getIntegration('Discord');
-        if ($integrationUser == null || !$integrationUser->isVerified()) {
+        if ($integrationUser === null || !$integrationUser->isVerified()) {
             return false;
         }
 
diff --git a/modules/Discord Integration/includes/endpoints/UpdateDiscordBotSettingsEndpoint.php b/modules/Discord Integration/includes/endpoints/UpdateDiscordBotSettingsEndpoint.php
index c784f92c9c..51726157a1 100644
--- a/modules/Discord Integration/includes/endpoints/UpdateDiscordBotSettingsEndpoint.php	
+++ b/modules/Discord Integration/includes/endpoints/UpdateDiscordBotSettingsEndpoint.php	
@@ -17,7 +17,7 @@ public function __construct() {
 
     public function execute(Nameless2API $api): void {
         if (isset($_POST['url'])) {
-            if ($_POST['url'] == null) {
+            if ($_POST['url'] === null) {
                 $api->throwError(DiscordApiErrors::ERROR_UNABLE_TO_SET_DISCORD_BOT_URL, "\$_POST['url'] is null.");
             }
 
diff --git a/modules/Discord Integration/module.php b/modules/Discord Integration/module.php
index 489b037700..a035043b5a 100644
--- a/modules/Discord Integration/module.php	
+++ b/modules/Discord Integration/module.php	
@@ -15,13 +15,13 @@ public function __construct(Language $language, Pages $pages, Endpoints $endpoin
         parent::__construct($this, $name, $author, $module_version, $nameless_version);
 
         $bot_url = Util::getSetting('discord_bot_url');
-        if ($bot_url == null) {
+        if ($bot_url === null) {
             $bot_url = '';
         }
         define('BOT_URL', $bot_url);
 
         $bot_username = Util::getSetting('discord_bot_username');
-        if ($bot_username == null) {
+        if ($bot_username === null) {
             $bot_username = '';
         }
         define('BOT_USERNAME', $bot_username);
diff --git a/modules/Forum/pages/forum/new_topic.php b/modules/Forum/pages/forum/new_topic.php
index 5ba41b8a57..a194fc8a1f 100644
--- a/modules/Forum/pages/forum/new_topic.php
+++ b/modules/Forum/pages/forum/new_topic.php
@@ -214,7 +214,7 @@
                     'avatar_url' => $user->getAvatar(128, true),
                     'title' => Input::get('title'),
                     'url' => URL::getSelfURL() . ltrim(URL::build('/forum/topic/' . urlencode($topic_id) . '-' . $forum->titleToURL(Input::get('title'))), '/'),
-                    'available_hooks' => $available_hooks == null ? [] : $available_hooks
+                    'available_hooks' => $available_hooks === null ? [] : $available_hooks
                 ]);
 
                 Session::flash('success_post', $forum_language->get('forum', 'post_successful'));
diff --git a/modules/Forum/pages/forum/view_topic.php b/modules/Forum/pages/forum/view_topic.php
index aebb101058..8b90e08f8e 100644
--- a/modules/Forum/pages/forum/view_topic.php
+++ b/modules/Forum/pages/forum/view_topic.php
@@ -315,7 +315,7 @@
                 'topic_author_nickname' => $topic_user->data()->nickname,
                 'topic_id' => $tid,
                 'post_id' => $last_post_id,
-                'available_hooks' => $available_hooks == null ? [] : $available_hooks
+                'available_hooks' => $available_hooks === null ? [] : $available_hooks
             ]);
 
             // Alerts + Emails

From e36285e9cc12dc9b0e19fe1e3eed646a90188c62 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Sun, 3 Jul 2022 21:50:16 +0200
Subject: [PATCH 233/337] Remove unnecessary null checks

---
 core/classes/Core/Language.php           | 2 +-
 core/classes/Templates/AssetResolver.php | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/core/classes/Core/Language.php b/core/classes/Core/Language.php
index 7f05235deb..9b68f7ff3c 100644
--- a/core/classes/Core/Language.php
+++ b/core/classes/Core/Language.php
@@ -170,7 +170,7 @@ public function __construct(string $module = 'core', string $active_language = n
         $this->_activeLanguage = $active_language ?? LANGUAGE ?? 'en_UK';
 
         // Require file
-        if ($module === null || $module === 'core') {
+        if ($module === 'core') {
             $path = implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'custom', 'languages', '__lng__.json']);
         } else {
             $path = str_replace('/', DIRECTORY_SEPARATOR, $module) . DIRECTORY_SEPARATOR . '__lng__.json';
diff --git a/core/classes/Templates/AssetResolver.php b/core/classes/Templates/AssetResolver.php
index 1e56a18411..676478e03b 100644
--- a/core/classes/Templates/AssetResolver.php
+++ b/core/classes/Templates/AssetResolver.php
@@ -27,17 +27,8 @@ public function include($assets): void {
         }
 
         foreach ($assets as $asset) {
-            if ($asset === null) {
-                throw new InvalidArgumentException("Attempted to register null asset");
-            }
-
             $this->validateAsset($asset);
-
             $this->_assets[$asset] = parent::ASSET_TREE[$asset];
-
-            if ($this->_assets[$asset] === null) {
-                throw new InvalidArgumentException("Asset missing in asset tree");
-            }
         }
     }
 

From bb08bba1a657c3915a226598a9eb601d80c739f9 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Sun, 3 Jul 2022 23:00:57 +0200
Subject: [PATCH 234/337] allow null url

---
 .../includes/endpoints/UpdateDiscordBotSettingsEndpoint.php   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/Discord Integration/includes/endpoints/UpdateDiscordBotSettingsEndpoint.php b/modules/Discord Integration/includes/endpoints/UpdateDiscordBotSettingsEndpoint.php
index 51726157a1..c7b7fc38ea 100644
--- a/modules/Discord Integration/includes/endpoints/UpdateDiscordBotSettingsEndpoint.php	
+++ b/modules/Discord Integration/includes/endpoints/UpdateDiscordBotSettingsEndpoint.php	
@@ -17,10 +17,6 @@ public function __construct() {
 
     public function execute(Nameless2API $api): void {
         if (isset($_POST['url'])) {
-            if ($_POST['url'] === null) {
-                $api->throwError(DiscordApiErrors::ERROR_UNABLE_TO_SET_DISCORD_BOT_URL, "\$_POST['url'] is null.");
-            }
-
             try {
                 Util::setSetting('discord_bot_url', $_POST['url']);
             } catch (Exception $e) {

From f01cd14e29dd3ad43d3465f9ba2fc086486ffcb6 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Tue, 5 Jul 2022 20:06:51 +0200
Subject: [PATCH 235/337] Add missing turkish language files to modules

---
 modules/Cookie Consent/language/tr_TR.json      | 1 +
 modules/Discord Integration/language/tr_TR.json | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 modules/Cookie Consent/language/tr_TR.json
 create mode 100644 modules/Discord Integration/language/tr_TR.json

diff --git a/modules/Cookie Consent/language/tr_TR.json b/modules/Cookie Consent/language/tr_TR.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Cookie Consent/language/tr_TR.json	
@@ -0,0 +1 @@
+{}
diff --git a/modules/Discord Integration/language/tr_TR.json b/modules/Discord Integration/language/tr_TR.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Discord Integration/language/tr_TR.json	
@@ -0,0 +1 @@
+{}

From 49ef61d495fff6ccfd0f827c9d066f89751b8508 Mon Sep 17 00:00:00 2001
From: NamelessMC Translations <robin+weblate@rkslot.nl>
Date: Sat, 2 Jul 2022 15:54:30 +0000
Subject: [PATCH 236/337] Translated using Weblate (Dutch)

Currently translated at 100.0% (1227 of 1227 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/nl/
---
 custom/languages/nl_NL.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/custom/languages/nl_NL.json b/custom/languages/nl_NL.json
index 5f7a721003..e11dc856ac 100644
--- a/custom/languages/nl_NL.json
+++ b/custom/languages/nl_NL.json
@@ -1224,5 +1224,6 @@
     "admin/trusted_proxies_not_configured": "{{linkStart}}Vertrouwde proxies{{linkEnd}} zijn nog niet geconfigureerd, IP verbanningen zouden niet correct kunnen werken.",
     "admin/https_port_80": "Het lijkt erop dat je HTTPS op poort 80 gebruikt, wat hoogstwaarschijnlijk niet correct is. Als je Cloudflare gebruikt, zorg ervoor dat je TLS encryptie modus op Full (strict) zet. Als je je eigen proxy runt, configureer dan de X-Forwarded-Port header.",
     "admin/debugging_enabled": "Debugging is ingeschakeld, gevoelige informatie zou kunnen worden blootgesteld aan onbevoegde bezoekers. Debugging zou alleen mogen worden gebruikt voor ontwikkeling, niet voor publieke sites.",
-    "admin/group_sync_no_results_warning": "Group synchronisatie regels zijn ingesteld maar geen wijzigingen zijn gerapporteerd. Dit kan een misconfiguratie aanwijzen."
+    "admin/group_sync_no_results_warning": "Group synchronisatie regels zijn ingesteld maar geen wijzigingen zijn gerapporteerd. Dit kan een misconfiguratie aanwijzen.",
+    "user/avatar_set_successfully": "Avatar succesvol ingesteld."
 }

From 973d638a6bdcd332b397370997154cde0cca9e2d Mon Sep 17 00:00:00 2001
From: PadowYT2 <me@padow.ru>
Date: Sat, 2 Jul 2022 13:05:40 +0000
Subject: [PATCH 237/337] Translated using Weblate (Russian)

Currently translated at 100.0% (1227 of 1227 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/ru/
---
 custom/languages/ru_RU.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/custom/languages/ru_RU.json b/custom/languages/ru_RU.json
index 73b018ff1d..936473a93c 100644
--- a/custom/languages/ru_RU.json
+++ b/custom/languages/ru_RU.json
@@ -1224,5 +1224,6 @@
     "installer/database_connection_failed": "Не удалось подключиться к датабазе:<br>{{message}}",
     "admin/https_port_80": "Похоже вы используйте HTTPS на порте 80, что скорее всего не правда. Если вы используете Cloudflare, не забудьте сделать TLS шифрование на Полное (строгое). Если у вас свой прокси, настройте его для отправки X-Forwarded-Port заголовка.",
     "admin/group_sync_no_results_warning": "Правила синхронизации групп настроены, но нет изменений которые были сообщены. Это может произойти из-за не правильной настройки.",
-    "installer/config_write_failed": "Не удалось написать в конфиг файл: {{message}}"
+    "installer/config_write_failed": "Не удалось написать в конфиг файл: {{message}}",
+    "user/avatar_set_successfully": "Аватарка успешно поставлена."
 }

From 55c989a12b9f467cb4010afcc396feba2398aef1 Mon Sep 17 00:00:00 2001
From: Marcos <marckos03br@gmail.com>
Date: Mon, 4 Jul 2022 16:46:13 +0000
Subject: [PATCH 238/337] Translated using Weblate (Spanish)

Currently translated at 100.0% (1227 of 1227 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/es/
---
 custom/languages/es_ES.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/custom/languages/es_ES.json b/custom/languages/es_ES.json
index b21343933c..3836cf812f 100644
--- a/custom/languages/es_ES.json
+++ b/custom/languages/es_ES.json
@@ -1224,5 +1224,6 @@
     "admin/trusted_proxies_configured": "Proxies de confianza",
     "admin/trusted_proxies_not_configured": "{{linkStart}}Proxies de confianza{{linkEnd}} no están configurados, las prohibiciones de IP pueden no funcionar correctamente.",
     "admin/https_port_80": "Parece como si estuvieras usando HTTPS en el puerto 80, lo que casi definitivamente no es cierto. Si usas Cloudflare, asegúrate de configurar el modo de encriptación TLS en Full (estricto). Si ejecuta su propio proxy, configúrelo para que envíe la cabecera X-Forwarded-Port.",
-    "admin/group_sync_no_results_warning": "Las reglas de sincronización de grupos están configuradas pero no se ha informado de ningún cambio. Esto podría indicar una configuración errónea."
+    "admin/group_sync_no_results_warning": "Las reglas de sincronización de grupos están configuradas pero no se ha informado de ningún cambio. Esto podría indicar una configuración errónea.",
+    "user/avatar_set_successfully": "Avatar fijado con éxito."
 }

From 909a8e650b18d9c203e5bf37ca40da625463c69f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mert=20Efe=20Soro=C4=9Flu?= <sorolu14@gmail.com>
Date: Tue, 5 Jul 2022 14:04:21 +0000
Subject: [PATCH 239/337] Translated using Weblate (Turkish)

Currently translated at 77.1% (947 of 1227 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/tr/
---
 custom/languages/tr_TR.json | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/custom/languages/tr_TR.json b/custom/languages/tr_TR.json
index b6ec3db51e..91f8ed458b 100644
--- a/custom/languages/tr_TR.json
+++ b/custom/languages/tr_TR.json
@@ -956,5 +956,14 @@
     "user/x_reactions": "{{count}} reaksiyon",
     "user/x_replies": "{{count}} cevap",
     "user/you_have_been_banned": "Engellendiniz!",
-    "user/you_have_received_a_warning": "Bir uyarı aldınız!"
+    "user/you_have_received_a_warning": "Bir uyarı aldınız!",
+    "admin/user_group_added_hook_info": "Kullanıcı Grubu Eklenildi",
+    "admin/user_group_removed_hook_info": "Kullanıcı Grubu Kaldırıldı",
+    "admin/administrator": "Yönetici",
+    "admin/administrator_permission_info": "Bu izne sahip olan kullanıcılar tüm izinlere sahip olacaktır. Bu, tehlikeli bir izindir.",
+    "admin/announcement_hook_info": "Duyuru oluşturma",
+    "admin/announcement_info": "Web sitenizin belirli sayfalarında belirli gruplara mesaj göstermek için duyurular oluşturun.",
+    "admin/announcement_order": "Sipariş",
+    "admin/announcements": "Duyurular",
+    "admin/api_endpoints": "API uç noktası"
 }

From d5b372dd1ec5d0f81315bac90b1dcb9db066fcf0 Mon Sep 17 00:00:00 2001
From: Edem Myle <cameratestadi@gmail.com>
Date: Tue, 5 Jul 2022 16:30:42 +0000
Subject: [PATCH 240/337] Translated using Weblate (Hungarian)

Currently translated at 10.7% (21 of 195 strings)

Translation: NamelessMC/Website - Forum
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-forum/hu/
---
 modules/Forum/language/hu_HU.json | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/modules/Forum/language/hu_HU.json b/modules/Forum/language/hu_HU.json
index 0967ef424b..d33f95974d 100644
--- a/modules/Forum/language/hu_HU.json
+++ b/modules/Forum/language/hu_HU.json
@@ -1 +1,23 @@
-{}
+{
+    "forum/all_topics_unfollowed": "Az összes téma követése megszűnt.",
+    "forum/available_hooks": "Elérhető Hookok",
+    "forum/average_posts": "Átlagos felhasználói bejegyzések száma",
+    "forum/topic_reply": "Téma válasz",
+    "forum/by": "által",
+    "forum/can_create_topic": "Lehet témákat létrehozni?",
+    "forum/can_post_reply": "Létrehozhat válaszokat?",
+    "forum/can_view_forum": "Meg tudja nézni a fórumot?",
+    "forum/can_moderate_forum": "Tudja moderálni a fórumot?",
+    "forum/can_edit_topic": "Tudja szerkeszteni a témáikat?",
+    "forum/can_view_other_topics": "Megnézheti más felhasználók témáit?",
+    "forum/confirm_delete_post": "Biztosan törlöd ezt a bejegyzést?",
+    "forum/confirm_delete_short": "A törlés megerősítése",
+    "forum/confirm_delete_topic": "Biztosan törlöd ezt a témát?",
+    "forum/confirm_unfollow_all_topics": "Biztosan le szeretnéd állítani az összes téma követését?",
+    "forum/content_max_50000": "A bejegyzés tartalma nem lehet hosszabb 50 000 karakternél",
+    "forum/content_min_2": "A bejegyzés tartalmának legalább 2 karakterből kell állnia",
+    "forum/content_required": "Kérjük, add meg a bejegyzés tartalmát",
+    "forum/creating_forum": "Új fórum létrehozása",
+    "forum/creating_label": "Új címke létrehozása",
+    "forum/creating_label_type": "Új címketípus létrehozása"
+}

From 27806ef3bf44f7fbe5bd1fa00dfee76cf2f99473 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Tue, 5 Jul 2022 20:27:03 -0600
Subject: [PATCH 241/337] Update changelog for unreleased changes

---
 CHANGELOG.md               | 70 ++++++++++++++++++++++++++++++++++++++
 core/classes/Misc/Text.php |  2 +-
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 076feb2634..27d3db2371 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,10 +4,80 @@
 > [Milestone](https://github.com/NamelessMC/Nameless/milestone/17)
 
 ### Added
+- Translation updates
+- Add info about OAuth providers to debug link
+- Respect light/dark mode for captcha popups
+- Added `ProfileUtils::getOfflineModeUuid()` & `ProfileUtils::formatUuid()`
 
 ### Changed
+- Better Discord widget error display
+- Light/dark mode for StaffCP statistics graph
+- Hide StaffCP stats on mobile
+- Renamed `OAuth` class to `NamelessOAuth` to avoid conflicts with OAuth PHP extension
+- Add warning to StaffCP dashboard when HTTPs is misconfigured
+- Add warnings for old versions of MySQL/MariaDB
+- Track avatar validity HTTP requests in debug bar
+- Only track queries when debug mode is enabled, this gives performance increases of ~15%
+- Allow server to send correct Minecraft verify command
+- Use `return [...` in config files instead of `$conf = [...`
+  - Backwards compatibility will be removed in 2.0.1 to ensure all sites have been updated
+- Use case insensitive header handling
+- "OR" in login page is no longer hardcoded
+- Better TinyMCE image uploading errors + logging
+- Add form token to announcement order change
 
 ### Fixed
+- Fix MariaDB version detection
+- Fix editing topic title not showing up
+- Fix MC banner image listing
+- Fix installer failing when migrations were silently not run
+- Fix `nl2_users_integrations.username` column not being nullable
+- Include `CGIPassAuth On` in the default `.htaccess` file
+- Fix MCAssoc file path
+- Fix exception when cloning a group
+- Fix error when `nl2_mc_servers.bedrock` is null
+- Fix `Util::determineOrder()` for empty arrays
+- Fix long sentences in statistic widget not going onto a new line
+- Fix maintenance mode message not appearing
+- Fix DefaultRevamp dropdown not respecting light/dark mode
+- Fix edge case exception when no `$_active_page` is set in `Pages` class
+- Fix issue with `Forum::getLatestDiscussions()` returning an array of objects randomly
+- Fix missing `ROOT_PATH` definition in Phinx migration file
+- Fix exception when captcha provider is null
+- Fix exception when `nl2_email_errors.user_id` is null while viewing logs in StaffCP
+- Fix forum label types page formatting in StaffCP
+- Fix debug link modal still being rendered on exception page when they don't have permission to generate debug link
+- Fix editing posts strict comparision which prevented users from editing their own post sometimes
+- Fix avatar related exception on maintenance mode page
+- Fix `Timeago` values being globally cached for all users on news posts
+- Use `.png` instead of `.svg` for default fallback avatar links
+  - Using `.svg` would break on Discord embeds
+- Fix forum signature overflow
+- Fix Oauth login when maintenance mode is enabled
+- Fix `createAnnouncement` webhook
+- Don't cast Discord snowflakes to integers (would break on 32bit systems)
+
+### Deprecated
+*These will be removed in 2.1.0*
+- The entire `Queries` class has been deprecated, read each of the methods' documentation for more information
+- Using `Config::get('path/to/value')` syntax is deprecated. Use `Config::get('path.to.value')` instead
+- `Hash::unique()`, use `SecureRandom::alphanumeric()` instead
+- `Pages->getActivePage()` is deprecated, no alternative was created
+- `Paginator->setValues()` is deprecated, set the values within the constructor instead
+- `User->getGroupClass()` is deprecated, use `User->getGroupStyle()` instead
+- `DB->selectQuery()` is deprecated, use `DB->query()` instead
+- `Util::isTrustedProxiesConfigured()` is deprecated, use `HttpUtils::isTrustedProxiesConfigured()` instead
+- `Util::getTrustedProxies()` is deprecated, use `HttpUtils::getTrustedProxies()` instead
+- `Util::getRemoteAddress()` is deprecated, use `HttpUtils::getRemoteAddress()` instead
+- `Util::getProtocol()` is deprecated, use `HttpUtils::getProtocol()` instead
+- `Util::getPort()` is deprecated, use `HttpUtils::getPort()` instead
+- `Util::isExternalURL()` is deprecated, use `URL::isExternalURL()` instead
+- `Util::getSelfURL()` is deprecated, use `URL::getSelfURL()` instead
+- `Util::replaceAnchorsWithText()` is deprecated, use `URL::replaceAnchorsWithText()` instead
+- `Util::stringToURL()` is deprecated, use native `urlencode()` for better non-latin support
+- `Util::truncate()` is deprecated, use `Text::truncate()` instead
+- `Util::renderEmojis()` is deprecated, use `Text::renderEmojis()` instead
+- `Util::bold()` is deprecated, use `Text::bold()` instead
 
 
 ## [2.0.0 pr-13](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr12...v2.0.0-pr13) - 2022-06-04
diff --git a/core/classes/Misc/Text.php b/core/classes/Misc/Text.php
index 7465cc2514..15b355e0d2 100644
--- a/core/classes/Misc/Text.php
+++ b/core/classes/Misc/Text.php
@@ -125,7 +125,7 @@ public static function truncate(string $text, int $length = 750, array $options
      *
      * @param string|null $string $string String to URLify
      * @return string Url-ified string. (I dont know what this means)
-     * @deprecated This should no longer be used because it doesn't work well for non-latin languages. Just use urlencode() instead.
+     * @deprecated This should no longer be used because it doesn't work well for non-latin languages. Just use urlencode() instead. Will be removed in 2.1.0
      */
     public static function urlSafe(string $string = null): string {
         if ($string) {

From 062be33494778de675bf86d58e482124dd2e0c26 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Tue, 5 Jul 2022 22:06:15 -0600
Subject: [PATCH 242/337] Fix AssetResolver including assets more than once if
 they are depended on more than once

---
 CHANGELOG.md                             |  1 +
 core/classes/Templates/AssetResolver.php | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27d3db2371..1954f0a4f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,7 @@
 - Fix Oauth login when maintenance mode is enabled
 - Fix `createAnnouncement` webhook
 - Don't cast Discord snowflakes to integers (would break on 32bit systems)
+- Fix `AssetResolver` adding an asset more than once if several assets depend on it
 
 ### Deprecated
 *These will be removed in 2.1.0*
diff --git a/core/classes/Templates/AssetResolver.php b/core/classes/Templates/AssetResolver.php
index 676478e03b..5cea8f67b5 100644
--- a/core/classes/Templates/AssetResolver.php
+++ b/core/classes/Templates/AssetResolver.php
@@ -27,8 +27,9 @@ public function include($assets): void {
         }
 
         foreach ($assets as $asset) {
-            $this->validateAsset($asset);
-            $this->_assets[$asset] = parent::ASSET_TREE[$asset];
+            if ($this->validateAsset($asset)) {
+                $this->_assets[$asset] = parent::ASSET_TREE[$asset];
+            }
         }
     }
 
@@ -42,7 +43,7 @@ public function compile(): array {
         $css = [];
         $js = [];
 
-        $assets = Util::determineOrder(array_map(function($key, $value) {
+        $assets = Util::determineOrder(array_map(static function(string $key, array $value) {
             return [
                 'name' => $key,
                 'after' => $value['depends'] ?? $value['after'] ?? [],
@@ -100,6 +101,10 @@ private function gatherAsset(string $name, array $asset, array &$css, array &$js
                 $js[] = $this->buildPath($jsFile, 'js');
             }
         }
+
+        if (!in_array($name, $this->_assets)) {
+            $this->_assets[$name] = $asset;
+        }
     }
 
     /**

From 8f2de9bac763ea3a65617ed8bc371dfc93e8be41 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Tue, 5 Jul 2022 22:18:31 -0600
Subject: [PATCH 243/337] Check validity of hex code substring before calling
 `hexdec`

Without this, we get a bunch of spam in the `other-log.log` file since we did not check if the value is valid before calling hexdec
---
 core/classes/Minecraft/MCQuery.php | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/core/classes/Minecraft/MCQuery.php b/core/classes/Minecraft/MCQuery.php
index e8fd7af0bc..fb7d175bb2 100644
--- a/core/classes/Minecraft/MCQuery.php
+++ b/core/classes/Minecraft/MCQuery.php
@@ -424,9 +424,24 @@ private static function colorDiff($rgb1, $rgb2): int {
         $green1 = hexdec(substr($rgb1, 2, 2));
         $blue1 = hexdec(substr($rgb1, 4, 2));
 
-        $red2 = hexdec(substr($rgb2, 0, 2));
-        $green2 = hexdec(substr($rgb2, 2, 2));
-        $blue2 = hexdec(substr($rgb2, 4, 2));
+        $red2_substr = substr($rgb2, 0, 2);
+        $green2_substr = substr($rgb2, 2, 2);
+        $blue2_substr = substr($rgb2, 4, 2);
+
+        $red2 = 0;
+        if (ctype_xdigit($red2_substr) && ctype_xdigit($red2_substr)) {
+            $red2 = hexdec($red2_substr);
+        }
+
+        $green2 = 0;
+        if (ctype_xdigit($green2_substr) && ctype_xdigit($green2_substr)) {
+            $green2 = hexdec($green2_substr);
+        }
+
+        $blue2 = 0;
+        if (ctype_xdigit($blue2_substr) && ctype_xdigit($blue2_substr)) {
+            $blue2 = hexdec($blue2_substr);
+        }
 
         return abs($red1 - $red2) + abs($green1 - $green2) + abs($blue1 - $blue2);
     }

From 3ff3040e8ede1ccd49d672b8680b8f9ec6a90570 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Wed, 6 Jul 2022 15:39:30 -0700
Subject: [PATCH 244/337] Fix PHPStan

---
 core/classes/Core/Input.php        | 2 +-
 core/classes/Minecraft/MCQuery.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/classes/Core/Input.php b/core/classes/Core/Input.php
index 3cf23a70aa..4c3a421a96 100644
--- a/core/classes/Core/Input.php
+++ b/core/classes/Core/Input.php
@@ -124,7 +124,7 @@ public static function createTinyEditor(Language $language, string $name, ?strin
                 'hr', 'image', 'link', 'lists', 'spoiler', 'code', 'table',
               ],
               external_plugins: {
-                'spoiler': '" . (defined('CONFIG_PATH') ? CONFIG_PATH : '') . "/core/assets/plugins/tinymce_spoiler/plugin.min.js',
+                'spoiler': '" . URL::build('/core/assets/plugins/tinymce_spoiler/plugin.min.js') . "',
               },
               toolbar: 'undo redo | bold italic underline strikethrough formatselect fontsizeselect forecolor backcolor ltr rtl emoticons | alignleft aligncenter alignright alignjustify | codesample code hr image link numlist bullist | spoiler-add spoiler-remove',
               spoiler_caption: '{$language->get('general', 'spoiler')}',
diff --git a/core/classes/Minecraft/MCQuery.php b/core/classes/Minecraft/MCQuery.php
index fb7d175bb2..28df18d5ae 100644
--- a/core/classes/Minecraft/MCQuery.php
+++ b/core/classes/Minecraft/MCQuery.php
@@ -429,17 +429,17 @@ private static function colorDiff($rgb1, $rgb2): int {
         $blue2_substr = substr($rgb2, 4, 2);
 
         $red2 = 0;
-        if (ctype_xdigit($red2_substr) && ctype_xdigit($red2_substr)) {
+        if (ctype_xdigit($red2_substr)) {
             $red2 = hexdec($red2_substr);
         }
 
         $green2 = 0;
-        if (ctype_xdigit($green2_substr) && ctype_xdigit($green2_substr)) {
+        if (ctype_xdigit($green2_substr)) {
             $green2 = hexdec($green2_substr);
         }
 
         $blue2 = 0;
-        if (ctype_xdigit($blue2_substr) && ctype_xdigit($blue2_substr)) {
+        if (ctype_xdigit($blue2_substr)) {
             $blue2 = hexdec($blue2_substr);
         }
 

From b4811a7b9280c7bb87382c4b6de7b60a2ff0d255 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Wed, 6 Jul 2022 16:56:35 -0600
Subject: [PATCH 245/337] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1954f0a4f1..fecb1a51a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,7 @@
 - Fix `createAnnouncement` webhook
 - Don't cast Discord snowflakes to integers (would break on 32bit systems)
 - Fix `AssetResolver` adding an asset more than once if several assets depend on it
+- Fix TinyMCE spoiler plugin not being added properly if a custom path is set
 
 ### Deprecated
 *These will be removed in 2.1.0*

From ad0e5b05e69b0b6de2d8379a18f6c9f668b472d5 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Fri, 8 Jul 2022 10:25:25 +0200
Subject: [PATCH 246/337] Remove pre-release warning, closes #2916

---
 core/installation/installer.php | 3 ---
 custom/languages/en_UK.json     | 1 -
 2 files changed, 4 deletions(-)

diff --git a/core/installation/installer.php b/core/installation/installer.php
index d5f919faa0..a0b09efac0 100644
--- a/core/installation/installer.php
+++ b/core/installation/installer.php
@@ -42,9 +42,6 @@
                 </div>
                 <div class="sixteen wide tablet eleven wide computer column">
                     <?php if (!isset($step)) { ?>
-                        <div class="ui red message">
-                            <?php echo $language->get('installer', 'pre-release_warning'); ?>
-                        </div>
                         <div class="ui segments">
                             <div class="ui secondary segment">
                                 <h4 class="ui header">
diff --git a/custom/languages/en_UK.json b/custom/languages/en_UK.json
index 0ebf157daa..c239710bf7 100644
--- a/custom/languages/en_UK.json
+++ b/custom/languages/en_UK.json
@@ -895,7 +895,6 @@
     "installer/password": "Password",
     "installer/passwords_must_match": "Your passwords must match.",
     "installer/pre-release": "pre-release",
-    "installer/pre-release_warning": "Please note that this pre-release is not intended for use on a public site.",
     "installer/proceed": "Proceed",
     "installer/reload": "Reload",
     "installer/reload_page": "Reload page",

From 11dbd6159b3fbb75230449244e4d56cdeed8fd9f Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Fri, 8 Jul 2022 22:49:22 -0600
Subject: [PATCH 247/337] Fix group sync rule creation error

---
 core/classes/Integrations/IntegrationUser.php |  4 +--
 .../includes/endpoints/ServerInfoEndpoint.php |  7 ++---
 modules/Core/pages/panel/api.php              | 28 +++++++------------
 3 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/core/classes/Integrations/IntegrationUser.php b/core/classes/Integrations/IntegrationUser.php
index 9b2f38f9e4..933cd4cc24 100644
--- a/core/classes/Integrations/IntegrationUser.php
+++ b/core/classes/Integrations/IntegrationUser.php
@@ -46,9 +46,7 @@ public function getIntegration(): IntegrationBase {
      * @return User NamelessMC User that belong to this integration user
      */
     public function getUser(): User {
-        return $this->_user ??= (function (): User {
-            return new User($this->data()->user_id);
-        })();
+        return $this->_user ??= new User($this->data()->user_id);
     }
 
     /**
diff --git a/modules/Core/includes/endpoints/ServerInfoEndpoint.php b/modules/Core/includes/endpoints/ServerInfoEndpoint.php
index 4275b7c613..a9596df188 100644
--- a/modules/Core/includes/endpoints/ServerInfoEndpoint.php
+++ b/modules/Core/includes/endpoints/ServerInfoEndpoint.php
@@ -72,7 +72,7 @@ public function execute(Nameless2API $api): void {
             foreach ($_POST['players'] as $uuid => $player) {
                 $integrationUser = new IntegrationUser($integration, $uuid, 'identifier');
                 if ($integrationUser->exists()) {
-                    $this->updateUsername($integrationUser, $player, $api);
+                    $this->updateUsername($integrationUser, $player);
                     $log = $this->updateGroups($integrationUser, $player);
                     if (count($log)) {
                         $group_sync_log[] = $log;
@@ -90,7 +90,7 @@ public function execute(Nameless2API $api): void {
         $api->returnArray(array_merge(['message' => $api->getLanguage()->get('api', 'server_info_updated')], ['log' => $group_sync_log]));
     }
 
-    private function updateUsername(IntegrationUser $integrationUser, array $player, Nameless2API $api): void {
+    private function updateUsername(IntegrationUser $integrationUser, array $player): void {
         if ($player['name'] != $integrationUser->data()->username) {
             $integrationUser->update([
                 'username' => Output::getClean($player['name'])
@@ -99,8 +99,7 @@ private function updateUsername(IntegrationUser $integrationUser, array $player,
 
         if (Util::getSetting('username_sync')) {
             $user = $integrationUser->getUser();
-            if (!$user->exists() ||
-                $player['name'] == $user->data()->username) {
+            if (!$user->exists() || $player['name'] == $user->data()->username) {
                 return;
             }
 
diff --git a/modules/Core/pages/panel/api.php b/modules/Core/pages/panel/api.php
index 46c569daca..6a02900735 100644
--- a/modules/Core/pages/panel/api.php
+++ b/modules/Core/pages/panel/api.php
@@ -82,36 +82,28 @@
 
                 $external = false;
                 $fields = [];
-
-                foreach (GroupSyncManager::getInstance()->getEnabledInjectors() as $injector) {
-                    if (
-                        $injector->getColumnName() == GroupSyncManager::getInstance()->getInjectorByClass(NamelessMCGroupSyncInjector::class)->getColumnName()
-                    ) {
-                        $fields[$injector->getColumnName()] = $_POST[$injector->getColumnName()];
+                $nameless_injector_column = GroupSyncManager::getInstance()->getInjectorByClass(NamelessMCGroupSyncInjector::class)->getColumnName();
+                foreach (GroupSyncManager::getInstance()->getEnabledInjectors() as $column_name => $injector) {
+                    if (!$_POST[$column_name]) {
                         continue;
                     }
 
-                    if ($_POST[$injector->getColumnName()]) {
-                        if ($_POST[$injector->getColumnName()] == 0) {
-                            continue;
-                        }
+                    $fields[$column_name] = $_POST[$column_name];
 
-                        $fields[$injector->getColumnName()] = $_POST[$injector->getColumnName()];
+                    if ($column_name !== $nameless_injector_column) {
                         $external = true;
                     }
                 }
 
                 if (!$external) {
                     $errors[] = $language->get('admin', 'at_least_one_external');
-                } else {
-                    if ($validation->passed()) {
+                } else if ($validation->passed()) {
 
-                        DB::getInstance()->insert('group_sync', $fields);
-                        Session::flash('api_success', $language->get('admin', 'group_sync_rule_created_successfully'));
+                    DB::getInstance()->insert('group_sync', $fields);
+                    Session::flash('api_success', $language->get('admin', 'group_sync_rule_created_successfully'));
 
-                    } else {
-                        $errors = $validation->errors();
-                    }
+                } else {
+                    $errors = $validation->errors();
                 }
             } else {
                 if ($_POST['action'] == 'update') {

From 347dd601c1248692532cfc5f02e1c973289c27f9 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Fri, 8 Jul 2022 22:49:36 -0600
Subject: [PATCH 248/337] Fix group sync rule creation error

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fecb1a51a9..e0aab28ee7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,7 +57,7 @@
 - Fix `createAnnouncement` webhook
 - Don't cast Discord snowflakes to integers (would break on 32bit systems)
 - Fix `AssetResolver` adding an asset more than once if several assets depend on it
-- Fix TinyMCE spoiler plugin not being added properly if a custom path is set
+- Fix error when creating group sync rules with only 1 external service
 
 ### Deprecated
 *These will be removed in 2.1.0*

From 4824416dfba827789e65bb0f153dd2f5dd23c646 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Fri, 8 Jul 2022 22:50:55 -0600
Subject: [PATCH 249/337] Add note to changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0aab28ee7..c6d0c353b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,7 @@
 - Fix `createAnnouncement` webhook
 - Don't cast Discord snowflakes to integers (would break on 32bit systems)
 - Fix `AssetResolver` adding an asset more than once if several assets depend on it
+- Fix TinyMCE spoiler plugin not being added properly if a custom path is set
 - Fix error when creating group sync rules with only 1 external service
 
 ### Deprecated

From c7eddf77ab531411730b133fb70a34ef3ac75b5c Mon Sep 17 00:00:00 2001
From: namelessmc-bot <robin+namelessmc-bot-github@rkslot.nl>
Date: Fri, 8 Jul 2022 08:25:35 +0000
Subject: [PATCH 250/337] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/
---
 custom/languages/cs_CZ.json  | 1 -
 custom/languages/da_DK.json  | 1 -
 custom/languages/de_DE.json  | 1 -
 custom/languages/el_GR.json  | 1 -
 custom/languages/en_US.json  | 1 -
 custom/languages/es_419.json | 1 -
 custom/languages/es_ES.json  | 1 -
 custom/languages/fr_FR.json  | 1 -
 custom/languages/it_IT.json  | 1 -
 custom/languages/ja_JP.json  | 1 -
 custom/languages/lt_LT.json  | 1 -
 custom/languages/nl_NL.json  | 1 -
 custom/languages/no_NO.json  | 1 -
 custom/languages/pl_PL.json  | 1 -
 custom/languages/pt_BR.json  | 1 -
 custom/languages/ro_RO.json  | 1 -
 custom/languages/ru_RU.json  | 1 -
 custom/languages/sk_SK.json  | 1 -
 custom/languages/sv_SE.json  | 1 -
 custom/languages/th_TH.json  | 1 -
 custom/languages/tr_TR.json  | 1 -
 custom/languages/uk_UA.json  | 1 -
 custom/languages/zh_CN.json  | 1 -
 custom/languages/zh_TW.json  | 1 -
 24 files changed, 24 deletions(-)

diff --git a/custom/languages/cs_CZ.json b/custom/languages/cs_CZ.json
index e6bd442f92..ff5fe2fa74 100644
--- a/custom/languages/cs_CZ.json
+++ b/custom/languages/cs_CZ.json
@@ -796,7 +796,6 @@
     "installer/password": "Heslo",
     "installer/passwords_must_match": "Vaše hesla se musí shodovat.",
     "installer/pre-release": "předběžné vydání",
-    "installer/pre-release_warning": "Toto předběžné vydání není určen pro použití na veřejném webu.",
     "installer/proceed": "Pokračovat",
     "installer/reload": "Znovu načíst",
     "installer/reload_page": "Znovu načíst stránku",
diff --git a/custom/languages/da_DK.json b/custom/languages/da_DK.json
index ca22cb6ab3..74f8f8117a 100644
--- a/custom/languages/da_DK.json
+++ b/custom/languages/da_DK.json
@@ -301,7 +301,6 @@
     "installer/password": "Adgangskode",
     "installer/passwords_must_match": "Dine adgangskoder stemmer ikke overens.",
     "installer/pre-release": "pre-release",
-    "installer/pre-release_warning": "Bemærk, at denne pre-release ikke er beregnet til brug på et offentligt websted.",
     "installer/proceed": "Fortsæt",
     "installer/reload": "Genindlæs",
     "installer/reload_page": "Genindlæs side",
diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index 684e6e4028..f9365b72f3 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -768,7 +768,6 @@
     "installer/password": "Passwort",
     "installer/passwords_must_match": "Ihre Passwörter müssen übereinstimmen.",
     "installer/pre-release": "Vorab Version (Pre-Release)",
-    "installer/pre-release_warning": "Bitte beachten Sie, dass diese Vorabversion nicht für den Einsatz auf einer öffentlichen Website bestimmt ist.",
     "installer/proceed": "Fortfahren",
     "installer/reload": "Neuladen",
     "installer/reload_page": "Seite neuladen",
diff --git a/custom/languages/el_GR.json b/custom/languages/el_GR.json
index efde36c271..f652d5fed9 100644
--- a/custom/languages/el_GR.json
+++ b/custom/languages/el_GR.json
@@ -204,7 +204,6 @@
     "installer/outgoing_email": "Εξερχόμενο Email",
     "installer/passwords_must_match": "Οι κωδικοί πρόσβασης πρέπει να ταιριάζουν.",
     "installer/pre-release": "προδηµοσιεύσει",
-    "installer/pre-release_warning": "Παρακαλείστε να σημειώσετε ότι αυτή η προδηµοσιεύσει δεν προορίζεται για χρήση σε δημόσιο χώρο.",
     "installer/proceed": "συνεχίζω",
     "installer/requirements": "Απαιτήσεις:",
     "installer/requirements_error": "Πρέπει να έχετε όλες τις απαιτούμενες επεκτάσεις εγκατεστημένες, και να έχουν οριστεί σωστά δικαιώματα, προκειμένου να προχωρήσει με την εγκατάσταση.",
diff --git a/custom/languages/en_US.json b/custom/languages/en_US.json
index e6055d8c71..2f94d96b22 100644
--- a/custom/languages/en_US.json
+++ b/custom/languages/en_US.json
@@ -817,7 +817,6 @@
     "installer/password": "Password",
     "installer/passwords_must_match": "Your passwords must match.",
     "installer/pre-release": "pre-release",
-    "installer/pre-release_warning": "Please note that this pre-release is not intended for use on a public site.",
     "installer/proceed": "Proceed",
     "installer/reload": "Reload",
     "installer/reload_page": "Reload page",
diff --git a/custom/languages/es_419.json b/custom/languages/es_419.json
index 2f4903648b..5810d60fe7 100644
--- a/custom/languages/es_419.json
+++ b/custom/languages/es_419.json
@@ -781,7 +781,6 @@
     "installer/password": "Contraseña",
     "installer/passwords_must_match": "La contraseña debe coincidir.",
     "installer/pre-release": "pre-lanzamiento",
-    "installer/pre-release_warning": "Tenga en cuenta que esta versión preliminar no está diseñada para su uso en sitios públicos.",
     "installer/proceed": "Siguiente",
     "installer/reload": "Recargar",
     "installer/reload_page": "Recargar pagina",
diff --git a/custom/languages/es_ES.json b/custom/languages/es_ES.json
index 3836cf812f..aa3c3ac31b 100644
--- a/custom/languages/es_ES.json
+++ b/custom/languages/es_ES.json
@@ -798,7 +798,6 @@
     "installer/password": "Contraseña",
     "installer/passwords_must_match": "Sus contraseñas deben coincidir.",
     "installer/pre-release": "antes del lanzamiento",
-    "installer/pre-release_warning": "Tenga en cuenta que esta versión preliminar no está pensada para su uso en un sitio público.",
     "installer/proceed": "Proceder",
     "installer/reload": "Recargar",
     "installer/reload_page": "Recargar la página",
diff --git a/custom/languages/fr_FR.json b/custom/languages/fr_FR.json
index fafc96bdfa..5ce8874b0d 100644
--- a/custom/languages/fr_FR.json
+++ b/custom/languages/fr_FR.json
@@ -714,7 +714,6 @@
     "installer/outgoing_email": "Email de sortie (addresse mail d'envoie)",
     "installer/password": "Mot de passe",
     "installer/passwords_must_match": "Vos mots de passe doivent correspondre.",
-    "installer/pre-release_warning": "Veuillez noter que ce pre-release n'est pas destinée à être utilisée sur un site public.",
     "installer/proceed": "Procéder",
     "installer/requirements": "Exigences :",
     "installer/requirements_error": "Vous devez avoir installé toutes les extensions requises, et avoir les permissions correctes définies, afin de procéder à l’installation.",
diff --git a/custom/languages/it_IT.json b/custom/languages/it_IT.json
index 9cbfd5b5c9..149ad8800e 100644
--- a/custom/languages/it_IT.json
+++ b/custom/languages/it_IT.json
@@ -727,7 +727,6 @@
     "installer/password": "Password",
     "installer/passwords_must_match": "Le password devono corrispondere.",
     "installer/pre-release": "Pre-Rilascio",
-    "installer/pre-release_warning": "Si prega di notare che questo è un pre-rilascio e non è pensato per l'uso su un sito pubblico.",
     "installer/proceed": "Procedi",
     "installer/reload": "Ricarica",
     "installer/reload_page": "Ricarica la pagina",
diff --git a/custom/languages/ja_JP.json b/custom/languages/ja_JP.json
index 84b4f0fad3..de280ac45b 100644
--- a/custom/languages/ja_JP.json
+++ b/custom/languages/ja_JP.json
@@ -816,7 +816,6 @@
     "installer/password": "パスワード",
     "installer/passwords_must_match": "パスワードが一致していません。",
     "installer/pre-release": "プレリリース",
-    "installer/pre-release_warning": "このプレリリースは、公開サイトでの利用を想定していません。",
     "installer/proceed": "続行",
     "installer/reload": "再読み込み",
     "installer/reload_page": "ページを再読み込み",
diff --git a/custom/languages/lt_LT.json b/custom/languages/lt_LT.json
index 92e9222803..f3d13919ec 100644
--- a/custom/languages/lt_LT.json
+++ b/custom/languages/lt_LT.json
@@ -642,7 +642,6 @@
     "installer/password": "Slaptažodis",
     "installer/passwords_must_match": "Jūsų slaptažodžiai turi atitikti.",
     "installer/pre-release": "Išankstinis išleidimas",
-    "installer/pre-release_warning": "Atkreipkite dėmesį, kad šis išankstinis leidimas nėra skirtas naudoti viešoje svetainėje.",
     "installer/proceed": "Tęsti",
     "installer/requirements": "Reikalavimai:",
     "installer/requirements_error": "Jei norite tęsti diegimą, turite turėti visus reikalingus plėtinius ir nustatyti teisingus leidimus.",
diff --git a/custom/languages/nl_NL.json b/custom/languages/nl_NL.json
index e11dc856ac..92ead80eb6 100644
--- a/custom/languages/nl_NL.json
+++ b/custom/languages/nl_NL.json
@@ -783,7 +783,6 @@
     "installer/password": "Wachtwoord",
     "installer/passwords_must_match": "Uw wachtwoorden komen niet overeen.",
     "installer/pre-release": "pre-release",
-    "installer/pre-release_warning": "Houd er rekening mee dat deze pre-release niet voor een openbare site bedoeld is.",
     "installer/proceed": "Doorgaan",
     "installer/reload": "Herlaad",
     "installer/reload_page": "Herlaad pagina",
diff --git a/custom/languages/no_NO.json b/custom/languages/no_NO.json
index b847782d8c..2a951cacd5 100644
--- a/custom/languages/no_NO.json
+++ b/custom/languages/no_NO.json
@@ -747,7 +747,6 @@
     "installer/password": "Passord",
     "installer/passwords_must_match": "Passordene dine er ikke like.",
     "installer/pre-release": "beta-utgivelse",
-    "installer/pre-release_warning": "Husk at denne beta-utgivelsen ikke er ment for å brukes på nettsider.",
     "installer/proceed": "Fortsett",
     "installer/reload": "Last inn på nytt",
     "installer/reload_page": "Last inn siden på nytt",
diff --git a/custom/languages/pl_PL.json b/custom/languages/pl_PL.json
index 825b15ccae..c815eaf26f 100644
--- a/custom/languages/pl_PL.json
+++ b/custom/languages/pl_PL.json
@@ -775,7 +775,6 @@
     "installer/password": "Hasło",
     "installer/passwords_must_match": "Twoje hasła muszą być takie same.",
     "installer/pre-release": "wersja-testowa",
-    "installer/pre-release_warning": "Pamiętaj, że wersja pre-release nie jest przeznaczona do użytku publicznego.",
     "installer/proceed": "Kontynuuj",
     "installer/reload": "Przeładuj",
     "installer/reload_page": "Przeładuj Stronę",
diff --git a/custom/languages/pt_BR.json b/custom/languages/pt_BR.json
index ad5b4ba601..47fa4e5587 100644
--- a/custom/languages/pt_BR.json
+++ b/custom/languages/pt_BR.json
@@ -802,7 +802,6 @@
     "installer/password": "Senha",
     "installer/passwords_must_match": "Suas senhas devem corresponder.",
     "installer/pre-release": "pre-release",
-    "installer/pre-release_warning": "Por favor, note que esta pre-release não se destina ao uso em um site público.",
     "installer/proceed": "Prosseguir",
     "installer/reload": "Recarregar",
     "installer/reload_page": "Recarregar a página",
diff --git a/custom/languages/ro_RO.json b/custom/languages/ro_RO.json
index fa8ca15d45..5dba295dea 100644
--- a/custom/languages/ro_RO.json
+++ b/custom/languages/ro_RO.json
@@ -660,7 +660,6 @@
     "installer/password": "Parola",
     "installer/passwords_must_match": "Parolele dvs. trebuie să se potrivească.",
     "installer/pre-release": "pre-lansare",
-    "installer/pre-release_warning": "Rețineți că această versiune prealabilă nu este destinată utilizării pe un site public.",
     "installer/proceed": "Continuă",
     "installer/requirements": "Cerinţe:",
     "installer/requirements_error": "Trebuie să aveți instalate toate extensiile necesare și setați permisiunile corecte (permisiuni de scriere) pentru a continua instalarea.",
diff --git a/custom/languages/ru_RU.json b/custom/languages/ru_RU.json
index 936473a93c..94ab486b93 100644
--- a/custom/languages/ru_RU.json
+++ b/custom/languages/ru_RU.json
@@ -815,7 +815,6 @@
     "installer/password": "Пароль",
     "installer/passwords_must_match": "Ваши пароли должны совпадать.",
     "installer/pre-release": "предрелиз",
-    "installer/pre-release_warning": "Внимание! Эта версия не предназначена для повседневного использования.",
     "installer/proceed": "Продолжить",
     "installer/reload": "Сброс",
     "installer/reload_page": "Перезагрузить страницу",
diff --git a/custom/languages/sk_SK.json b/custom/languages/sk_SK.json
index b86a172f30..bab36f2ed3 100644
--- a/custom/languages/sk_SK.json
+++ b/custom/languages/sk_SK.json
@@ -808,7 +808,6 @@
     "installer/password": "Heslo",
     "installer/passwords_must_match": "Vaše heslá sa nezhodujú.",
     "installer/pre-release": "pre-release",
-    "installer/pre-release_warning": "Upozorňujeme, že toto predbežné vydanie nie je určené na použitie na verejnej stránke.",
     "installer/proceed": "Pokračovať",
     "installer/reload": "Znovu načítať",
     "installer/reload_page": "Znovu načítať stránku",
diff --git a/custom/languages/sv_SE.json b/custom/languages/sv_SE.json
index 41d7f76c87..d7c3ae51ef 100644
--- a/custom/languages/sv_SE.json
+++ b/custom/languages/sv_SE.json
@@ -766,7 +766,6 @@
     "installer/password": "Lösenord",
     "installer/passwords_must_match": "Dina lösenord måste matcha.",
     "installer/pre-release": "Förhands-utgivning",
-    "installer/pre-release_warning": "Kom ihåg att detta släppet är inte avsett att användas på en allmän hemsida.",
     "installer/proceed": "Fortsätt",
     "installer/reload": "Ladda om",
     "installer/reload_page": "Ladda om sidan",
diff --git a/custom/languages/th_TH.json b/custom/languages/th_TH.json
index cf4d58f722..f37ce84004 100644
--- a/custom/languages/th_TH.json
+++ b/custom/languages/th_TH.json
@@ -772,7 +772,6 @@
     "installer/password": "รหัสผ่าน",
     "installer/passwords_must_match": "รหัสผ่านของคุณต้องตรงกัน",
     "installer/pre-release": "pre-release",
-    "installer/pre-release_warning": "โปรดทราบว่ารุ่นก่อนเผยแพร่นี้ไม่ได้มีไว้สำหรับใช้บนเว็บไซต์สาธารณะ",
     "installer/proceed": "ดำเนินการ",
     "installer/reload": "โหลดซ้ำ",
     "installer/reload_page": "โหลดหน้าใหม่",
diff --git a/custom/languages/tr_TR.json b/custom/languages/tr_TR.json
index 91f8ed458b..e8761d260a 100644
--- a/custom/languages/tr_TR.json
+++ b/custom/languages/tr_TR.json
@@ -668,7 +668,6 @@
     "installer/password": "Şifre",
     "installer/passwords_must_match": "Şifreleriniz eşleşmeli",
     "installer/pre-release": "Ön sürüm",
-    "installer/pre-release_warning": "Bu ön sürümün halka açık bir sitede kullanılmak üzere tasarlanmadığını lütfen unutmayın.",
     "installer/proceed": "İlerle",
     "installer/requirements": "Gereksinimler:",
     "installer/requirements_error": "Yüklemeye devam etmek için gerekli tüm uzantıların kurulu olması ve doğru izinlerin ayarlanmış olması gerekir.",
diff --git a/custom/languages/uk_UA.json b/custom/languages/uk_UA.json
index 69f473e969..767e22b9c1 100644
--- a/custom/languages/uk_UA.json
+++ b/custom/languages/uk_UA.json
@@ -776,7 +776,6 @@
     "installer/password": "Пароль",
     "installer/passwords_must_match": "Ваші паролі мають співпадати.",
     "installer/pre-release": "Передреліз",
-    "installer/pre-release_warning": "Увага! Ця версія не призначена для повсякденного використання.",
     "installer/proceed": "Продовжити",
     "installer/reload": "Скидання",
     "installer/reload_page": "Перезавантажити сторінку",
diff --git a/custom/languages/zh_CN.json b/custom/languages/zh_CN.json
index 41a84610c1..e32d8f573d 100644
--- a/custom/languages/zh_CN.json
+++ b/custom/languages/zh_CN.json
@@ -790,7 +790,6 @@
     "installer/password": "密码",
     "installer/passwords_must_match": "您的密码必须匹配",
     "installer/pre-release": "预览版本",
-    "installer/pre-release_warning": "请注意，此预发行版不适用于公共站点。",
     "installer/proceed": "继续",
     "installer/reload": "刷新",
     "installer/reload_page": "刷新页面",
diff --git a/custom/languages/zh_TW.json b/custom/languages/zh_TW.json
index 468460729b..6f272f914a 100644
--- a/custom/languages/zh_TW.json
+++ b/custom/languages/zh_TW.json
@@ -387,7 +387,6 @@
     "installer/password": "密碼",
     "installer/passwords_must_match": "密碼不相同。",
     "installer/pre-release": "測試版",
-    "installer/pre-release_warning": "請注意! 不建議您使用此版本於正式網站。",
     "installer/proceed": "繼續",
     "installer/requirements": "必要條件:",
     "installer/requirements_error": "您必須安裝所有必要條件，並設置正確才能繼續安裝。",

From 04f0b59001ed814904df648e0753fde8511a6d83 Mon Sep 17 00:00:00 2001
From: Matthew Skrzypczak <support@earthblock.org>
Date: Fri, 8 Jul 2022 19:09:44 +0000
Subject: [PATCH 251/337] Translated using Weblate (Polish)

Currently translated at 90.7% (1113 of 1226 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/pl/
---
 custom/languages/pl_PL.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/languages/pl_PL.json b/custom/languages/pl_PL.json
index c815eaf26f..f9218f6a19 100644
--- a/custom/languages/pl_PL.json
+++ b/custom/languages/pl_PL.json
@@ -57,7 +57,7 @@
     "admin/bust": "Popiersie",
     "admin/cache_cleared": "Pamięć podręczna stylów została zresetowana",
     "admin/cache_not_writable": "Katalog <strong>cache</strong> nie jest zapisywalny.",
-    "admin/can_edit_own_group": "Nie można zmienić uprawnień własnej grupy.",
+    "admin/can_edit_own_group": "Możliwość zmiany uprawnień własnej grupy",
     "admin/can_view_announcement": "Może wyświetlić ogłoszenie",
     "admin/can_view_staffcp": "Czy grupa może używać AdminCP?",
     "admin/cant_edit_this_group": "Nie możesz edytować uprawnień tej grupy!!",

From 2f817c3b0dfe4930aff0ac64c5497a19049d54b6 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Sat, 9 Jul 2022 10:58:27 -0600
Subject: [PATCH 252/337] Add api error code for already verified integration

---
 modules/Core/classes/Misc/CoreApiErrors.php            |  1 +
 .../includes/endpoints/VerifyIntegrationEndpoint.php   | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/Core/classes/Misc/CoreApiErrors.php b/modules/Core/classes/Misc/CoreApiErrors.php
index 8a89c42e09..912c67bca9 100644
--- a/modules/Core/classes/Misc/CoreApiErrors.php
+++ b/modules/Core/classes/Misc/CoreApiErrors.php
@@ -30,6 +30,7 @@ class CoreApiErrors {
 
     public const ERROR_INVALID_INTEGRATION = 'core:invalid_integration';
     public const ERROR_INVALID_CODE = 'core:invalid_code';
+    public const ERROR_INTEGRATION_ALREADY_VERIFIED = 'core:integration_already_verified';
     public const ERROR_USER_ALREADY_ACTIVE = 'core:user_already_active';
 
     public const ERROR_UNABLE_TO_UPDATE_USERNAME = 'core:unable_to_update_username';
diff --git a/modules/Core/includes/endpoints/VerifyIntegrationEndpoint.php b/modules/Core/includes/endpoints/VerifyIntegrationEndpoint.php
index 27fd078683..54c606613f 100644
--- a/modules/Core/includes/endpoints/VerifyIntegrationEndpoint.php
+++ b/modules/Core/includes/endpoints/VerifyIntegrationEndpoint.php
@@ -27,10 +27,18 @@ public function execute(Nameless2API $api): void {
 
         // Get integration user by code
         $integrationUser = new IntegrationUser($integration, $_POST['code'], 'code');
-        if (!$integrationUser->exists() || $integrationUser->isVerified()) {
+        if (!$integrationUser->exists()) {
             $api->throwError(CoreApiErrors::ERROR_INVALID_CODE);
         }
 
+        // Should never occur, if they are verified there should be no code associated with their integration anymore
+        if ($integrationUser->isVerified()) {
+            $integrationUser->update([
+                'code' => null
+            ]);
+            $api->throwError(CoreApiErrors::ERROR_INTEGRATION_ALREADY_VERIFIED);
+        }
+
         // Validate username and make sure username is unique
         if (!$integration->validateUsername($_POST['username'], $integrationUser->data()->id)) {
             $api->throwError(CoreApiErrors::ERROR_INTEGRATION_USERNAME_ERRORS, $integration->getErrors());

From 1e543b5ae158a70be6f427700930723123aeb68f Mon Sep 17 00:00:00 2001
From: samerton <samerton@users.noreply.github.com>
Date: Sun, 10 Jul 2022 11:41:22 +0100
Subject: [PATCH 253/337] Fix issue with latest posts widget

---
 modules/Forum/classes/Forum.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/Forum/classes/Forum.php b/modules/Forum/classes/Forum.php
index b04a5cce1c..3e957ce878 100644
--- a/modules/Forum/classes/Forum.php
+++ b/modules/Forum/classes/Forum.php
@@ -248,7 +248,8 @@ public function getLatestDiscussions(array $groups = [0], int $user_id = 0): arr
                 UNION
                 (SELECT topics.id as id, topics.forum_id as forum_id, topics.topic_title as topic_title, topics.topic_creator as topic_creator, topics.topic_last_user as topic_last_user, topics.topic_date as topic_date, topics.topic_reply_date as topic_reply_date, topics.topic_views as topic_views, topics.locked as locked, topics.sticky as sticky, topics.label as label, topics.deleted as deleted, posts.id as last_post_id FROM nl2_topics topics LEFT JOIN nl2_posts posts ON topics.id = posts.topic_id AND posts.id = (SELECT MAX(id) FROM nl2_posts p WHERE p.topic_id = topics.id AND p.deleted = 0) WHERE topics.deleted = 0 AND ((topics.forum_id IN (' . $own_topics_forums_string . ') AND topics.topic_creator = ?) OR topics.sticky = 1) ORDER BY topics.topic_reply_date DESC LIMIT 50)
                 ORDER BY topic_reply_date DESC LIMIT 50',
-                [$user_id]
+                [$user_id],
+                true
             )->results();
         }
 

From 39c8a9c3a8cfc638b7692bcf7db6692e5315e690 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Sun, 10 Jul 2022 18:59:49 -0700
Subject: [PATCH 254/337] group sync fixes:tm: (#2920)

Co-authored-by: Tadhg Boyle <tadhgsmboyle@gmail.com>
Co-authored-by: DominikSLK <74055080+DominikSLK@users.noreply.github.com>
---
 CHANGELOG.md                                  |  1 +
 core/classes/Group_Sync/GroupSyncManager.php  |  7 ++--
 core/classes/Integrations/IntegrationUser.php |  3 ++
 .../includes/endpoints/AddGroupsEndpoint.php  |  4 +--
 .../endpoints/RemoveGroupsEndpoint.php        |  7 ++--
 modules/Core/pages/panel/users_edit.php       | 32 ++++++-------------
 .../Core/pages/panel/users_integrations.php   |  4 +++
 .../Discord Integration/classes/Discord.php   | 11 ++++---
 .../classes/DiscordIntegration.php            |  6 +++-
 9 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6d0c353b7..9e6bcfd665 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -59,6 +59,7 @@
 - Fix `AssetResolver` adding an asset more than once if several assets depend on it
 - Fix TinyMCE spoiler plugin not being added properly if a custom path is set
 - Fix error when creating group sync rules with only 1 external service
+- Fix website -> Discord group sync issues
 
 ### Deprecated
 *These will be removed in 2.1.0*
diff --git a/core/classes/Group_Sync/GroupSyncManager.php b/core/classes/Group_Sync/GroupSyncManager.php
index cf9d82c400..5b620a1d64 100644
--- a/core/classes/Group_Sync/GroupSyncManager.php
+++ b/core/classes/Group_Sync/GroupSyncManager.php
@@ -177,7 +177,6 @@ public function broadcastChange(User $user, string $sending_injector_class, arra
                 $injector_column = $injector->getColumnName();
                 $injector_group_id = $rule->{$injector_column};
                 $sending_group_id = $rule->{$sending_injector->getColumnName()};
-                $nameless_group_id = $rule->{$namelessmc_column};
 
                 // Skip this injector if it doesn't have a group id setup for this rule
                 if ($injector_group_id === null) {
@@ -194,10 +193,8 @@ public function broadcastChange(User $user, string $sending_injector_class, arra
                     continue;
                 }
 
-                if (
-                    in_array($sending_group_id, $group_ids)
-                    && !in_array($nameless_group_id, $user->getAllGroupIds())
-                ) {
+                if (in_array($sending_group_id, $group_ids)) {
+                    // TODO: add bot status of "nochange" @ https://canary.discord.com/channels/246705793066467328/434751012428054530/995503906350174290
                     // Attempt to add group if this group id was sent in the broadcastChange() method
                     // and if they don't have the namelessmc equivilant of it
                     if ($injector->addGroup($user, $injector_group_id)) {
diff --git a/core/classes/Integrations/IntegrationUser.php b/core/classes/Integrations/IntegrationUser.php
index 933cd4cc24..f536ae93b1 100644
--- a/core/classes/Integrations/IntegrationUser.php
+++ b/core/classes/Integrations/IntegrationUser.php
@@ -110,6 +110,9 @@ public function linkIntegration(User $user, ?string $identifier, ?string $userna
             ]
         );
 
+        // Load the data for this integration from the query we just made
+        $this->_data = new IntegrationUserData($this->_db->query('SELECT * FROM nl2_users_integrations WHERE id = ?', [$this->_db->lastId()])->first());
+
         $default_language = new Language('core', DEFAULT_LANGUAGE);
         EventHandler::executeEvent('linkIntegrationUser', [
             'integration' => $this->_integration->getName(),
diff --git a/modules/Core/includes/endpoints/AddGroupsEndpoint.php b/modules/Core/includes/endpoints/AddGroupsEndpoint.php
index 971d8c1d94..7d8c654f25 100644
--- a/modules/Core/includes/endpoints/AddGroupsEndpoint.php
+++ b/modules/Core/includes/endpoints/AddGroupsEndpoint.php
@@ -22,7 +22,6 @@ public function execute(Nameless2API $api, User $user): void {
         }
 
         $log_array = [];
-        $added_groups = [];
         foreach ($groups as $group) {
             $group_query = $api->getDb()->get('groups', ['id', $group]);
             if (!$group_query->count()) {
@@ -31,7 +30,6 @@ public function execute(Nameless2API $api, User $user): void {
             $group_query = $group_query->first();
 
             if ($user->addGroup($group, 0, $group_query)) {
-                $added_groups[] = $group;
                 $log_array['added'][] = $group_query->name;
             }
         }
@@ -39,7 +37,7 @@ public function execute(Nameless2API $api, User $user): void {
         GroupSyncManager::getInstance()->broadcastChange(
             $user,
             NamelessMCGroupSyncInjector::class,
-            $added_groups
+            $user->getAllGroupIds(),
         );
 
         $api->returnArray(array_merge(['message' => $api->getLanguage()->get('api', 'group_updated')], $log_array));
diff --git a/modules/Core/includes/endpoints/RemoveGroupsEndpoint.php b/modules/Core/includes/endpoints/RemoveGroupsEndpoint.php
index 144f883837..c68b539885 100644
--- a/modules/Core/includes/endpoints/RemoveGroupsEndpoint.php
+++ b/modules/Core/includes/endpoints/RemoveGroupsEndpoint.php
@@ -23,17 +23,14 @@ public function execute(Nameless2API $api, User $user): void {
             $api->throwError(Nameless2API::ERROR_INVALID_POST_CONTENTS);
         }
 
-        $removed_groups = [];
         foreach ($groups as $group) {
-            if ($user->removeGroup($group)) {
-                $removed_groups[] = $group;
-            }
+            $user->removeGroup($group);
         }
 
         GroupSyncManager::getInstance()->broadcastChange(
             $user,
             NamelessMCGroupSyncInjector::class,
-            $removed_groups
+            $user->getAllGroupIds(),
         );
 
         $api->returnArray(['message' => $api->getLanguage()->get('api', 'group_updated')]);
diff --git a/modules/Core/pages/panel/users_edit.php b/modules/Core/pages/panel/users_edit.php
index a40a53366f..e25cc416bd 100644
--- a/modules/Core/pages/panel/users_edit.php
+++ b/modules/Core/pages/panel/users_edit.php
@@ -173,44 +173,32 @@
                     $group_sync_log = [];
                     if ($view_user->data()->id != $user->data()->id || $user->hasPermission('admincp.groups.self')) {
                         if ($view_user->data()->id == 1 || (isset($_POST['groups']) && count($_POST['groups']))) {
-                            $modified = [];
+                            $user_group_ids = $view_user->getAllGroupIds();
+                            $form_groups = $_POST['groups'] ?? [];
 
-                            // Check for new groups to give them which they dont already have
-                            foreach ($_POST['groups'] as $group_id) {
-                                if (!in_array($group_id, $view_user->getAllGroupIds())) {
+                            // Check for new groups to give them which they don't already have
+                            foreach ($form_groups as $group_id) {
+                                if (!in_array($group_id, $user_group_ids)) {
                                     $view_user->addGroup($group_id);
-                                    $modified[] = $group_id;
                                 }
                             }
 
-                            // Check for groups they had, but werent in the $_POST groups
-                            foreach ($view_user->getAllGroupIds() as $group_id) {
-                                $form_groups = $_POST['groups'] ?? [];
+                            // Check for groups they had, but weren't in the $_POST groups
+                            foreach ($user_group_ids as $group_id) {
                                 if (!in_array($group_id, $form_groups)) {
                                     $view_user->removeGroup($group_id);
-                                    $modified[] = $group_id;
                                 }
                             }
 
-                            // Dispatch the modified groups
-                            $group_sync_log = GroupSyncManager::getInstance()->broadcastChange(
+                            // Dispatch groupsync with all of their groups
+                            GroupSyncManager::getInstance()->broadcastChange(
                                 $view_user,
                                 NamelessMCGroupSyncInjector::class,
-                                $modified
+                                $view_user->getAllGroupIds(),
                             );
                         }
                     }
 
-                    if (!count($group_sync_log)) {
-                        // TODO: more "dynamic" since we should not assume they don't have other group sync injectors installed by a module
-                        $rules = DB::getInstance()->query(
-                            'SELECT COUNT(*) AS count FROM nl2_group_sync WHERE website_group_id IN (' . implode(', ', $modified) . ') AND discord_role_id IS NOT NULL;'
-                        )->first()->count;
-                        if ($rules > 0) {
-                            Session::flash('edit_user_warnings', $language->get('admin', 'group_sync_no_results_warning'));
-                        }
-                    }
-
                     Session::flash('edit_user_success', $language->get('admin', 'user_updated_successfully'));
                     Redirect::to(URL::build('/panel/users/edit/', 'id=' . urlencode($user_query->id)));
                 } catch (Exception $e) {
diff --git a/modules/Core/pages/panel/users_integrations.php b/modules/Core/pages/panel/users_integrations.php
index a133f28c13..506fba600d 100644
--- a/modules/Core/pages/panel/users_integrations.php
+++ b/modules/Core/pages/panel/users_integrations.php
@@ -102,6 +102,10 @@
 
                             $integrationUser = new IntegrationUser($integration);
                             $integrationUser->linkIntegration($view_user, Output::getClean(Input::get('identifier')), Output::getClean(Input::get('username')), (bool) Output::getClean(Input::get('verified')), $code);
+
+                            if (Output::getClean(Input::get('verified'))) {
+                                $integrationUser->verifyIntegration();
+                            }
                         } else {
                             // Update existing integration user
                             $integrationUser->update([
diff --git a/modules/Discord Integration/classes/Discord.php b/modules/Discord Integration/classes/Discord.php
index 74913f3431..f93354e860 100644
--- a/modules/Discord Integration/classes/Discord.php	
+++ b/modules/Discord Integration/classes/Discord.php	
@@ -25,10 +25,11 @@ class Discord {
     private static Language $_discord_integration_language;
 
     /**
-     * @var array|string[] Valid responses from the Discord bot
+     * @var array Valid responses from the Discord bot
      */
-    private static array $_valid_responses = [
+    private const VALID_RESPONSES = [
         'fullsuccess',
+        'partsuccess',
         'badparameter',
         'error',
         'invguild',
@@ -71,7 +72,7 @@ public static function updateDiscordRoles(User $user, array $added, array $remov
         }
 
         if ($result == 'partsuccess') {
-            Log::getInstance()->log(Log::Action('discord/role_set'), self::getLanguageTerm('discord_bot_error_partsuccess'));
+            Log::getInstance()->log(Log::Action('discord/role_set'), self::getLanguageTerm('discord_bot_error_partsuccess'), $user->data()->id);
             return true;
         }
 
@@ -174,7 +175,7 @@ private static function discordBotRequest(string $url = '/status', ?string $body
 
         $response = $client->contents();
 
-        if (in_array($response, self::$_valid_responses)) {
+        if (in_array($response, self::VALID_RESPONSES)) {
             return $response;
         }
 
@@ -214,7 +215,7 @@ private static function parseErrors($result): array {
             ];
         }
 
-        if (in_array($result, self::$_valid_responses)) {
+        if (in_array($result, self::VALID_RESPONSES)) {
             return [self::getLanguageTerm('discord_bot_error_' . $result)];
         }
 
diff --git a/modules/Discord Integration/classes/DiscordIntegration.php b/modules/Discord Integration/classes/DiscordIntegration.php
index 068e7b18d8..f2b6ee2e66 100644
--- a/modules/Discord Integration/classes/DiscordIntegration.php	
+++ b/modules/Discord Integration/classes/DiscordIntegration.php	
@@ -50,7 +50,11 @@ public function onSuccessfulVerification(IntegrationUser $integrationUser) {
         // attempt to update their Discord roles
         $user = $integrationUser->getUser();
 
-        Discord::updateDiscordRoles($user, $user->getAllGroupIds(), []);
+        $roles = array_unique(array_map(static function ($group_id) {
+            return Discord::getDiscordRoleId(DB::getInstance(), $group_id);
+        }, $user->getAllGroupIds()));
+
+        Discord::updateDiscordRoles($user, $roles, []);
     }
 
     public function validateUsername(string $username, int $integration_user_id = 0): bool {

From e4afd5708c85648fe7c056f3fa5b60e6e0b7cb12 Mon Sep 17 00:00:00 2001
From: Robin <robin+git@rkslot.nl>
Date: Mon, 11 Jul 2022 02:07:30 +0000
Subject: [PATCH 255/337] Handle non-ascii characters in subject, SITE_NAME and
 message (#2886)

---
 core/classes/Core/Email.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/classes/Core/Email.php b/core/classes/Core/Email.php
index f64e3d9c03..e5bacb12cd 100644
--- a/core/classes/Core/Email.php
+++ b/core/classes/Core/Email.php
@@ -72,13 +72,16 @@ private static function sendPHP(array $email) {
         $outgoing_email = Util::getSetting('outgoing_email');
         $incoming_email = Util::getSetting('incoming_email');
 
-        // TODO Handle non-ascii in subject and headers (RFC 1342)
+        $encoded_subject = '=?UTF-8?B?' . base64_encode($email['subject']) . '?=';
+        $encoded_message = base64_encode($email['message']);
+        $encoded_from = '=?UTF-8?B?' . base64_encode(SITE_NAME) . '?= <' . $outgoing_email . '>';
 
-        if (mail($email['to']['email'], $email['subject'], $email['message'], [
-            'From' => SITE_NAME . ' ' . '<' . $outgoing_email . '>',
+        if (mail($email['to']['email'], $encoded_subject, $encoded_message, [
+            'From' => $encoded_from,
             'Reply-To' => $incoming_email,
             'MIME-Version' => '1.0',
-            'Content-type' => 'text/html; charset=UTF-8'
+            'Content-type' => 'text/html; charset=UTF-8',
+            'Content-Transfer-Encoding' => 'base64',
         ])) {
             return true;
         }

From b8dc0c7213108ce0bb97fed2edd76e8a9e110460 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Sun, 10 Jul 2022 20:10:27 -0600
Subject: [PATCH 256/337] Remove "advanced" event listeners, not used + messy

---
 CHANGELOG.md                         |  3 +++
 core/classes/Events/EventHandler.php | 40 ++--------------------------
 modules/Core/module.php              | 14 +++++-----
 modules/Forum/module.php             | 16 +++++------
 4 files changed, 20 insertions(+), 53 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e6bcfd665..1fd00839b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -83,6 +83,9 @@
 - `Util::renderEmojis()` is deprecated, use `Text::renderEmojis()` instead
 - `Util::bold()` is deprecated, use `Text::bold()` instead
 
+### Breaking Changes
+- "Advanced" event listeners have been removed.
+
 
 ## [2.0.0 pr-13](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr12...v2.0.0-pr13) - 2022-06-04
 > [Milestone](https://github.com/NamelessMC/Nameless/milestone/14)
diff --git a/core/classes/Events/EventHandler.php b/core/classes/Events/EventHandler.php
index c54d9d4c4c..9a24bff257 100644
--- a/core/classes/Events/EventHandler.php
+++ b/core/classes/Events/EventHandler.php
@@ -70,10 +70,9 @@ public static function registerEvent(
      *
      * @param string $event Event name to hook into (must be registered with `registerEvent()`).
      * @param callable $callback Listener callback to execute.
-     * @param bool $advanced When true, the callback will be given specific parameters as per its method declaration, otherwise it will be given the raw $params array.
      * @param int $priority Execution priority - higher gets executed first
      */
-    public static function registerListener(string $event, callable $callback, bool $advanced = false, int $priority = 10): void {
+    public static function registerListener(string $event, callable $callback, int $priority = 10): void {
         if (!isset(self::$_events[$event])) {
             // Silently create event if it doesn't exist, maybe throw exception instead?
             self::registerEvent($event, $event);
@@ -81,7 +80,6 @@ public static function registerListener(string $event, callable $callback, bool
 
         self::$_events[$event]['listeners'][] = [
             'callback' => $callback,
-            'advanced' => $advanced,
             'priority' => $priority,
         ];
     }
@@ -112,41 +110,7 @@ public static function executeEvent(string $event, array $params = []) {
             });
 
             foreach ($listeners as $listener) {
-                $callback = $listener['callback'];
-
-                if ($listener['advanced'] === false) {
-                    $response = $callback($params);
-                } else {
-                    $toPass = [];
-
-                    foreach ((new ReflectionMethod($callback))->getParameters() as $callbackParam) {
-                        if (!isset($params[$callbackParam->getName()])) {
-                            throw new InvalidArgumentException(
-                                "Callable parameter: {$callbackParam->getName()}, is not set in event params (event: $event)"
-                            );
-                        }
-
-                        if ($callbackParam->getType() != null) {
-                            $eventParamType = get_debug_type($params[$callbackParam->getName()]);
-
-                            if ($callbackParam->getType()->getName() != $eventParamType) {
-                                throw new InvalidArgumentException(
-                                    "{$callbackParam->getName()} expected to be {$callbackParam->getType()->getName()}, but found: $eventParamType"
-                                );
-                            }
-
-                            if (!$callbackParam->getType()->isBuiltin()) {
-                                throw new InvalidArgumentException(
-                                    "Callable parameter must be a built-in type, parameter {$callbackParam->getName()} expects: {$callbackParam->getType()->getName()}"
-                                );
-                            }
-                        }
-
-                        $toPass[] = $params[$callbackParam->getName()];
-                    }
-
-                    $response = $callback(...$toPass);
-                }
+                $response = $listener['callback']($params);
 
                 if (self::$_events[$event]['shouldReturn'] && $response) {
                     $params = $response;
diff --git a/modules/Core/module.php b/modules/Core/module.php
index 0067d2eda0..ab0cbf1181 100644
--- a/modules/Core/module.php
+++ b/modules/Core/module.php
@@ -543,15 +543,15 @@ public function __construct(Language $language, Pages $pages, User $user, Naviga
 
         // TODO: Use [class, 'method'] callable syntax
         EventHandler::registerListener('renderPrivateMessage', 'ContentHook::purify');
-        EventHandler::registerListener('renderPrivateMessage', 'ContentHook::codeTransform', false, 15);
-        EventHandler::registerListener('renderPrivateMessage', 'ContentHook::decode', false, 20);
-        EventHandler::registerListener('renderPrivateMessage', 'ContentHook::renderEmojis', false, 10);
-        EventHandler::registerListener('renderPrivateMessage', 'ContentHook::replaceAnchors', false, 15);
+        EventHandler::registerListener('renderPrivateMessage', 'ContentHook::codeTransform', 15);
+        EventHandler::registerListener('renderPrivateMessage', 'ContentHook::decode', 20);
+        EventHandler::registerListener('renderPrivateMessage', 'ContentHook::renderEmojis', 10);
+        EventHandler::registerListener('renderPrivateMessage', 'ContentHook::replaceAnchors', 15);
 
         EventHandler::registerListener('renderPrivateMessageEdit', 'ContentHook::purify');
-        EventHandler::registerListener('renderPrivateMessageEdit', 'ContentHook::codeTransform', false, 15);
-        EventHandler::registerListener('renderPrivateMessageEdit', 'ContentHook::decode', false, 20);
-        EventHandler::registerListener('renderPrivateMessageEdit', 'ContentHook::replaceAnchors', false, 15);
+        EventHandler::registerListener('renderPrivateMessageEdit', 'ContentHook::codeTransform', 15);
+        EventHandler::registerListener('renderPrivateMessageEdit', 'ContentHook::decode', 20);
+        EventHandler::registerListener('renderPrivateMessageEdit', 'ContentHook::replaceAnchors', 15);
 
         EventHandler::registerListener('cloneGroup', 'CloneGroupHook::execute');
 
diff --git a/modules/Forum/module.php b/modules/Forum/module.php
index 1e5a556716..047940dae1 100644
--- a/modules/Forum/module.php
+++ b/modules/Forum/module.php
@@ -165,16 +165,16 @@ public function __construct(Language $language, Language $forum_language, Pages
         EventHandler::registerListener('preTopicEdit', 'MentionsHook::preEdit');
 
         EventHandler::registerListener('renderPost', 'ContentHook::purify');
-        EventHandler::registerListener('renderPost', 'ContentHook::codeTransform', false, 15);
-        EventHandler::registerListener('renderPost', 'ContentHook::decode', false, 20);
-        EventHandler::registerListener('renderPost', 'ContentHook::renderEmojis', false, 10);
-        EventHandler::registerListener('renderPost', 'ContentHook::replaceAnchors', false, 15);
-        EventHandler::registerListener('renderPost', 'MentionsHook::parsePost', false, 5);
+        EventHandler::registerListener('renderPost', 'ContentHook::codeTransform', 15);
+        EventHandler::registerListener('renderPost', 'ContentHook::decode', 20);
+        EventHandler::registerListener('renderPost', 'ContentHook::renderEmojis', 10);
+        EventHandler::registerListener('renderPost', 'ContentHook::replaceAnchors', 15);
+        EventHandler::registerListener('renderPost', 'MentionsHook::parsePost', 5);
 
         EventHandler::registerListener('renderPostEdit', 'ContentHook::purify');
-        EventHandler::registerListener('renderPostEdit', 'ContentHook::codeTransform', false, 15);
-        EventHandler::registerListener('renderPostEdit', 'ContentHook::decode', false, 20);
-        EventHandler::registerListener('renderPostEdit', 'ContentHook::replaceAnchors', false, 15);
+        EventHandler::registerListener('renderPostEdit', 'ContentHook::codeTransform', 15);
+        EventHandler::registerListener('renderPostEdit', 'ContentHook::decode', 20);
+        EventHandler::registerListener('renderPostEdit', 'ContentHook::replaceAnchors', 15);
 
         EventHandler::registerListener('cloneGroup', 'CloneGroupForumHook::execute');
     }

From eca3fe20568e8918e6e3fc7727157bd717819fc0 Mon Sep 17 00:00:00 2001
From: samerton <samerton@users.noreply.github.com>
Date: Mon, 11 Jul 2022 20:51:29 +0100
Subject: [PATCH 257/337] Add tab initialisation back

---
 custom/templates/DefaultRevamp/js/core/core.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/custom/templates/DefaultRevamp/js/core/core.js b/custom/templates/DefaultRevamp/js/core/core.js
index 5e59ecccb6..2f1fae7ea5 100755
--- a/custom/templates/DefaultRevamp/js/core/core.js
+++ b/custom/templates/DefaultRevamp/js/core/core.js
@@ -49,6 +49,8 @@ $(function () {
         $(this).closest('.message').transition('fade');
     });
 
+    $('.menu .item').tab();
+
 });
 
 $(function () {

From 42494094e03d6d20a47c0c571d76e8772a9b6d57 Mon Sep 17 00:00:00 2001
From: TeemoCell <11705513+TeemoCell@users.noreply.github.com>
Date: Tue, 12 Jul 2022 21:15:58 +0200
Subject: [PATCH 258/337] Update template.php (#2925)

---
 custom/panel_templates/Default/template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/panel_templates/Default/template.php b/custom/panel_templates/Default/template.php
index d521be449a..3de3e4022f 100644
--- a/custom/panel_templates/Default/template.php
+++ b/custom/panel_templates/Default/template.php
@@ -51,7 +51,7 @@ public function __construct(Smarty $smarty, Language $language) {
                 // Dark and light theme switch
                 var currentPanelTheme = $.cookie("nmc_panel_theme");
 
-                if (currentPanelTheme === null) {
+                if (currentPanelTheme == null) {
                     $.cookie("nmc_panel_theme", "light", { path: "/" });
                 } else {
                     if (currentPanelTheme == "dark") {

From eb253fccaad8deaa9f483b1d3eddb1a83486b3a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Loskot?= <fjuro@seznam.cz>
Date: Sat, 9 Jul 2022 09:16:09 +0000
Subject: [PATCH 259/337] Translated using Weblate (Czech)

Currently translated at 100.0% (1226 of 1226 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/cs/
---
 custom/languages/cs_CZ.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/custom/languages/cs_CZ.json b/custom/languages/cs_CZ.json
index ff5fe2fa74..c4c72268f0 100644
--- a/custom/languages/cs_CZ.json
+++ b/custom/languages/cs_CZ.json
@@ -1223,5 +1223,6 @@
     "admin/trusted_proxies_not_configured": "{{linkStart}}Důvěryhodné sítě proxy{{linkEnd}} nejsou nastaveny, IP bany nemusí správně fungovat.",
     "admin/debugging_enabled": "Ladění je povoleno, nepovoleným návštěvníkům mohou být zobrazeny citlivé informacy. Ladění by mělo být použito pouze při vývoji, ne na veřejných webech.",
     "admin/https_port_80": "Vypadá to, že používáte HTTPS na portu 80, což nejspíše není pravda. Pokud používáte Cloudflare, nezapomeňte nastavit šifrování TLS na Full (strict). Pokud máte svou vlastní síť proxy, nastavte ji tak, aby posílala hlavičku X-Forwarded-Port.",
-    "admin/group_sync_no_results_warning": "Pravidla synchronizace skupin jsou nastavena, ale nebyly nahlášeny žádné změny. Toto může znamenat nesprávné nastavení."
+    "admin/group_sync_no_results_warning": "Pravidla synchronizace skupin jsou nastavena, ale nebyly nahlášeny žádné změny. Toto může znamenat nesprávné nastavení.",
+    "user/avatar_set_successfully": "Avatar úspěšně nastaven."
 }

From 79b2ae4b75f86918aa15af517923f184ef7d1ad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonathan=20H=C3=B8jgaard?= <YodaZen05@gmail.com>
Date: Sat, 9 Jul 2022 17:44:36 +0000
Subject: [PATCH 260/337] Translated using Weblate (Danish)

Currently translated at 60.8% (746 of 1226 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/da/
---
 custom/languages/da_DK.json | 170 ++++++++++++++++++++++++++++++++++--
 1 file changed, 163 insertions(+), 7 deletions(-)

diff --git a/custom/languages/da_DK.json b/custom/languages/da_DK.json
index 74f8f8117a..e680103bd2 100644
--- a/custom/languages/da_DK.json
+++ b/custom/languages/da_DK.json
@@ -22,18 +22,18 @@
     "admin/deactivate": "Deaktiver",
     "admin/default_avatar": "Standard Avatar",
     "admin/default_language": "Standard Sprog",
-    "admin/default_language_help": "Brugere vil være i stand til at vælge mellem installerede sprog.",
+    "admin/default_language_help": "Brugere vil være i stand til at vælge mellem alle installerede sprog. {{docLinkStart}}Læs mere »{{docLinkEnd}}",
     "admin/default_timezone": "Standard Tidszone",
     "admin/delete_email_error": "Slet fejl",
     "admin/delete_group": "Slet Gruppe",
     "admin/details": "Detaljer",
     "admin/disable": "Deaktiver",
     "admin/disabled": "Deaktiveret",
-    "admin/dropdown_name": "Dropdown Name",
-    "admin/editing_messages": "Redigerer Beskeder",
-    "admin/editing_profile_field": "Redigerer Profilfelt",
-    "admin/editing_reaction": "Redigerer Reaktion",
-    "admin/editing_user_x": "Redigerer bruger {{user}}",
+    "admin/dropdown_name": "Dropdown Navn",
+    "admin/editing_messages": "Redigering af Beskeder",
+    "admin/editing_profile_field": "Redigering af Profilfelt",
+    "admin/editing_reaction": "Redigering af Reaktioner",
+    "admin/editing_user_x": "Redigering af Bruger {{user}}",
     "admin/email_errors": "E-mail Fejl",
     "admin/email_errors_logged": "E-mail fejl er blevet logget",
     "admin/email_message_greeting": "Hilsen",
@@ -598,5 +598,161 @@
     "user/x_reactions": "{{count}} reaktioner",
     "user/x_replies": "{{author}} svar",
     "user/you_have_been_banned": "Du er blevet udelukket!",
-    "user/you_have_received_a_warning": "Du har modtaget en advarsel!"
+    "user/you_have_received_a_warning": "Du har modtaget en advarsel!",
+    "admin/api_url": "API URL",
+    "admin/api_verification": "Aktiver API-bekræftelse?",
+    "admin/captcha_secret_key": "Captcha Hemmelig Nøgle",
+    "admin/captcha_site_key": "Captcha Webstedsnøgle",
+    "admin/captcha_type": "Captcha Type",
+    "admin/check_again": "Tjek igen",
+    "admin/delete": "Slet",
+    "admin/admin_dir_still_exists": "Advarsel! Mappen /modules/Core/pages/admin eksisterer stadig. Fjern venligst denne mappe.",
+    "admin/cloning_group": "Kloner gruppe {{group}}",
+    "admin/account_verification": "Minecraft kontobekræftelse",
+    "admin/at_least_one_external": "Indtast venligst mindst 1 ekstern gruppe (Minecraft eller Discord)",
+    "admin/enable_mailer_help": "Hvis aktiveret, vil e-mails blive sendt med PHPMailer i stedet for systemets standard. Dette kan hjælpe med levering, men kræver, at du konfigurerer en SMTP-udbyder. {{docLinkStart}}Læs mere »{{docLinkEnd}}",
+    "admin/use_external_mail_server": "Brug ekstern mailserver",
+    "admin/debug_link_info": "Vigtigt - del kun dette link med personer, du stoler på!",
+    "admin/editing_template_x": "Redigering af skabelon {{template}}",
+    "admin/editing_widget_x": "Redigering af widget {{widget}}",
+    "admin/email_errors_purged_successfully": "E-mail fejl er blevet slettet.",
+    "admin/email_logs": "Masse E-mails",
+    "admin/email_password_hidden": "Adgangskoden vises ikke af sikkerhedsmæssige årsager.",
+    "admin/email_port": "Port",
+    "admin/email_resend_failed": "E-mail gensend mislykkedes. Tjek venligst dine e-mail indstillinger.",
+    "admin/email_resent_successfully": "E-mail blev sendt igen.",
+    "admin/email_settings_updated_successfully": "E-mail indstillinger er blevet opdateret.",
+    "admin/emails": "E-mails",
+    "admin/emails_mass_message": "E-mail massebesked",
+    "admin/emails_mass_message_replacements": "Du kan bruge variabler i din e-mail. Understøttede variabler: {username}, {sitename}",
+    "admin/enable_authme": "Aktiver AuthMe-integration?",
+    "admin/enable_debug_mode": "Aktiver fejlretningstilstand?",
+    "admin/enable_maintenance_mode": "Aktiver vedligeholdelsestilstand?",
+    "admin/enable_nicknames_on_registration": "Vil du aktivere kaldenavne for at registrere brugere?",
+    "admin/user_group_added_hook_info": "Brugergruppe tilføjet",
+    "admin/user_group_removed_hook_info": "Brugergruppe fjernet",
+    "admin/acp_logins": "PersonaleCP logins",
+    "admin/action_info": "Handlingsinfo",
+    "admin/action": "Handling",
+    "admin/add_server": "Tilføj Server",
+    "admin/adding_server": "Tilføjelse af Server",
+    "admin/administrator": "Administrator",
+    "admin/all_logs": "Alle Logs",
+    "admin/announcement_hook_info": "Oprettelse af annoncering",
+    "admin/announcement_info": "Opret meddelelser for at vise en besked til bestemte grupper på bestemte sider på din hjemmeside.",
+    "admin/announcement_order": "Rækkefølge",
+    "admin/announcements": "Meddelelser",
+    "admin/api": "API",
+    "admin/api_endpoints": "API-endepunkter",
+    "admin/api_info": "API'en tillader plugins og andre tjenester at interagere med din hjemmeside, såsom det {{pluginLinkStart}}officielle Nameless plugin{{pluginLinkEnd}} og den {{botLinkStart}}officielle NamelessMC Discord Bot{{botLinkEnd}}.",
+    "admin/api_key": "API Nøgle",
+    "admin/api_key_regenerated": "API-nøglen er blevet gendannet.",
+    "admin/api_registration_email": "API Registrerings E-mail",
+    "admin/api_settings_updated_successfully": "API-indstillinger blev opdateret.",
+    "admin/authme_db_address": "AuthMe Databaseadresse",
+    "admin/authme_db_name": "AuthMe Databasenavn",
+    "admin/authme_db_password": "AuthMe Database Adgangskode",
+    "admin/authme_db_password_hidden": "AuthMe Databasens adgangskode er skjult af sikkerhedsmæssige årsager.",
+    "admin/authme_db_port": "AuthMe Database Port",
+    "admin/authme_db_user": "AuthMe Database Brugernavn",
+    "admin/authme_hash_algorithm": "AuthMe Hashing Algoritme",
+    "admin/authme_integration": "AuthMe Integration",
+    "admin/authme_integration_info": "Når AuthMe Integration er aktiveret, kan brugere kun registrere i spillet.",
+    "admin/authme_password_sync": "Synkronisere AuthMe Adgangskode?",
+    "admin/authme_password_sync_help": "Hvis det er aktiveret, vil adgangskoden også blive opdateret på hjemmesiden, når en brugers adgangskode opdateres i spillet.",
+    "admin/avatar_settings_updated_successfully": "Avatarindstillingerne blev opdateret.",
+    "admin/average_players": "Gennemsnitlige spillere",
+    "admin/background_colour": "Baggrundsfarve",
+    "admin/background_colour_required": "Baggrundsfarve er påkrævet",
+    "admin/ban_hook_info": "Bruger udelukket",
+    "admin/banner_image_x": "Banner billede:{{imageName}}",
+    "admin/creating_announcement_failure": "Oprettelse af meddelelse mislykkedes.",
+    "admin/enable_username_sync": "Aktiver brugernavn synkronisering?",
+    "admin/delete_hook_info": "Sletning af Bruger",
+    "admin/description": "Beskrivelse",
+    "admin/description_max_500": "Beskrivelsen må højst være på 500 tegn.",
+    "admin/deselect_all": "Fravælg alle",
+    "admin/display_field_on_forum": "Vis felt på forum?",
+    "admin/download": "Download",
+    "admin/download_sitemap": "Download Sitemap",
+    "admin/downloads_x": "Downloads: {{downloads}}",
+    "admin/drag_files_here": "Træk filer hertil for at uploade.",
+    "admin/dropdown_items": "Dropdown Elementer",
+    "admin/editable": "Redigerbar",
+    "admin/edit_email_messages": "Email Beskeder",
+    "admin/editing_announcement": "Redigering af meddelelse",
+    "admin/debug_link_toast": "Kopieret fejlretningslink til din udklipsholder!<br>Se fejlretningsloggen: {{linkStart}}her{{linkEnd}}",
+    "admin/administrator_permission_info": "Medlemmer med denne tilladelse vil have alle tilladelser. Dette er en farlig tilladelse at give.",
+    "admin/announcement_icon_instructions": "Du kan også tilføje et ikon til hver meddelelse her, for eksempel ved at bruge {{faLink}} eller {{semLink}}.",
+    "admin/api_endpoints_info": "API-endepunkter giver moduler mulighed for at skabe måder, hvorpå eksterne applikationer (såsom Minecraft og Discord) kan interagere med din NamelessMC-hjemmeside. Se API-dokumentationen {{docLinkStart}}her{{docLinkEnd}}",
+    "admin/api_verification_info": "Hvis det er aktiveret, kan konti kun verificeres gennem API'en, for eksempel i spillet ved hjælp af det officielle Nameless plugin. Denne mulighed vil tilsidesætte e-mail bekræftelse, og konti aktiveres automatisk!\\nDu bør konfigurere din standardgruppe til at have begrænsede tilladelser, og derefter opdatere gruppen efter validering i StaffCP -> Konfiguration -> Registrering fanen, til den fulde medlemsgruppe med normale tilladelser.",
+    "admin/banner_background": "Banner baggrund",
+    "admin/banner_updated_successfully": "Banneret blev opdateret. Det kan tage et stykke tid, før dine ændringer træder i kraft.",
+    "admin/captcha_login": "Aktiver Captcha på login-siden?",
+    "admin/confirm_delete_page": "Er du sikker på, at du vil slette denne side?",
+    "admin/confirm_group_deletion": "Er du sikker på, at du vil slette denne gruppe {{group}}?",
+    "admin/creating_announcement": "Oprettelse af meddelelse",
+    "admin/email_language_info": "Kan du ikke se dit sprog? Sørg for, at dens sprogfil er skrivbar af din hjemmeside i /custom/languages/.",
+    "admin/email_port_invalid": "Indsæt venligst en gyldig e-mail port.",
+    "admin/emails_mass_message_loading": "Indlæser... Lad være med at genindlæse siden. Dette kan tage et stykke tid.",
+    "admin/enable_minecraft_integration": "Vil du aktivere Minecraft-integration?",
+    "admin/enable_placeholders": "Aktiver Placeholders?",
+    "admin/enable_status_query": "Aktiver status query?",
+    "admin/basic_page": "Grundlæggende side?",
+    "admin/bedrock": "Bedrock?",
+    "admin/bedrock_help": "Vælg denne mulighed, hvis serveren er en Bedrock-server.",
+    "admin/bungee_instance_help": "Vælg denne mulighed, hvis serveren er en BungeeCord-instans.",
+    "admin/cache_cleared": "Skabeloncachen er ryddet",
+    "admin/cache_not_writable": "Cache-mappen er ikke skrivbar.",
+    "admin/can_edit_own_group": "Kan redigere egen gruppes tilladelser",
+    "admin/can_unlink": "Kan fjerne link",
+    "admin/can_unlink_integration": "Kan fjerne integrations link?",
+    "admin/can_view_announcement": "Kan se meddelelsen",
+    "admin/can_view_staffcp": "Kan gruppen se PersonaleCP?",
+    "admin/cant_edit_this_group": "Du kan ikke redigere denne gruppes tilladelser!",
+    "admin/cant_modify_root_user": "Kan ikke ændre denne brugers hovedgruppe!",
+    "admin/cant_write_to_template": "Kan ikke skrive til skabelonfil! Tjek venligst filtilladelser.",
+    "admin/captcha_general": "Aktiver Captcha på registreringssiden?",
+    "admin/clear_cache": "Ryd skabeloncache",
+    "admin/closable": "Kan lukkes",
+    "admin/config_not_writable": "Din core/config.php fil er ikke skrivbar. Tjek venligst filtilladelser.",
+    "admin/confirm_api_regen": "Er du sikker på, at du vil genskabe din API-nøgle?",
+    "admin/confirm_delete_reaction": "Er du sikker på, at du vil slette denne reaktion?",
+    "admin/confirm_delete_server": "Er du sikker på, at du vil slette denne server?",
+    "admin/confirm_delete_template": "Er du sikker på, at du vil slette denne skabelon?",
+    "admin/confirm_leave_site": "Du er ved at forlade denne side! Er du sikker på, at du vil besøge {{link}}?",
+    "admin/confirm_purge_errors": "Er du sikker på, at du vil slette alle fejl?",
+    "admin/confirm_query_error_deletion": "Er du sikker på at du vil slette denne Query fejl?",
+    "admin/confirm_user_deletion": "Er du sikker på, at du vil slette brugeren {{user}}?",
+    "admin/copy": "Kopier",
+    "admin/creating_announcement_success": "Meddelelsen blev oprettet.",
+    "admin/creating_group": "Oprettelse af ny gruppe",
+    "admin/creating_new_hook": "Oprettelse af ny webhook",
+    "admin/creating_new_page": "Opretter side",
+    "admin/current_version_x": "Nuværende version: {{version}}",
+    "admin/custom_fields": "Brugerdefinerede Profilfelter",
+    "admin/custom_pages": "Brugerdefinerede Sider",
+    "admin/custom_content": "Tilpasset indhold",
+    "admin/dark_mode": "Mørk tilstand",
+    "admin/date": "Dato",
+    "admin/debug_link": "Fejlretningslink",
+    "admin/default_server": "Standardserver",
+    "admin/default_template_set": "Standardskabelonen blev sat til {{template}}.",
+    "admin/debugging_and_maintenance": "Fejlretning & Vedligeholdelse",
+    "admin/debugging_settings_updated_successfully": "Indstillinger for fejlretning blev opdateret.",
+    "admin/default": "Standard",
+    "admin/default_group": "Er gruppen standardgruppen (for nye brugere)?",
+    "admin/delete_user": "Slet bruger",
+    "admin/deleted_announcement_success": "Meddelelsen blev slettet.",
+    "admin/editing_announcement_failure": "Opdatering af meddelelse mislykkedes.",
+    "admin/editing_announcement_success": "Meddelelsen blev opdateret.",
+    "admin/delete_hook": "Er du sikker på, at du vil slette denne hook?",
+    "admin/editing_language": "Redigering af Sprog",
+    "admin/editing_page_x": "Redigering af Side {{page}}",
+    "admin/editing_hook": "Redigering af Webhook",
+    "admin/editing_integration_for_x": "Redigering af {{integration}} integration for {{user}}",
+    "admin/editing_integration_x": "Redigering af integration {{integration}}",
+    "admin/editing_template_file_in_template": "Redigering af fil {{file}} i skabelon {{template}}",
+    "admin/editing_server": "Redigering af Server",
+    "admin/enable_api": "Aktiver API?"
 }

From e1fb8d650a57dc1657b94adac1f8e71659627b29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonathan=20H=C3=B8jgaard?= <YodaZen05@gmail.com>
Date: Sat, 9 Jul 2022 18:37:39 +0000
Subject: [PATCH 261/337] Translated using Weblate (Danish)

Currently translated at 92.1% (47 of 51 strings)

Translation: NamelessMC/Website - Discord Integration
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-discord-integration/da/
---
 .../Discord Integration/language/da_DK.json   | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/modules/Discord Integration/language/da_DK.json b/modules/Discord Integration/language/da_DK.json
index 520536e167..efe327990c 100644
--- a/modules/Discord Integration/language/da_DK.json	
+++ b/modules/Discord Integration/language/da_DK.json	
@@ -21,5 +21,29 @@
     "discord_integration/unable_to_set_discord_id": "Discord ID kan ikke angives.",
     "discord_integration/unable_to_update_discord_bot_username": "Kunne ikke opdatere Discord bot brugernavn.",
     "discord_integration/unable_to_update_discord_roles": "Kunne ikke opdatere Discord rollelisten.",
-    "discord_integration/unable_to_update_discord_username": "Discord brugernavn kunne ikke opdateres."
+    "discord_integration/unable_to_update_discord_username": "Discord brugernavn kunne ikke opdateres.",
+    "discord_integration/discord_id_required": "Indtast venligst dit Discord Server ID.",
+    "discord_integration/discord_integration_not_setup": "Discord-integration er ikke sat op",
+    "discord_integration/discord": "Discord",
+    "discord_integration/discord_bot_check_logs": "Du bør tjekke for en mere specifik fejl (hvis der findes en) i StaffCP -> Security-> All Logs.",
+    "discord_integration/discord_bot_error_badparameter": "Ugyldig anmodningstekst.",
+    "discord_integration/discord_bot_error_error": "Der opstod en intern bot-fejl.",
+    "discord_integration/discord_bot_error_invrole": "Angivet Rolle ID er ugyldigt.",
+    "discord_integration/discord_bot_error_invuser": "Angivet Bruger ID er ugyldigt, eller ikke er i specificeret Guild.",
+    "discord_integration/discord_bot_error_notlinked": "Botten er ikke knyttet til denne hjemmeside med givet Guild ID.",
+    "discord_integration/discord_bot_error_unauthorized": "Hjemmesidens API-nøgle er ugyldig",
+    "discord_integration/discord_bot_must_be_setup": "Kan ikke aktivere Discord-integration, før du har konfigureret botten. For information, klik venligst {{linkStart}}her{{linkEnd}}.",
+    "discord_integration/discord_bot_setup": "Er Botten sat op?",
+    "discord_integration/discord_guild_id": "Discord Server ID",
+    "discord_integration/discord_id_confirm": "Brug venligst kommandoen \"/verify {{token}}\" på Discord for at afslutte tilknytningen af din Discord-konto.",
+    "discord_integration/discord_id_length": "Sørg for, at dit Discord Server ID er på 18 tegn.",
+    "discord_integration/discord_id_numeric": "Sørg for, at dit Discord-server-id er numerisk (Kun Numre).",
+    "discord_integration/discord_invite_info": "For at invitere Nameless Link-botten til din Discord-server skal du klikke {{inviteLinkStart}}her{{inviteLinkEnd}}. Brug derefter kommandoen {{command}} for at linke botten til din hjemmeside. Alternativt kan du selv {{selfHostLinkStart}}hoste botten {{selfHostLinkEnd}.",
+    "discord_integration/discord_role_id": "Discord Rolle ID",
+    "discord_integration/discord_username": "Discord Brugernavn",
+    "discord_integration/discord_user_id": "Discord Bruger ID",
+    "discord_integration/discord_role_id_length": "Discord Rolle ID skal være på 18 cifre.",
+    "discord_integration/discord_role_id_numeric": "Discord Rolle ID skal være numerisk.",
+    "discord_integration/discord_bot_error_invguild": "Angivet Guild ID er ugyldigt, eller er botten ikke i Guilden.",
+    "discord_integration/discord_bot_error_partsuccess": "Botten kunne ikke redigere en eller flere af rollerne på grund af en fejlkonfiguration af Discord-hierarki."
 }

From c8a874c4f3f6d4c51d162d3a18401bf1dc421fca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonathan=20H=C3=B8jgaard?= <YodaZen05@gmail.com>
Date: Sat, 9 Jul 2022 17:33:41 +0000
Subject: [PATCH 262/337] Translated using Weblate (Danish)

Currently translated at 100.0% (11 of 11 strings)

Translation: NamelessMC/Website - Cookie Consent
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/cookie-consent/da/
---
 modules/Cookie Consent/language/da_DK.json | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/Cookie Consent/language/da_DK.json b/modules/Cookie Consent/language/da_DK.json
index 0967ef424b..1cccfba3d4 100644
--- a/modules/Cookie Consent/language/da_DK.json	
+++ b/modules/Cookie Consent/language/da_DK.json	
@@ -1 +1,13 @@
-{}
+{
+    "cookie/configure_cookies": "Konfigurer cookies",
+    "cookie/cookie_notice": "Cookie-meddelelse",
+    "cookie/cookie_notice_error": "Indtast venligst en cookie-meddelelse, på højst 10.000 tegn.",
+    "cookie/cookie_notice_info": "Denne widget kræver cookies",
+    "cookie/cookie_notice_success": "Cookie-meddelelse blev opdateret.",
+    "cookie/cookie_popup": "Denne hjemmeside bruger cookies til at forbedre din browseroplevelse.",
+    "cookie/cookie_popup_allow": "Tillad cookies",
+    "cookie/cookie_popup_disallow": "Tillad ikke cookies",
+    "cookie/cookie_popup_more_info": "Mere information",
+    "cookie/cookies": "Cookies",
+    "cookie/update_settings": "Vis Cookie Popup"
+}

From 4a2ac4b6638207a899e29efb2c145ab2db9ca071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tofalvy-Ger=C3=A9nyi=20Istv=C3=A1n?= <sorry125465@gmail.com>
Date: Sat, 9 Jul 2022 11:07:33 +0000
Subject: [PATCH 263/337] Translated using Weblate (Hungarian)

Currently translated at 7.3% (90 of 1226 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/hu/
---
 custom/languages/hu_HU.json | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/custom/languages/hu_HU.json b/custom/languages/hu_HU.json
index 99e1af350a..a677046594 100644
--- a/custom/languages/hu_HU.json
+++ b/custom/languages/hu_HU.json
@@ -71,5 +71,25 @@
     "admin/background_colour": "Átlagos játékosok",
     "admin/banner_updated_successfully": "A banner sikeresen frissítve. Eltarthat egy ideig, amíg a módosítások életbe lépnek.",
     "admin/cant_edit_this_group": "Nem szerkesztheted ennek a csoportnak az engedélyeit!",
-    "admin/captcha_general": "Engedélyezed a Captchát a regisztrációs oldalon?"
+    "admin/captcha_general": "Engedélyezed a Captchát a regisztrációs oldalon?",
+    "admin/config_not_writable": "A core/config.php fájlod nem írható. Nézd meg a fájl engedélyét.",
+    "admin/configuration": "Beállítás",
+    "admin/captcha_login": "Bekapcsolod a Captcha-t a bejelentkezési oldalon?",
+    "admin/captcha_secret_key": "Captcha Titkos Kulcs",
+    "admin/captcha_site_key": "Captcha Site Kulcs",
+    "admin/captcha_type": "Captcha Típusa",
+    "admin/check_again": "Próbáld újra",
+    "admin/clear_cache": "Sablon Gyorsítótár Törlése",
+    "admin/closable": "Bezárható",
+    "admin/confirm_api_regen": "Biztosan újra akarod generálni az API kulcsod?",
+    "admin/confirm_delete_page": "Biztosan törölni akarod ezt az oldalt?",
+    "admin/confirm_delete_reaction": "Biztosan törölni akarod ezt a reakciót?",
+    "admin/confirm_delete_server": "Biztosan törölni akarod ezt a szervert?",
+    "admin/confirm_delete_template": "Biztosan törölni akarod ezt a sablont?",
+    "admin/confirm_email_error_deletion": "Biztosan törölni akarod ezt a hibát?",
+    "admin/confirm_group_deletion": "Biztosan törölni akarod a {{group}} csoportot?",
+    "admin/confirm_leave_site": "El fogod hagyni az oldalt! Biztosan tovább akarsz menni ide: {{link}}?",
+    "admin/confirm_purge_errors": "Biztosan törölni akarod az összes hibát?",
+    "admin/confirm_query_error_deletion": "Biztosan törölni akarod ezt a lekérdező hibát?",
+    "admin/confirm_user_deletion": "Biztosan törölni akarod {{user}} felhasználót?"
 }

From e5980035729d47ce2e41326810fd5614098b3737 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Wed, 13 Jul 2022 21:03:56 -0600
Subject: [PATCH 264/337] Create ko_KR.json

---
 custom/languages/ko_KR.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 custom/languages/ko_KR.json

diff --git a/custom/languages/ko_KR.json b/custom/languages/ko_KR.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/custom/languages/ko_KR.json
@@ -0,0 +1 @@
+{}

From 1bd3d5e1946a12740851369e02afb5a983a33670 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Thu, 14 Jul 2022 08:28:46 -0700
Subject: [PATCH 265/337] Add ko_KR to language array

---
 core/classes/Core/Language.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/classes/Core/Language.php b/core/classes/Core/Language.php
index 9b68f7ff3c..f85b3fb419 100644
--- a/core/classes/Core/Language.php
+++ b/core/classes/Core/Language.php
@@ -124,6 +124,10 @@ class Language {
             'name' => 'Ukrainian',
             'htmlCode' => 'uk',
         ],
+        'ko_KR' => [
+            'name' => 'Korean (Korea)',
+            'htmlCode' => 'ko',
+        ],
     ];
 
     /**

From 9e21abe12bf3c43fc70497d5bc516d6c67e93d47 Mon Sep 17 00:00:00 2001
From: Maiu <maiuxd77@gmail.com>
Date: Fri, 15 Jul 2022 08:27:07 +0000
Subject: [PATCH 266/337] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 85.4% (1048 of 1226 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/nb_NO/
---
 custom/languages/no_NO.json | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/custom/languages/no_NO.json b/custom/languages/no_NO.json
index 2a951cacd5..48604f28a5 100644
--- a/custom/languages/no_NO.json
+++ b/custom/languages/no_NO.json
@@ -6,7 +6,7 @@
     "admin/active": "Aktiv",
     "admin/add_server": "Legg til en server",
     "admin/adding_server": "Legger til en server",
-    "admin/admin_dir_still_exists": "Advarsel! <strong>modules/Core/pages/admin</strong>-mappen eksisterer fortsatt. Vennligst slett denne mappen.",
+    "admin/admin_dir_still_exists": "Advarsel! /modules/Core/pages/admin-mappen eksisterer fortsatt. Vennligst fjern denne mappen.",
     "admin/all_logs": "Alle logger",
     "admin/allow_custom_avatars": "Tillatt egne avatarer?",
     "admin/announcement_hook_info": "Announcement creation",
@@ -24,7 +24,7 @@
     "admin/api_settings_updated_successfully": "API-innstillingene har blitt oppdatert.",
     "admin/api_url": "API-URL",
     "admin/api_verification": "Aktiver API-verifisering?",
-    "admin/api_verification_info": "Hvis aktivert, kan brukerne kun bli aktivert gjennom API-en, som f.eks Nameless-pluginen.<strong> Dette vil overstyre e-postverifisering og brukere vil automatisk bli verifisert.</strong>",
+    "admin/api_verification_info": "Hvis aktivert, kan brukerne kun bli aktivert gjennom API-en, f.eks. i spillet med den offisielle Nameless-pluginen. Dette vil overstyre e-postverifisering og brukere vil automatisk bli aktivert.\\nDu burde gi standardgruppen begrenset med rettigheter, og deretter oppdatere gruppen som tildeles etter validering i StaffCP -> Konfigurering -> Registrering til den fullverdige medlemsgruppen med vanlige rettigheter.",
     "admin/authme_db_address": "IP-adresse for AuthMe (MySQL)",
     "admin/authme_db_name": "Databasenavn for AuthMe (MySQL)",
     "admin/authme_db_password": "Passord for AuthMe (MySQL)",
@@ -34,7 +34,7 @@
     "admin/authme_db_user": "Brukernavn for AuthMe (MySQL)",
     "admin/authme_hash_algorithm": "AuthMe hashing-algoritme",
     "admin/authme_integration": "AuthMe-integrasjon",
-    "admin/authme_integration_info": "Hvis AuthMe-integrasjonen er aktivert, vil brukere kun kunne registrere seg inne på serveren.",
+    "admin/authme_integration_info": "Hvis AuthMe-integrasjonen er aktivert, kan brukere kun registrere seg i spillet.",
     "admin/authme_password_sync": "Synkroniser brukerpassordet",
     "admin/authme_password_sync_help": "Hvis denne funksjonen er aktivert vil en brukers passord automatisk oppdateres på nettstedet når brukeren endrer det i spillet.",
     "admin/author": "Utgiver:",
@@ -103,7 +103,7 @@
     "admin/default_avatar": "Standard avatar",
     "admin/default_group": "Er denne gruppen standardgruppen (for nye brukere)?",
     "admin/default_language": "Standardspråk",
-    "admin/default_language_help": "Gjester på nettsiden kan benytte alle installerte språk",
+    "admin/default_language_help": "Gjester på nettsiden kan benytte alle installerte språk. {{docLinkStart}}Les mer »{{docLinkEnd}}",
     "admin/default_server": "Standardserver",
     "admin/default_template_set": "Din standardmal er nå {{template}}.",
     "admin/default_timezone": "Standard tidssone",
@@ -1041,5 +1041,25 @@
     "user/you_have_been_banned": "Du har blitt utestengt!",
     "user/you_have_received_a_warning": "Du har mottatt en advarsel!",
     "admin/action_info": "Handlingsinfo",
-    "admin/administrator": "Administrator"
+    "admin/administrator": "Administrator",
+    "admin/use_external_mail_server": "Bruk ekstern e-postserver",
+    "admin/captcha_type": "Captchatype",
+    "admin/cloning_group": "Kloningsgruppe {{group}}",
+    "admin/debug_link_toast": "Kopierte feilsøkingslenken til utklippstavlen!<br>Se feilsøkingsloggen {{linkStart}}her{{linkEnd}}",
+    "admin/debug_link_info": "Viktig - del lenken kun med personer du stoler på!",
+    "admin/editing_integration_x": "Redigerer {{integration}}-integrering",
+    "admin/user_group_added_hook_info": "Brukergruppe lagt til",
+    "admin/user_group_removed_hook_info": "Brukergruppe fjernet",
+    "admin/administrator_permission_info": "Medlemmer med denne rettigheten vil ha alle rettigheter. Dette er en farlig rettighet å gi.",
+    "admin/at_least_one_external": "Vennligst skriv inn minst én ekstern gruppe (Minecraft eller Discord)",
+    "admin/bedrock": "Bedrock?",
+    "admin/ban_hook_info": "Bruker utestengt",
+    "admin/custom_content": "Egendefinert innhold",
+    "admin/editing_integration_for_x": "Redigerer {{integration}}-integreringen for {{user}}",
+    "admin/email_language_info": "Ser du ikke språket ditt? Sjekk om språkfilen er skrivbar av webserveren i /custom/languages/.",
+    "admin/bedrock_help": "Velg dette alternativet hvis serveren er en Bedrock-server.",
+    "admin/captcha_general": "Aktiver Captcha på registreringssiden?",
+    "admin/captcha_login": "Aktiver Captcha på påloggingssiden?",
+    "admin/dashboard": "Dashboard",
+    "admin/debug_link": "Feilsøkingslenke"
 }

From 671c7b966272db610a2bfd4350617929d18cc2e6 Mon Sep 17 00:00:00 2001
From: Maiu <maiuxd77@gmail.com>
Date: Fri, 15 Jul 2022 08:39:37 +0000
Subject: [PATCH 267/337] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (11 of 11 strings)

Translation: NamelessMC/Website - Cookie Consent
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/cookie-consent/nb_NO/
---
 modules/Cookie Consent/language/nb_NO.json | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/Cookie Consent/language/nb_NO.json b/modules/Cookie Consent/language/nb_NO.json
index 0967ef424b..f2ef424d03 100644
--- a/modules/Cookie Consent/language/nb_NO.json	
+++ b/modules/Cookie Consent/language/nb_NO.json	
@@ -1 +1,13 @@
-{}
+{
+    "cookie/configure_cookies": "Konfigurer informasjonskapsler",
+    "cookie/cookie_notice": "Notis om informasjonskapsler",
+    "cookie/cookie_notice_error": "Vennligst skriv et notis om informasjonskapsler på inntil 10 000 tegn.",
+    "cookie/cookie_notice_info": "Denne widgeten krever informasjonskapsler",
+    "cookie/cookie_notice_success": "Notis om informasjonskapsler oppdatert.",
+    "cookie/cookie_popup": "Denne nettsiden benytter seg av informasjonskapsler for å forbedre opplevelsen din.",
+    "cookie/cookie_popup_allow": "Tillatt informasjonskapsler",
+    "cookie/cookie_popup_disallow": "Avvis informasjonskapsler",
+    "cookie/cookie_popup_more_info": "Mer info",
+    "cookie/cookies": "Informasjonskapsler",
+    "cookie/update_settings": "Vis informasjonskapsel-popup"
+}

From b72678a60a83b05d53af6090e56767afc5c79de4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=85=B8=ED=98=84=EC=9A=B0?= <norhu1130@naver.com>
Date: Thu, 14 Jul 2022 13:06:56 +0000
Subject: [PATCH 268/337] Translated using Weblate (Korean)

Currently translated at 1.7% (22 of 1226 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/ko/
---
 custom/languages/ko_KR.json | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/custom/languages/ko_KR.json b/custom/languages/ko_KR.json
index 0967ef424b..360ea4479c 100644
--- a/custom/languages/ko_KR.json
+++ b/custom/languages/ko_KR.json
@@ -1 +1,24 @@
-{}
+{
+    "admin/user_group_added_hook_info": "유저 그룹 추가됨",
+    "admin/user_group_removed_hook_info": "유저 그룹 삭제됨",
+    "admin/account_verification": "마인크래프트 계정 인증",
+    "admin/acp_logins": "StaffCP 로그인",
+    "admin/action": "동작",
+    "admin/action_info": "동작 정보",
+    "admin/activate": "활성화",
+    "admin/active": "활성",
+    "admin/adding_server": "서버 추가 중",
+    "admin/administrator": "관리자",
+    "admin/administrator_permission_info": "이 권한을 가진 멤버들은 모든 권한을 가집니다. 이것은 허가하기에 위험한 권한입니다.",
+    "admin/all_logs": "모든 로그",
+    "admin/allow_custom_avatars": "커스텀 유저 아바타 허용?",
+    "admin/announcement_hook_info": "공지사항 생성",
+    "admin/announcement_info": "공지사항을 작성하여 웹 사이트의 특정 페이지에 특정 그룹에 메시지를 표시합니다.",
+    "admin/announcement_order": "요청",
+    "admin/announcements": "공지사항",
+    "admin/api": "API",
+    "admin/api_endpoints": "API 엔드포인트",
+    "admin/add_server": "서버 추가",
+    "admin/admin_dir_still_exists": "경고! /modules/Core/pages/admin 디렉터리가 아직 존재해요. 이 디렉터리를 삭제해주세요.",
+    "admin/announcement_icon_instructions": "여기서 각 공지사항에 아이콘을 추가할 수도 있습니다. {{faLink}}를 사용하거나 또는 {{semLink}}를 사용할 수 있어요."
+}

From dd10fdca0d1bdf1fb69838475c9c291237227502 Mon Sep 17 00:00:00 2001
From: Supercrafter100 <58982133+supercrafter100@users.noreply.github.com>
Date: Sat, 16 Jul 2022 16:50:49 +0200
Subject: [PATCH 269/337] Allow accessing rewrite_test during installation

---
 index.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/index.php b/index.php
index ac8643e19e..dec4c9d857 100644
--- a/index.php
+++ b/index.php
@@ -47,6 +47,11 @@
 
 require_once __DIR__ . '/vendor/autoload.php';
 
+if (isset($_GET['route']) && $_GET['route'] == '/rewrite_test') {
+    require_once('rewrite_test.php');
+    die();
+}
+
 if (!Config::exists()) {
     if (is_file(ROOT_PATH . '/install.php')) {
         Redirect::to('install.php');
@@ -75,10 +80,6 @@
 $directories = explode('/', $directory);
 $lim = count($directories);
 
-if (isset($_GET['route']) && $_GET['route'] == '/rewrite_test') {
-    require_once('rewrite_test.php');
-    die();
-}
 
 // Start initialising the page
 require(ROOT_PATH . '/core/init.php');

From 332cca520e96921de8b1667cb47ce25cf5da9e55 Mon Sep 17 00:00:00 2001
From: Supercrafter100 <58982133+supercrafter100@users.noreply.github.com>
Date: Sat, 16 Jul 2022 16:54:31 +0200
Subject: [PATCH 270/337] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fd00839b4..af901f88b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -60,6 +60,7 @@
 - Fix TinyMCE spoiler plugin not being added properly if a custom path is set
 - Fix error when creating group sync rules with only 1 external service
 - Fix website -> Discord group sync issues
+- Fix /rewrite_test not being accessible during installation
 
 ### Deprecated
 *These will be removed in 2.1.0*

From 6a7a168b3b33cb4c25e47b7a7c0d8df5c36bcb04 Mon Sep 17 00:00:00 2001
From: Partydragen <adrian_kili@outlook.com>
Date: Sun, 17 Jul 2022 17:41:41 +0200
Subject: [PATCH 271/337] Fix verification_code typo

---
 modules/Core/classes/Integrations/MinecraftIntegration.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/Core/classes/Integrations/MinecraftIntegration.php b/modules/Core/classes/Integrations/MinecraftIntegration.php
index 99983ee066..2c8b391bd4 100644
--- a/modules/Core/classes/Integrations/MinecraftIntegration.php
+++ b/modules/Core/classes/Integrations/MinecraftIntegration.php
@@ -20,7 +20,7 @@ public function __construct(Language $language) {
         parent::__construct();
     }
 
-    private function flashVerifyCommand(string $verifaction_code): void {
+    private function flashVerifyCommand(string $verification_code): void {
         $verification_command = Output::getClean(Util::getSetting('minecraft_verify_command', '/verify'));
         $message = $this->_language->get('user', 'validate_account_command', ['command' => $verification_command . ' ' . $verification_code]);
         Session::flash('connections_success', $message);

From b6fd5ba4364f11f072745a3b1f51034960fd2ba2 Mon Sep 17 00:00:00 2001
From: Erdem Bekci <bekcierdem@gmail.com>
Date: Sat, 16 Jul 2022 13:07:02 +0000
Subject: [PATCH 272/337] Translated using Weblate (Turkish)

Currently translated at 100.0% (1226 of 1226 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/tr/
---
 custom/languages/tr_TR.json | 474 ++++++++++++++++++++++++++++--------
 1 file changed, 367 insertions(+), 107 deletions(-)

diff --git a/custom/languages/tr_TR.json b/custom/languages/tr_TR.json
index e8761d260a..45ee79112a 100644
--- a/custom/languages/tr_TR.json
+++ b/custom/languages/tr_TR.json
@@ -7,7 +7,7 @@
     "admin/active": "Aktif",
     "admin/add_server": "Sunucu Ekle",
     "admin/adding_server": "Suncuu Ekleme",
-    "admin/admin_dir_still_exists": "Uyarı! <strong> modules/Core/pages/admin</strong> dizini hala mevcut. Lütfen bu dizini kaldırın.",
+    "admin/admin_dir_still_exists": "Uyarı! modules/Core/pages/admin dizini hala mevcut. Lütfen bu dizini kaldırın.",
     "admin/all_logs": "Tüm günlükler",
     "admin/allow_custom_avatars": "Özel kullanıcı resimlerine izin verilsin mi?",
     "admin/api": "API",
@@ -18,7 +18,7 @@
     "admin/api_settings_updated_successfully": "API ayarları başarıyla güncellendi.",
     "admin/api_url": "API URL'si",
     "admin/api_verification": "API doğrulaması etkinleştirilsin mi?",
-    "admin/api_verification_info": "Etkinleştirilirse, hesaplar yalnızca API aracılığıyla, örneğin resmi Adeless eklentisi kullanılarak oyun içi ile doğrulanabilir. <strong> Bu seçenek e-posta doğrulamasını geçersiz kılar ve hesaplar otomatik olarak etkinleştirilir! </strong> <br /> Varsayılan grubunuzu sınırlı izinlere sahip olacak şekilde ayarlamanız ve ardından Yönetim Panelin'deki doğrulama sonrası grubu güncellemeniz gerekir -> Yapılandırma -> Normal izinlere sahip tam üye grubuna Kayıt sekmesi. ",
+    "admin/api_verification_info": "Etkinleştirilirse, hesaplar yalnızca API aracılığıyla, örneğin oyun içinde resmi Nameless eklentisi kullanılarak doğrulanabilir. Bu seçenek e-posta doğrulamasını geçersiz kılar ve hesaplar otomatik olarak etkinleştirilir!\\nVarsayılan grubunuzu sınırlı izinlere sahip olacak şekilde ayarlamanız ve ardından StaffCP -> Yapılandırma -> Kayıt sekmesindeki doğrulama sonrası grubu tam üye grubuna güncellemeniz gerekir. normal izinlerle.",
     "admin/authme_db_address": "AuthMe Veritabanı Adresi",
     "admin/authme_db_name": "AuthMe Veritabanı Adı",
     "admin/authme_db_password": "AuthMe Veritabanı Şifre",
@@ -30,7 +30,7 @@
     "admin/authme_integration": "AuthMe Entegrasyonu",
     "admin/authme_integration_info": "AuthMe entegrasyonu etkinleştirildiğinde, kullanıcılar yalnızca oyun içi kayıt yaptırabilirler.",
     "admin/authme_password_sync": "AuthMe şifresi senkronize edilsin mi?",
-    "admin/authme_password_sync_help": "Etkinleştirilirse, kullanıcının parolası her güncellendiğinde, parola web sitesinde de güncellenir.",
+    "admin/authme_password_sync_help": "Etkinleştirilirse, bir kullanıcının şifresi oyun içinde her güncellendiğinde, şifre web sitesinde de güncellenecektir.",
     "admin/author": "Yazar:",
     "admin/author_x": "Yazar: {{author}}",
     "admin/avatar_settings_updated_successfully": "Resim ayarları başarıyla güncellendi.",
@@ -39,23 +39,23 @@
     "admin/banner_background": "Banner Arka Plan",
     "admin/banner_image_x": "Afiş(Banner) resmi: {{imageName}}",
     "admin/banner_updated_successfully": "Banner başarıyla güncellendi. Değişikliklerinizin geçerli olması biraz zaman alabilir.",
-    "admin/basic_page": "Basic page?",
+    "admin/basic_page": "Temel sayfa?",
     "admin/bedrock": "Bedrock?",
-    "admin/bedrock_help": "Select this option if the server is a Bedrock server.",
+    "admin/bedrock_help": "Sunucu bir Bedrock sunucusuysa bu seçeneği seçin.",
     "admin/built_in_avatars": "Yerleşik resim hizmeti",
-    "admin/bungee_instance": "BungeeCord",
+    "admin/bungee_instance": "BungeeCord?",
     "admin/bungee_instance_help": "Sunucu bir BungeeCord örneği ise bu seçeneği belirleyin.",
     "admin/bust": "Büst",
     "admin/cache_not_writable": "<strong>cache</strong> dizini yazılamaz.",
     "admin/can_edit_own_group": "Kendi grubunun izinlerini düzenleyebilir",
     "admin/can_view_staffcp": "Grup yönetim panelini görebilir mi?",
     "admin/cant_edit_this_group": "Bu grubun yetkilerini düzenleyemezsiniz!",
-    "admin/cant_modify_root_user": "Can't modify this user's main group!",
+    "admin/cant_modify_root_user": "Bu kullanıcının ana grubu değiştirilemiyor!",
     "admin/cant_write_to_template": "Şablon dosyasına yazılamıyor! Lütfen dosya izinlerini kontrol edin.",
-    "admin/captcha_general": "Enable Captcha on registration page?",
-    "admin/captcha_login": "Enable Captcha on login page?",
-    "admin/captcha_secret_key": "Captcha Secret Key",
-    "admin/captcha_site_key": "Captcha Site Key",
+    "admin/captcha_general": "Kayıt sayfasında Captcha etkinleştirilsin mi?",
+    "admin/captcha_login": "Giriş sayfasında Captcha etkinleştirilsin mi?",
+    "admin/captcha_secret_key": "Captcha Gizli Anahtarı",
+    "admin/captcha_site_key": "Captcha Site Anahtarı",
     "admin/captcha_type": "Captcha Type",
     "admin/check_again": "Tekrar kontrol et",
     "admin/config_not_writable": "<strong>core/config.php</strong> dosyanız yazılabilir değil. Lütfen dosya izinlerini kontrol edin.",
@@ -86,14 +86,14 @@
     "admin/dark": "Koyu",
     "admin/dashboard": "Yönetim Paneli",
     "admin/date": "Tarih",
-    "admin/deactivate": "De-Aktif",
+    "admin/deactivate": "Devre dışı bırak",
     "admin/debugging_and_maintenance": "Bakım Modu",
-    "admin/debugging_settings_updated_successfully": "Bakım modu ayarları başarıyla güncellendi!",
+    "admin/debugging_settings_updated_successfully": "Bakım modu ayarları başarıyla güncellendi.",
     "admin/default": "Varsayılan",
-    "admin/default_avatar": "Standart Resim",
+    "admin/default_avatar": "Varsayılan Avatar",
     "admin/default_group": "Grup varsayılan grup mu (yeni kullanıcılar için)?",
     "admin/default_language": "Varsayılan Dil",
-    "admin/default_language_help": "Kullanıcılar yüklü diller arasından seçim yapabilir.",
+    "admin/default_language_help": "Kullanıcılar herhangi bir yüklü dil arasından seçim yapabilecektir. {{docLinkStart}}Daha fazlasını okuyun »{{docLinkEnd}}",
     "admin/default_server": "Varsayılan Sunucu",
     "admin/default_template_set": "Varsayılan şablon başarıyla {{template}} olarak ayarlandı.",
     "admin/default_timezone": "Varsayılan Saat Dilimi",
@@ -105,8 +105,8 @@
     "admin/description_max_500": "Açıklama en fazla 500 karakter olmalıdır.",
     "admin/deselect_all": "Tüm seçimleri kaldır",
     "admin/details": "Detaylar",
-    "admin/disable": "De-Aktif",
-    "admin/disabled": "De-Aktif",
+    "admin/disable": "Devre dışı bırak",
+    "admin/disabled": "Devre dışı",
     "admin/display_field_on_forum": "Forumdaki alan gösterilsin mi?",
     "admin/download": "İndir",
     "admin/download_sitemap": "Site Haritasını İndir",
@@ -125,17 +125,17 @@
     "admin/email_errors": "E-posta Hataları",
     "admin/email_errors_logged": "E-posta hataları günlüğe kaydedildi!",
     "admin/email_errors_purged_successfully": "E-posta hataları başarıyla temizlendi.",
-    "admin/email_logs": "Mass Emails",
+    "admin/email_logs": "Toplu E-postalar",
     "admin/email_password_hidden": "Güvenlik nedeniyle şifre gösterilmez.",
     "admin/email_port": "Port",
-    "admin/email_settings_updated_successfully": "E-posta ayarları başarıyla güncellendi. ",
+    "admin/email_settings_updated_successfully": "E-posta ayarları başarıyla güncellendi.",
     "admin/email_verification": "E-posta doğrulaması etkinleştirilsin mi?",
     "admin/emails": "E-postalar",
-    "admin/enable": "Aktif",
+    "admin/enable": "Etkin",
     "admin/enable_api": "API etkinleştirilsin mi?",
     "admin/enable_authme": "AuthMe entegrasyonu etkinleştirilsin mi?",
     "admin/enable_debug_mode": "Hata ayıklama modu etkinleştirilsin mi?",
-    "admin/enable_mailer_help": "Varsayılan olarak e-postalar gönderilmiyorsa bunu etkinleştirin. PHPMailer kullanımı için Gmail veya SMTP sağlayıcısı gibi e-posta gönderebilecek bir hizmetinizin olması gerekir.",
+    "admin/enable_mailer_help": "Etkinleştirilirse, e-postalar sistem varsayılanı yerine PHPMailer kullanılarak gönderilir. Bu, teslimatta yardımcı olabilir, ancak bir SMTP sağlayıcısı yapılandırmanızı gerektirir. {{docLinkStart}}Daha fazlasını okuyun »{{docLinkEnd}}",
     "admin/enable_maintenance_mode": "Bakım modu etkinleştirilsin mi?",
     "admin/enable_minecraft_integration": "Minecraft entegrasyonu etkinleştirilsin mi?",
     "admin/enable_nicknames_on_registration": "Kullanıcıları kaydetmek için takma adlar etkinleştirilsin mi?",
@@ -144,7 +144,7 @@
     "admin/enable_registration": "Kayıt etkinleştirilsin mi?",
     "admin/enable_status_query": "Durum sorgusu etkinleştirilsin mi?",
     "admin/enable_username_sync": "Kullanıcı adı senkronizasyonu etkinleştirilsin mi?",
-    "admin/enable_username_sync_info": "Etkinleştirilirse, web sitesi kullanıcı adları oyun içi kullanıcı adlarıyla eşleşecek şekilde güncellenir.",
+    "admin/enable_username_sync_info": "Etkinleştirilirse, web sitesi kullanıcı adları oyun içi kullanıcı adlarıyla eşleşecek şekilde güncellenecektir. Bu, oyun içi eklenti, çevrimiçi oyuncular için web sitesine UUID'lerin ve kullanıcı adlarının bir listesini gönderdiğinde gerçekleşir.",
     "admin/enabled": "Aktif",
     "admin/enter_authme_db_details": "Lütfen geçerli veritabanı bilgilerini girin.",
     "admin/error_deleted_successfully": "Hata başarıyla silindi.",
@@ -152,26 +152,26 @@
     "admin/external_query": "Harici sorgu kullanılsın mı?",
     "admin/external_query_help": "Varsayılan sunucu sorgusu çalışmıyorsa bu seçeneği etkinleştirin.",
     "admin/face": "Yüz",
-    "admin/fatal_log": "Fatal Günlükler",
+    "admin/fatal_log": "Kritik Günlükler",
     "admin/favicon_image_x": "Favicon image: {{imageName}}",
-    "admin/favicon_reset_successfully": "Favicon reset successfully.",
-    "admin/favicon_updated_successfully": "Favicon updated successfully.",
+    "admin/favicon_reset_successfully": "Favicon başarıyla sıfırlandı.",
+    "admin/favicon_updated_successfully": "Favicon başarıyla güncellendi.",
     "admin/field_name": "Alan Adı",
     "admin/file_changed": "Dosya Değişti",
     "admin/file_too_big": "File too big! Your file was {{filesize}} and the limit is {{maxFilesize}}",
     "admin/find_modules": "Modül ara",
     "admin/find_templates": "Tema Ara",
     "admin/force_https": "https yönlendirilsin mi?",
-    "admin/force_https_help": "Etkinleştirilirse, web sitenize gelen tüm istekler httpsye yönlendirilir. Bunun düzgün çalışması için etkin bir SSL sertifikanız olması gerekir.",
-    "admin/force_premium_accounts": "Premium Minecraft hesaplarını zorunlu mu?",
+    "admin/force_https_help": "Etkinleştirilirse, web sitenize gelen tüm istekler https'ye yönlendirilecektir. Bunun çalışması için geçerli bir SSL sertifikanızın etkin olması gerekir.",
+    "admin/force_premium_accounts": "Premium Minecraft hesaplarını zorla?",
     "admin/force_www": "www yönlendirilsin mi?",
     "admin/forgot_password_email": "Şifremi Unuttum",
-    "admin/forum_posts": "Display on Forum",
+    "admin/forum_posts": "Forumda Görüntüle",
     "admin/general_settings": "Genel Ayarlar",
     "admin/generate_sitemap": "Site Haritası Oluştur",
     "admin/group": "Grup",
-    "admin/group_created_successfully": "Grup başarıyla oluşturuldu!",
-    "admin/group_deleted_successfully": "Grup başarıyla silindi!",
+    "admin/group_created_successfully": "Grup başarıyla oluşturuldu.",
+    "admin/group_deleted_successfully": "Grup başarıyla silindi.",
     "admin/group_html": "Grup HTML",
     "admin/group_id": "Grup ID",
     "admin/group_name_maximum": "Lütfen grup adınızın en fazla 20 karakter uzunluğunda olduğundan emin olun.",
@@ -180,17 +180,17 @@
     "admin/group_order": "Grup Sırası",
     "admin/group_staff": "Grup bir personel grubu mu?",
     "admin/group_sync": "Grup Senkronizasyonu",
-    "admin/group_sync_info": "Oyun içi grupları değiştiğinde, API'yı bir kullanıcının web sitesi grubunu otomatik olarak güncelleyecek şekilde yapılandırabilirsiniz. Oyun içi grup adını ve aşağıdaki ile senkronize edilmesi gereken web sitesi grubunu girmeniz yeterlidir. ",
+    "admin/group_sync_info": "Oyun içi grupları değiştiğinde, API'yı bir kullanıcının web sitesi grubunu otomatik olarak güncelleyecek şekilde yapılandırabilirsiniz. Oyun içi grup adını ve aşağıdaki ile senkronize edilmesi gereken web sitesi grubunu girmeniz yeterlidir.",
     "admin/group_sync_logs": "Group Sync Changes",
     "admin/group_sync_rule_created_successfully": "Grup senkronizasyon kuralı başarıyla oluşturuldu.",
     "admin/group_sync_rule_deleted_successfully": "Grup senkronizasyon kuralı başarıyla silindi.",
     "admin/group_sync_rules_updated_successfully": "Grup senkronizasyon kuralları başarıyla güncellendi.",
-    "admin/group_updated_successfully": "Grup başarıyla güncellendi!",
+    "admin/group_updated_successfully": "Grup başarıyla güncellendi.",
     "admin/group_username_colour": "Grup Kullanıcı Adı Rengi",
-    "admin/group_username_css": "Group Username CSS",
+    "admin/group_username_css": "Grup kullanıcı adı CSS",
     "admin/groups": "Gruplar",
-    "admin/groups_added": "Groups Added",
-    "admin/groups_removed": "Groups Removed",
+    "admin/groups_added": "Gruplar Eklendi",
+    "admin/groups_removed": "Gruplar Kaldırıldı",
     "admin/head": "Kafa",
     "admin/homepage_type": "Ana Sayfa Türü",
     "admin/host": "Host",
@@ -221,8 +221,8 @@
     "admin/log_purged_successfully": "Günlük başarıyla temizlendi.",
     "admin/login_method": "Giriş Yöntemi",
     "admin/logo_image_x": "Logo image: {{imageName}}",
-    "admin/logo_reset_successfully": "Logo reset successfully.",
-    "admin/logo_updated_successfully": "Logo updated successfully.",
+    "admin/logo_reset_successfully": "Logo başarıyla sıfırlandı.",
+    "admin/logo_updated_successfully": "Logo başarıyla güncellendi.",
     "admin/main_group": "Main Group",
     "admin/maintenance": "Bakım Modu",
     "admin/maintenance_enabled": "Bakım modu şu anda etkin.",
@@ -244,10 +244,10 @@
     "admin/minecraft_uuid": "Minecraft UUID",
     "admin/missing_contact_address": "Lütfen 3 ila 255 karakter uzunluğunda bir iletişim e-posta adresi girin.",
     "admin/missing_sitename": "Lütfen 2 ila 64 karakter uzunluğunda bir site adı girin.",
-    "admin/mod_dir_still_exists": "Uyarı! <strong> modules/Core/pages/mod </strong> dizini hala var. Lütfen bu dizini kaldırın.",
+    "admin/mod_dir_still_exists": "Uyarı! modules/Core/pages/mod dizini hala var. Lütfen bu dizini kaldırın.",
     "admin/module": "Modül",
-    "admin/module_disabled": "Modül de-aktif.",
-    "admin/module_enabled": "Modül aktif.",
+    "admin/module_disabled": "Modül devre dışı.",
+    "admin/module_enabled": "Modül etkin.",
     "admin/module_outdated": "Bu modülün {{intendedVersion}} Nameless sürümü için tasarlandığını tespit ettik, ancak {{actualVersion}} Nameless sürümü çalıştırıyorsunuz",
     "admin/module_x": "Modül: {{module}}",
     "admin/modules": "Modüller",
@@ -256,10 +256,10 @@
     "admin/name_maximum_16": "İsim 16 karakterden fazla olmamalıdır",
     "admin/name_required": "Bir ad gerekli",
     "admin/nameless_news": "NamelessMC Haberleri",
-    "admin/navbar_icon": "Menü Icon",
+    "admin/navbar_icon": "Gezinme Çubuğu İkonu",
     "admin/navbar_icon_instructions": "Ayrıca her gezinme çubuğuna bir simge ekleyebilirsiniz, örneğin {{faLink}}, {{semLink}}.",
-    "admin/navbar_order": "Menü Sıra",
-    "admin/navbar_order_instructions": "Gezinme çubuğundaki öğeleri sipariş etmek için her öğeye 0'ın üzerinde bir sayı verebilirsiniz; 1 ilk öğe ve daha sonra gelen daha yüksek sayılardır.",
+    "admin/navbar_order": "Gezinme Çubuğu Sırası",
+    "admin/navbar_order_instructions": "Her öğeye pozitif bir sayı atanabilir, burada en düşük sayı gezinme çubuğunda ilk önce görünecek ve daha yüksek sayılar ondan sonra gelecektir.",
     "admin/navigation": "Navigasyon",
     "admin/navigation_settings_updated_successfully": "Gezinme ayarları başarıyla güncellendi.",
     "admin/negative": "Negatif",
@@ -271,7 +271,7 @@
     "admin/new_rule": "Yeni Kural",
     "admin/new_update_available": "Yeni bir güncelleme var.",
     "admin/new_urgent_update_available": "Yeni bir acil güncelleme var. Lütfen en kısa zamanda güncelleyin!",
-    "admin/new_version_x": "Yeni versiyonu: {{version}}",
+    "admin/new_version_x": "Yeni sürüm: {{version}}",
     "admin/no_avatars_available": "Kullanılabilir resim yok. Lütfen önce yeni bir resim yükleyin.",
     "admin/no_custom_fields": "Henüz özel alan yok.",
     "admin/no_custom_pages": "Henüz hiç sayfa oluşturulmadı.",
@@ -290,7 +290,7 @@
     "admin/page": "Sayfa",
     "admin/page_content": "Sayfa içeriği",
     "admin/page_content_maximum_100000": "Sayfa içeriği en fazla 100000 karakter olmalıdır.",
-    "admin/page_created_successfully": "Sayfa başarıyla oluşturuldu!",
+    "admin/page_created_successfully": "Sayfa başarıyla oluşturuldu.",
     "admin/page_deleted_successfully": "Sayfa başarıyla silindi!",
     "admin/page_link_footer": "Alt kısım",
     "admin/page_link_location": "Sayfa Bağlantısı Konumu",
@@ -303,7 +303,7 @@
     "admin/page_redirect": "Sayfa Yönlendirme?",
     "admin/page_redirect_link_maximum_512": "Sayfa yönlendirme bağlantısı maksimum 512 karakterden oluşmalıdır.",
     "admin/page_redirect_to": "Yönlendirme Bağlantısı (önceki http:// ile)",
-    "admin/page_target": "Open page in a new tab?",
+    "admin/page_target": "Sayfa yeni bir sekmede açılsın mı?",
     "admin/page_title": "Sayfa Adı",
     "admin/page_title_maximum_255": "Sayfa başlığı maksimum 255 karakterden oluşmalıdır.",
     "admin/page_title_minimum_2": "Sayfa başlığı en az 2 karakterden oluşmalıdır.",
@@ -326,7 +326,7 @@
     "admin/pre_1_7": "Sunucu sürümü 1.7'den eski sürüm mü?",
     "admin/privacy_and_terms": "Gizlilik ve Şartlar",
     "admin/privacy_policy_error": "Lütfen 100.000 karakterden uzun olmayan bir gizlilik politikası girin.",
-    "admin/private_profiles": "Özel Profil",
+    "admin/private_profiles": "Özel Profiller",
     "admin/profile_field_created_successfully": "Profil alanı başarıyla oluşturuldu.",
     "admin/profile_field_deleted_successfully": "Profil alanı başarıyla silindi.",
     "admin/profile_field_editable_help": "Etkinleştirilirse, kullanıcıların profil ayarlarında alanı düzenleme izni olur.",
@@ -351,20 +351,20 @@
     "admin/reaction_created_successfully": "Reaksiyon başarıyla oluşturuldu.",
     "admin/reaction_deleted_successfully": "Reaksiyon başarıyla silindi.",
     "admin/reaction_edited_successfully": "Reaksiyon başarıyla güncellendi.",
-    "admin/reason": "Ban Reason",
+    "admin/reason": "Yasaklama Nedeni",
     "admin/recent_users": "Yeni Kullanıcılar",
-    "admin/registered": "Kayıt Tarihi",
+    "admin/registered": "Kayıtlı",
     "admin/registration": "Kayıt",
     "admin/registration_disabled_message": "Kayıt devre dışı bırakıldı mesajı",
     "admin/registration_email": "Kayıt E-postası",
     "admin/registration_link": "Kayıt Bağlantısı",
     "admin/registration_settings_updated": "Kayıt ayarları başarıyla güncellendi.",
     "admin/registrations": "Kayıtlar",
-    "admin/required": "Gereklidir.",
+    "admin/required": "Gerekli",
     "admin/reset_background": "Arka Planı Sıfırla",
     "admin/reset_banner": "Afişi(Banner) sıfırla",
-    "admin/reset_favicon": "Reset Favicon",
-    "admin/reset_logo": "Reset Logo",
+    "admin/reset_favicon": "Faviconu Sıfırla",
+    "admin/reset_logo": "Logoyu Sıfırla",
     "admin/running_nameless_version": "NamelessMC Sürümü {{version}}",
     "admin/security": "Güvenlik",
     "admin/select_all": "Hepsini seç",
@@ -393,7 +393,7 @@
     "admin/server_port_maximum": "Lütfen sunucu bağlantı noktanızın en fazla 5 karakter olduğundan emin olun",
     "admin/server_port_minimum": "Lütfen sunucu bağlantı noktanızın en az 2 karakter olduğundan emin olun",
     "admin/server_port_required": "Lütfen sunucu bağlantı noktasını girin",
-    "admin/server_query_information": "Web sitenizdeki çevrimiçi oyuncuların bir listesini görüntülemek için sunucunuzun <strong> sunucusunda sunucunuzda  'enable-query' seçeneğinin etkinleştirilmiş olması gerekir .properties </strong> dosya ",
+    "admin/server_query_information": "Web sitenizdeki çevrimiçi oyuncuların bir listesini görüntülemek istiyorsanız Minecraft sunucunuzun <strong>server.properties</strong> dosyasında <strong>'enable-query'</strong> seçeneğinin etkinleştirilmiş olması gerekir.",
     "admin/server_query_port": "Sunucu Query Portu",
     "admin/server_query_port_help": "Bu, aynı dosyadaki sorgu etkinleştirme seçeneğinin true olarak ayarlanması koşuluyla, sunucunuzun <strong> server.properties </strong> öğesindeki query.port seçeneğidir.",
     "admin/server_updated": "Sunucu başarıyla güncellendi.",
@@ -405,10 +405,10 @@
     "admin/show_registration_link": "Kayıt bağlantısını göster",
     "admin/sitemap_generated": "Site haritası başarıyla oluşturuldu",
     "admin/sitemap_last_generated_x": "Site haritası en son oluşturuldu {{generatedAt}}",
-    "admin/sitemap_link": "Site harita linki:",
+    "admin/sitemap_link": "Site haritası linki:",
     "admin/sitemap_not_generated_yet": "Henüz bir site haritası oluşturulmadı!",
     "admin/sitemap_not_writable": "<strong>cache/sitemaps</strong> dizini yazılamaz.",
-    "admin/sitename": "Site Adı",
+    "admin/sitename": "Site İsmi",
     "admin/social_media": "Sosyal Medya",
     "admin/social_media_settings_updated": "Sosyal medya ayarları başarıyla güncellendi!",
     "admin/source": "Kaynak",
@@ -416,11 +416,11 @@
     "admin/stats": "İstatistikler",
     "admin/status_page": "Durum sayfası etkinleştirilsin mi?",
     "admin/status_query_help": "Bu etkinleştirilirse, durum sayfası bu sunucuyu çevrimiçi veya çevrimdışı olarak gösterir.",
-    "admin/styles": "Stil",
+    "admin/styles": "Stiller",
     "admin/successfully_updated": "Başarıyla güncellendi!",
     "admin/support": "Destek",
     "admin/template": "Tema",
-    "admin/template_activated": "Şablon aktif edildi!",
+    "admin/template_activated": "Tema aktif edildi.",
     "admin/template_banner_reset_successfully": "Afiş(Banner) başarıyla sıfırlandı!",
     "admin/template_banner_updated_successfully": "Afiş(Banner) başarıyla güncellendi!",
     "admin/template_changes": "Şablon Değişiklikleri",
@@ -466,7 +466,7 @@
     "admin/upgrade_php_version": "Please upgrade your PHP version to at least 7.4 - the next Nameless release will no longer support the version you are using.",
     "admin/upload_new_image": "Yeni Resim Yükle",
     "admin/use_friendly_urls": "Kolay URLler",
-    "admin/use_friendly_urls_help": "ÖNEMLİ: Sunucunuzun, bunun çalışması için mod_rewrite ve .htaccess dosyalarının kullanımına izin verecek şekilde yapılandırılması gerekir.",
+    "admin/use_friendly_urls_help": "Etkinleştirilirse, daha temiz görünen web adresleri kullanılacaktır. Bunun çalışması için mod_rewrite ve .htaccess dosyalarının kullanımına izin vermelisiniz. {{docLinkStart}}Daha fazlasını okuyun »{{docLinkEnd}}",
     "admin/user": "Kullanıcı",
     "admin/user_deleted": "Kullanıcı kaydı başarıyla silindi!",
     "admin/user_id": "Kullanıcı ID",
@@ -489,7 +489,7 @@
     "admin/views_x": "Görüntüleme: {{views}}",
     "admin/warning": "Uyarı",
     "admin/warning_editing_default_template": "Uyarı! Varsayılan şablonu düzenlememeniz önerilir.",
-    "admin/warning_log": "Uyarı Günlükleri",
+    "admin/warning_log": "Uyarı Logları",
     "admin/widget_disabled": "Widget devre dışı.",
     "admin/widget_enabled": "Widget etkin.",
     "admin/widget_location": "Widget Location",
@@ -506,30 +506,30 @@
     "api/unable_to_update_server_info": "Sunucu bilgileri güncellenemiyor",
     "api/unable_to_update_username": "Kullanıcı adı güncellenemedi",
     "api/unknown_error": "Bilinmeyen hata",
-    "api/user_already_active": "Your account has already been activated.",
+    "api/user_already_active": "Hesabınız daha önceden aktifleştirilmiştir.",
     "api/username_updated": "Kullanıcı adı başarıyla güncellendi",
-    "emails/change_password_message": "Şifrenizi sıfırlamak için lütfen aşağıdaki bağlantıyı tıklayın. Bunu kendiniz istemediyseniz, bu e-postayı güvenle silebilirsiniz.",
+    "emails/change_password_message": "Şifrenizi sıfırlamak için lütfen aşağıdaki bağlantıyı tıklayın. Bunu siz yapmadıysanız bağlantıyı kullanmayın.",
     "emails/change_password_subject": "Parolanızı mı unuttunuz?",
     "emails/greeting": "Merhaba,",
     "emails/register_message": "Kayıt olduğunuz için teşekkürler! Kaydınızı tamamlamak için lütfen aşağıdaki bağlantıyı tıklayın:",
     "emails/register_subject": "Hesabı Doğrula",
     "emails/thanks": "Teşekkürler,",
     "errors/403_back": "Geri Dön",
-    "errors/403_content": "Bu sayfaya girmek için yetkiniz yok!",
+    "errors/403_content": "Bu sayfayı görüntülemek için yetkiniz yok.",
     "errors/403_home": "Ana Sayfa",
     "errors/403_login": "Devam etmek için giriş yapınız.",
     "errors/403_title": "Üzgünüm!",
     "errors/404_back": "Geri Dön",
-    "errors/404_content": "Sayfa bulunamadı!",
-    "errors/404_error": "Bunun bir hata olduğunu düşünüyorsanız, yönetici ile iletişime geçin!",
+    "errors/404_content": "Sayfa bulunamadı.",
+    "errors/404_error": "Bunun bir hata olduğunu düşünüyorsanız, yönetici ile iletişime geçebilirsiniz.",
     "errors/404_home": "Ana Sayfa",
     "errors/404_title": "Üzgünüm!",
-    "errors/fatal_error": "Fatal Error",
+    "errors/fatal_error": "Kritik Hata",
     "errors/fatal_error_message_admin": "Maalesef, sayfa yüklenirken bir şeyler ters gitti. Hata detayları:",
     "errors/fatal_error_message_user": "Maalesef, sayfa yüklenirken bir şeyler ters gitti. Lütfen bir yöneticiye başvurun.",
     "errors/fatal_error_title": "Üzgünüm!",
     "errors/maintenance_retry": "Yeniden Dene",
-    "errors/maintenance_title": "Bakım Modu",
+    "errors/maintenance_title": "Bakım Modu.",
     "general/actions": "Eylemler",
     "general/alerts": "Bildirimler",
     "general/already_registered": "Zaten bir hesabın var mı?",
@@ -537,7 +537,7 @@
     "general/are_you_sure": "Emin misiniz?",
     "general/back": "Geri",
     "general/browse": "Araştır",
-    "general/bungee_instance": "Bu sunucu bir Bungee(çekirdek) örneğidir.",
+    "general/bungee_instance": "BungeeCord veya Velocity kullanıyorsanız işaretleyin.",
     "general/bypass": "Bypass",
     "general/cancel": "Iptal",
     "general/change": "Değiştir",
@@ -551,7 +551,7 @@
     "general/content": "İçerik",
     "general/cookie_notice": "Bu web sitesi, tarama deneyiminizi geliştirmek için çerezleri kullanır. Web sitemize kayıt olarak veya bu bildirimi kapatarak kullanımlarını kabul etmiş olursunuz..",
     "general/copied": "Kopyalandı!",
-    "general/currently_1_player_online": "Şu anda <strong>1</strong> oyuncu çevrimiçi.",
+    "general/currently_1_player_online": "Şu anda 1 oyuncu çevrimiçi.",
     "general/currently_x_players_online": "Şu anda çevrimiçi {{count}} oyuncu var",
     "general/date": "Tarih",
     "general/delete": "Sil",
@@ -559,15 +559,15 @@
     "general/error": "Hata",
     "general/forum_statistics": "Forum İstatistikleri",
     "general/full_content": "Tam İçerik",
-    "general/help": "Help",
+    "general/help": "Yardım",
     "general/home": "Ana Sayfa",
     "general/info": "Bilgi",
-    "general/invalid_timezone": "That timezone is invalid",
+    "general/invalid_timezone": "Seçtiğiniz saat dilimi geçersiz",
     "general/invalid_token": "Geçersiz token, lütfen tekrar deneyin.",
     "general/ip": "IP",
     "general/latest_member": "Son Üye:",
     "general/leaderboards": "Leaderboards",
-    "general/link": "Link",
+    "general/link": "Bağlantı",
     "general/loading": "Yükleniyor...",
     "general/log_out": "Çıkış Yap",
     "general/more": "Daha",
@@ -633,9 +633,9 @@
     "installer/database_address": "Veritaban Adresi",
     "installer/database_configuration": "Veritaban Ayarları",
     "installer/database_error": "Lütfen tüm alanların doldurulduğundan emin olun.",
-    "installer/database_name": "Veritaban Adı",
-    "installer/database_password": "Veritaban Şifresi",
-    "installer/database_port": "Veritaban Port",
+    "installer/database_name": "Veritabanı Adı",
+    "installer/database_password": "Veritabanı Şifresi",
+    "installer/database_port": "Veritabanı Port",
     "installer/database_username": "Veritaban Kullanıcı Adı",
     "installer/disabled": "Etkin değil",
     "installer/email_address": "E-posta",
@@ -643,14 +643,14 @@
     "installer/enabled": "Etkin",
     "installer/enter_admin_details": "Lütfen yönetici hesabının ayrıntılarını girin.",
     "installer/finish": "Bitti",
-    "installer/finish_message": "NamelessMC'yi yüklediğiniz için teşekkürler! Artık web sitenizi daha fazla yapılandırabileceğiniz Yönetim Paneli'ne geçebilirsiniz. <br>  <a href=\"https://minecraft-tr.cf/\">xOrcun tarafıdan türkleştirilmiştir.</a>",
+    "installer/finish_message": "NamelessMC'yi yüklediğiniz için teşekkürler! Yönetim Paneline giderek sitenizi daha detaylı düzenleyebilirsiniz.",
     "installer/friendly_urls": "Kolay URL'ler (önerilir)",
     "installer/friendly_urls_info": "Kolay URL'ler, tarayıcınızdaki URL'lerin okunabilirliğini artırır. <br />Örneğin:<br /><code>example.com/index.php?route=/forum</code><br/><br/> <code>example.com/forum olur</code><br /><div class=\"ui inverted orange segment\"><i class=\"exclamation circle icon\"></i><strong>Önemli!</strong><br/>Bunun çalışması için sunucunuzun doğru yapılandırılması gerekir <a href='./rewrite_test' target='_blank' style=\"color:#2185D0\">aqui</a> tıklayarak bu seçeneği etkinleştirip etkinleştiremeyeceğinizi görebilirsiniz.</div>",
     "installer/host": "Host Adı",
     "installer/host_help": "Ana bilgisayar adı, web siteniz için <strong> temel URL</strong>'dir. Kurulum Yolu alanındaki alt klasörleri veya http (s): // buraya eklemeyin!",
     "installer/initialising_database_and_cache": "Veritabanı ve önbellek başlatılıyor, lütfen bekleyin ...",
-    "installer/input_maximum": "Lütfen kullanıcı adınızın en fazla 20 karakter, e-posta adresinizin ve şifrenizin en fazla 64 karakter olduğundan emin olun.",
-    "installer/input_minimum": "Lütfen kullanıcı adınızın en az 3 karakter, e-posta adresinizin en az 4 karakter ve şifrenizin en az 6 karakter olduğundan emin olun.",
+    "installer/input_maximum": "Lütfen kullanıcı adınızın maksimum {{maxUsername}} karakter, e-posta adresinizin maksimum {{maxEmail}} karakter ve şifrenizin maksimum {{maxPassword}} karakter olduğundan emin olun.",
+    "installer/input_minimum": "Lütfen kullanıcı adınızın en az {{minUsername}} karakter, e-posta adresinizin en az {{minEmail}} karakter ve şifrenizin en az {{minPassword}} karakter olduğundan emin olun.",
     "installer/input_required": "Lütfen geçerli bir kullanıcı adı, e-posta adresi ve şifre girin.",
     "installer/input_v1_details": "Lütfen Nameless sürüm 1 kurulumunuz için veritabanı detaylarını girin.",
     "installer/install": "Kur",
@@ -658,7 +658,7 @@
     "installer/installer_now_initialising_database": "Yükleyici şimdi veritabanını başlatıyor. Bu biraz zaman alabilir...",
     "installer/installer_upgrading_database": "Yükleyici veritabanınızı yükseltirken lütfen bekleyin...",
     "installer/installer_welcome": "NamelessMC sürüm 2.0 ön sürümüne hoş geldiniz.",
-    "installer/language": "Language",
+    "installer/language": "Dil",
     "installer/nameless_path": "Kurulum Yolu",
     "installer/nameless_path_info": "Alan adınıza göre, Adeless'ın yüklendiği yoldur. Örneğin, Nameless example.com/forum adresine yüklenmişse, bunun <strong>forum</strong> olması gerekir. Nameless bir alt klasörde değilse boş bırakın.",
     "installer/new_installation": "Yeni kurulum(önerilir) &raquo;",
@@ -671,7 +671,7 @@
     "installer/proceed": "İlerle",
     "installer/requirements": "Gereksinimler:",
     "installer/requirements_error": "Yüklemeye devam etmek için gerekli tüm uzantıların kurulu olması ve doğru izinlerin ayarlanmış olması gerekir.",
-    "installer/site_name": "Site Adı",
+    "installer/site_name": "Site İsmi",
     "installer/support_message": "Herhangi bir desteğe ihtiyacınız varsa, web sitemizi {{websiteLinkStart}}buradan{{websiteLinkEnd}} inceleyin veya {{discordLinkStart}}Discord sunucusu{{discordLinkEnd}} veya {{githubLinkStart}}GitHub depomuz{{githubLinkEnd}}.",
     "installer/template_cache_writable": "Şablon Önbelleği Yazılabilir",
     "installer/terms_and_conditions": "By continuing you agree to the terms and conditions.",
@@ -680,9 +680,9 @@
     "installer/unable_to_login": "Giriş yapılamıyor.",
     "installer/upgrade": "Yükselt",
     "installer/upgrading_from_v1": "V1 sürümünden yükseltme &raquo;",
-    "installer/username": "Kullanıcı Adı",
+    "installer/username": "Kullanıcı adı",
     "installer/yes": "Evet",
-    "log/info_forums_lock": "Kilitle",
+    "log/info_forums_lock": "Kilitli",
     "log/info_forums_unlock": "Kiliti kaldır",
     "moderator/1_account_with_ip": "IP {{address}} ile 1 hesap bulundu",
     "moderator/1_ip_with_name": "{{user}} kullanıcısı için 1 IP adresi bulundu",
@@ -722,7 +722,7 @@
     "moderator/punish": "Cezalandır",
     "moderator/punishment_revoked": "Ceza iptal edildi.",
     "moderator/punishments": "Cezalar",
-    "moderator/reason": "Sebei",
+    "moderator/reason": "Sebep",
     "moderator/reason:": "Sebep:",
     "moderator/recent_punishments": "Son Cezalar",
     "moderator/recent_registrations": "Son Kayıtlar",
@@ -734,10 +734,10 @@
     "moderator/report_reopened": "Rapor başarıyla yeniden açıldı.",
     "moderator/reported_by": "Raporlayan:",
     "moderator/reports": "Raporlar",
-    "moderator/reset_avatar": "Reset Avatar",
+    "moderator/reset_avatar": "Avatarı Sıfırla",
     "moderator/reset_profile_banner": "Profil banner(afiş) sıfırla",
-    "moderator/revoke": "Iptal Et",
-    "moderator/revoked": "Iptal Edilen",
+    "moderator/revoke": "İptal et",
+    "moderator/revoked": "İptal edildi",
     "moderator/search_for_ip": "Bir kullanıcı adı veya IP adresi arayın",
     "moderator/spam": "Spam",
     "moderator/staff": "Yetkili",
@@ -813,13 +813,13 @@
     "user/create_an_account": "Hesap Oluştur",
     "user/current_password": "Şimdiki Şifre",
     "user/delete_all": "Tümünü Sil",
-    "user/disable": "De-Aktif",
-    "user/disabled": "De-Akitf",
+    "user/disable": "Devre dışı",
+    "user/disabled": "Devre dışı",
     "user/email": "E-Posta",
     "user/email_address": "E-Posta Adresi",
     "user/email_already_exists": "Girdiğiniz e-posta adresi zaten var.",
     "user/email_changed_successfully": "E-posta adresi başarıyla değiştirildi.",
-    "user/email_or_username": "Email or Username",
+    "user/email_or_username": "Kullanıcı adı veya Email",
     "user/email_required": "Bir e-posta gerekmektedir.",
     "user/enable": "Aktif",
     "user/enabled": "Aktif",
@@ -854,14 +854,14 @@
     "user/mcname_lookup_error": "Kullanıcı adınızı doğrulamak için Mojang'ın sunucularıyla iletişimde bir hata oluştu. Lütfen daha sonra tekrar deneyiniz.",
     "user/mcname_maximum_20": "Minecraft kullanıcı adınız maksimum 20 karakter olmalıdır.",
     "user/mcname_minimum_3": "Minecraft kullanıcı adınız en az 3 karakter olmalıdır.",
-    "user/mcname_required": "A Minecraft username is required.",
+    "user/mcname_required": "Minecraft kullanıcı adı gerekli.",
     "user/message_sent_successfully": "Mesaj başarıyla gönderildi",
     "user/message_title": "Mesaj Başlığı",
     "user/messages": "Özel Mesajlar",
     "user/messaging": "Özel Konuşmalar",
     "user/minecraft_username": "Minecraft Kullanıcı Adı",
     "user/must_input_email": "Bir e-posta adresi girmelisiniz.",
-    "user/must_input_email_or_username": "You must input an email or username.",
+    "user/must_input_email_or_username": "Eposta veya kullanıcı adı girmelisiniz.",
     "user/must_input_password": "Bir şifre girmelisiniz.",
     "user/must_input_username": "Bir kullanıcı adı girmelisiniz.",
     "user/new_message": "Yeni Özel Mesaj",
@@ -873,12 +873,12 @@
     "user/nickname": "Kullanıcı Adı",
     "user/nickname_already_exists": "Seçtiğiniz isim zaten var.",
     "user/no_about_fields": "Bu kullanıcı henüz alanlarla ilgili herhangi bir bilgi eklemedi.",
-    "user/no_alerts": "Şu an hiç bildiriminiz yok.",
+    "user/no_alerts": "Yeni bildirim yok",
     "user/no_alerts_usercp": "Şu an hiç bildiriminiz yok.",
-    "user/no_messages": "Şu an hiç özel konuşmanız yok.",
+    "user/no_messages": "Yeni mesajınız yok",
     "user/no_messages_full": "Şu an hiç özel konuşmanız yok.",
-    "user/no_placeholders": "No Placeholders",
-    "user/no_profile_posts": "No profile posts.",
+    "user/no_placeholders": "Yer Tutucular yok",
+    "user/no_profile_posts": "Profil gönderisi yok.",
     "user/no_replies_yet": "henüz cevap yok",
     "user/no_wall_posts": "Henüz duvar yazısı yok.",
     "user/one_or_more_users_blocked": "İleti dizisinin en az bir üyesine özel ileti gönderemezsiniz.",
@@ -888,7 +888,7 @@
     "user/password_minimum_6": "Şifreniz en az 6 karakterden oluşmalıdır.",
     "user/password_required": "Bir şifre gerekmektedir.",
     "user/passwords_dont_match": "Şifreleriniz birbirine uymuyor.",
-    "user/placeholders": "Placeholders",
+    "user/placeholders": "Yer Tutucular",
     "user/post_on_wall": "{{user}} duvarında yayınla",
     "user/private_profile": "Özel Profil",
     "user/private_profile_page": "Bu özel bir profil!",
@@ -903,7 +903,7 @@
     "user/replies": "Cevaplar",
     "user/reply": "cevap",
     "user/report_created": "Rapor başarıyla oluşturuldu",
-    "user/report_post_content": "Lütfen raporunuz için bir neden girin!",
+    "user/report_post_content": "Lütfen raporunuz için bir neden girin",
     "user/separate_users_with_commas": "Kullanıcıları virgülle ayırın",
     "user/settings_updated_successfully": "Ayarlar başarıyla güncellendi.",
     "user/signature": "İmza",
@@ -916,9 +916,9 @@
     "user/tfa_scan_code": "Lütfen kimlik doğrulama uygulamanızda aşağıdaki kodu tarayın:",
     "user/tfa_successful": "İki faktörlü kimlik doğrulama başarıyla kuruldu. Bundan sonra her oturum açışınızda kimlik doğrulamanız gerekecektir.",
     "user/timezone": "Saat Dilimi",
-    "user/title_max_64": "Başlık en fazla 64 karakter olmalıdır.",
-    "user/title_min_2": "Başlık en az 2 karakter olmalıdır.",
-    "user/title_required": "Lütfen bir başlık girin!",
+    "user/title_max_64": "Başlık en fazla 64 karakter olmalıdır",
+    "user/title_min_2": "Başlık en az 2 karakter olmalıdır",
+    "user/title_required": "Lütfen bir başlık girin",
     "user/to": "Kime?",
     "user/two_factor_auth": "İki Faktörlü Kimlik Doğrulama",
     "user/unable_to_connect_to_authme_db": "AuthMe veritabanına bağlanılamıyor. Bu hata devam ederse, lütfen bir yöneticiye başvurun.",
@@ -937,8 +937,8 @@
     "user/username_maximum_20": "Kullanıcı adınız en fazla 20 karakter olmalıdır.",
     "user/username_mcname_email_exists": "Kullanıcı adınız veya e-posta adresiniz zaten var.",
     "user/username_minimum_3": "Kullanıcı adınız en az 3 karakterden oluşmalıdır.",
-    "user/username_required": "Bir kullanıcı adı gerekmektedir",
-    "user/users_to_required": "Lütfen bazı mesaj alıcıları girin!",
+    "user/username_required": "Bir kullanıcı adı gerekmektedir.",
+    "user/users_to_required": "Lütfen bazı mesaj alıcıları girin",
     "user/uuid_already_exists": "UUID'niz zaten var, yani bu Minecraft hesabı zaten kayıtlı.",
     "user/validate_account_command": "Kaydı tamamlamak için lütfen {{command}} oyun adı komutunu yürütün.",
     "user/validation_complete": "Hesabınız doğrulandı, şimdi giriş yapabilirsiniz.",
@@ -947,16 +947,16 @@
     "user/verification_success": "Başarıyla doğrulandı! Şimdi giriş yapabilirsiniz.",
     "user/verify_account": "Hesabı Doğrula",
     "user/verify_account_help": "Söz konusu Minecraft hesabına sahip olduğunuzu doğrulayabilmemiz için lütfen aşağıdaki talimatları uygulayın.",
-    "user/view_alerts": "Tümünü gör..",
-    "user/view_messages": "Tümünü gör..",
+    "user/view_alerts": "Uyarıları görüntüle",
+    "user/view_messages": "Mesajları görüntüle",
     "user/views": "Profilin görüntülenme sayısı:",
-    "user/x_new_alerts": "{{count}} yeni bildiriminiz var.",
-    "user/x_new_messages": "{{count}} yeni özel mesajın var.",
+    "user/x_new_alerts": "{{count}} yeni bildiriminiz var",
+    "user/x_new_messages": "{{count}} yeni özel mesajın var",
     "user/x_reactions": "{{count}} reaksiyon",
     "user/x_replies": "{{count}} cevap",
     "user/you_have_been_banned": "Engellendiniz!",
     "user/you_have_received_a_warning": "Bir uyarı aldınız!",
-    "admin/user_group_added_hook_info": "Kullanıcı Grubu Eklenildi",
+    "admin/user_group_added_hook_info": "Kullanıcı Grubu Eklendi",
     "admin/user_group_removed_hook_info": "Kullanıcı Grubu Kaldırıldı",
     "admin/administrator": "Yönetici",
     "admin/administrator_permission_info": "Bu izne sahip olan kullanıcılar tüm izinlere sahip olacaktır. Bu, tehlikeli bir izindir.",
@@ -964,5 +964,265 @@
     "admin/announcement_info": "Web sitenizin belirli sayfalarında belirli gruplara mesaj göstermek için duyurular oluşturun.",
     "admin/announcement_order": "Sipariş",
     "admin/announcements": "Duyurular",
-    "admin/api_endpoints": "API uç noktası"
+    "admin/api_endpoints": "API uç noktası",
+    "admin/hooks": "Webhooklar",
+    "admin/email_language_info": "Dilinizi görmüyor musunuz? Dil dosyasının web sunucunuz tarafından /custom/languages/ içinde yazılabilir olduğundan emin olun.",
+    "emails/forum_topic_reply_message": "{{author}}, takip ettiğiniz bir konuyu yanıtladı. İçerik: {{content}}",
+    "general/red": "Kırmızı",
+    "installer/step_conversion": "Dönüştür",
+    "user/pending_verification": "Doğrulama Bekleniyor",
+    "general/deleted_user": "Kullanıcı Silindi",
+    "admin/group_sync_plugin_not_set_up": "Oyun içi eklenti kurulu değil",
+    "user/nickname_maximum_20": "Kullanıcı adınız en fazla 20 karakter olmalıdır.",
+    "admin/use_external_mail_server": "Harici posta sunucusu kullan",
+    "installer/database_configured": "Veritabanı yapılandırıldı.",
+    "installer/general_configuration": "Genel Yapılandırma",
+    "installer/config_write_failed": "Ayar dosyası kaydedilirken hata oluştu: {{message}}",
+    "installer/database_connection_failed": "Veritabanı bağlantısı başarısız oldu: <br> {{message}}",
+    "admin/debugging_enabled": "Hata ayıklama etkinleştirildi, hassas bilgileriniz ziyaretçilere açık olacaktır. Hata ayıklama, herkese açık sitelerde değil, yalnızca geliştirme için kullanılmalıdır.",
+    "general/server_status": "Sunucu Durumu",
+    "installer/not_upgrading": "Yükseltilemiyor",
+    "admin/confirm_leave_site": "Bu siteden ayrılmak üzeresiniz! {{link}} adresini ziyaret etmek istediğinizden emin misiniz?",
+    "admin/debug_link": "Hata Ayıklama Bağlantısı",
+    "admin/creating_new_hook": "Yeni Webhook Oluşturma",
+    "user/connections": "Bağlantılar",
+    "user/avatar_set_successfully": "Avatar başarıyla ayarlandı.",
+    "admin/email_message_greeting": "Selamlama",
+    "admin/email_message_message": "Mesaj",
+    "admin/email_message_thanks": "Teşekkürler",
+    "admin/email_port_invalid": "Lütfen geçerli bir e-posta portu girin.",
+    "admin/email_message_subject": "Subject",
+    "admin/email_preview_popup": "Ön izleme",
+    "user/integration_unlinked": "{{integration}} hesabınızın bağlantısını başarıyla kaldırdınız.",
+    "user/integration_required_to_continue": "Lütfen bu web sitesini kullanmaya devam etmeden önce bağlanın ve gerekli bağlantıları doğrulayın.",
+    "user/integration_identifier_already_linked": "{{integration}} tanımlayıcısı zaten başka bir kullanıcıya bağlı.",
+    "user/user_has_linked_integration": "{{user}}, {{integration}} hesabını bağladı.",
+    "user/topic_updates": "Takip ettiğiniz konular için e-posta alın",
+    "admin/hook_select_info": "Yalnızca etkinlik olarak 'Yeni konu' veya 'Konu yanıtı' seçili olan Kancalar gösterilir.",
+    "admin/left": "Ayrıldı",
+    "admin/placeholders_show_on_profile_info": "Bu yer tutucunun her kullanıcının profilinde gösterilip gösterilmeyeceği.",
+    "admin/validate_hook_info": "Kullanıcı doğrulama",
+    "general/no_default_server": "Varsayılan sunucu yok, lütfen StaffCP -> Entegrasyonlar -> Minecraft sekmesinden birini seçin.",
+    "general/oauth_message_continue": "{{provider}} ile kaydolmaya devam edin",
+    "general/view_report": "Raporu görüntüle",
+    "installer/hostname_error": "Lütfen http:// veya https:// olmadan geçerli bir ana bilgisayar adı girin",
+    "user/gravatar": "Gravatar'ı avatar olarak kullan",
+    "admin/delete_hook_info": "Kullanıcı silme",
+    "admin/trusted_proxies_configured": "Güvenilir proxy'ler",
+    "api/integration_username_already_linked": "{{integration}} kullanıcı adı zaten başka bir kullanıcıya bağlı.",
+    "api/integration_identifier_already_linked": "{{integration}} tanımlayıcısı zaten başka bir kullanıcıya bağlı.",
+    "admin/trusted_proxies_not_configured": "{{linkStart}}Güvenilir proxy'ler{{linkEnd}} yapılandırılmamış, IP yasakları düzgün çalışmayabilir.",
+    "installer/upgrade_error": "Yükseltme sırasında hatalarla karşılaşıldı.",
+    "admin/announcement_icon_instructions": "Ayrıca burada her duyuruya bir simge ekleyebilirsiniz, örneğin {{faLink}} veya {{semLink}} kullanarak.",
+    "admin/at_least_one_external": "Lütfen en az 1 harici grup girin (Minecraft veya Discord)",
+    "admin/background_colour": "Arkaplan Rengi",
+    "admin/background_colour_required": "Arkaplan Rengi Gereklidir",
+    "admin/ban_hook_info": "Kullanıcı yasaklandı",
+    "admin/cache_cleared": "Şablon önbelleği temizlendi",
+    "admin/can_unlink": "Bağlantıyı Kaldırabilir",
+    "admin/can_unlink_integration": "Kullanıcılar entegrasyonun bağlantısını kaldırabilir mi?",
+    "admin/can_view_announcement": "Duyuruyu görüntüleyebilir",
+    "admin/creating_announcement_success": "Duyuru başarıyla oluşturuldu.",
+    "admin/creating_announcement_failure": "Duyuru oluşturulamadı.",
+    "admin/creating_announcement": "Duyuru Oluşturma",
+    "admin/closable": "Kapatılabilir",
+    "user/mcname_already_exists": "Minecraft kullanıcı adınız zaten var.",
+    "user/integration_username_already_linked": "{{integration}} kullanıcı adı zaten başka bir kullanıcıya bağlı.",
+    "user/nickname_minimum_3": "Kullanıcı adınız en az 3 karakter olmalıdır.",
+    "user/no_user_found_with_provider": "Bu {{provider}} hesabıyla hiçbir kullanıcı bulunamadı.",
+    "user/no_providers": "Ayarlanmış OAuth sağlayıcısı yok.",
+    "user/oauth_unlinked": "Hesabınızın bu sağlayıcıyla olan bağlantısı başarıyla kaldırıldı.",
+    "user/oauth_unlink_confirm": "Hesabınızın {{provider}} ile bağlantısını kaldırmak istediğinizden emin misiniz? Artık bu hesapla giriş yapamayacaksınız.",
+    "user/user_x_has_validated": "{{user}} hesabını doğruladı!",
+    "admin/oauth": "OAuth",
+    "admin/delete_hook": "Bu kancayı silmek istediğinizden emin misiniz?",
+    "admin/deleted_announcement_success": "Duyuru başarıyla silindi.",
+    "admin/email_message_options": "Seçenekler",
+    "admin/youtube_url": "Youtube URL",
+    "admin/facebook_url": "Facebook URL",
+    "general/orange": "Turuncu",
+    "general/yellow": "Sarı",
+    "user/agree_t_and_c": "{{linkStart}}Şartlar ve Koşulları{{linkEnd}} okudum ve kabul ediyorum.",
+    "user/nickname_required": "Kullanıcı adı gereklidir.",
+    "admin/homepage_news": "Haberler",
+    "admin/page_url_contains_nameless_path": "Özel sayfanız NamelessMC sayfasının üzerine yazar.",
+    "admin/resend_activation_email": "Aktivasyon mailini yeniden gönder",
+    "admin/right": "Doğru",
+    "admin/route": "Rota",
+    "admin/template_not_supported": "NamelessMC 2.0.0-pr8'den itibaren Varsayılan şablon desteklenmemektedir. En iyi deneyim için lütfen desteklenen bir şablon kullanın.",
+    "admin/transformers": "Transformatörler",
+    "admin/twitter_url": "Twitter URL",
+    "general/connect": "Bağlan",
+    "general/origin_api": "API",
+    "general/origin_website": "Website",
+    "user/oauth_already_linked": "Başka bir NamelessMC kullanıcısı bu {{provider}} hesabına zaten bağlı.",
+    "user/not_connected": "Bağlı Değil",
+    "user/overview": "Genel Bakış",
+    "admin/hook_created": "Kanca başarıyla oluşturuldu.",
+    "admin/group_cloned_successfully": "Grup başarıyla klonlandı.",
+    "admin/header": "Başlık",
+    "admin/header_required": "Başlık gerekli.",
+    "admin/home_custom_content": "Ana Sayfa Özel İçerik",
+    "admin/hook_deleted": "Kanca başarıyla silindi.",
+    "admin/hook_name": "Webhook İsmi",
+    "admin/hook_events": "Bu webhookları tetikleyecek etkinlikler",
+    "admin/hook_edited": "Kanca başarıyla düzenlendi",
+    "general/auto_language": "Otomatik dil",
+    "general/teal": "Deniz mavisi",
+    "admin/integration": "Entegrasyon",
+    "admin/integration_identifier": "{{integration}} Tanımlayıcı",
+    "admin/integration_identifier_required": "{{integration}} tanımlayıcı gerekli.",
+    "admin/integration_sync_not_supported": "Bu entegrasyon için senkronizasyon desteklenmiyor!",
+    "admin/integration_updated_successfully": "Entegrasyon başarıyla güncellendi.",
+    "admin/integration_username_invalid": "{{integration}} kullanıcı adı geçersiz.",
+    "admin/integration_username": "{{integration}} Kullanıcı adı",
+    "admin/message_required": "Mesaj gerekli",
+    "admin/is_verified": "Doğrulandı mı?",
+    "user/user_has_unlinked_integration": "{{user}}, {{integration}} hesabının bağlantısını kaldırdı.",
+    "admin/no_item_selected": "Hiçbir öğe seçilmedi",
+    "admin/no_hooks_yet": "Henüz webhook yok.",
+    "admin/leaderboard_settings": "Skor Tablosu Ayarları",
+    "admin/placeholders_value": "Değer",
+    "admin/unable_to_retrieve_nameless_news": "En son haberler alınamıyor",
+    "admin/message": "Mesaj",
+    "admin/method": "Yöntem",
+    "admin/placeholders_none": "Yer tutucu yok.",
+    "admin/mode_toggle": "Karanlık Mod",
+    "admin/sync_integration": "Senkronizasyon Entegrasyonu",
+    "admin/unlink_account_confirm": "Bu sağlayıcının bu kullanıcıyla olan bağlantısını zorla kaldırmak istediğinizden emin misiniz?",
+    "admin/unlink_account_success": "Hesabının {{provider}} ile olan bağlantısı başarıyla kaldırıldı.",
+    "admin/verified": "Doğrulandı",
+    "admin/verify_delete_announcement": "Bu duyuruyu silmek istediğinizden emin misiniz?",
+    "admin/view_all_panel_templates": "Tüm panel şablonlarını görüntüleyin",
+    "general/or": "VEYA",
+    "general/report_origin": "Orijinal",
+    "general/reported_by": "{{author}} tarafından rapor edildi",
+    "general/verify": "Doğrula",
+    "installer/step_general_config": "Genel Yapılandırma",
+    "installer/step_finish": "Tamamlandı",
+    "installer/step_site_config": "Site Yapılandırması",
+    "installer/step_requirements": "Gereksinimler",
+    "user/no_providers_admin": "Henüz site yöneticileri tarafından hiçbir OAuth sağlayıcısı yapılandırılmadı.",
+    "user/oauth_link_confirm": "Hesabınızı bağlamak için {{provider}} web sitesine yönlendirileceksiniz.",
+    "user/oauth_link_success": "Hesabınızı {{provider}} ile başarıyla bağladınız!",
+    "user/oauth_login_success": "{{provider}} hesabınızla giriş yaptınız.",
+    "admin/user_link_integration_hook_info": "Kullanıcı bağlantı entegrasyonu",
+    "admin/user_integration_updated_successfully": "Kullanıcı entegrasyonu başarıyla güncellendi.",
+    "emails/forum_topic_reply_subject": "{{author}}, {{topic}} konusunu yanıtladı",
+    "admin/api_disabled": "API devre dışı",
+    "general/grey": "Gri",
+    "admin/navbar_colour": "Gezinme Çubuğu Rengi",
+    "admin/manual_linking": "Manuel Bağlantı",
+    "admin/integration_identifier_invalid": "{{integration}} tanımlayıcı geçersiz.",
+    "admin/identifier": "Tanımlayıcı",
+    "admin/hooks_info": "Webhooklar, belirli olaylar gerçekleştiğinde harici hizmetlerin bildirilmesine izin verir.",
+    "admin/hook_url": "Webhook URL",
+    "admin/hook_type": "Webhook Tipi",
+    "admin/new_announcement": "Yeni Duyuru",
+    "admin/new_hook": "Yeni Kanca",
+    "admin/placeholders_score": "Skor",
+    "admin/placeholders_friendly_name": "Arkadaş İsmi",
+    "admin/placeholders_name": "İsim",
+    "admin/placeholders_last_updated": "Son güncelleme",
+    "admin/placeholders_friendly_name_info": "Bu yer tutucuya bir 'takma ad' ayarlamak için bunu kullanın. Ham ad yerine kolay ad kullanılacaktır.",
+    "admin/placeholders_show_on_profile": "Profili Görüntüle",
+    "admin/placeholders_server_id": "Sunucu ID",
+    "admin/placeholders_show_on_forum": "Forumu Görüntüle",
+    "admin/placeholders_show_on_forum_info": "Bu yer tutucunun her kullanıcının forum gönderilerinde gösterilip gösterilmeyeceği.",
+    "admin/register_hook_info": "Kullanıcı kaydı",
+    "admin/report_hook_info": "Rapor oluşturma",
+    "admin/seo": "SEO (Arama Motoru Optimizasyonu)",
+    "admin/seo_settings_updated_successfully": "SEO ayarları başarılı bir şekilde güncellendi.",
+    "admin/sitemap": "Site haritası",
+    "admin/test_email_suggest_1": "Birkaç dakika bekleyin ve Spam klasörünüzü kontrol edin.",
+    "admin/test_email_query": "Gelen kutunuza ulaşmıyor musunuz? Takip et:",
+    "admin/text_colour_required": "Metin Rengi gerekli",
+    "installer/reload": "Yenile",
+    "admin/updated": "Güncellendi",
+    "admin/unlink": "Bağlantıyı kaldır",
+    "general/internet_explorer_info": "Internet Explorer desteklenmiyor. Lütfen daha modern bir tarayıcı(Chrome,MS Edge veya Opera) ile giriş yapın.",
+    "admin/user_unlink_integration_hook_info": "Kullanıcı bağlantısını kaldırma entegrasyonu",
+    "admin/updated_placeholder_settings": "Yer tutucu ayarları başarıyla güncellendi.",
+    "installer/step_database_config": "Veritabanı Yapılandırması",
+    "installer/step_home": "Ev",
+    "admin/dark_mode": "Koyu Mod",
+    "admin/cloning_group": "Klonlama grubu {{group}}",
+    "admin/not_linked": "Bağlı değil",
+    "general/links": "Bağlantılar",
+    "general/internet_explorer_header": "Internet Explorer",
+    "admin/text_colour": "Metin Rengi",
+    "admin/placeholders_player": "Oyuncu",
+    "admin/placeholders_last_updated_time": "Son güncelleme: {{time}}",
+    "admin/not_set": "Ayarlanmadı",
+    "admin/oauth_info": "OAuth sağlayıcılarını, kullanıcıların sosyal ağ hesaplarıyla oturum açmasına izin verecek şekilde yapılandırın. {{docLinkStart}}Yardım için belgelerimize göz atın{{docLinkEnd}}.",
+    "admin/no_announcements": "Henüz bir duyuru yapılmadı.",
+    "admin/clear_cache": "Şablon Önbelleğini Temizle",
+    "admin/api_endpoints_info": "API Uç Noktaları, Modüllerin harici uygulamaların (Minecraft ve Discord gibi) NamelessMC web sitenizle etkileşim kurması için yollar oluşturmasına olanak tanır. API belgelerine {{docLinkStart}}buradan{{docLinkEnd}} göz atın",
+    "user/user_has_verified_integration": "{{user}}, {{integration}} hesabını doğruladı.",
+    "admin/dropdown_name": "Dropdown İsmi",
+    "admin/edit_email_messages": "E-posta Mesajları",
+    "admin/editing_announcement": "Duyuru Düzenleme",
+    "admin/editing_announcement_failure": "Duyuru güncellemesi başarısız oldu.",
+    "admin/editing_announcement_success": "Duyuru başarıyla güncellendi.",
+    "admin/editing_hook": "Wobhook düzenleme",
+    "admin/editing_language": "Dil Düzenleme",
+    "admin/editing_messages": "Mesajları Düzenleme",
+    "admin/debug_link_toast": "Hata ayıklama bağlantısı panonuza kopyalandı!<br>Hata ayıklama günlüğünü görüntüleyin: {{linkStart}}buradan{{linkEnd}}",
+    "admin/debug_link_info": "Önemli - bu bağlantıyı yalnızca güvendiğiniz kişilerle paylaşın!",
+    "admin/editing_integration_for_x": "{{user}} için {{integration}} entegrasyonunu düzenleme",
+    "admin/editing_integration_x": "{{integration}} entegrasyonu düzenleniyor",
+    "admin/force_tfa": "Grup üyeleri için 2FA Zorla?",
+    "admin/force_tfa_alert": "Grubunuz, 2FA etkinleştirmenizi gerektiriyor.",
+    "admin/enable_placeholders": "Yer Tutucular Etkinleştirilsin mi?",
+    "admin/emails_mass_message": "E-posta Toplu Mesaj",
+    "admin/emails_mass_message_loading": "Yükleniyor... Lütfen sayfayı yenilemeyin. Bu biraz zaman alabilir.",
+    "admin/email_preview_popup_message": "E-postanın önizlemesini görmek için burayı tıklayın.",
+    "admin/email_resend_failed": "E-posta yeniden gönderilemedi, lütfen e-posta ayarlarınızı kontrol edin.",
+    "admin/email_resent_successfully": "E-posta başarıyla yeniden gönderildi.",
+    "admin/existing_rules": "Mevcut Kurallar",
+    "admin/group_name": "Grup İsmi",
+    "admin/google_analytics": "Google Analistik",
+    "admin/emails_mass_message_replacements": "Değişkenleri e-posta mesajınızda kullanabilirsiniz. Desteklenen değişkenler: {username}, {sitename}",
+    "admin/force_tfa_warning": "Lütfen bunun ne işe yaradığını bildiğinizden emin olun, yoksa kendinizi ve tüm grup üyelerini kilitleme riskini alırsınız.",
+    "admin/forum_topic_reply_email": "Forum Konusu Cevap",
+    "admin/google_analytics_help": "Ziyaretçileri ve istatistikleri izlemek için web sitenize Google Analytics ekleyin. Bu işlevi kullanmak için bir Google Analytics hesabı oluşturmanız gerekecektir. Google Analytics Web Mülkü Kimliğinizi girin. Kimlik UA-XXXXA-X'e benziyor ve bunu hesap bilgilerinizde veya Google tarafından sağlanan izleme kodunda bulabilirsiniz.",
+    "admin/invalid_hook_name": "Geçersiz Webhook adı",
+    "admin/invalid_hook_events": "En az 1 etkinlik seçmelisiniz",
+    "admin/integration_username_required": "{{integration}} kullanıcı adı gerekli.",
+    "admin/invalid_hook_url": "Geçersiz Webhook URL'si",
+    "admin/group_sync_no_results_warning": "Grup senkronizasyon kuralları ayarlandı ancak herhangi bir değişiklik bildirilmedi. Bu, yanlış bir yapılandırmayı gösterebilir.",
+    "admin/linking_integration_for_x": "{{user}} için {{integration}} entegrasyonunu bağlama",
+    "admin/link_account_success": "{{user}}, {{integration}} hesabını başarıyla bağladı.",
+    "admin/placeholders": "Yer Tutuclar",
+    "admin/placeholder_leaderboard_enabled": "Lider Tablosu Etkin",
+    "admin/placeholder_leaderboard_sort": "Skor Tablosu Sıralaması",
+    "admin/placeholder_leaderboard_title": "Skor Tablosu Başlığı",
+    "admin/placeholder_leaderboard_settings": "Yer Tutucu Lider Tablosu Ayarları",
+    "admin/placeholder_leaderboard_info": "Yer Tutucu Lider Tabloları, sunucunuzda herhangi bir yer tutucuya göre sıralanmış oyuncuları görüntülemek için skor tabloları oluşturmanıza olanak tanır.",
+    "admin/placeholder_leaderboard_updated": "Skor tablosu ayarları başarıyla güncellendi",
+    "admin/placeholder_leaderboard_enable_info": "Skor tabloları en iyi şekilde sayısal yer tutucularla (madeni paralar, öldürmeler, mayınlı bloklar vb.) Metin tabanlı bir yer tutucuda bir lider panosunu etkinleştirirseniz, istediğiniz gibi sıralayacağından emin olamazsınız.",
+    "user/integration_linked": "{{integration}} hesabınızı başarıyla bağladınız.",
+    "installer/session_doesnt_exist": "Oturum algılanamadı. Oturum kaydetme, Nameless kullanmak için bir gerekliliktir. Lütfen web tarayıcınızdaki tanımlama bilgilerini temizledikten sonra tekrar deneyin ve sorun devam ederse lütfen destek için web barındırıcınızla iletişime geçin.",
+    "installer/no_converters_available": "Kullanılabilir dönüştürücü yok.",
+    "admin/https_port_80": "80 numaralı bağlantı noktasında HTTPS kullanıyormuş gibi görünüyorsunuz, bu neredeyse kesinlikle doğru değil. Cloudflare kullanıyorsanız TLS şifreleme modunu Tam (strict) olarak ayarladığınızdan emin olun. Kendi proxy'nizi çalıştırıyorsanız, lütfen onu X-Forwarded-Port başlığını gönderecek şekilde yapılandırın.",
+    "admin/viewing_integrations_for_x": "{{user}} için kullanıcı entegrasyonları görüntüleniyor",
+    "admin/user_verify_integration_hook_info": "Kullanıcı doğrulama entegrasyonu",
+    "general/toggle_dark_mode": "Karanlık moda geç",
+    "admin/test_email_suggest_3": "Bir SMTP sunucusu kurun. {{docLinkStart}}Daha fazlasını okuyun »{{docLinkEnd}}",
+    "general/default": "Varsayılan",
+    "general/olive": "Zeytin Yeşili",
+    "general/green": "Yeşil",
+    "general/blue": "Mavi",
+    "general/violet": "Menekşe",
+    "general/purple": "Mor",
+    "general/pink": "Pempe",
+    "general/brown": "Kahve rengi",
+    "admin/test_email_suggest_2": "Sitenizin DNS kayıtlarını güncelleyin (SPF ve DKIM'i kontrol edin).",
+    "installer/step_admin_account": "Yönetici Hesabı",
+    "installer/reload_page": "Sayfayı yenile",
+    "admin/sending_mass_message": "Toplu Mesaj Gönderme",
+    "admin/require_integration": "Kullanıcıların entegrasyonu bağlamasını ve doğrulamasını zorunlu kılın",
+    "admin/placeholders_info": "Yer tutucular, NamelessMC Spigot eklentisinin, profillerinde ve forum gönderilerinde gösterebilmeleri için web sitenize her oyuncu hakkında istatistik göndermesine izin verir.",
+    "admin/custom_content": "Özel içerik",
+    "admin/warning_hook_info": "Kullanıcı uyarıldı"
 }

From 21df59dfe245df745fe9bf0e53786a4a66730ffe Mon Sep 17 00:00:00 2001
From: yamagami2211 <yamagami2211@gmail.com>
Date: Mon, 18 Jul 2022 12:20:08 +0000
Subject: [PATCH 273/337] Translated using Weblate (Japanese)

Currently translated at 100.0% (1226 of 1226 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/ja/
---
 custom/languages/ja_JP.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/custom/languages/ja_JP.json b/custom/languages/ja_JP.json
index de280ac45b..ee53ad2c5e 100644
--- a/custom/languages/ja_JP.json
+++ b/custom/languages/ja_JP.json
@@ -1223,5 +1223,6 @@
     "user/integration_linked": "{{integration}}のアカウントは正常にリンクされました。",
     "user/integration_unlinked": "{{integration}}のアカウントは正常にリンク解除されました。",
     "user/integration_username_already_linked": "{{integration}}のユーザー名は、すでに他のユーザーとリンクしています。",
-    "api/integration_username_already_linked": "{{integration}}のユーザー名は、すでに他のユーザーとリンクしています。"
+    "api/integration_username_already_linked": "{{integration}}のユーザー名は、すでに他のユーザーとリンクしています。",
+    "user/avatar_set_successfully": "アバター設定に成功。"
 }

From f3785cae99f90c71761c71fd069020c76e78a7ac Mon Sep 17 00:00:00 2001
From: Erdem Bekci <bekcierdem@gmail.com>
Date: Sun, 17 Jul 2022 22:53:39 +0000
Subject: [PATCH 274/337] Translated using Weblate (Turkish)

Currently translated at 100.0% (1226 of 1226 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/tr/
---
 custom/languages/tr_TR.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/custom/languages/tr_TR.json b/custom/languages/tr_TR.json
index 45ee79112a..4b8fc98448 100644
--- a/custom/languages/tr_TR.json
+++ b/custom/languages/tr_TR.json
@@ -11,7 +11,7 @@
     "admin/all_logs": "Tüm günlükler",
     "admin/allow_custom_avatars": "Özel kullanıcı resimlerine izin verilsin mi?",
     "admin/api": "API",
-    "admin/api_info": "API, eklentilerin ve diğer hizmetlerin gibi web sitenizle etkileşime girmesine izin verir resmi {{pluginLinkStart}}NameLessMC Plugin{{pluginLinkEnd}}.",
+    "admin/api_info": "API, {{pluginLinkStart}}resmi Nameless eklentisi{{pluginLinkEnd}} ve {{botLinkStart}}resmi NamelessMC Discord Botu{{botLinkEnd}} gibi eklentilerin ve diğer hizmetlerin web sitenizle etkileşime girmesine izin verir.",
     "admin/api_key": "API Anahtarı",
     "admin/api_key_regenerated": "API anahtarı başarıyla yeniden oluşturuldu.",
     "admin/api_registration_email": "API Kayıt E-postası",
@@ -452,7 +452,7 @@
     "admin/unable_to_retrieve_modules": "Modüller alınamıyor",
     "admin/unable_to_retrieve_templates": "Şablonlar alınamıyor",
     "admin/unknown": "Bilinmeyen",
-    "admin/unsafe_html": "Güvenli olmayan HTML'ye izin verilsin mi? ",
+    "admin/unsafe_html": "Güvenli olmayan HTML'ye izin verilsin mi?",
     "admin/unsafe_html_warning": "Bu seçeneğin etkinleştirilmesi, tehlikeli olabilecek JavaScript de dahil olmak üzere sayfada herhangi bir HTML'nin kullanılabileceği anlamına gelir. Bunu yalnızca HTML'nizin güvenli olduğundan eminseniz etkinleştirin.",
     "admin/up_to_date": "NamelessMC kurulumunuz güncel!",
     "admin/update": "Güncelle",
@@ -578,7 +578,7 @@
     "general/no_players_online": "Çevrimiçi oyuncu yok",
     "general/no_servers": "Gözükecek sunucu yok!",
     "general/none": "Yok",
-    "general/not_registered_yet": "Hesabın yoksa kayıt ol",
+    "general/not_registered_yet": "Henüz kayıt olmadınız mı?",
     "general/offline": "Çevrimdışı",
     "general/online": "Çevrimiçi",
     "general/online_guests": "Çevrimiçi Ziyaretçi",
@@ -778,7 +778,7 @@
     "time/less_than_a_minute": "1 dakikadan az bir süre önce",
     "time/over_x_years": "{{count}} yıldan uzun bir süre önce",
     "user/1_new_alert": "1 yeni bildiriminiz var.",
-    "user/1_new_message": "1 yeni özel mesajın var.",
+    "user/1_new_message": "{{count}} yeni mesajınız var",
     "user/1_reaction": "1 reaksiyon",
     "user/1_reply": "1 cevap",
     "user/about": "Hakkında",
@@ -1114,7 +1114,7 @@
     "admin/navbar_colour": "Gezinme Çubuğu Rengi",
     "admin/manual_linking": "Manuel Bağlantı",
     "admin/integration_identifier_invalid": "{{integration}} tanımlayıcı geçersiz.",
-    "admin/identifier": "Tanımlayıcı",
+    "admin/identifier": "UUID",
     "admin/hooks_info": "Webhooklar, belirli olaylar gerçekleştiğinde harici hizmetlerin bildirilmesine izin verir.",
     "admin/hook_url": "Webhook URL",
     "admin/hook_type": "Webhook Tipi",

From dffd06342ed052f0e9e8b6e16473b80dd80413f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonathan=20H=C3=B8jgaard?= <YodaZen05@gmail.com>
Date: Sat, 16 Jul 2022 20:17:00 +0000
Subject: [PATCH 275/337] Translated using Weblate (Danish)

Currently translated at 100.0% (51 of 51 strings)

Translation: NamelessMC/Website - Discord Integration
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-discord-integration/da/
---
 modules/Discord Integration/language/da_DK.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/Discord Integration/language/da_DK.json b/modules/Discord Integration/language/da_DK.json
index efe327990c..d8a966b3fd 100644
--- a/modules/Discord Integration/language/da_DK.json	
+++ b/modules/Discord Integration/language/da_DK.json	
@@ -45,5 +45,9 @@
     "discord_integration/discord_role_id_length": "Discord Rolle ID skal være på 18 cifre.",
     "discord_integration/discord_role_id_numeric": "Discord Rolle ID skal være numerisk.",
     "discord_integration/discord_bot_error_invguild": "Angivet Guild ID er ugyldigt, eller er botten ikke i Guilden.",
-    "discord_integration/discord_bot_error_partsuccess": "Botten kunne ikke redigere en eller flere af rollerne på grund af en fejlkonfiguration af Discord-hierarki."
+    "discord_integration/discord_bot_error_partsuccess": "Botten kunne ikke redigere en eller flere af rollerne på grund af en fejlkonfiguration af Discord-hierarki.",
+    "discord_integration/discord_widget_error": "Der opstod en fejl ved indlæsning af Discord widget: {{error}}.",
+    "discord_integration/discord_widget_theme": "Discord Widget Tema",
+    "discord_integration/discord_widget_disabled": "Widgetten er deaktiveret for den angivet Discord-server. Gå til fanen 'Widget' i dine Discord-serverindstillinger, og sørg for, at Discord-widgetten er aktiveret, og at ID'et er korrekt.",
+    "discord_integration/enable_discord_integration": "Aktiver Discord Integration?"
 }

From 7f76206652c45b9ade3e20a83b80fd9a2fc8ce86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=85=B8=ED=98=84=EC=9A=B0?= <norhu1130@naver.com>
Date: Sat, 16 Jul 2022 06:05:36 +0000
Subject: [PATCH 276/337] Translated using Weblate (Korean)

Currently translated at 2.3% (29 of 1226 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/ko/
---
 custom/languages/ko_KR.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/custom/languages/ko_KR.json b/custom/languages/ko_KR.json
index 360ea4479c..983a89e1f5 100644
--- a/custom/languages/ko_KR.json
+++ b/custom/languages/ko_KR.json
@@ -20,5 +20,12 @@
     "admin/api_endpoints": "API 엔드포인트",
     "admin/add_server": "서버 추가",
     "admin/admin_dir_still_exists": "경고! /modules/Core/pages/admin 디렉터리가 아직 존재해요. 이 디렉터리를 삭제해주세요.",
-    "admin/announcement_icon_instructions": "여기서 각 공지사항에 아이콘을 추가할 수도 있습니다. {{faLink}}를 사용하거나 또는 {{semLink}}를 사용할 수 있어요."
+    "admin/announcement_icon_instructions": "여기서 각 공지사항에 아이콘을 추가할 수도 있습니다. {{faLink}}를 사용하거나 또는 {{semLink}}를 사용할 수 있어요.",
+    "admin/api_endpoints_info": "모듈은 API Endpoints를 통해 외부 응용 프로그램(예: 마인크래프트 및 디스코드)이 NamelessMC와 상호 작용할 수 있는 방법을 만들 수 있습니다.\nAPI 설명서를 {{docLinkStart}} 여기서 {{docLinkEnd}}확인하세요.",
+    "admin/api_key": "API 키",
+    "admin/api_key_regenerated": "API 키가 성공적으로 재생성되었습니다.",
+    "admin/api_registration_email": "API 등록 이메일",
+    "admin/api_settings_updated_successfully": "API 설정이 업데이트되었습니다.",
+    "admin/api_url": "API URL",
+    "admin/api_verification": "API 인증 활성화?"
 }

From 2987ac1e34ca5ba17f277dfd380efc2196eca0f4 Mon Sep 17 00:00:00 2001
From: samerton <samerton@users.noreply.github.com>
Date: Wed, 20 Jul 2022 19:18:29 +0100
Subject: [PATCH 277/337] Add custom page render hooks + move mentions parser
 to core module

---
 core/classes/Core/Input.php                   |  8 ++-
 core/classes/Misc/MentionsParser.php          |  6 +--
 custom/languages/en_UK.json                   |  5 ++
 .../Default/core/pages_edit.tpl               |  2 +-
 .../Default/core/pages_new.tpl                |  2 +-
 custom/panel_templates/Default/template.php   | 10 ----
 modules/Core/hooks/ContentHook.php            |  2 +-
 .../{Forum => Core}/hooks/MentionsHook.php    | 10 ++--
 modules/Core/module.php                       | 52 +++++++++++++++++++
 modules/Core/pages/custom.php                 | 11 ++--
 modules/Core/pages/panel/pages.php            | 36 +++++++++++--
 modules/Forum/pages/forum/edit.php            |  5 +-
 modules/Forum/pages/forum/new_topic.php       |  5 +-
 modules/Forum/pages/forum/view_topic.php      |  5 +-
 14 files changed, 123 insertions(+), 36 deletions(-)
 rename modules/{Forum => Core}/hooks/MentionsHook.php (80%)

diff --git a/core/classes/Core/Input.php b/core/classes/Core/Input.php
index 4c3a421a96..7155e2b221 100644
--- a/core/classes/Core/Input.php
+++ b/core/classes/Core/Input.php
@@ -55,8 +55,11 @@ public static function get(string $item) {
      * @param string $name Name of input field ID.
      * @param ?string $content Any default content to insert
      * @param bool $mentions Whether to enable mention autocompletion/parsing or not.
+     * @param bool $admin Enable admin only features
+     *
+     * @return string Script to render on page
      */
-    public static function createTinyEditor(Language $language, string $name, ?string $content = null, bool $mentions = false): string {
+    public static function createTinyEditor(Language $language, string $name, ?string $content = null, bool $mentions = false, bool $admin = false): string {
         if (
             (defined('DARK_MODE') && DARK_MODE) ||
             (Cookie::exists('nmc_panel_theme') && Cookie::get('nmc_panel_theme') === 'dark')
@@ -178,6 +181,9 @@ public static function createTinyEditor(Language $language, string $name, ?strin
 
                   xhr.send(formData);
                 },
+                extended_valid_elements: " . ($admin ?
+                    '"script[src|async|defer|type|charset],+@[data-options]"'
+                : 'undefined') . "
             });
         ";
 
diff --git a/core/classes/Misc/MentionsParser.php b/core/classes/Misc/MentionsParser.php
index 54fd74ea36..150d37170b 100644
--- a/core/classes/Misc/MentionsParser.php
+++ b/core/classes/Misc/MentionsParser.php
@@ -15,13 +15,13 @@ class MentionsParser {
      *
      * @param int $author_id User ID of post creator.
      * @param string $value Post content.
-     * @param string $link Link back to post.
+     * @param ?string $link Link back to post.
      * @param ?array $alert_short Short alert info, leave null to not alert user.
      * @param ?array $alert_full Full alert info, leave null to not alert user.
      *
      * @return string Parsed post content.
      */
-    public static function parse(int $author_id, string $value, string $link, array $alert_short = null, array $alert_full = null): string {
+    public static function parse(int $author_id, string $value, string $link = null, array $alert_short = null, array $alert_full = null): string {
         if (preg_match_all('/@([A-Za-z0-9\-_!.]+)/', $value, $matches)) {
             $matches = $matches[1];
 
@@ -35,7 +35,7 @@ public static function parse(int $author_id, string $value, string $link, array
                         $value = preg_replace('/' . preg_quote("@$possible_username", '/') . '/', '[user]' . $user->data()->id . '[/user]', $value);
 
                         // Check if user is blocked by OP
-                        if (($alert_full && $alert_short) && ($user->data()->id != $author_id) && !$user->isBlocked($user->data()->id, $author_id)) {
+                        if ($link && ($alert_full && $alert_short) && ($user->data()->id != $author_id) && !$user->isBlocked($user->data()->id, $author_id)) {
                             Alert::create($user->data()->id, 'tag', $alert_short, $alert_full, $link);
                             break;
                         }
diff --git a/custom/languages/en_UK.json b/custom/languages/en_UK.json
index c239710bf7..e387aa4512 100644
--- a/custom/languages/en_UK.json
+++ b/custom/languages/en_UK.json
@@ -468,6 +468,8 @@
     "admin/positive": "Positive",
     "admin/posts": "Posts",
     "admin/pre_1_7": "Minecraft version older than 1.7?",
+    "admin/pre_custom_page_create_hook_info": "Pre custom page create",
+    "admin/pre_custom_page_edit_hook_info": "Pre custom page edit",
     "admin/privacy_and_terms": "Privacy & Terms",
     "admin/privacy_policy_error": "Please enter a privacy policy no longer than 100,000 characters.",
     "admin/private_profiles": "Private Profiles",
@@ -505,6 +507,8 @@
     "admin/registration_link": "Registration Link",
     "admin/registration_settings_updated": "Registration settings updated successfully.",
     "admin/registrations": "Registrations",
+    "admin/render_custom_page_hook_info": "Render custom page",
+    "admin/render_custom_page_edit_hook_info": "Render custom page edit",
     "admin/report_hook_info": "Report creation",
     "admin/require_integration": "Require users to link and verify integration",
     "admin/required": "Required",
@@ -813,6 +817,7 @@
     "general/total_threads": "Total Threads",
     "general/unlink": "Unlink",
     "general/url": "URL",
+    "general/user_object": "User object",
     "general/users_registered": "Users Registered",
     "general/verify": "Verify",
     "general/version": "Version: {{version}}",
diff --git a/custom/panel_templates/Default/core/pages_edit.tpl b/custom/panel_templates/Default/core/pages_edit.tpl
index b5a4c64e21..40a89e0314 100644
--- a/custom/panel_templates/Default/core/pages_edit.tpl
+++ b/custom/panel_templates/Default/core/pages_edit.tpl
@@ -78,7 +78,7 @@
                                 </div>
                                 <div class="form-group">
                                     <label for="inputContent">{$PAGE_CONTENT}</label>
-                                    <textarea name="content" id="inputContent">{$PAGE_CONTENT_VALUE}</textarea>
+                                    <textarea name="content" id="inputContent"></textarea>
                                 </div>
                                 <div class="form-group custom-control custom-switch">
                                     <input id="inputBasicPage" name="basic" type="checkbox" class="custom-control-input"
diff --git a/custom/panel_templates/Default/core/pages_new.tpl b/custom/panel_templates/Default/core/pages_new.tpl
index c43da286c4..d9396c93d4 100644
--- a/custom/panel_templates/Default/core/pages_new.tpl
+++ b/custom/panel_templates/Default/core/pages_new.tpl
@@ -74,7 +74,7 @@
                                 </div>
                                 <div class="form-group">
                                     <label for="inputContent">{$PAGE_CONTENT}</label>
-                                    <textarea name="content" id="inputContent">{$PAGE_CONTENT_VALUE}</textarea>
+                                    <textarea name="content" id="inputContent"></textarea>
                                 </div>
                                 <div class="form-group custom-control custom-switch">
                                     <input id="inputBasicPage" name="basic" type="checkbox"
diff --git a/custom/panel_templates/Default/template.php b/custom/panel_templates/Default/template.php
index 3de3e4022f..30221e584f 100644
--- a/custom/panel_templates/Default/template.php
+++ b/custom/panel_templates/Default/template.php
@@ -288,16 +288,6 @@ public function onPageLoad() {
 
                         break;
 
-                    case 'custom_pages':
-                        if (isset($_GET['action'])) {
-                            $this->assets()->include([
-                                AssetTree::TINYMCE,
-                            ]);
-
-                            $this->addJSScript(Input::createTinyEditor($this->_language, 'inputContent'));
-                        }
-                        break;
-
                     case 'seo':
                         $this->assets()->include([
                             AssetTree::DATATABLES,
diff --git a/modules/Core/hooks/ContentHook.php b/modules/Core/hooks/ContentHook.php
index f5403ced05..fe8b591a85 100644
--- a/modules/Core/hooks/ContentHook.php
+++ b/modules/Core/hooks/ContentHook.php
@@ -47,7 +47,7 @@ public static function decode(array $params = []): array {
     }
 
     public static function purify(array $params = []): array {
-        if (parent::validateParams($params, ['content'])) {
+        if (parent::validateParams($params, ['content']) && empty($params['skip_purify'])) {
             $params['content'] = Output::getPurified($params['content'], true);
         }
 
diff --git a/modules/Forum/hooks/MentionsHook.php b/modules/Core/hooks/MentionsHook.php
similarity index 80%
rename from modules/Forum/hooks/MentionsHook.php
rename to modules/Core/hooks/MentionsHook.php
index ce9f8ea23c..b56fdc9c82 100644
--- a/modules/Forum/hooks/MentionsHook.php
+++ b/modules/Core/hooks/MentionsHook.php
@@ -4,7 +4,7 @@
  *  https://github.com/NamelessMC/Nameless/
  *  NamelessMC version 2.0.0 pre-13
  *
- *  Mentions hook for pre-create/edit event for Forum module
+ *  Mentions hook for pre-create/edit event for Core module
  */
 
 class MentionsHook extends HookBase {
@@ -16,9 +16,9 @@ public static function preCreate(array $params = []): array {
             $params['content'] = MentionsParser::parse(
                 $params['user']->data()->id,
                 $params['content'],
-                URL::build('/forum/topic/' . urlencode($params['topic_id']), 'pid=' . urlencode($params['post_id'])),
-                ['path' => ROOT_PATH . '/modules/Forum/language', 'file' => 'forum', 'term' => 'user_tag'],
-                ['path' => ROOT_PATH . '/modules/Forum/language', 'file' => 'forum', 'term' => 'user_tag_info', 'replace' => '{{author}}', 'replace_with' => Output::getClean($params['user']->data()->nickname)]
+                $params['alert_url'] ?: null,
+                $params['alert_short'] ?: null,
+                $params['alert_full'] ?: null,
             );
         }
 
@@ -69,6 +69,6 @@ static function (array $match) {
     }
 
     private static function validate(array $params): bool {
-        return parent::validateParams($params, ['content', 'post_id', 'topic_id', 'user']);
+        return parent::validateParams($params, ['content', 'user']);
     }
 }
diff --git a/modules/Core/module.php b/modules/Core/module.php
index ab0cbf1181..10185a1ea8 100644
--- a/modules/Core/module.php
+++ b/modules/Core/module.php
@@ -376,6 +376,44 @@ public function __construct(Language $language, Pages $pages, User $user, Naviga
             ]
         );
 
+        EventHandler::registerEvent('preCustomPageCreate',
+            $language->get('admin', 'pre_custom_page_create_hook_info'),
+            [
+                'content' => $language->get('general', 'content'),
+                'user' => $language->get('general', 'user_object')
+            ],
+            true,
+            true
+        );
+
+        EventHandler::registerEvent('preCustomPageEdit',
+            $language->get('admin', 'pre_custom_page_edit_hook_info'),
+            [
+                'content' => $language->get('general', 'content'),
+                'user' => $language->get('general', 'user_object')
+            ],
+            true,
+            true
+        );
+
+        EventHandler::registerEvent('renderCustomPage',
+            $language->get('admin', 'render_custom_page_hook_info'),
+            [
+                'content' => $language->get('general', 'content')
+            ],
+            true,
+            true
+        );
+
+        EventHandler::registerEvent('renderCustomPageEdit',
+            $language->get('admin', 'render_custom_page_edit_hook_info'),
+            [
+                'content' => $language->get('general', 'content')
+            ],
+            true,
+            true
+        );
+
         EventHandler::registerEvent('linkIntegrationUser',
             $language->get('admin', 'user_link_integration_hook_info'),
             [
@@ -555,6 +593,20 @@ public function __construct(Language $language, Pages $pages, User $user, Naviga
 
         EventHandler::registerListener('cloneGroup', 'CloneGroupHook::execute');
 
+        EventHandler::registerListener('preCustomPageCreate', 'MentionsHook::preCreate');
+        EventHandler::registerListener('preCustomPageEdit', 'MentionsHook::preEdit');
+
+        EventHandler::registerListener('renderCustomPage', 'ContentHook::purify');
+        EventHandler::registerListener('renderCustomPage', 'ContentHook::codeTransform', 15);
+        EventHandler::registerListener('renderCustomPage', 'ContentHook::decode', 20);
+        EventHandler::registerListener('renderCustomPage', 'ContentHook::renderEmojis', 10);
+        EventHandler::registerListener('renderCustomPage', 'ContentHook::replaceAnchors', 15);
+        EventHandler::registerListener('renderCustomPage', 'MentionsHook::parsePost', 5);
+
+        EventHandler::registerListener('renderCustomPageEdit', 'ContentHook::codeTransform', 15);
+        EventHandler::registerListener('renderCustomPageEdit', 'ContentHook::decode', 20);
+        EventHandler::registerListener('renderCustomPageEdit', 'ContentHook::replaceAnchors', 15);
+
         Email::addPlaceholder('[Sitename]', Output::getClean(SITE_NAME));
         Email::addPlaceholder('[Greeting]', static fn(Language $viewing_language) => $viewing_language->get('emails', 'greeting'));
         Email::addPlaceholder('[Message]', static fn(Language $viewing_language, string $email) => $viewing_language->get('emails', $email . '_message'));
diff --git a/modules/Core/pages/custom.php b/modules/Core/pages/custom.php
index 9e68944676..a527e3b33d 100644
--- a/modules/Core/pages/custom.php
+++ b/modules/Core/pages/custom.php
@@ -72,14 +72,15 @@
 // Load modules + template
 Module::loadPage($user, $pages, $cache, $smarty, [$navigation, $cc_nav, $staffcp_nav], $widgets, $template);
 
+$content = EventHandler::executeEvent('renderCustomPage', [
+    'content' => $custom_page->content,
+    'skip_purify' => $custom_page->all_html ?? false
+])['content'];
+
 $smarty->assign([
     'WIDGETS_LEFT' => $widgets->getWidgets('left'),
     'WIDGETS_RIGHT' => $widgets->getWidgets('right'),
-    'CONTENT' => Text::renderEmojis(
-        $custom_page->all_html
-            ? Output::getDecoded($custom_page->content)
-            : Output::getPurified($custom_page->content)
-    )
+    'CONTENT' => $content,
 ]);
 
 $template->onPageLoad();
diff --git a/modules/Core/pages/panel/pages.php b/modules/Core/pages/panel/pages.php
index 7d42765256..a52b39e50f 100644
--- a/modules/Core/pages/panel/pages.php
+++ b/modules/Core/pages/panel/pages.php
@@ -125,10 +125,15 @@
                             $sitemap = intval(isset($_POST['sitemap']) && $_POST['sitemap'] == 'on');
                             $basic = intval(isset($_POST['basic']) && $_POST['basic'] == 'on');
 
+                            $content = EventHandler::executeEvent('preCustomPageCreate', [
+                                'content' => Input::get('content'),
+                                'user' => $user,
+                            ])['content'];
+
                             DB::getInstance()->insert('custom_pages', [
                                 'url' => rtrim(Input::get('page_url'), '/'),
                                 'title' => Input::get('page_title'),
-                                'content' => Input::get('content'),
+                                'content' => $content,
                                 'link_location' => $location,
                                 'redirect' => $redirect,
                                 'link' => $link,
@@ -187,6 +192,12 @@
                 ];
             }
 
+            $content = $_POST['content'] ?? null;
+            if ($content) {
+                // Purify post content
+                $content = EventHandler::executeEvent('renderCustomPageEdit', ['content' => $content])['content'];
+            }
+
             $smarty->assign([
                 'CANCEL' => $language->get('general', 'cancel'),
                 'CANCEL_LINK' => URL::build('/panel/core/pages'),
@@ -205,7 +216,6 @@
                 'PAGE_LINK_FOOTER' => $language->get('admin', 'page_link_footer'),
                 'PAGE_LINK_NONE' => $language->get('admin', 'page_link_none'),
                 'PAGE_CONTENT' => $language->get('admin', 'page_content'),
-                'PAGE_CONTENT_VALUE' => Output::getClean(Input::get('content')),
                 'BASIC_PAGE' => $language->get('admin', 'basic_page'),
                 'PAGE_REDIRECT' => $language->get('admin', 'page_redirect'),
                 'PAGE_REDIRECT_TO' => $language->get('admin', 'page_redirect_to'),
@@ -221,6 +231,12 @@
                 'GROUPS' => $template_array
             ]);
 
+            $template->assets()->include([
+                AssetTree::TINYMCE,
+            ]);
+
+            $template->addJSScript(Input::createTinyEditor($language, 'inputContent', $content, true, true));
+
             $template_file = 'core/pages_new.tpl';
 
             break;
@@ -307,10 +323,15 @@
                             $sitemap = intval(isset($_POST['sitemap']) && $_POST['sitemap'] == 'on');
                             $basic = intval(isset($_POST['basic']) && $_POST['basic'] == 'on');
 
+                            $content = EventHandler::executeEvent('preCustomPageEdit', [
+                                'content' => Input::get('content'),
+                                'user' => $user,
+                            ])['content'];
+
                             DB::getInstance()->update('custom_pages', $page->id, [
                                 'url' => rtrim(Input::get('page_url'), '/'),
                                 'title' => Input::get('page_title'),
-                                'content' => Input::get('content'),
+                                'content' => $content,
                                 'link_location' => $location,
                                 'redirect' => $redirect,
                                 'link' => $link,
@@ -471,6 +492,8 @@
                 }
             }
 
+            $content = EventHandler::executeEvent('renderCustomPageEdit', ['content' => ($_POST['content'] ?: $page->content)])['content'];
+
             $smarty->assign([
                 'CANCEL' => $language->get('general', 'cancel'),
                 'CANCEL_LINK' => URL::build('/panel/core/pages'),
@@ -492,7 +515,6 @@
                 'PAGE_LINK_FOOTER' => $language->get('admin', 'page_link_footer'),
                 'PAGE_LINK_NONE' => $language->get('admin', 'page_link_none'),
                 'PAGE_CONTENT' => $language->get('admin', 'page_content'),
-                'PAGE_CONTENT_VALUE' => (isset($_POST['content']) ? Output::getClean(Input::get('content')) : Output::getClean($page->content)),
                 'PAGE_REDIRECT' => $language->get('admin', 'page_redirect'),
                 'PAGE_REDIRECT_VALUE' => $page->redirect,
                 'PAGE_REDIRECT_TO' => $language->get('admin', 'page_redirect_to'),
@@ -514,6 +536,12 @@
                 'GUEST_PERMS' => $guest_can_view
             ]);
 
+            $template->assets()->include([
+                AssetTree::TINYMCE,
+            ]);
+
+            $template->addJSScript(Input::createTinyEditor($language, 'inputContent', $content, true, true));
+
             $template_file = 'core/pages_edit.tpl';
 
             break;
diff --git a/modules/Forum/pages/forum/edit.php b/modules/Forum/pages/forum/edit.php
index cf36af39d2..b6f62b7845 100644
--- a/modules/Forum/pages/forum/edit.php
+++ b/modules/Forum/pages/forum/edit.php
@@ -233,7 +233,10 @@
 }
 
 // Purify post content
-$content = EventHandler::executeEvent('renderPostEdit', ['content' => $post_editing[0]->post_content])['content'];
+$content = EventHandler::executeEvent('renderPostEdit', [
+    'content' => $post_editing[0]->post_content,
+    'user' => $user
+])['content'];
 
 $smarty->assign([
     'TOKEN' => Token::get(),
diff --git a/modules/Forum/pages/forum/new_topic.php b/modules/Forum/pages/forum/new_topic.php
index a194fc8a1f..e903b96447 100644
--- a/modules/Forum/pages/forum/new_topic.php
+++ b/modules/Forum/pages/forum/new_topic.php
@@ -180,9 +180,10 @@
                 // Get last post ID
                 $last_post_id = DB::getInstance()->lastId();
                 $content = EventHandler::executeEvent('preTopicCreate', [
+                    'alert_full' => ['path' => ROOT_PATH . '/modules/Forum/language', 'file' => 'forum', 'term' => 'user_tag_info', 'replace' => '{{author}}', 'replace_with' => $user->getDisplayname()],
+                    'alert_short' => ['path' => ROOT_PATH . '/modules/Forum/language', 'file' => 'forum', 'term' => 'user_tag'],
+                    'alert_url' => URL::build('/forum/topic/' . urlencode($topic_id), 'pid=' . urlencode($last_post_id)),
                     'content' => $content,
-                    'post_id' => $last_post_id,
-                    'topic_id' => $topic_id,
                     'user' => $user,
                 ])['content'];
 
diff --git a/modules/Forum/pages/forum/view_topic.php b/modules/Forum/pages/forum/view_topic.php
index 8b90e08f8e..257166649f 100644
--- a/modules/Forum/pages/forum/view_topic.php
+++ b/modules/Forum/pages/forum/view_topic.php
@@ -273,9 +273,10 @@
             // Get last post ID
             $last_post_id = DB::getInstance()->lastId();
             $content = EventHandler::executeEvent('prePostCreate', [
+                'alert_full' => ['path' => ROOT_PATH . '/modules/Forum/language', 'file' => 'forum', 'term' => 'user_tag_info', 'replace' => '{{author}}', 'replace_with' => $user->getDisplayname()],
+                'alert_short' => ['path' => ROOT_PATH . '/modules/Forum/language', 'file' => 'forum', 'term' => 'user_tag'],
+                'alert_url' => URL::build('/forum/topic/' . urlencode($tid), 'pid=' . urlencode($last_post_id)),
                 'content' => $content,
-                'post_id' => $last_post_id,
-                'topic_id' => $tid,
                 'user' => $user,
             ])['content'];
 

From 8e80f63f4408d2594906796d4abbb0df7dcdd050 Mon Sep 17 00:00:00 2001
From: samerton <samerton@users.noreply.github.com>
Date: Thu, 21 Jul 2022 17:10:47 +0100
Subject: [PATCH 278/337] Add slashes to saved config values Closes #2933

---
 core/classes/Core/Config.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/classes/Core/Config.php b/core/classes/Core/Config.php
index b291e826a2..e13e66032c 100644
--- a/core/classes/Core/Config.php
+++ b/core/classes/Core/Config.php
@@ -114,10 +114,10 @@ public static function set(string $key, $value): void {
             foreach ($path as $step) {
                 $loc = &$loc[$step];
             }
-            $loc = $value;
+            $loc = addslashes($value);
         }
 
-        static::write($config);
+        static::write((array) $config);
     }
 
     /**
@@ -138,11 +138,11 @@ public static function setMultiple(array $values): void {
                 foreach ($path as $step) {
                     $loc = &$loc[$step];
                 }
-                $loc = $value;
+                $loc = addslashes($value);
             }
         }
 
-        static::write($config);
+        static::write((array) $config);
     }
 
     /**

From 3d98df06368d6ca9cc6a2425d5cd3efcbb19852e Mon Sep 17 00:00:00 2001
From: Supercrafter100 <58982133+supercrafter100@users.noreply.github.com>
Date: Thu, 21 Jul 2022 19:10:53 +0200
Subject: [PATCH 279/337] Match both old and new mariadb version format

---
 modules/Core/pages/panel/index.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/Core/pages/panel/index.php b/modules/Core/pages/panel/index.php
index 91c16a372a..c15025481a 100644
--- a/modules/Core/pages/panel/index.php
+++ b/modules/Core/pages/panel/index.php
@@ -171,9 +171,10 @@
             $pdo_driver = 'MySQL';
         } else {
             $pdo_driver = 'MariaDB';
-            // MariaDB version strings are displayed as: "<major>.<minor>.<patch>-MariaDB",
+            // MariaDB version strings are displayed as: "<major>.<minor>.<patch>-MariaDB" OR sometimes its "<replication version hack>-<major>.<minor>.<patch>-MariaDB",
             // and we only want the version number.
-            $pdo_server_version = explode('-', $pdo_server_version)[0];
+            preg_match('/(?:\d+-)?(.+)?-MariaDB/', $pdo_server_version, $pdo_server_version);
+            $pdo_server_version = $pdo_server_version[1];
         }
     }
 

From 708f577c0adb2d0bb6cfdcce7d187d7d221aa669 Mon Sep 17 00:00:00 2001
From: Supercrafter100 <58982133+supercrafter100@users.noreply.github.com>
Date: Thu, 21 Jul 2022 19:14:22 +0200
Subject: [PATCH 280/337] Fix regex

---
 modules/Core/pages/panel/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/Core/pages/panel/index.php b/modules/Core/pages/panel/index.php
index c15025481a..374f671793 100644
--- a/modules/Core/pages/panel/index.php
+++ b/modules/Core/pages/panel/index.php
@@ -173,7 +173,7 @@
             $pdo_driver = 'MariaDB';
             // MariaDB version strings are displayed as: "<major>.<minor>.<patch>-MariaDB" OR sometimes its "<replication version hack>-<major>.<minor>.<patch>-MariaDB",
             // and we only want the version number.
-            preg_match('/(?:\d+-)?(.+)?-MariaDB/', $pdo_server_version, $pdo_server_version);
+            preg_match('/(?:.+-)?(.+)?-MariaDB/', $pdo_server_version, $pdo_server_version);
             $pdo_server_version = $pdo_server_version[1];
         }
     }

From 2fc62c134ab8be90b8335feacac27e1eff280f5d Mon Sep 17 00:00:00 2001
From: Dominik Roman <dominikslk9@gmail.com>
Date: Wed, 20 Jul 2022 19:45:52 +0000
Subject: [PATCH 281/337] Translated using Weblate (Slovak)

Currently translated at 100.0% (1231 of 1231 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/sk/
---
 custom/languages/sk_SK.json | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/custom/languages/sk_SK.json b/custom/languages/sk_SK.json
index bab36f2ed3..017798a1d3 100644
--- a/custom/languages/sk_SK.json
+++ b/custom/languages/sk_SK.json
@@ -682,7 +682,7 @@
     "general/cookie_notice": "Táto webstránka používa súbory cookie na zlepšenie vášho zážitku z prehliadania. Registráciou na našom webe alebo zatvorením tohto oznámenia súhlasíte s ich použitím.",
     "general/copied": "Skopírované!",
     "general/currently_1_player_online": "Aktuálne je online 1 hráč.",
-    "general/currently_x_players_online": "Aktuálne je {{count}} online hráčov.",
+    "general/currently_x_players_online": "Aktuálne je {{count}} hráčov online.",
     "general/date": "Dátum",
     "general/delete": "Odstrániť",
     "general/edit": "Upraviť",
@@ -707,7 +707,7 @@
     "general/no_default_server": "Neexistuje žiadny predvolený server, vyberte ho v StaffCP - Integrácie - Minecraft.",
     "general/no_online_staff": "Nie sú žiadni admini online.",
     "general/no_online_users": "Nie sú žiadni užívatelia online.",
-    "general/no_players_online": "Nie sú žiadni hráči online.",
+    "general/no_players_online": "Nie sú online žiadni hráči.",
     "general/no_servers": "Nie sú k dispozícii žiadne servery na zobrazenie!",
     "general/none": "Žiadne",
     "general/not_registered_yet": "Ešte nie ste zaregistrovaný?",
@@ -928,7 +928,7 @@
     "time/less_than_a_minute": "pred menej ako minútou",
     "time/over_x_years": "pred viac ako {{count}} rokmi",
     "user/1_new_alert": "Máte 1 nové upozornenie",
-    "user/1_new_message": "Máte 1 novú správu",
+    "user/1_new_message": "Máte {{count}} novú správu",
     "user/1_reaction": "1 reakcia",
     "user/1_reply": "1 odpoveď",
     "user/about": "O užívateľovi",
@@ -1224,5 +1224,10 @@
     "admin/user_group_added_hook_info": "Uživateľská skupina pridaná",
     "admin/user_group_removed_hook_info": "Užívateľská skupina odstránená",
     "admin/group_name": "Názov skupiny",
-    "user/avatar_set_successfully": "Avatar bol úspešne nastavený."
+    "user/avatar_set_successfully": "Avatar bol úspešne nastavený.",
+    "admin/pre_custom_page_create_hook_info": "Pred vytvorením vlastnej stránky",
+    "admin/pre_custom_page_edit_hook_info": "Pred úpravou vlastnej stránky",
+    "general/user_object": "Používateľský objekt",
+    "admin/render_custom_page_hook_info": "Vykresliť vlastnú stránku",
+    "admin/render_custom_page_edit_hook_info": "Vykresliť úpravu vlastnej stránky"
 }

From 2f908ada8aa692348acc905bf3f1a479740a2e79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Loskot?= <fjuro@seznam.cz>
Date: Thu, 21 Jul 2022 06:38:37 +0000
Subject: [PATCH 282/337] Translated using Weblate (Czech)

Currently translated at 100.0% (1231 of 1231 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/cs/
---
 custom/languages/cs_CZ.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/custom/languages/cs_CZ.json b/custom/languages/cs_CZ.json
index c4c72268f0..c08c7f8d13 100644
--- a/custom/languages/cs_CZ.json
+++ b/custom/languages/cs_CZ.json
@@ -1224,5 +1224,10 @@
     "admin/debugging_enabled": "Ladění je povoleno, nepovoleným návštěvníkům mohou být zobrazeny citlivé informacy. Ladění by mělo být použito pouze při vývoji, ne na veřejných webech.",
     "admin/https_port_80": "Vypadá to, že používáte HTTPS na portu 80, což nejspíše není pravda. Pokud používáte Cloudflare, nezapomeňte nastavit šifrování TLS na Full (strict). Pokud máte svou vlastní síť proxy, nastavte ji tak, aby posílala hlavičku X-Forwarded-Port.",
     "admin/group_sync_no_results_warning": "Pravidla synchronizace skupin jsou nastavena, ale nebyly nahlášeny žádné změny. Toto může znamenat nesprávné nastavení.",
-    "user/avatar_set_successfully": "Avatar úspěšně nastaven."
+    "user/avatar_set_successfully": "Avatar úspěšně nastaven.",
+    "admin/pre_custom_page_edit_hook_info": "Předběžná úprava vlastní stránky",
+    "general/user_object": "Uživatelský objekt",
+    "admin/pre_custom_page_create_hook_info": "Předběžné vytvoření vlastní stránky",
+    "admin/render_custom_page_hook_info": "Vykreslení vlastní stránky",
+    "admin/render_custom_page_edit_hook_info": "Vykreslení úpravy vlastní stránky"
 }

From e24b4839f2ca99fa709559cf9c7a31f626292097 Mon Sep 17 00:00:00 2001
From: enno123 <admin@enno123.de>
Date: Thu, 21 Jul 2022 14:28:29 +0000
Subject: [PATCH 283/337] Translated using Weblate (German)

Currently translated at 100.0% (1231 of 1231 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/
---
 custom/languages/de_DE.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index f9365b72f3..209c2fa429 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -1224,5 +1224,10 @@
     "admin/debugging_enabled": "Wenn Debugging aktiviert ist, können sensible Informationen für unbefugte Besucher zugänglich sein. Debugging sollte nur für die Entwicklung verwendet werden, nicht auf öffentlichen Seiten.",
     "admin/https_port_80": "Es sieht so aus, als ob du HTTPS auf Port 80 verwendest, was mit ziemlicher Sicherheit nicht der Fall ist. Wenn du Cloudflare verwendest, stelle sicher, dass du den TLS-Verschlüsselungsmodus auf Full (strict) gesetzt hast. Wenndu deine eigene Proxy verwendest, konfiguriere ihn bitte so, dass er den X-Forwarded-Port-Header sendet.",
     "admin/group_sync_no_results_warning": "Gruppensynchronisierungsregeln sind eingerichtet, aber es wurden keine Änderungen gemeldet. Dies könnte auf eine Fehlkonfiguration hindeuten.",
-    "user/avatar_set_successfully": "Avatar erfolgreich gesetzt."
+    "user/avatar_set_successfully": "Avatar erfolgreich gesetzt.",
+    "general/user_object": "Benutzerobjekt",
+    "admin/pre_custom_page_create_hook_info": "Vordefinierte Seite erstellen",
+    "admin/pre_custom_page_edit_hook_info": "Vordefinierte Seite bearbeiten",
+    "admin/render_custom_page_hook_info": "Benutzerdefinierte Seite rendern",
+    "admin/render_custom_page_edit_hook_info": "Rendering benutzerdefinierte Seite bearbeiten"
 }

From 1d470e50a2c1e484b535584a78a668f0a0645739 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Fri, 22 Jul 2022 13:17:04 -0700
Subject: [PATCH 284/337] Fix exception when trying to login with non-existant
 oauth account

---
 CHANGELOG.md                 | 2 ++
 modules/Core/pages/login.php | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index af901f88b4..8efe8575a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,6 +61,8 @@
 - Fix error when creating group sync rules with only 1 external service
 - Fix website -> Discord group sync issues
 - Fix /rewrite_test not being accessible during installation
+- Fix exception when no user tries to login with OAuth and no Nameless user is linked
+- Fix some special chars in DB/email password getting escaped
 
 ### Deprecated
 *These will be removed in 2.1.0*
diff --git a/modules/Core/pages/login.php b/modules/Core/pages/login.php
index 28f9a29f4a..08e5af7ea0 100644
--- a/modules/Core/pages/login.php
+++ b/modules/Core/pages/login.php
@@ -295,11 +295,9 @@
 ]);
 
 if (Session::exists('oauth_error')) {
-    $smarty->assign('ERROR', Session::flash('oauth_error'));
+    $smarty->assign('ERROR', [Session::flash('oauth_error')]);
 } else if (isset($return_error)) {
-    $smarty->assign('SESSION_FLASH', $return_error);
-} else {
-    $smarty->assign('SESSION_FLASH', '');
+    $smarty->assign('ERROR', $return_error);
 }
 
 if (Session::exists('login_success')) {

From 6f38627d05e0b7031e748ee620d66dbef3d5d804 Mon Sep 17 00:00:00 2001
From: Supercrafter100 <58982133+supercrafter100@users.noreply.github.com>
Date: Mon, 25 Jul 2022 18:09:56 +0200
Subject: [PATCH 285/337] Only show source code option in staffcp pages for
 TinyMCE (#2944)

* Only show source code option in staffcp pages for TinyMCE

* Support all editors in staffcp
---
 core/classes/Core/Input.php                      |  2 +-
 custom/panel_templates/Default/template.php      | 12 ++++++------
 modules/Core/pages/panel/emails_mass_message.php |  2 +-
 modules/Core/pages/panel/users_edit.php          |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/classes/Core/Input.php b/core/classes/Core/Input.php
index 7155e2b221..3a4534da72 100644
--- a/core/classes/Core/Input.php
+++ b/core/classes/Core/Input.php
@@ -129,7 +129,7 @@ public static function createTinyEditor(Language $language, string $name, ?strin
               external_plugins: {
                 'spoiler': '" . URL::build('/core/assets/plugins/tinymce_spoiler/plugin.min.js') . "',
               },
-              toolbar: 'undo redo | bold italic underline strikethrough formatselect fontsizeselect forecolor backcolor ltr rtl emoticons | alignleft aligncenter alignright alignjustify | codesample code hr image link numlist bullist | spoiler-add spoiler-remove',
+              toolbar: 'undo redo | bold italic underline strikethrough formatselect fontsizeselect forecolor backcolor ltr rtl emoticons | alignleft aligncenter alignright alignjustify | codesample " . ($admin ? "code" : "") . " hr image link numlist bullist | spoiler-add spoiler-remove',
               spoiler_caption: '{$language->get('general', 'spoiler')}',
               default_link_target: '_blank',
               skin: '$skin'," .
diff --git a/custom/panel_templates/Default/template.php b/custom/panel_templates/Default/template.php
index 30221e584f..c5f9631d6b 100644
--- a/custom/panel_templates/Default/template.php
+++ b/custom/panel_templates/Default/template.php
@@ -232,7 +232,7 @@ public function onPageLoad() {
                             (defined('CONFIG_PATH') ? CONFIG_PATH : '') . '/core/assets/js/fomantic.toast.min.js' => [],
                         ]);
 
-                        $this->addJSScript(Input::createTinyEditor($this->_language, 'InputMaintenanceMessage'));
+                        $this->addJSScript(Input::createTinyEditor($this->_language, 'InputMaintenanceMessage', null, false, true));
 
                         break;
 
@@ -243,10 +243,10 @@ public function onPageLoad() {
                         ]);
 
                         if (PANEL_PAGE === 'cookie_settings') {
-                            $this->addJSScript(Input::createTinyEditor($this->_language, 'InputCookies'));
+                            $this->addJSScript(Input::createTinyEditor($this->_language, 'InputCookies', null, false, true));
                         } else {
-                            $this->addJSScript(Input::createTinyEditor($this->_language, 'InputPrivacy'));
-                            $this->addJSScript(Input::createTinyEditor($this->_language, 'InputTerms'));
+                            $this->addJSScript(Input::createTinyEditor($this->_language, 'InputPrivacy', null, false, true));
+                            $this->addJSScript(Input::createTinyEditor($this->_language, 'InputTerms', null, false, true));
                         }
                         break;
 
@@ -255,7 +255,7 @@ public function onPageLoad() {
                             AssetTree::TINYMCE,
                         ]);
 
-                        $this->addJSScript(Input::createTinyEditor($this->_language, 'InputRegistrationDisabledMessage'));
+                        $this->addJSScript(Input::createTinyEditor($this->_language, 'InputRegistrationDisabledMessage', null, false, true));
 
                         $this->addJSScript('
                         /*
@@ -520,7 +520,7 @@ public function onPageLoad() {
                         ]);
 
                         if (isset($_GET['forum'])) {
-                            $this->addJSScript(Input::createTinyEditor($this->_language, 'InputPlaceholder'));
+                            $this->addJSScript(Input::createTinyEditor($this->_language, 'InputPlaceholder', null, false, true));
                         }
                         break;
 
diff --git a/modules/Core/pages/panel/emails_mass_message.php b/modules/Core/pages/panel/emails_mass_message.php
index b51e6c30ea..a7792d7e82 100644
--- a/modules/Core/pages/panel/emails_mass_message.php
+++ b/modules/Core/pages/panel/emails_mass_message.php
@@ -95,7 +95,7 @@
     AssetTree::TINYMCE,
 ]);
 
-$template->addJSScript(Input::createTinyEditor($language, 'reply'));
+$template->addJSScript(Input::createTinyEditor($language, 'reply', null, false, true));
 
 if (Session::exists('emails_success')) {
     $success = Session::flash('emails_success');
diff --git a/modules/Core/pages/panel/users_edit.php b/modules/Core/pages/panel/users_edit.php
index e25cc416bd..7990145c91 100644
--- a/modules/Core/pages/panel/users_edit.php
+++ b/modules/Core/pages/panel/users_edit.php
@@ -368,7 +368,7 @@
     AssetTree::TINYMCE,
 ]);
 
-$template->addJSScript(Input::createTinyEditor($language, 'InputSignature'));
+$template->addJSScript(Input::createTinyEditor($language, 'InputSignature', null, false, true));
 
 $template->onPageLoad();
 

From ec8af98a60e53ce166a62ed11546de3db7df7a9d Mon Sep 17 00:00:00 2001
From: Robin <robin+git@rkslot.nl>
Date: Tue, 26 Jul 2022 08:58:20 +0200
Subject: [PATCH 286/337] non-nullable $module, use 'core' string instead of
 null

---
 core/classes/Core/Util.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/classes/Core/Util.php b/core/classes/Core/Util.php
index 7e45621e0a..4870b75898 100644
--- a/core/classes/Core/Util.php
+++ b/core/classes/Core/Util.php
@@ -309,12 +309,12 @@ private static function setSettingsCache(?string $module, array $cache): void {
      *                        nl2_settings table.
      * @return ?string Setting from DB or $fallback.
      */
-    public static function getSetting(string $setting, ?string $fallback = null, ?string $module = null): ?string {
+    public static function getSetting(string $setting, ?string $fallback = null, string $module = 'core'): ?string {
         $cache = self::getSettingsCache($module);
 
         if ($cache === null) {
             // Load all settings for this module and store it as a dictionary
-            if ($module === null) {
+            if ($module === 'core') {
                 $result = DB::getInstance()->query('SELECT `name`, `value` FROM `nl2_settings` WHERE `module` IS NULL')->results();
             } else {
                 $result = DB::getInstance()->query('SELECT `name`, `value` FROM `nl2_settings` WHERE `module` = ?', [$module])->results();
@@ -339,15 +339,15 @@ public static function getSetting(string $setting, ?string $fallback = null, ?st
      *                        specify 'store' to use the 'nl2_store_settings' table. Null to use the standard
      *                        nl2_settings table.
      */
-    public static function setSetting(string $setting, ?string $new_value, ?string $module = null): void {
+    public static function setSetting(string $setting, ?string $new_value, string $module = 'core'): void {
         if ($new_value == null) {
-            if ($module === null) {
+            if ($module === 'core') {
                 DB::getInstance()->query('DELETE FROM `nl2_settings` WHERE `name` = ? AND `module` IS NULL', [$setting]);
             } else {
                 DB::getInstance()->query('DELETE FROM `nl2_settings` WHERE `name` = ? AND `module` = ?', [$setting, $module]);
             }
         } else {
-            if ($module === null) {
+            if ($module === 'core') {
                 DB::getInstance()->query(
                     'INSERT INTO `nl2_settings` (`name`, `value`)
                      VALUES (?, ?)

From e2da55c3591445ccbf7e730f7d4883ff6cb69fff Mon Sep 17 00:00:00 2001
From: Robin <robin+git@rkslot.nl>
Date: Tue, 26 Jul 2022 09:04:09 +0200
Subject: [PATCH 287/337] Update doc

---
 core/classes/Core/Util.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/core/classes/Core/Util.php b/core/classes/Core/Util.php
index 4870b75898..8c52ace522 100644
--- a/core/classes/Core/Util.php
+++ b/core/classes/Core/Util.php
@@ -303,10 +303,9 @@ private static function setSettingsCache(?string $module, array $cache): void {
      * Get a setting from the database table `nl2_settings`.
      *
      * @param string $setting Setting to check.
-     * @param ?string $fallback Fallback to return if $setting is not set in DB.
-     * @param ?string $module Alphanumeric (no spaces!) module name to use as a settings table prefix. For example,
-     *                        specify 'store' to use the 'nl2_store_settings' table. Null to use the standard
-     *                        nl2_settings table.
+     * @param ?string $fallback Fallback to return if $setting is not set in DB. Defaults to null.
+     * @param string $module Module name to keep settings separate from other modules. Set module
+     *                       to 'Core' for global settings.
      * @return ?string Setting from DB or $fallback.
      */
     public static function getSetting(string $setting, ?string $fallback = null, string $module = 'core'): ?string {
@@ -335,9 +334,8 @@ public static function getSetting(string $setting, ?string $fallback = null, str
      *
      * @param string $setting Setting name.
      * @param string|null $new_value New setting value, or null to delete
-     * @param ?string $module Alphanumeric (no spaces!) module name to use as a settings table prefix. For example,
-     *                        specify 'store' to use the 'nl2_store_settings' table. Null to use the standard
-     *                        nl2_settings table.
+     * @param string $module Module name to keep settings separate from other modules. Set module
+     *                       to 'Core' for global settings.
      */
     public static function setSetting(string $setting, ?string $new_value, string $module = 'core'): void {
         if ($new_value == null) {

From f9518be369ce930ee968fbd958001fce4c8f44e5 Mon Sep 17 00:00:00 2001
From: Supercrafter100 <58982133+supercrafter100@users.noreply.github.com>
Date: Wed, 27 Jul 2022 21:29:13 +0200
Subject: [PATCH 288/337] Handle OAuth2 errors properly (#2940)

* Handle OAuth2 login errors properly

* Handle all 3 oath methods when redirecting.

* Spelling mistake in language key

* Proper error handling of invalid provider & invalid oauth_method

* Accidental spelling mistake (whoops)

* PR comments
---
 custom/languages/en_UK.json  |  2 ++
 modules/Core/pages/oauth.php | 32 +++++++++++++++++++++++++++-----
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/custom/languages/en_UK.json b/custom/languages/en_UK.json
index e387aa4512..05ac60c722 100644
--- a/custom/languages/en_UK.json
+++ b/custom/languages/en_UK.json
@@ -780,6 +780,8 @@
     "general/none": "None",
     "general/not_registered_yet": "Not registered yet?",
     "general/oauth_message_continue": "Continue registering with {{provider}}",
+    "general/oauth_failed_setup": "Something went wrong. The OAuth2 setup is invalid. Contact an administrator",
+    "general/oauth_failed": "Something went wrong while trying to use OAuth. Please try again.",
     "general/offline": "Offline",
     "general/online": "Online",
     "general/online_guests": "Online Guests",
diff --git a/modules/Core/pages/oauth.php b/modules/Core/pages/oauth.php
index bc4d66b8b8..18f15c7f05 100644
--- a/modules/Core/pages/oauth.php
+++ b/modules/Core/pages/oauth.php
@@ -2,19 +2,41 @@
 
 if (!isset($_GET['provider'], $_GET['code'])) {
     if (!array_key_exists($_GET['provider'], NamelessOAuth::getInstance()->getProvidersAvailable())) {
-        throw new RuntimeException("Invalid provider {$_GET['provider']}");
+        ErrorHandler::logWarning("Invalid provider {$_GET['provider']}");
+        Session::flash('home_error', $language->get('general', 'oauth_failed'));
+        Redirect::to(URL::build('/'));
     }
 }
 
 if (!Session::exists('oauth_method')) {
-    throw new RuntimeException('No OAuth method set');
+    ErrorHandler::logWarning("No OAuth method set");
+    Session::flash('home_error', $language->get('general', 'oauth_failed'));
+    Redirect::to(URL::build('/'));
 }
 
 $provider_name = $_GET['provider'];
 $provider = NamelessOAuth::getInstance()->getProviderInstance($provider_name);
-$token = $provider->getAccessToken('authorization_code', [
-    'code' => $_GET['code']
-]);
+try {
+    $token = $provider->getAccessToken('authorization_code', [
+        'code' => $_GET['code']
+    ]);
+} catch (\League\OAuth2\Client\Provider\Exception\IdentityProviderException $e) {
+    Session::flash('oauth_error', $language->get('general', 'oauth_failed_setup'));
+    ErrorHandler::logWarning('An error occurred while handling an OAuth ' . Session::get('oauth_method') . ' request: ' . $e->getMessage());
+
+    $method = Session::get('oauth_method');
+    switch($method) {
+        case 'register':
+            Redirect::to(URL::build('/register'));
+
+        case 'login':
+            Redirect::to(URL::build('/login'));
+
+        case 'link':
+            Redirect::to(URL::build('/user/oauth/'));
+    }
+}
+
 $oauth_user = $provider->getResourceOwner($token)->toArray();
 $provider_id = $oauth_user[NamelessOAuth::getInstance()->getUserIdName($provider_name)];
 

From 616ee1dff77e01b1f8b40b7f009f78eec5afa536 Mon Sep 17 00:00:00 2001
From: samerton <samerton@users.noreply.github.com>
Date: Thu, 28 Jul 2022 17:57:57 +0100
Subject: [PATCH 289/337] Fix issues converting groups and reports from v1

---
 core/installation/includes/upgrade_perform.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/installation/includes/upgrade_perform.php b/core/installation/includes/upgrade_perform.php
index 89821be1b4..833272468d 100644
--- a/core/installation/includes/upgrade_perform.php
+++ b/core/installation/includes/upgrade_perform.php
@@ -167,7 +167,8 @@
                 'name' => $item->name,
                 'group_html' => $item->group_html,
                 'admin_cp' => (($item->staff) ? 1 : 0),
-                'default_group' => (($item->id == 1) ? 1 : 0)
+                'default_group' => (($item->id == 1) ? 1 : 0),
+                'permissions' => '{}',
             ]);
         }
 
@@ -374,6 +375,8 @@
                 'status' => $item->status,
                 'date_reported' => $item->date_reported,
                 'date_updated' => $item->date_updated,
+                'reported' => strtotime($item->date_reported),
+                'updated' => $item->date_updated ? strtotime($item->date_updated) : null,
                 'report_reason' => $item->report_reason,
                 'updated_by' => $item->updated_by,
                 'reported_post' => $item->reported_post,
@@ -398,6 +401,7 @@
                 'report_id' => $item->report_id,
                 'commenter_id' => $item->commenter_id,
                 'comment_date' => $item->comment_date,
+                'date' => strtotime($item->comment_date),
                 'comment_content' => $item->comment_content
             ]);
         }

From 457b5a76707fc177a9a17c0576fd719597b11efc Mon Sep 17 00:00:00 2001
From: Supercrafter100 <admin@supercrafter100.com>
Date: Wed, 27 Jul 2022 18:34:58 +0000
Subject: [PATCH 290/337] Translated using Weblate (Dutch)

Currently translated at 100.0% (1231 of 1231 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/nl/
---
 custom/languages/nl_NL.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/custom/languages/nl_NL.json b/custom/languages/nl_NL.json
index 92ead80eb6..0ae0690fe2 100644
--- a/custom/languages/nl_NL.json
+++ b/custom/languages/nl_NL.json
@@ -1224,5 +1224,10 @@
     "admin/https_port_80": "Het lijkt erop dat je HTTPS op poort 80 gebruikt, wat hoogstwaarschijnlijk niet correct is. Als je Cloudflare gebruikt, zorg ervoor dat je TLS encryptie modus op Full (strict) zet. Als je je eigen proxy runt, configureer dan de X-Forwarded-Port header.",
     "admin/debugging_enabled": "Debugging is ingeschakeld, gevoelige informatie zou kunnen worden blootgesteld aan onbevoegde bezoekers. Debugging zou alleen mogen worden gebruikt voor ontwikkeling, niet voor publieke sites.",
     "admin/group_sync_no_results_warning": "Group synchronisatie regels zijn ingesteld maar geen wijzigingen zijn gerapporteerd. Dit kan een misconfiguratie aanwijzen.",
-    "user/avatar_set_successfully": "Avatar succesvol ingesteld."
+    "user/avatar_set_successfully": "Avatar succesvol ingesteld.",
+    "admin/pre_custom_page_create_hook_info": "Voor op maat gemaakte pagina creatie",
+    "admin/pre_custom_page_edit_hook_info": "Voor op na gemaakte pagina aanpassing",
+    "admin/render_custom_page_hook_info": "Op maat gemaakte pagina weergeven",
+    "admin/render_custom_page_edit_hook_info": "Op maat gemaakte pagina aanpassing weergeven",
+    "general/user_object": "Gebruikersobject"
 }

From 1f2a291b5a07f1db2f16ffc088f27d109585cde9 Mon Sep 17 00:00:00 2001
From: PadowYT2 <me@padow.ru>
Date: Wed, 27 Jul 2022 05:18:50 +0000
Subject: [PATCH 291/337] Translated using Weblate (Russian)

Currently translated at 99.9% (1230 of 1231 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/ru/
---
 custom/languages/ru_RU.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/custom/languages/ru_RU.json b/custom/languages/ru_RU.json
index 94ab486b93..e7acb22c94 100644
--- a/custom/languages/ru_RU.json
+++ b/custom/languages/ru_RU.json
@@ -1224,5 +1224,9 @@
     "admin/https_port_80": "Похоже вы используйте HTTPS на порте 80, что скорее всего не правда. Если вы используете Cloudflare, не забудьте сделать TLS шифрование на Полное (строгое). Если у вас свой прокси, настройте его для отправки X-Forwarded-Port заголовка.",
     "admin/group_sync_no_results_warning": "Правила синхронизации групп настроены, но нет изменений которые были сообщены. Это может произойти из-за не правильной настройки.",
     "installer/config_write_failed": "Не удалось написать в конфиг файл: {{message}}",
-    "user/avatar_set_successfully": "Аватарка успешно поставлена."
+    "user/avatar_set_successfully": "Аватарка успешно поставлена.",
+    "admin/pre_custom_page_create_hook_info": "Создание при кастом страницы",
+    "admin/pre_custom_page_edit_hook_info": "Изменение при кастом страницы",
+    "admin/render_custom_page_hook_info": "Зарендерить кастомную страницу",
+    "general/user_object": "Объект пользователя"
 }

From bae49a2cac118521343e4290d34b55e1406947e9 Mon Sep 17 00:00:00 2001
From: Nibbles <nibbles.cool@foxmail.com>
Date: Wed, 27 Jul 2022 03:50:35 +0000
Subject: [PATCH 292/337] Translated using Weblate (Chinese (Simplified))

Currently translated at 99.3% (1223 of 1231 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/zh_Hans/
---
 custom/languages/zh_CN.json | 64 ++++++++++++++++++++++++++++++-------
 1 file changed, 53 insertions(+), 11 deletions(-)

diff --git a/custom/languages/zh_CN.json b/custom/languages/zh_CN.json
index e32d8f573d..644207fb34 100644
--- a/custom/languages/zh_CN.json
+++ b/custom/languages/zh_CN.json
@@ -14,13 +14,13 @@
     "admin/allow_custom_avatars": "是否允许用户自定义头像?",
     "admin/announcement_hook_info": "公告创建",
     "admin/announcement_icon_instructions": "您也可以为公告添加图标，例如使用 {{faLink}} 或 {{semLink}}.",
-    "admin/announcement_info": "创建公告来对所选定的组的所有成员在指定的页面上显示",
+    "admin/announcement_info": "创建公告来对所选定的组的所有成员在指定的页面上显示。",
     "admin/announcement_order": "顺序",
     "admin/announcements": "公告",
     "admin/api": "API",
     "admin/api_endpoints": "API 结点",
     "admin/api_endpoints_info": "API 结点允许模块添加第三方程序 (例如 Minecraft 和 Discord) 与您的 NamelessMC 网站互动的方法。{{docLinkStart}}Check out the API documentation here{{docLinkEnd}}",
-    "admin/api_info": "该 API 允许插件和其他服务与您的网站进行交互，例如 {{pluginLinkStart}}Nameless 官方插件{{pluginLinkEnd}}.",
+    "admin/api_info": "该 API 允许插件和其他服务与您的网站进行交互，例如 {{pluginLinkStart}}Nameless 官方插件{{pluginLinkEnd}}和 {{botLinkStart}}Nameless 官方Discord机器人{{botLinkEnd}}。",
     "admin/api_key": "API 密钥",
     "admin/api_key_regenerated": "API 密匙重新生成成功。",
     "admin/api_registration_email": "API 注册邮件",
@@ -47,14 +47,14 @@
     "admin/average_players": "普通玩家",
     "admin/background_colour": "背景颜色",
     "admin/background_colour_required": "背景颜色为必填项",
-    "admin/ban_hook_info": "User banned",
+    "admin/ban_hook_info": "已ban用户",
     "admin/banner_background": "条幅背景",
     "admin/banner_image_x": "条幅图片: {{imageName}}",
     "admin/banner_updated_successfully": "条幅已成功更新。您的更改可能需要一段时间才能生效。",
-    "admin/basic_page": "基本页面",
+    "admin/basic_page": "作为基本页面？",
     "admin/built_in_avatars": "内置头像服务",
     "admin/bungee_instance": "是否启用 BungeeCord 实例?",
-    "admin/bungee_instance_help": "如果服务器是 BungeeCord 代理服，请开启这个配置",
+    "admin/bungee_instance_help": "如果服务器是 BungeeCord 代理服，请开启这个配置。",
     "admin/bust": "肢体",
     "admin/cache_cleared": "模板缓存已清空",
     "admin/cache_not_writable": "<strong>cache</strong> 目录不可写。",
@@ -64,7 +64,7 @@
     "admin/cant_edit_this_group": "您无法编辑该组的权限!",
     "admin/cant_modify_root_user": "无法修改此用户的主权限组!",
     "admin/cant_write_to_template": "无法写入模板文件！请检查文件权限。",
-    "admin/captcha_general": "在注册和联系页上启用验证码? (大陆可能无法使用)",
+    "admin/captcha_general": "在注册和联系页上启用验证码? （大陆可能无法使用）",
     "admin/captcha_login": "在登录页上启用验证码?",
     "admin/captcha_secret_key": "验证码 Secret Key",
     "admin/captcha_site_key": "验证码 Site Key",
@@ -115,7 +115,7 @@
     "admin/default_language": "默认语言",
     "admin/default_language_help": "用户可从已安装的语言中选择 {{docLinkStart}}阅读更多 »{{docLinkEnd}}",
     "admin/default_server": "默认服务器",
-    "admin/default_template_set": "将默认模板设置为 {{template}} 的操作已成功",
+    "admin/default_template_set": "将默认模板设置为 {{template}} 的操作已成功。",
     "admin/default_timezone": "默认时区",
     "admin/delete": "删除",
     "admin/delete_email_error": "删除时遇到了错误",
@@ -134,7 +134,7 @@
     "admin/download": "下载",
     "admin/download_sitemap": "下载 Sitemap",
     "admin/downloads_x": "下载次数: {{downloads}}",
-    "admin/drag_files_here": "将文件扔到这以上传",
+    "admin/drag_files_here": "将文件扔到这以上传。",
     "admin/dropdown_items": "下拉项目",
     "admin/dropdown_name": "下拉菜单的名字",
     "admin/edit_email_messages": "邮件信息",
@@ -166,10 +166,10 @@
     "admin/email_port": "端口",
     "admin/email_port_invalid": "请输入一个有效的邮箱端口。",
     "admin/email_preview_popup": "预览",
-    "admin/email_preview_popup_message": "点击此处来查看邮件预览",
+    "admin/email_preview_popup_message": "点击此处来查看邮件预览。",
     "admin/email_resend_failed": "邮件发送失败，请检查邮件设置。",
     "admin/email_resent_successfully": "邮件已重新发送。",
-    "admin/email_settings_updated_successfully": "邮件配置已被更新成功",
+    "admin/email_settings_updated_successfully": "邮件配置已被更新成功。",
     "admin/email_verification": "是否启用邮箱验证?",
     "admin/emails": "邮件",
     "admin/emails_mass_message": "邮件广播",
@@ -1187,5 +1187,47 @@
     "user/oauth_link_success": "成功将您的账号链接到了 {{provider}}!",
     "admin/unlink": "解绑",
     "admin/cloning_group": "正在复制 {{group}} 群组",
-    "admin/debug_link": "调试链接"
+    "admin/debug_link": "调试链接",
+    "admin/user_group_added_hook_info": "新增用户组",
+    "general/deleted_user": "已删除的用户",
+    "installer/database_configured": "数据库已配置。",
+    "admin/use_external_mail_server": "使用外部邮件服务器",
+    "general/red": "红色",
+    "general/olive": "橄榄色",
+    "general/green": "绿色",
+    "general/blue": "蓝色",
+    "general/pink": "粉红色",
+    "general/brown": "棕色",
+    "installer/config_write_failed": "无法写入配置文件：{{message}}",
+    "installer/database_connection_failed": "连接数据库失败：<br>{{message}}",
+    "general/teal": "蓝绿色",
+    "general/purple": "绀色",
+    "general/grey": "灰色",
+    "user/avatar_set_successfully": "头像设置成功。",
+    "admin/trusted_proxies_not_configured": "{{linkStart}}可信代理{{linkEnd}} 未配置，IP 禁令可能无法正常工作。",
+    "admin/trusted_proxies_configured": "受信任的代理",
+    "admin/pre_custom_page_create_hook_info": "预自定义页面创建",
+    "admin/pre_custom_page_edit_hook_info": "预自定义页面编辑",
+    "admin/test_email_query": "没有到达您的收件箱？ 尝试以下操作：",
+    "admin/test_email_suggest_1": "等待几分钟，然后检查您的垃圾邮件文件夹。",
+    "admin/test_email_suggest_2": "更新您网站的 DNS 记录（检查 SPF 和 DKIM）。",
+    "admin/test_email_suggest_3": "设置 SMTP 服务器。 {{docLinkStart}}阅读更多 »{{docLinkEnd}}",
+    "admin/https_port_80": "您看起来好像在端口 80 上使用 HTTPS，这几乎绝对不是真的。 如果您使用 Cloudflare，请确保将 TLS 加密模式设置为 Full（严格）。 如果您运行自己的代理，请将其配置为发送 X-Forwarded-Port 标头。",
+    "general/user_object": "用户对象",
+    "general/violet": "紫色",
+    "installer/upgrade_error": "升级时遇到错误。",
+    "admin/page_url_contains_nameless_path": "您的自定义页面将覆盖 NamelessMC 页面。",
+    "general/auto_language": "自动语言",
+    "user/no_providers_admin": "站点管理员尚未配置任何 OAuth 程序。",
+    "general/yellow": "黄色",
+    "general/orange": "橙色",
+    "admin/user_group_removed_hook_info": "删除用户组",
+    "admin/group_sync_no_results_warning": "已设置组同步规则，但未报告任何更改。 这可能意味着配置错误。",
+    "admin/render_custom_page_hook_info": "渲染自定义页面",
+    "admin/render_custom_page_edit_hook_info": "编辑渲染自定义页面",
+    "admin/api_disabled": "API 已禁用",
+    "admin/debugging_enabled": "启用调试，敏感信息可能会暴露给未经授权的访问者。 调试只能用于开发，不能用于公共站点。",
+    "general/default": "默认",
+    "admin/debug_link_info": "重要 - 仅与您信任的人分享此链接！",
+    "admin/group_name": "权限组名称"
 }

From 1c0b8f3bdeed45b8503e54ae0ff89a5443a50001 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Loskot?= <fjuro@seznam.cz>
Date: Thu, 28 Jul 2022 05:12:03 +0000
Subject: [PATCH 293/337] Translated using Weblate (Czech)

Currently translated at 100.0% (1233 of 1233 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/cs/
---
 custom/languages/cs_CZ.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/custom/languages/cs_CZ.json b/custom/languages/cs_CZ.json
index c08c7f8d13..d39b555c86 100644
--- a/custom/languages/cs_CZ.json
+++ b/custom/languages/cs_CZ.json
@@ -1229,5 +1229,7 @@
     "general/user_object": "Uživatelský objekt",
     "admin/pre_custom_page_create_hook_info": "Předběžné vytvoření vlastní stránky",
     "admin/render_custom_page_hook_info": "Vykreslení vlastní stránky",
-    "admin/render_custom_page_edit_hook_info": "Vykreslení úpravy vlastní stránky"
+    "admin/render_custom_page_edit_hook_info": "Vykreslení úpravy vlastní stránky",
+    "general/oauth_failed_setup": "Něco se pokazilo. Nastavení OAuth2 je neplatné. Kontaktujte správce",
+    "general/oauth_failed": "Něco se pokazilo při pokusu o použití OAuth. Zkuste to prosím znovu."
 }

From cb5528f43b47c150796746a01f55e240b6f138fb Mon Sep 17 00:00:00 2001
From: Dominik Roman <dominikslk9@gmail.com>
Date: Wed, 27 Jul 2022 20:12:20 +0000
Subject: [PATCH 294/337] Translated using Weblate (Slovak)

Currently translated at 100.0% (1233 of 1233 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/sk/
---
 custom/languages/sk_SK.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/custom/languages/sk_SK.json b/custom/languages/sk_SK.json
index 017798a1d3..93b82ac580 100644
--- a/custom/languages/sk_SK.json
+++ b/custom/languages/sk_SK.json
@@ -1229,5 +1229,7 @@
     "admin/pre_custom_page_edit_hook_info": "Pred úpravou vlastnej stránky",
     "general/user_object": "Používateľský objekt",
     "admin/render_custom_page_hook_info": "Vykresliť vlastnú stránku",
-    "admin/render_custom_page_edit_hook_info": "Vykresliť úpravu vlastnej stránky"
+    "admin/render_custom_page_edit_hook_info": "Vykresliť úpravu vlastnej stránky",
+    "general/oauth_failed_setup": "Niečo sa pokazilo. Nastavenie OAuth2 je neplatné. Kontaktujte správcu",
+    "general/oauth_failed": "Pri pokuse o použitie OAuth sa vyskytla chyba. Prosím skúste znova."
 }

From 0bba6258a6dc975e9752ec5d2d3d4337a9ebc551 Mon Sep 17 00:00:00 2001
From: Robin <robin+git@rkslot.nl>
Date: Fri, 29 Jul 2022 19:43:02 +0200
Subject: [PATCH 295/337] Give solution in error message

---
 custom/languages/en_UK.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/languages/en_UK.json b/custom/languages/en_UK.json
index 05ac60c722..dcba387e96 100644
--- a/custom/languages/en_UK.json
+++ b/custom/languages/en_UK.json
@@ -776,7 +776,7 @@
     "general/no_online_staff": "There are no staff members online.",
     "general/no_online_users": "There are no users online.",
     "general/no_players_online": "There are no players online.",
-    "general/no_servers": "There are no servers to display!",
+    "general/no_servers": "There are no servers to display. The site administrator can add a Minecraft server in StaffCP > Integrations > Minecraft > Minecraft servers.",
     "general/none": "None",
     "general/not_registered_yet": "Not registered yet?",
     "general/oauth_message_continue": "Continue registering with {{provider}}",

From 93913f54e6193ad80f85f0453f1f2cf1f40d030c Mon Sep 17 00:00:00 2001
From: enno123 <admin@enno123.de>
Date: Thu, 28 Jul 2022 18:38:18 +0000
Subject: [PATCH 296/337] Translated using Weblate (German)

Currently translated at 100.0% (1233 of 1233 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/
---
 custom/languages/de_DE.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index 209c2fa429..b9e5a215ce 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -1229,5 +1229,7 @@
     "admin/pre_custom_page_create_hook_info": "Vordefinierte Seite erstellen",
     "admin/pre_custom_page_edit_hook_info": "Vordefinierte Seite bearbeiten",
     "admin/render_custom_page_hook_info": "Benutzerdefinierte Seite rendern",
-    "admin/render_custom_page_edit_hook_info": "Rendering benutzerdefinierte Seite bearbeiten"
+    "admin/render_custom_page_edit_hook_info": "Rendering benutzerdefinierte Seite bearbeiten",
+    "general/oauth_failed_setup": "Etwas ist schief gelaufen. Die OAuth2-Einrichtung ist ungültig. Kontaktiere einen Administrator",
+    "general/oauth_failed": "Beim Versuch, OAuth zu verwenden, ist etwas schief gelaufen. Bitte versuch es erneut."
 }

From 101debb90ab3b5655e4b6c0194c9140ae222e26d Mon Sep 17 00:00:00 2001
From: Dominik Roman <dominikslk9@gmail.com>
Date: Thu, 28 Jul 2022 21:13:53 +0000
Subject: [PATCH 297/337] Translated using Weblate (Slovak)

Currently translated at 100.0% (1233 of 1233 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/sk/
---
 custom/languages/sk_SK.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/custom/languages/sk_SK.json b/custom/languages/sk_SK.json
index 93b82ac580..3c34750b07 100644
--- a/custom/languages/sk_SK.json
+++ b/custom/languages/sk_SK.json
@@ -7,7 +7,7 @@
     "admin/active": "Aktívny",
     "admin/add_server": "Pridať server",
     "admin/adding_server": "Pridanie serveru",
-    "admin/admin_dir_still_exists": "Varovanie! Adresár modules/Core/pages/admin stále existuje. Odstráňte tento adresár.",
+    "admin/admin_dir_still_exists": "Varovanie! Adresár /modules/Core/pages/admin stále existuje. Prosím odstráňte tento adresár.",
     "admin/administrator": "Administrátor",
     "admin/administrator_permission_info": "Členovia s týmto povolením budú mať všetky povolenia. Toto je nebezpečné povolenie na udelenie.",
     "admin/all_logs": "Všetky záznamy",
@@ -69,8 +69,8 @@
     "admin/cant_write_to_template": "Nie je možné zapisovať do súboru šablóny! Skontrolujte oprávnenia súborov.",
     "admin/captcha_general": "Povoliť Captcha na registračnej stránke?",
     "admin/captcha_login": "Povoliť Captcha na prihlasovacej stránke?",
-    "admin/captcha_secret_key": "Captcha Secret Key",
-    "admin/captcha_site_key": "Captcha Site Key",
+    "admin/captcha_secret_key": "Captcha tajný kľúč",
+    "admin/captcha_site_key": "Captcha kľúč webu",
     "admin/captcha_type": "Typ Captcha",
     "admin/check_again": "Skontrolovať znova",
     "admin/clear_cache": "Vymazať cache šablóny",
@@ -117,7 +117,7 @@
     "admin/default_avatar": "Predvolený avatar",
     "admin/default_group": "Je skupina predvolenou skupinou (pre nových užívateľov)?",
     "admin/default_language": "Hlavný jazyk",
-    "admin/default_language_help": "Užívatelia si budú môcť vybrať z ľubovoľných nainštalovaných jazykov. {{docLinkStart}}\nViac informácií »{{docLinkEnd}}",
+    "admin/default_language_help": "Užívatelia si budú môcť vybrať z nainštalovaných jazykov. {{docLinkStart}}\nViac informácií »{{docLinkEnd}}",
     "admin/default_server": "Predvolený server",
     "admin/default_template_set": "Predvolená šablóna bola úspešne nastavená na {{template}}.",
     "admin/default_timezone": "Predvolené časové pásmo",
@@ -319,7 +319,7 @@
     "admin/minecraft_uuid": "Minecraft UUID",
     "admin/missing_contact_address": "Vložte kontaktnú emailovú adresu o dĺžke 3 až 255 znakov.",
     "admin/missing_sitename": "Vložte názov webu o dĺžke 2 až 64 znakov.",
-    "admin/mod_dir_still_exists": "Varovanie! Adresár modules/Core/pages/mod stále existuje. Odstráňte tento adresár.",
+    "admin/mod_dir_still_exists": "Varovanie! Adresár /modules/Core/pages/mod stále existuje. Prosím odstráňte tento adresár.",
     "admin/mode_toggle": "Tmavý režim",
     "admin/module": "Modul",
     "admin/module_disabled": "Modul zakázaný.",
@@ -1198,7 +1198,7 @@
     "admin/test_email_query": "Nedostáva sa do vašej doručenej pošty? Skúste následovné:",
     "admin/test_email_suggest_1": "Počkajte niekoľko minút a skontrolujte priečinok nevyžiadanej pošty.",
     "admin/test_email_suggest_2": "Aktualizujte DNS záznamy vašej stránky (skontrolujte SPF a DKIM).",
-    "admin/test_email_suggest_3": "Nastavte SMTP server.\n{{docLinkStart}}Čítať viac »\n{{docLinkEnd}}",
+    "admin/test_email_suggest_3": "Nastavte SMTP server.\n{{docLinkStart}}Viac informácii »\n{{docLinkEnd}}",
     "admin/trusted_proxies_not_configured": "{{linkStart}}Dôveryhodné proxy servery\n{{linkEnd}} nie sú nastavené, IP zákazy nemusia správne fungovať.",
     "general/orange": "Oranžová",
     "general/default": "Predvolené",

From 74ffb1193614f1a79023d1e0d66c4ef6a04ed427 Mon Sep 17 00:00:00 2001
From: Supercrafter100 <58982133+supercrafter100@users.noreply.github.com>
Date: Sat, 30 Jul 2022 15:39:53 +0200
Subject: [PATCH 298/337] Support 2FA with OAuth2 logging in (#2943)

* Support 2FA with OAuth2 logging in

* Forgot to rename a variable
---
 modules/Core/pages/oauth.php | 41 ++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/modules/Core/pages/oauth.php b/modules/Core/pages/oauth.php
index 18f15c7f05..e23240f53c 100644
--- a/modules/Core/pages/oauth.php
+++ b/modules/Core/pages/oauth.php
@@ -1,5 +1,8 @@
 <?php
 
+const PAGE = 'oauth';
+require_once(ROOT_PATH . '/core/templates/frontend_init.php');
+
 if (!isset($_GET['provider'], $_GET['code'])) {
     if (!array_key_exists($_GET['provider'], NamelessOAuth::getInstance()->getProvidersAvailable())) {
         ErrorHandler::logWarning("Invalid provider {$_GET['provider']}");
@@ -14,6 +17,31 @@
     Redirect::to(URL::build('/'));
 }
 
+// If they are filling in 2FA. We've already retrieved their user. We can skip the other steps in this case
+if (isset($_SESSION['user_id']) && isset($_POST['tfa_code'])) {
+    $user = new User($_SESSION['user_id']);
+
+    // Continue the 2FA process
+    $tfa = new \RobThree\Auth\TwoFactorAuth('NamelessMC');
+    if ($tfa->verifyCode($user->data()->tfa_secret, str_replace(' ', '', $_POST['tfa_code'])) !== true) {
+        Session::flash('tfa_signin', $language->get('user', 'invalid_tfa'));
+        require(ROOT_PATH . '/core/includes/tfa_signin.php');
+        die();
+    }
+    unset($_SESSION['user_id']);
+
+    // Log the user in if 2FA passed
+    if ($user->login(
+        $user->data()->id,
+        '', true, 'oauth'
+    )) {
+        Log::getInstance()->log(Log::Action('user/login'));
+        Session::flash('home', $language->get('user', 'oauth_login_success', ['provider' => ucfirst($provider_name)]));
+        Session::delete('oauth_method');
+        Redirect::to(URL::build('/'));
+    }
+}
+
 $provider_name = $_GET['provider'];
 $provider = NamelessOAuth::getInstance()->getProviderInstance($provider_name);
 try {
@@ -64,6 +92,19 @@
         Redirect::to(URL::build('/login'));
     }
 
+    $user_id = NamelessOAuth::getInstance()->getUserIdFromProviderId($provider_name, $provider_id);
+    $user = new User($user_id);
+
+    // If the user has 2FA enabled, ask for those credentials
+    if ($user->data()->tfa_enabled == 1 && $user->data()->tfa_complete == 1) {
+        $_SESSION['user_id'] = $user_id;
+        if (!isset($_POST['tfa_code'])) {
+            require(ROOT_PATH . '/core/includes/tfa_signin.php');
+            die();
+        }
+    }
+
+    // Log the user in
     if ((new User())->login(
         NamelessOAuth::getInstance()->getUserIdFromProviderId($provider_name, $provider_id),
         '', true, 'oauth'

From 2facd695b1844058d6211554fe115bc859dca5cb Mon Sep 17 00:00:00 2001
From: Supercrafter100 <58982133+supercrafter100@users.noreply.github.com>
Date: Sat, 30 Jul 2022 15:41:25 +0200
Subject: [PATCH 299/337] Block banned ips from registering (#2942)

* Block banned ips from registering

* Simplify if statement

* PR comments
---
 custom/languages/en_UK.json     | 1 +
 modules/Core/pages/register.php | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/custom/languages/en_UK.json b/custom/languages/en_UK.json
index dcba387e96..b0c94e891e 100644
--- a/custom/languages/en_UK.json
+++ b/custom/languages/en_UK.json
@@ -1231,5 +1231,6 @@
     "user/x_reactions": "{{count}} reactions",
     "user/x_replies": "{{count}} replies",
     "user/you_have_been_banned": "You have been banned!",
+    "user/banned_from_registering": "Your IP has been banned, you cannot register.",
     "user/you_have_received_a_warning": "You have received a warning!"
 }
diff --git a/modules/Core/pages/register.php b/modules/Core/pages/register.php
index f9ea4f5763..73007a4f62 100644
--- a/modules/Core/pages/register.php
+++ b/modules/Core/pages/register.php
@@ -220,6 +220,13 @@
                 },
             ]);
 
+            // Check if the ip they are trying to register with is banned
+            $ip = HttpUtils::getRemoteAddress();
+            if (DB::getInstance()->get('ip_bans', ['ip', $ip])->count()) {
+                Session::flash('home_error', $language->get('user', 'banned_from_registering'));
+                Redirect::to(URL::build('/'));
+            }
+
             // Check if any integrations wanna modify the validation
             foreach ($integrations->getEnabledIntegrations() as $integration) {
                 $integration->beforeRegistrationValidation($validation);

From fc391d4c47d328f0ccfb26437135f2ab2e09543b Mon Sep 17 00:00:00 2001
From: enno123 <admin@enno123.de>
Date: Sat, 30 Jul 2022 12:56:56 +0000
Subject: [PATCH 300/337] Translated using Weblate (German)

Currently translated at 100.0% (1233 of 1233 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/
---
 custom/languages/de_DE.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index b9e5a215ce..7e5144319d 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -667,7 +667,7 @@
     "general/no_online_staff": "Derzeit sind keine Teammitglieder online.",
     "general/no_online_users": "Es sind keine User online.",
     "general/no_players_online": "Es sind keine Spieler Online.",
-    "general/no_servers": "Es sind keine Server verfügbar!",
+    "general/no_servers": "Es gibt keine Server, die angezeigt werden können. Der Website-Administrator kann einen Minecraft-Server unter StaffCP > Integrationen > Minecraft > Minecraft-Server hinzufügen.",
     "general/none": "Nichts",
     "general/not_registered_yet": "Noch nicht registriert?",
     "general/offline": "Offline",

From 77f5dd97bf0212ac9fb2d5d0664271ca793185fc Mon Sep 17 00:00:00 2001
From: Dominik Roman <dominikslk9@gmail.com>
Date: Sat, 30 Jul 2022 08:51:27 +0000
Subject: [PATCH 301/337] Translated using Weblate (Slovak)

Currently translated at 100.0% (1233 of 1233 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/sk/
---
 custom/languages/sk_SK.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/custom/languages/sk_SK.json b/custom/languages/sk_SK.json
index 3c34750b07..9262c58169 100644
--- a/custom/languages/sk_SK.json
+++ b/custom/languages/sk_SK.json
@@ -233,7 +233,7 @@
     "admin/group_name_minimum": "Uistite sa, že názov vašej skupiny má minimálne 2 znaky.",
     "admin/group_name_required": "Prosím zadajte názov skupiny.",
     "admin/group_order": "Poradie skupiny",
-    "admin/group_staff": "Je skupina skupinou adminov?",
+    "admin/group_staff": "Je skupina určená pre tím?",
     "admin/group_sync": "Synchronizácia skupiny",
     "admin/group_sync_info": "Môžete nakonfigurovať API na automatickú aktualizáciu užívateľovej skupiny na webstránke, keď sa zmení ich integračná skupina. Jednoducho zadajte názov/ID integračnej skupiny a skupinu na webstránke, s ktorou by sa mali synchronizovať.",
     "admin/group_sync_logs": "Zmeny skupinovej synchronizácie",
@@ -268,7 +268,7 @@
     "admin/identifier": "Identifikátor",
     "admin/images": "Obrázky",
     "admin/include_in_sitemap": "Zahrnúť do sitemap?",
-    "admin/include_staff_in_user_widget": "Zahrnúť vedenie do widgetu užívateľov?",
+    "admin/include_staff_in_user_widget": "Zahrnúť aj členov tímu?",
     "admin/ingame_group_maximum": "Uistite sa, že názov vašej skupiny je dlhý maximálne 64 znakov.",
     "admin/install": "Inštalovať",
     "admin/install_confirm": "Uistite sa, že ste si najskôr stiahli balík a nahrali obsiahnuté súbory!",
@@ -352,7 +352,7 @@
     "admin/new_urgent_update_available": "K dispozícii je nová urgentná aktualizácia. Aktualizujte čo najskôr!",
     "admin/new_version_x": "Nová verzia: {{version}}",
     "admin/no_announcements": "Zatiaľ neboli vytvorené žiadne oznámenia.",
-    "admin/no_avatars_available": "K dispozícii nie sú žiadni avatary. Najskôr nahrajte nový obrázok vyššie.",
+    "admin/no_avatars_available": "K dispozícii nie sú žiadne avatary. Najskôr nahrajte nový obrázok vyššie.",
     "admin/no_custom_fields": "Zatiaľ neexistujú žiadne vlastné polia.",
     "admin/no_custom_pages": "Zatiaľ neboli vytvorené žiadne stránky.",
     "admin/no_default_server": "Žiadny predvolený server",
@@ -704,16 +704,16 @@
     "general/more": "Viac",
     "general/next": "Ďalšie",
     "general/no": "Nie",
-    "general/no_default_server": "Neexistuje žiadny predvolený server, vyberte ho v StaffCP - Integrácie - Minecraft.",
-    "general/no_online_staff": "Nie sú žiadni admini online.",
-    "general/no_online_users": "Nie sú žiadni užívatelia online.",
+    "general/no_default_server": "Neexistuje žiadny predvolený server, vyberte ho v StaffCP -> Integrácie -> Minecraft.",
+    "general/no_online_staff": "Žiadny člen tímu nie je online.",
+    "general/no_online_users": "Žiadni užívatelia nie sú online.",
     "general/no_players_online": "Nie sú online žiadni hráči.",
-    "general/no_servers": "Nie sú k dispozícii žiadne servery na zobrazenie!",
+    "general/no_servers": "Neexistujú žiadne servery na zobrazenie. Správca stránky môže pridať Minecraft server v StaffCP > Integrácie > Minecraft > Minecraft servery.",
     "general/none": "Žiadne",
     "general/not_registered_yet": "Ešte nie ste zaregistrovaný?",
     "general/oauth_message_continue": "Pokračovať v registrácii s {{provider}}",
     "general/online_guests": "Online hostia",
-    "general/online_staff": "Online admini",
+    "general/online_staff": "Online tím",
     "general/online_users": "Online užívatelia",
     "general/origin_api": "API",
     "general/origin_website": "Webstránka",
@@ -739,7 +739,7 @@
     "general/submit": "Potvrdiť",
     "general/success": "Úspešne",
     "general/total_online": "Celkom online",
-    "general/total_online_staff": "Celkom online adminov: {{count}}",
+    "general/total_online_staff": "Celkom online členov tímu: {{count}}",
     "general/total_online_users": "Celkom online užívateľov: {{count}}",
     "general/total_posts": "Celkom príspevkov",
     "general/total_threads": "Celkom vlákien",
@@ -780,7 +780,7 @@
     "installer/enabled": "Povolené",
     "installer/enter_admin_details": "Zadajte podrobnosti pre admin účet.",
     "installer/finish": "Dokončenie",
-    "installer/finish_message": "Ďakujeme, že ste si nainštalovali NamelessMC! Teraz môžete prejsť na StaffCP, kde môžete ďalej konfigurovať svoju webstránku.",
+    "installer/finish_message": "Ďakujeme, že ste si nainštalovali NamelessMC! Teraz môžete prejsť na StaffCP, kde môžete ďalej nastaviť svoju webstránku.",
     "installer/friendly_urls": "Priateľské URL",
     "installer/friendly_urls_info": "Priateľské adresy URL zlepšia čitateľnosť adries URL vo vašom prehliadači. <br /> Napríklad: <br /><code>example.com/index.php?route=/forum</code><br />sa stane:<br /><code>example.com/forum</code><br /><div class=\"ui inverted orange segment\"><i class=\"exclamation circle icon\"></i><strong>Dôležité!</strong><br />Váš server musí byť správne nakonfigurovaný, aby to fungovalo. To, či môžete povoliť túto možnosť, zobrazíte kliknutím <a href=\"./rewrite_test\" target=\"_blank\" style=\"color:#2185D0\">tu</a>.</div>",
     "installer/general_configuration": "Všeobecná konfigurácia",
@@ -891,8 +891,8 @@
     "moderator/revoked": "Odvolané",
     "moderator/search_for_ip": "Vyhľadajte užívateľské meno alebo IP adresu",
     "moderator/spam": "Spam",
-    "moderator/staff": "Admini",
-    "moderator/staff:": "Admini:",
+    "moderator/staff": "Člen tímu",
+    "moderator/staff:": "Člen tímu:",
     "moderator/type": "Typ",
     "moderator/updated_by": "Aktualizované užívateľom",
     "moderator/user_marked_as_spam": "Používateľ bol úspešne označený ako spam.",

From 39956821ca1ef46d0a2e022390e743daa42b4e46 Mon Sep 17 00:00:00 2001
From: Partydragen <admin@partydragen.com>
Date: Sat, 30 Jul 2022 17:01:34 +0200
Subject: [PATCH 302/337] Fix StaffCP navigation order

---
 core/classes/Core/Navigation.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/core/classes/Core/Navigation.php b/core/classes/Core/Navigation.php
index 6684e4831f..f3d97d776b 100644
--- a/core/classes/Core/Navigation.php
+++ b/core/classes/Core/Navigation.php
@@ -4,7 +4,7 @@
  *
  * @package NamelessMC\Core
  * @author Samerton
- * @version 2.0.0-pr9
+ * @version 2.0.0
  * @license MIT
  */
 class Navigation {
@@ -93,6 +93,19 @@ public function add(
      * @param string $icon Icon to prepend to nav item.
      */
     public function addDropdown(string $name, string $title, string $location = 'top', int $order = 10, string $icon = ''): void {
+        if ($this->_panel && $location == 'top') {
+            // Discard order
+            // TODO: only a temporary solution to the link conflict issue in the StaffCP
+            if (count($this->_topNavbar)) {
+                $key = array_keys($this->_topNavbar)[count($this->_topNavbar) - 1];
+                $previous_order = $this->_topNavbar[$key]['order'];
+            } else {
+                $previous_order = 0;
+            }
+
+            $order = $previous_order + 1;
+        }
+
         // Add the dropdown
         if ($location == 'top') {
             // Navbar

From 3a38fd48fe00ad182250f1312e4d497d5420123e Mon Sep 17 00:00:00 2001
From: Partydragen <adrian_kili@outlook.com>
Date: Sun, 31 Jul 2022 13:16:33 +0200
Subject: [PATCH 303/337] Discord webhook formatter (#2830)

* Discord webhook formatter

* Move createAnnouncement to hook class

* Update DiscordFormatterHook

* Hide internal events

* Update CHANGELOG.md

* Add Normal webhook type (Raw Data)

* Move DiscordFormatterHook to discord module

* Revert event settings changes

Co-authored-by: Tadhg Boyle <tadhgsmboyle@gmail.com>
---
 CHANGELOG.md                                  |  1 +
 core/init.php                                 |  6 +--
 custom/languages/en_UK.json                   |  1 +
 .../Default/core/hooks_edit.tpl               |  1 +
 .../Default/core/hooks_new.tpl                |  1 +
 modules/Core/hooks/WebHook.php                | 27 +++++++++++
 modules/Core/pages/panel/hooks.php            |  4 +-
 .../hooks/DiscordFormatterHook.php            | 47 +++++++++++++++++++
 .../Discord Integration/hooks/DiscordHook.php | 35 +++-----------
 modules/Discord Integration/module.php        | 13 +++++
 10 files changed, 104 insertions(+), 32 deletions(-)
 create mode 100644 modules/Core/hooks/WebHook.php
 create mode 100644 modules/Discord Integration/hooks/DiscordFormatterHook.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8efe8575a6..0ad4be8aab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Add info about OAuth providers to debug link
 - Respect light/dark mode for captcha popups
 - Added `ProfileUtils::getOfflineModeUuid()` & `ProfileUtils::formatUuid()`
+- Added `discordWebhookFormatter` event so modules can define how a Discord webhook embed looks
 
 ### Changed
 - Better Discord widget error display
diff --git a/core/init.php b/core/init.php
index 1465d41ea5..edc98df05d 100644
--- a/core/init.php
+++ b/core/init.php
@@ -478,19 +478,19 @@
             $hooks = DB::getInstance()->get('hooks', ['id', '<>', 0])->results();
             if (count($hooks)) {
                 foreach ($hooks as $hook) {
-                    if ($hook->action != 2) {
+                    if ($hook->action != 1 && $hook->action != 2) {
                         continue;
                     }
 
                     // TODO: more extendable webhook system, #2676
-                    if (!class_exists(DiscordHook::class)) {
+                    if ($hook->action == 2 && !class_exists(DiscordHook::class)) {
                         continue;
                     }
 
                     $hook_array[] = [
                         'id' => $hook->id,
                         'url' => Output::getClean($hook->url),
-                        'action' => 'DiscordHook::execute',
+                        'action' => $hook->action == 1 ? 'WebHook::execute' : 'DiscordHook::execute',
                         'events' => json_decode($hook->events, true)
                     ];
                 }
diff --git a/custom/languages/en_UK.json b/custom/languages/en_UK.json
index b0c94e891e..cc74190f05 100644
--- a/custom/languages/en_UK.json
+++ b/custom/languages/en_UK.json
@@ -778,6 +778,7 @@
     "general/no_players_online": "There are no players online.",
     "general/no_servers": "There are no servers to display. The site administrator can add a Minecraft server in StaffCP > Integrations > Minecraft > Minecraft servers.",
     "general/none": "None",
+    "general/normal": "Normal",
     "general/not_registered_yet": "Not registered yet?",
     "general/oauth_message_continue": "Continue registering with {{provider}}",
     "general/oauth_failed_setup": "Something went wrong. The OAuth2 setup is invalid. Contact an administrator",
diff --git a/custom/panel_templates/Default/core/hooks_edit.tpl b/custom/panel_templates/Default/core/hooks_edit.tpl
index ceea521c32..d818737667 100644
--- a/custom/panel_templates/Default/core/hooks_edit.tpl
+++ b/custom/panel_templates/Default/core/hooks_edit.tpl
@@ -65,6 +65,7 @@
                                     <label for="link_location">{$HOOK_TYPE}</label>
                                     <select class="form-control" id="hook_type" name="hook_type">
                                         <option value="2" {if $HOOK_TYPE_VALUE eq 2} selected{/if}>Discord</option>
+                                        <option value="1" {if $HOOK_TYPE_VALUE eq 1} selected{/if}>{$NORMAL}</option>
                                     </select>
                                 </div>
                                 <label for="InputName">{$HOOK_EVENTS}</label>
diff --git a/custom/panel_templates/Default/core/hooks_new.tpl b/custom/panel_templates/Default/core/hooks_new.tpl
index cdc213eb78..8ec3f24fbb 100644
--- a/custom/panel_templates/Default/core/hooks_new.tpl
+++ b/custom/panel_templates/Default/core/hooks_new.tpl
@@ -65,6 +65,7 @@
                                     <label for="link_location">{$HOOK_TYPE}</label>
                                     <select class="form-control" id="hook_type" name="hook_type">
                                         <option value="2">Discord</option>
+                                        <option value="1">{$NORMAL}</option>
                                     </select>
                                 </div>
                                 <label for="InputName">{$HOOK_EVENTS}</label>
diff --git a/modules/Core/hooks/WebHook.php b/modules/Core/hooks/WebHook.php
new file mode 100644
index 0000000000..2da0bec089
--- /dev/null
+++ b/modules/Core/hooks/WebHook.php
@@ -0,0 +1,27 @@
+<?php
+/*
+ *  Made by Partydragen
+ *  https://github.com/NamelessMC/Nameless/
+ *  NamelessMC version 2.0.0
+ *
+ *  Webhook handler class
+ */
+
+class WebHook {
+
+    public static function execute(array $params = []): void {
+        $return = $params;
+        unset($return['webhook']);
+        $json = json_encode($return, JSON_UNESCAPED_SLASHES);
+
+        $httpClient = HttpClient::post($params['webhook'], $json, [
+            'headers' => [
+                'Content-Type' => 'application/json',
+            ],
+        ]);
+
+        if ($httpClient->hasError()) {
+            trigger_error($httpClient->getError());
+        }
+    }
+}
diff --git a/modules/Core/pages/panel/hooks.php b/modules/Core/pages/panel/hooks.php
index 5c1ae6ba74..b6121640c7 100644
--- a/modules/Core/pages/panel/hooks.php
+++ b/modules/Core/pages/panel/hooks.php
@@ -114,7 +114,8 @@
                 'HOOK_EVENTS' => $language->get('admin', 'hook_events'),
                 'BACK' => $language->get('general', 'back'),
                 'BACK_LINK' => URL::build('/panel/core/hooks'),
-                'ALL_EVENTS' => EventHandler::getEvents(),
+                'NORMAL' => $language->get('general', 'normal'),
+                'ALL_EVENTS' => EventHandler::getEvents()
             ]);
 
             $template_file = 'core/hooks_new.tpl';
@@ -199,6 +200,7 @@
                 'HOOK_EVENTS' => $language->get('admin', 'hook_events'),
                 'BACK' => $language->get('general', 'back'),
                 'BACK_LINK' => URL::build('/panel/core/hooks'),
+                'NORMAL' => $language->get('general', 'normal'),
                 'ALL_EVENTS' => EventHandler::getEvents(),
                 'ENABLED_HOOKS' => json_decode($hook->events, true)
             ]);
diff --git a/modules/Discord Integration/hooks/DiscordFormatterHook.php b/modules/Discord Integration/hooks/DiscordFormatterHook.php
new file mode 100644
index 0000000000..f0de556c29
--- /dev/null
+++ b/modules/Discord Integration/hooks/DiscordFormatterHook.php	
@@ -0,0 +1,47 @@
+<?php
+/*
+ *  Made by Partydragen
+ *  https://github.com/NamelessMC/Nameless/
+ *  NamelessMC version 2.0.0 pre-13
+ *
+ *  Discord formatter hook
+ */
+
+class DiscordFormatterHook extends HookBase {
+
+    public static function format(array $params = []): array {
+        $data = $params['data'];
+        $format = $params['format'];
+
+        if ($data['event'] == 'registerUser') {
+            $format['username'] = SITE_NAME;
+            $format['content'] = '';
+            $format['embeds'] = [[
+                'author' => [
+                    'name' => Output::getClean($data['username']),
+                    'url' => $data['url'],
+                    'icon_url' => $data['avatar_url']
+                ],
+                'description' => $data['language']->get('user', 'user_x_has_registered', ['user' => Output::getClean($data['username']), 'siteName' => SITE_NAME])
+            ]];
+
+            $params['format'] = $format;
+        } else if ($data['event'] == 'createAnnouncement') {
+            $content = html_entity_decode(str_replace(['&nbsp;', '&bull;'], [' ', ''], $data['message']));
+            if (mb_strlen($content) > 512) {
+                $content = mb_substr($content, 0, 512) . '...';
+            }
+
+            $format['username'] = $data['username'] . ' | ' . SITE_NAME;
+            $format['avatar_url'] = $data['avatar_url'];
+            $format['embeds'] = [[
+                'title' => 'New Announcement: ' . $data['header'],
+                'description' => $content,
+            ]];
+
+            $params['format'] = $format;
+        }
+
+        return $params;
+    }
+}
\ No newline at end of file
diff --git a/modules/Discord Integration/hooks/DiscordHook.php b/modules/Discord Integration/hooks/DiscordHook.php
index c57cdcdb55..2727118312 100644
--- a/modules/Discord Integration/hooks/DiscordHook.php	
+++ b/modules/Discord Integration/hooks/DiscordHook.php	
@@ -11,32 +11,11 @@
 class DiscordHook {
 
     public static function execute(array $params = []): void {
-        // Ensure hook is compatible
-        $return = [];
-        if ($params['event'] == 'registerUser') {
-            $return['username'] = SITE_NAME;
-            $return['content'] = '';
-            $return['embeds'] = [[
-                'author' => [
-                    'name' => Output::getClean($params['username']),
-                    'url' => $params['url'],
-                    'icon_url' => $params['avatar_url']
-                ],
-                'description' => $params['language']->get('user', 'user_x_has_registered', ['user' => Output::getClean($params['username']), 'siteName' => SITE_NAME])
-            ]];
-        } else if ($params['event'] == 'createAnnouncement') {
-            $content = html_entity_decode(str_replace(['&nbsp;', '&bull;'], [' ', ''], $params['message']));
-            if (mb_strlen($content) > 512) {
-                $content = mb_substr($content, 0, 512) . '...';
-            }
+        $return = EventHandler::executeEvent('discordWebhookFormatter', ['format' => [], 'data' => $params])['format'];
+
+        if (!is_array($return) || !count($return)) {
+            $return = [];
 
-            $return['username'] = $params['username'] . ' | ' . SITE_NAME;
-            $return['avatar_url'] = $params['avatar_url'];
-            $return['embeds'] = [[
-                'title' => 'New Announcement: ' . $params['header'],
-                'description' => $content,
-            ]];
-        } else {
             $content = html_entity_decode(str_replace(['&nbsp;', '&bull;'], [' ', ''], $params['content_full']));
             if (mb_strlen($content) > 512) {
                 $content = mb_substr($content, 0, 512) . '...';
@@ -50,10 +29,10 @@ public static function execute(array $params = []): void {
                 'url' => $params['url'],
                 'footer' => ['text' => $params['content']]
             ]];
-        }
 
-        if (isset($params['color']) && $params['color'] != null) {
-            $return['embeds'][0]['color'] = hexdec($params['color']);
+            if (isset($params['color'])) {
+                $return['embeds'][0]['color'] = hexdec($params['color']);
+            }
         }
 
         $json = json_encode($return, JSON_UNESCAPED_SLASHES);
diff --git a/modules/Discord Integration/module.php b/modules/Discord Integration/module.php
index a035043b5a..e9e0bc5cdf 100644
--- a/modules/Discord Integration/module.php	
+++ b/modules/Discord Integration/module.php	
@@ -33,6 +33,19 @@ public function __construct(Language $language, Pages $pages, Endpoints $endpoin
         GroupSyncManager::getInstance()->registerInjector(new DiscordGroupSyncInjector);
 
         Integrations::getInstance()->registerIntegration(new DiscordIntegration($language));
+
+        // Hooks
+        EventHandler::registerEvent('discordWebhookFormatter',
+            'Discord webhook formatter',
+            [
+                'data' => 'Event data',
+                'format' => 'The format which being sent to the discord webhook'
+            ],
+            true,
+            true
+        );
+
+        EventHandler::registerListener('discordWebhookFormatter', 'DiscordFormatterHook::format');
     }
 
     public function onInstall() {

From f5416cdcb40581631ec532c9783d5b0bbfff7310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Loskot?= <fjuro@seznam.cz>
Date: Sat, 30 Jul 2022 18:03:21 +0000
Subject: [PATCH 304/337] Translated using Weblate (Czech)

Currently translated at 100.0% (1234 of 1234 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/cs/
---
 custom/languages/cs_CZ.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/custom/languages/cs_CZ.json b/custom/languages/cs_CZ.json
index d39b555c86..fa1a9d4c43 100644
--- a/custom/languages/cs_CZ.json
+++ b/custom/languages/cs_CZ.json
@@ -698,7 +698,7 @@
     "general/no_online_staff": "Online není žádný člen týmu.",
     "general/no_online_users": "Online nejsou žádní uživatelé.",
     "general/no_players_online": "Na serveru nehrají žádní hráči.",
-    "general/no_servers": "Nejsou zde žádné servery k zobrazení!",
+    "general/no_servers": "Nejsou zde žádné servery k zobrazení. Správce webu může přidat Minecraft server v Panel > Integrace > Minecraft > Minecraft servery.",
     "general/none": "Žádný",
     "general/not_registered_yet": "Ještě nejste zaregistrováni?",
     "general/online_guests": "Hosté online",
@@ -1231,5 +1231,6 @@
     "admin/render_custom_page_hook_info": "Vykreslení vlastní stránky",
     "admin/render_custom_page_edit_hook_info": "Vykreslení úpravy vlastní stránky",
     "general/oauth_failed_setup": "Něco se pokazilo. Nastavení OAuth2 je neplatné. Kontaktujte správce",
-    "general/oauth_failed": "Něco se pokazilo při pokusu o použití OAuth. Zkuste to prosím znovu."
+    "general/oauth_failed": "Něco se pokazilo při pokusu o použití OAuth. Zkuste to prosím znovu.",
+    "user/banned_from_registering": "Vaše IP byla zabanována, nemůžete se zaregistrovat."
 }

From 266bbbc597d4e1e27c4b6247fc4f0ad8e0a841a1 Mon Sep 17 00:00:00 2001
From: enno123 <admin@enno123.de>
Date: Sun, 31 Jul 2022 08:54:29 +0000
Subject: [PATCH 305/337] Translated using Weblate (German)

Currently translated at 100.0% (1234 of 1234 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/
---
 custom/languages/de_DE.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index 7e5144319d..8e582d127d 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -1231,5 +1231,6 @@
     "admin/render_custom_page_hook_info": "Benutzerdefinierte Seite rendern",
     "admin/render_custom_page_edit_hook_info": "Rendering benutzerdefinierte Seite bearbeiten",
     "general/oauth_failed_setup": "Etwas ist schief gelaufen. Die OAuth2-Einrichtung ist ungültig. Kontaktiere einen Administrator",
-    "general/oauth_failed": "Beim Versuch, OAuth zu verwenden, ist etwas schief gelaufen. Bitte versuch es erneut."
+    "general/oauth_failed": "Beim Versuch, OAuth zu verwenden, ist etwas schief gelaufen. Bitte versuch es erneut.",
+    "user/banned_from_registering": "Deine IP wurde gesperrt, du kannst dich nicht registrieren."
 }

From 78ec8d01ab8b1abd5ea2fb7ab0867888ce41de5f Mon Sep 17 00:00:00 2001
From: Marcos <marckos03br@gmail.com>
Date: Sat, 30 Jul 2022 14:03:21 +0000
Subject: [PATCH 306/337] Translated using Weblate (Spanish)

Currently translated at 99.6% (1230 of 1234 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/es/
---
 custom/languages/es_ES.json | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/custom/languages/es_ES.json b/custom/languages/es_ES.json
index aa3c3ac31b..f07a06d535 100644
--- a/custom/languages/es_ES.json
+++ b/custom/languages/es_ES.json
@@ -699,7 +699,7 @@
     "general/no_online_staff": "No hay miembros del personal administrativo en línea.",
     "general/no_online_users": "No hay usuarios en línea.",
     "general/no_players_online": "No hay jugadores conectados.",
-    "general/no_servers": "¡No hay servidores para mostrar!",
+    "general/no_servers": "No hay servidores que mostrar. El administrador del sitio web puede añadir un servidor de Minecraft en StaffCP > Integraciones > Minecraft > Servidores de Minecraft.",
     "general/none": "Ninguno",
     "general/not_registered_yet": "¿Aún no se ha registrado?",
     "general/offline": "Desconectado",
@@ -1224,5 +1224,9 @@
     "admin/trusted_proxies_not_configured": "{{linkStart}}Proxies de confianza{{linkEnd}} no están configurados, las prohibiciones de IP pueden no funcionar correctamente.",
     "admin/https_port_80": "Parece como si estuvieras usando HTTPS en el puerto 80, lo que casi definitivamente no es cierto. Si usas Cloudflare, asegúrate de configurar el modo de encriptación TLS en Full (estricto). Si ejecuta su propio proxy, configúrelo para que envíe la cabecera X-Forwarded-Port.",
     "admin/group_sync_no_results_warning": "Las reglas de sincronización de grupos están configuradas pero no se ha informado de ningún cambio. Esto podría indicar una configuración errónea.",
-    "user/avatar_set_successfully": "Avatar fijado con éxito."
+    "user/avatar_set_successfully": "Avatar fijado con éxito.",
+    "general/user_object": "Objeto del usuario",
+    "user/banned_from_registering": "Tu IP ha sido vetada, no puedes registrarte.",
+    "general/oauth_failed_setup": "Algo salió mal. La configuración de OAuth2 no es válida. Póngase en contacto con un administrador",
+    "general/oauth_failed": "Algo ha ido mal al intentar utilizar OAuth. Por favor, inténtelo de nuevo."
 }

From fe660814843984b2fd722536cb19918e25f60e81 Mon Sep 17 00:00:00 2001
From: Partydragen <admin@partydragen.com>
Date: Sun, 31 Jul 2022 14:11:57 +0200
Subject: [PATCH 307/337] Accept discord role ids up to 20 characters long

Closes https://github.com/NamelessMC/Nameless/issues/2949
---
 .../classes/DiscordGroupSyncInjector.php                    | 6 +++---
 modules/Discord Integration/classes/DiscordIntegration.php  | 2 +-
 modules/Discord Integration/language/en_UK.json             | 4 ++--
 modules/Discord Integration/pages/panel/discord.php         | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/Discord Integration/classes/DiscordGroupSyncInjector.php b/modules/Discord Integration/classes/DiscordGroupSyncInjector.php
index 6ab5fea3f9..1f50c39032 100644
--- a/modules/Discord Integration/classes/DiscordGroupSyncInjector.php	
+++ b/modules/Discord Integration/classes/DiscordGroupSyncInjector.php	
@@ -49,15 +49,15 @@ public function getSelectionOptions(): array {
     public function getValidationRules(): array {
         return [
             Validate::MIN => 18,
-            Validate::MAX => 18,
+            Validate::MAX => 20,
             Validate::NUMERIC => true
         ];
     }
 
     public function getValidationMessages(Language $language): array {
         return [
-            Validate::MIN => Discord::getLanguageTerm('discord_role_id_length'),
-            Validate::MAX => Discord::getLanguageTerm('discord_role_id_length'),
+            Validate::MIN => Discord::getLanguageTerm('discord_role_id_length', ['min' => 18, 'max' => 20]),
+            Validate::MAX => Discord::getLanguageTerm('discord_role_id_length', ['min' => 18, 'max' => 20]),
             Validate::NUMERIC => Discord::getLanguageTerm('discord_role_id_numeric'),
         ];
     }
diff --git a/modules/Discord Integration/classes/DiscordIntegration.php b/modules/Discord Integration/classes/DiscordIntegration.php
index f2b6ee2e66..f9b957385f 100644
--- a/modules/Discord Integration/classes/DiscordIntegration.php	
+++ b/modules/Discord Integration/classes/DiscordIntegration.php	
@@ -93,7 +93,7 @@ public function validateIdentifier(string $identifier, int $integration_user_id
                 Validate::REQUIRED => true,
                 Validate::NUMERIC => true,
                 Validate::MIN => 17,
-                Validate::MAX => 18
+                Validate::MAX => 20
             ]
         ])->messages([
             'identifier' => [
diff --git a/modules/Discord Integration/language/en_UK.json b/modules/Discord Integration/language/en_UK.json
index e7f0fd91a3..8eb162e2c7 100644
--- a/modules/Discord Integration/language/en_UK.json	
+++ b/modules/Discord Integration/language/en_UK.json	
@@ -17,7 +17,7 @@
     "discord_integration\/discord_guild_id": "Discord Server ID",
     "discord_integration\/discord_id_confirm": "Please run the command \"\/verify {{token}}\" in Discord to finish linking your Discord account.",
     "discord_integration\/discord_id_help": "For information on where to find Discord IDs, please read {{linkStart}}this.{{linkEnd}}",
-    "discord_integration\/discord_id_length": "Please ensure your Discord Server ID is 18 characters long.",
+    "discord_integration\/discord_id_length": "Please ensure your Discord Server ID is between {{min}} and {{max}} digits long.",
     "discord_integration\/discord_id_numeric": "Please ensure your Discord Server ID is numeric (Numbers only).",
     "discord_integration\/discord_id_required": "Please enter your Discord Server ID.",
     "discord_integration\/discord_id_set": "Discord ID set successfully",
@@ -28,7 +28,7 @@
     "discord_integration\/discord_invalid_id": "That Discord User ID is invalid.",
     "discord_integration\/discord_invite_info": "To invite the Nameless Link bot to your Discord server, click {{inviteLinkStart}}here{{inviteLinkEnd}}. Then, run the {{command}} command to link the bot with your website. Alternatively, you can {{selfHostLinkStart}}host the bot yourself{{selfHostLinkEnd}}.",
     "discord_integration\/discord_role_id": "Discord Role ID",
-    "discord_integration\/discord_role_id_length": "Discord Role ID must be 18 digits long.",
+    "discord_integration\/discord_role_id_length": "Discord Role ID must be between {{min}} and {{max}} digits long.",
     "discord_integration\/discord_role_id_numeric": "Discord Role ID must be numeric.",
     "discord_integration\/discord_settings_updated": "Discord settings updated successfully",
     "discord_integration\/discord_unknown_error": "There was an unknown error while syncing Discord roles. Please contact an administrator.",
diff --git a/modules/Discord Integration/pages/panel/discord.php b/modules/Discord Integration/pages/panel/discord.php
index c8b063dfda..8cdf60e240 100644
--- a/modules/Discord Integration/pages/panel/discord.php	
+++ b/modules/Discord Integration/pages/panel/discord.php	
@@ -28,14 +28,14 @@
             $validation = Validate::check($_POST, [
                 'discord_guild_id' => [
                     Validate::MIN => 18,
-                    Validate::MAX => 18,
+                    Validate::MAX => 20,
                     Validate::NUMERIC => true,
                     Validate::REQUIRED => true,
                 ]
             ])->messages([
                 'discord_guild_id' => [
-                    Validate::MIN => Discord::getLanguageTerm('discord_id_length'),
-                    Validate::MAX => Discord::getLanguageTerm('discord_id_length'),
+                    Validate::MIN => Discord::getLanguageTerm('discord_id_length', ['min' => 18, 'max' => 20]),
+                    Validate::MAX => Discord::getLanguageTerm('discord_id_length', ['min' => 18, 'max' => 20]),
                     Validate::NUMERIC => Discord::getLanguageTerm('discord_id_numeric'),
                     Validate::REQUIRED => Discord::getLanguageTerm('discord_id_required'),
                 ]

From cfa0331743fe20f148e9fd5370e07a69d03229c5 Mon Sep 17 00:00:00 2001
From: Robin <robin+git@rkslot.nl>
Date: Tue, 2 Aug 2022 16:43:32 +0200
Subject: [PATCH 308/337] Nested extra can be null to

for the record, I have no idea what any of this code does but this fixed an issue in support
---
 core/classes/Minecraft/MCQuery.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/classes/Minecraft/MCQuery.php b/core/classes/Minecraft/MCQuery.php
index 28df18d5ae..4362d1a502 100644
--- a/core/classes/Minecraft/MCQuery.php
+++ b/core/classes/Minecraft/MCQuery.php
@@ -364,11 +364,11 @@ private static function getMotd(string $text, array $modern_format): string {
 
         // some servers (originrealms) return a weird MOTD
         if (count($modern_format) === 1 && is_array($modern_format[0])) {
-            $modern_format = $modern_format[0]['extra'];
+            $modern_format = $modern_format[0]['extra'] ?? [];
         }
         // and sometimes it's doubly nested...
         if (count($modern_format) === 1 && is_array($modern_format[0])) {
-            $modern_format = $modern_format[0]['extra'];
+            $modern_format = $modern_format[0]['extra'] ?? [];
         }
 
         $motd = '';

From dd60969d2c77e7bbccff07592e17583fc5b5bf94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Loskot?= <fjuro@seznam.cz>
Date: Mon, 1 Aug 2022 22:06:19 +0000
Subject: [PATCH 309/337] Translated using Weblate (Czech)

Currently translated at 100.0% (1235 of 1235 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/cs/
---
 custom/languages/cs_CZ.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/custom/languages/cs_CZ.json b/custom/languages/cs_CZ.json
index fa1a9d4c43..308d72ccc7 100644
--- a/custom/languages/cs_CZ.json
+++ b/custom/languages/cs_CZ.json
@@ -1232,5 +1232,6 @@
     "admin/render_custom_page_edit_hook_info": "Vykreslení úpravy vlastní stránky",
     "general/oauth_failed_setup": "Něco se pokazilo. Nastavení OAuth2 je neplatné. Kontaktujte správce",
     "general/oauth_failed": "Něco se pokazilo při pokusu o použití OAuth. Zkuste to prosím znovu.",
-    "user/banned_from_registering": "Vaše IP byla zabanována, nemůžete se zaregistrovat."
+    "user/banned_from_registering": "Vaše IP byla zabanována, nemůžete se zaregistrovat.",
+    "general/normal": "Normální"
 }

From 557be89beddb61e984b4e44fa59df83ef8d9f4e8 Mon Sep 17 00:00:00 2001
From: enno123 <admin@enno123.de>
Date: Mon, 1 Aug 2022 19:52:43 +0000
Subject: [PATCH 310/337] Translated using Weblate (German)

Currently translated at 100.0% (1235 of 1235 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/de/
---
 custom/languages/de_DE.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
index 8e582d127d..0bd4f8e3e4 100644
--- a/custom/languages/de_DE.json
+++ b/custom/languages/de_DE.json
@@ -816,7 +816,7 @@
     "moderator/enter_valid_punishment_reason": "Bitte geben Sie einen Grund für Ihre Bestrafung ein, zwischen 5 und 5000 Zeichen.",
     "moderator/groups": "Gruppen",
     "moderator/ingame": "Im Spiel",
-    "moderator/ip_ban": "IP Sperren",
+    "moderator/ip_ban": "IP Sperre",
     "moderator/ip_lookup": "IP Suche",
     "moderator/mark_as_spam": "Als Spam makieren",
     "moderator/new_comment": "Neuer Kommentar",
@@ -1232,5 +1232,6 @@
     "admin/render_custom_page_edit_hook_info": "Rendering benutzerdefinierte Seite bearbeiten",
     "general/oauth_failed_setup": "Etwas ist schief gelaufen. Die OAuth2-Einrichtung ist ungültig. Kontaktiere einen Administrator",
     "general/oauth_failed": "Beim Versuch, OAuth zu verwenden, ist etwas schief gelaufen. Bitte versuch es erneut.",
-    "user/banned_from_registering": "Deine IP wurde gesperrt, du kannst dich nicht registrieren."
+    "user/banned_from_registering": "Deine IP wurde gesperrt, du kannst dich nicht registrieren.",
+    "general/normal": "Normal"
 }

From d532fb2966091e2403612300606dd13c23b4bc71 Mon Sep 17 00:00:00 2001
From: Dominik Roman <dominikslk9@gmail.com>
Date: Sun, 31 Jul 2022 14:32:04 +0000
Subject: [PATCH 311/337] Translated using Weblate (Slovak)

Currently translated at 100.0% (1235 of 1235 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/sk/
---
 custom/languages/sk_SK.json | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/custom/languages/sk_SK.json b/custom/languages/sk_SK.json
index 9262c58169..4690dad7fa 100644
--- a/custom/languages/sk_SK.json
+++ b/custom/languages/sk_SK.json
@@ -6,14 +6,14 @@
     "admin/activate": "Aktivovať",
     "admin/active": "Aktívny",
     "admin/add_server": "Pridať server",
-    "admin/adding_server": "Pridanie serveru",
+    "admin/adding_server": "Pridávanie serveru",
     "admin/admin_dir_still_exists": "Varovanie! Adresár /modules/Core/pages/admin stále existuje. Prosím odstráňte tento adresár.",
     "admin/administrator": "Administrátor",
     "admin/administrator_permission_info": "Členovia s týmto povolením budú mať všetky povolenia. Toto je nebezpečné povolenie na udelenie.",
     "admin/all_logs": "Všetky záznamy",
     "admin/allow_custom_avatars": "Povoliť vlastné avatary užívateľov?",
     "admin/announcement_hook_info": "Vytvorenie oznámenia",
-    "admin/announcement_icon_instructions": "Môžete tu tiež pridať ikonu ku každému oznámeniu, napríklad pomocou {{faLink}}, {{semLink}}.",
+    "admin/announcement_icon_instructions": "Môžete tu tiež pridať ikonu ku každému oznámeniu, napríklad pomocou {{faLink}} alebo {{semLink}}.",
     "admin/announcement_info": "Vytvorte oznámenia na zobrazenie správy konkrétnym skupinám na konkrétnych stránkach vášho webu.",
     "admin/announcement_order": "Poradie",
     "admin/announcements": "Oznámenia",
@@ -22,7 +22,7 @@
     "admin/api_endpoints_info": "API Endpoints umožňujú modulom vytvárať spôsoby, ako môžu externé aplikácie (napríklad Minecraft a Discord) interagovať s vašou NamelessMC webstránkou. {{docLinkStart}}Pozrite si tu API dokumentáciu API{{docLinkEnd}}",
     "admin/api_info": "API umožňuje interakciu pluginov a ďalších služieb s vašou webstránkou, napríklad {{pluginLinkStart}}oficiálny Nameless plugin{{pluginLinkEnd}}, a {{botLinkStart}}oficiálny NamelessMC Discord Bot{{botLinkEnd}}.",
     "admin/api_key": "API kľuč",
-    "admin/api_key_regenerated": "API kľúč bol úspešne regenerovaný.",
+    "admin/api_key_regenerated": "API kľúč bol úspešne znovu vygenerovaný.",
     "admin/api_registration_email": "Registračný API email",
     "admin/api_settings_updated_successfully": "Nastavenia API sa úspešne aktualizovali.",
     "admin/api_url": "API URL",
@@ -1231,5 +1231,7 @@
     "admin/render_custom_page_hook_info": "Vykresliť vlastnú stránku",
     "admin/render_custom_page_edit_hook_info": "Vykresliť úpravu vlastnej stránky",
     "general/oauth_failed_setup": "Niečo sa pokazilo. Nastavenie OAuth2 je neplatné. Kontaktujte správcu",
-    "general/oauth_failed": "Pri pokuse o použitie OAuth sa vyskytla chyba. Prosím skúste znova."
+    "general/oauth_failed": "Pri pokuse o použitie OAuth sa vyskytla chyba. Prosím skúste znova.",
+    "general/normal": "Normálny",
+    "user/banned_from_registering": "Vaša IP adresa bola zabanovaná, nemôžete sa zaregistrovať."
 }

From 5ef9f7346ab220ea55c259f20e380da1eaa4ff20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Loskot?= <fjuro@seznam.cz>
Date: Mon, 1 Aug 2022 22:05:55 +0000
Subject: [PATCH 312/337] Translated using Weblate (Czech)

Currently translated at 100.0% (51 of 51 strings)

Translation: NamelessMC/Website - Discord Integration
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-discord-integration/cs/
---
 modules/Discord Integration/language/cs_CZ.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/Discord Integration/language/cs_CZ.json b/modules/Discord Integration/language/cs_CZ.json
index 4793950d4a..66aa71cbee 100644
--- a/modules/Discord Integration/language/cs_CZ.json	
+++ b/modules/Discord Integration/language/cs_CZ.json	
@@ -14,7 +14,7 @@
     "discord_integration/discord_database_error": "Databáze Nameless Link momentálně není dostupná. Zkuste to prosím znovu za chvíli.",
     "discord_integration/discord_guild_id": "ID Discord serveru",
     "discord_integration/discord_id_help": "Pro informace, kde nalézt Discord ID, si přečtěte {{linkStart}}toto.{{linkEnd}}",
-    "discord_integration/discord_id_length": "Ujistěte se, že ID vašeho Discord serveru je dlouhé 18 znaků.",
+    "discord_integration/discord_id_length": "Ujistěte se, že ID vašeho Discord serveru má délku {{min}} až {{max}} znaků.",
     "discord_integration/discord_id_numeric": "Ujistěte se, že ID vašeho Discord serveru obsahuje pouze čísla.",
     "discord_integration/discord_id_set": "ID Discordu úspěšně nastaveno",
     "discord_integration/discord_id_taken": "Toto Discord ID je již zabráno.",
@@ -23,7 +23,7 @@
     "discord_integration/discord_integration_not_setup": "Integrace Discordu nenastavena",
     "discord_integration/discord_invalid_id": "Toto uživatelské Discord ID je neplatné.",
     "discord_integration/discord_role_id": "ID Discord role",
-    "discord_integration/discord_role_id_length": "ID Discord role musí být dlouhé 18 znaků.",
+    "discord_integration/discord_role_id_length": "ID Discord role musí mít délku {{min}} až {{max}} znaků.",
     "discord_integration/discord_role_id_numeric": "ID Discord role může obsahovat pouze čísla.",
     "discord_integration/discord_settings_updated": "Nastavení Discordu úspěšně aktualizována",
     "discord_integration/discord_unknown_error": "Při synchronizaci Discord rolí se vyskytla neznámá chyba. Kontaktujte prosím správce.",

From 17be86c7e86d3e06bc0dfadfcc63adf3bb55b6db Mon Sep 17 00:00:00 2001
From: enno123 <admin@enno123.de>
Date: Mon, 1 Aug 2022 19:53:55 +0000
Subject: [PATCH 313/337] Translated using Weblate (German)

Currently translated at 100.0% (51 of 51 strings)

Translation: NamelessMC/Website - Discord Integration
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-discord-integration/de/
---
 modules/Discord Integration/language/de_DE.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/Discord Integration/language/de_DE.json b/modules/Discord Integration/language/de_DE.json
index 7c4af23e1b..19c3b3d4bb 100644
--- a/modules/Discord Integration/language/de_DE.json	
+++ b/modules/Discord Integration/language/de_DE.json	
@@ -12,7 +12,7 @@
     "discord_integration/discord_communication_error": "Bei der Kommunikation mit dem Discord Bot ist ein Fehler aufgetreten. Bitte stellen Sie sicher, dass der Bot ausgeführt wird und Ihre Bot-URL korrekt ist.",
     "discord_integration/discord_database_error": "Die Nameless Link-Datenbank ist derzeit nicht verfügbar. Bitte versuchen Sie es später noch einmal.",
     "discord_integration/discord_id_help": "Für Informationen darüber, wo man Discord-IDs findet, lies bitte {{linkStart}}hier.{{linkEnd}}",
-    "discord_integration/discord_id_length": "Bitte stelle sicher, dass deine Discord Server ID 18 Zeichen lang ist.",
+    "discord_integration/discord_id_length": "Bitte stelle sicher, dass deine Discord Server ID zwischen {{min}} und {{max}} Ziffern lang ist.",
     "discord_integration/discord_id_numeric": "Bitte stelle sicher, dass deine Discord Server ID numerisch ist (nur Zahlen)..",
     "discord_integration/discord_id_set": "Discord ID erfolgreich eingestellt",
     "discord_integration/discord_id_taken": "Diese Discord ID wurde bereits vergeben.",
@@ -21,7 +21,7 @@
     "discord_integration/discord_integration_not_setup": "Die Discord-Integration ist nicht eingerichtet",
     "discord_integration/discord_invalid_id": "Diese Discord-Benutzer-ID ist ungültig.",
     "discord_integration/discord_role_id": "Discord Rollen ID",
-    "discord_integration/discord_role_id_length": "Die Discord Rollen ID muss 18 Stellen lang sein.",
+    "discord_integration/discord_role_id_length": "Die Discord-Rollen-ID muss zwischen {{min}} und {{max}} Ziffern lang sein.",
     "discord_integration/discord_role_id_numeric": "Die ID der Discord Rolle muss numerisch sein.",
     "discord_integration/discord_settings_updated": "Discord Einstellungen erfolgreich aktualisiert",
     "discord_integration/discord_unknown_error": "Beim Synchronisieren der Discord-Rollen ist ein unbekannter Fehler aufgetreten. Bitte wenden Sie sich an einen Administrator.",

From 6e1029ac5017967f83ab6836f5538611c1389851 Mon Sep 17 00:00:00 2001
From: Dominik Roman <dominikslk9@gmail.com>
Date: Sun, 31 Jul 2022 15:18:39 +0000
Subject: [PATCH 314/337] Translated using Weblate (Slovak)

Currently translated at 100.0% (51 of 51 strings)

Translation: NamelessMC/Website - Discord Integration
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-discord-integration/sk/
---
 modules/Discord Integration/language/sk_SK.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/Discord Integration/language/sk_SK.json b/modules/Discord Integration/language/sk_SK.json
index 43698b1993..0d555ccfae 100644
--- a/modules/Discord Integration/language/sk_SK.json	
+++ b/modules/Discord Integration/language/sk_SK.json	
@@ -17,7 +17,7 @@
     "discord_integration/discord_guild_id": "ID Discord serveru",
     "discord_integration/discord_id_confirm": "Spustite príkaz \"/verify {{token}}\" v Discorde, aby ste dokončili prepojenie svojho Discord účtu.",
     "discord_integration/discord_id_help": "Informácie o tom, kde nájdete Discord ID, si prečítajte {{linkStart}}toto.{{linkEnd}}",
-    "discord_integration/discord_id_length": "Uistite sa, že vaše ID discord servera má 18 znakov.",
+    "discord_integration/discord_id_length": "Uistite sa, že vaše ID Discord servera má {{min}} až {{max}} číslic.",
     "discord_integration/discord_id_numeric": "Uistite sa, že vaše ID discord servera je číselné (iba čísla).",
     "discord_integration/discord_id_set": "Discord ID bolo úspešne nastavené",
     "discord_integration/discord_id_taken": "Toto Discord ID už bolo použité.",
@@ -27,7 +27,7 @@
     "discord_integration/discord_invalid_id": "Toto Discord užívateľské ID už bolo použité.",
     "discord_integration/discord_invite_info": "Ak chcete pozvať Nameless Link bota na svoj Discord server, kliknite {{inviteLinkStart}}sem{{inviteLinkEnd}}. Potom spustite príkaz <code>/apiurl</code> na prepojenie bota s vašou webstránkou. Prípadne môžete {{selfHostLinkStart}}hostiť robota sami{{selfHostLinkEnd}}.",
     "discord_integration/discord_role_id": "ID Discord role",
-    "discord_integration/discord_role_id_length": "Discord Role ID musí mať dĺžku 18 číslic.",
+    "discord_integration/discord_role_id_length": "ID Discord roly musí mať dĺžku {{min}} až {{max}} číslic.",
     "discord_integration/discord_role_id_numeric": "Discord Role ID musí byť číselné.",
     "discord_integration/discord_settings_updated": "Nastavenia Discordu sa úspešne aktualizovali",
     "discord_integration/discord_unknown_error": "Pri synchronizácii Discord rolí sa vyskytla neznáma chyba. Prosím kontaktujte správcu.",

From 4e46290b5f7adf1c9e398debb3f9c2b228086f99 Mon Sep 17 00:00:00 2001
From: Partydragen <admin@partydragen.com>
Date: Fri, 5 Aug 2022 02:03:04 +0200
Subject: [PATCH 315/337] Fix Twitter and Facebook widget

Closes https://github.com/NamelessMC/Nameless/issues/2963
Broke in https://github.com/NamelessMC/Nameless/commit/4ed51b974ddfb658d141a800346127bd3e50676b#diff-4e70e6cbf401c2fa82f5dc82cb1c6b7a654872afacff3225350420e48f1023c4
---
 modules/Core/module.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/Core/module.php b/modules/Core/module.php
index 10185a1ea8..48834d8109 100644
--- a/modules/Core/module.php
+++ b/modules/Core/module.php
@@ -735,16 +735,16 @@ public function onPageLoad(User $user, Pages $pages, Cache $cache, Smarty $smart
         if (defined('FRONT_END') || (defined('PANEL_PAGE') && str_contains(PANEL_PAGE, 'widget'))) {
             // Facebook
             $cache->setCache('social_media');
-            $fb_url = $cache->retrieve('facebook');
+            $fb_url = Util::getSetting('fb_url');
             if ($fb_url) {
                 $widgets->add(new FacebookWidget($smarty, $fb_url));
             }
 
             // Twitter
-            $twitter = $cache->retrieve('twitter');
+            $twitter = Util::getSetting('twitter_url');
 
             if ($twitter) {
-                $theme = $cache->retrieve('twitter_theme');
+                $theme = Util::getSetting('twitter_style');
                 $widgets->add(new TwitterWidget($smarty, $twitter, $theme));
             }
 

From 291f16aaf49ea1cee62320df75fcd6cf5eed5e24 Mon Sep 17 00:00:00 2001
From: samerton <samerton@users.noreply.github.com>
Date: Fri, 5 Aug 2022 16:36:19 +0100
Subject: [PATCH 316/337] Change forum post content, private message content,
 custom page content to mediumtext Closes #2965

---
 .../20220805152044_forum_post_medium_text.php     | 15 +++++++++++++++
 ...20220805152052_private_message_medium_text.php | 15 +++++++++++++++
 .../20220805152101_custom_page_medium_text.php    | 15 +++++++++++++++
 3 files changed, 45 insertions(+)
 create mode 100644 core/migrations/20220805152044_forum_post_medium_text.php
 create mode 100644 core/migrations/20220805152052_private_message_medium_text.php
 create mode 100644 core/migrations/20220805152101_custom_page_medium_text.php

diff --git a/core/migrations/20220805152044_forum_post_medium_text.php b/core/migrations/20220805152044_forum_post_medium_text.php
new file mode 100644
index 0000000000..af822f5592
--- /dev/null
+++ b/core/migrations/20220805152044_forum_post_medium_text.php
@@ -0,0 +1,15 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Db\Adapter\MysqlAdapter;
+use Phinx\Migration\AbstractMigration;
+
+final class ForumPostMediumText extends AbstractMigration
+{
+    public function change(): void
+    {
+        $table = $this->table('nl2_posts');
+        $table->changeColumn('post_content', 'text', ['limit' => MysqlAdapter::TEXT_MEDIUM]);
+        $table->update();
+    }
+}
diff --git a/core/migrations/20220805152052_private_message_medium_text.php b/core/migrations/20220805152052_private_message_medium_text.php
new file mode 100644
index 0000000000..0efb0879cc
--- /dev/null
+++ b/core/migrations/20220805152052_private_message_medium_text.php
@@ -0,0 +1,15 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Db\Adapter\MysqlAdapter;
+use Phinx\Migration\AbstractMigration;
+
+final class PrivateMessageMediumText extends AbstractMigration
+{
+    public function change(): void
+    {
+        $table = $this->table('nl2_private_messages_replies');
+        $table->changeColumn('content', 'text', ['limit' => MysqlAdapter::TEXT_MEDIUM]);
+        $table->update();
+    }
+}
diff --git a/core/migrations/20220805152101_custom_page_medium_text.php b/core/migrations/20220805152101_custom_page_medium_text.php
new file mode 100644
index 0000000000..ea27a50e9e
--- /dev/null
+++ b/core/migrations/20220805152101_custom_page_medium_text.php
@@ -0,0 +1,15 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Db\Adapter\MysqlAdapter;
+use Phinx\Migration\AbstractMigration;
+
+final class CustomPageMediumText extends AbstractMigration
+{
+    public function change(): void
+    {
+        $table = $this->table('nl2_custom_pages');
+        $table->changeColumn('content', 'text', ['limit' => MysqlAdapter::TEXT_MEDIUM]);
+        $table->update();
+    }
+}

From 04998fa3373d3a51bf0e018f871ecec93ac70504 Mon Sep 17 00:00:00 2001
From: samerton <samerton@users.noreply.github.com>
Date: Fri, 5 Aug 2022 16:40:13 +0100
Subject: [PATCH 317/337] Update log table info column to mediumtext

---
 .../20220805153842_log_info_medium_text.php       | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 core/migrations/20220805153842_log_info_medium_text.php

diff --git a/core/migrations/20220805153842_log_info_medium_text.php b/core/migrations/20220805153842_log_info_medium_text.php
new file mode 100644
index 0000000000..cbccf0b6fd
--- /dev/null
+++ b/core/migrations/20220805153842_log_info_medium_text.php
@@ -0,0 +1,15 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Db\Adapter\MysqlAdapter;
+use Phinx\Migration\AbstractMigration;
+
+final class LogInfoMediumText extends AbstractMigration
+{
+    public function change(): void
+    {
+        $table = $this->table('nl2_logs');
+        $table->changeColumn('info', 'text', ['limit' => MysqlAdapter::TEXT_MEDIUM]);
+        $table->update();
+    }
+}

From a0ffdbda83347c19f8ce44a4d0ac4295f0943808 Mon Sep 17 00:00:00 2001
From: samerton <samerton@users.noreply.github.com>
Date: Fri, 5 Aug 2022 17:16:34 +0100
Subject: [PATCH 318/337] Fix forum post avatars not matching rest of site

---
 modules/Forum/pages/forum/view_topic.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/Forum/pages/forum/view_topic.php b/modules/Forum/pages/forum/view_topic.php
index 257166649f..1d94b40769 100644
--- a/modules/Forum/pages/forum/view_topic.php
+++ b/modules/Forum/pages/forum/view_topic.php
@@ -308,7 +308,7 @@
                     'author' => $user->getDisplayname(),
                 ]),
                 'content_full' => strip_tags(str_ireplace(['<br />', '<br>', '<br/>'], "\r\n", $content)),
-                'avatar_url' => $user->getAvatar(128, true),
+                'avatar_url' => $user->getAvatar(null, true),
                 'title' => $topic->topic_title,
                 'url' => URL::getSelfURL() . ltrim(URL::build('/forum/topic/' . urlencode($topic->id) . '-' . $forum->titleToURL($topic->topic_title)), '/'),
                 'topic_author_user_id' => $topic_user->data()->id,
@@ -687,7 +687,7 @@
                     'username' => $reaction_user->getDisplayname(true),
                     'nickname' => $reaction_user->getDisplayname(),
                     'style' => $reaction_user->getGroupStyle(),
-                    'avatar' => $reaction_user->getAvatar(500),
+                    'avatar' => $reaction_user->getAvatar(),
                     'profile' => $reaction_user->getProfileURL()
                 ];
             }
@@ -711,7 +711,7 @@
         'heading' => $heading,
         'id' => $nValue->id,
         'user_id' => $post_creator->data()->id,
-        'avatar' => $post_creator->getAvatar(500),
+        'avatar' => $post_creator->getAvatar(),
         'integrations' => $user_integrations,
         'username' => $post_creator->getDisplayname(),
         'mcname' => $post_creator->getDisplayname(true),

From dc251191f23f655f0d008918e87c439a3ffa93dc Mon Sep 17 00:00:00 2001
From: samerton <samerton@users.noreply.github.com>
Date: Fri, 5 Aug 2022 17:54:43 +0100
Subject: [PATCH 319/337] Return empty string from Util::readFileEnd if file is
 empty

---
 core/classes/Core/Util.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/core/classes/Core/Util.php b/core/classes/Core/Util.php
index 8c52ace522..3085807306 100644
--- a/core/classes/Core/Util.php
+++ b/core/classes/Core/Util.php
@@ -450,13 +450,17 @@ public static function readFileEnd(string $file_path, int $max_bytes = 100_000):
         $start = max([$size - $max_bytes, 0]);
         fseek($fp, $start);
         $read_length = $size - $start;
-        $content = fread($fp, $read_length);
-        if ($start > 0) {
-            // Read content may contain partial line, remove it
-            $first_lf = strpos($content, PHP_EOL);
-            $content = substr($content, $first_lf + 1);
+        if ($read_length) {
+            $content = fread($fp, $read_length);
+            if ($start > 0) {
+                // Read content may contain partial line, remove it
+                $first_lf = strpos($content, PHP_EOL);
+                $content = substr($content, $first_lf + 1);
+            }
+            return $content;
         }
-        return $content;
+
+        return '';
     }
 
     /**

From 6151b6210cf4639c97ef1af8f15374496a23fa31 Mon Sep 17 00:00:00 2001
From: samerton <samerton@users.noreply.github.com>
Date: Fri, 5 Aug 2022 17:56:35 +0100
Subject: [PATCH 320/337] Convert more StaffCP actions to POST requests - Email
 error delete/purge - Minecraft query error purge - Error log purge - User
 report close/re-open

---
 .../Default/core/emails_errors.tpl            | 12 ++++--
 .../Default/core/emails_errors_view.tpl       |  5 ++-
 .../Default/core/errors_view.tpl              |  8 +++-
 .../Default/core/users_reports_view.tpl       | 14 ++++++-
 .../minecraft/minecraft_query_errors.tpl      |  6 ++-
 modules/Core/pages/panel/emails_errors.php    | 34 ++++++++++-----
 modules/Core/pages/panel/errors.php           | 20 +++++++--
 .../pages/panel/minecraft_query_errors.php    | 13 +++++-
 modules/Core/pages/panel/users_reports.php    | 42 +++++++++++++------
 9 files changed, 116 insertions(+), 38 deletions(-)

diff --git a/custom/panel_templates/Default/core/emails_errors.tpl b/custom/panel_templates/Default/core/emails_errors.tpl
index a8640f8c3a..5203dd1b48 100644
--- a/custom/panel_templates/Default/core/emails_errors.tpl
+++ b/custom/panel_templates/Default/core/emails_errors.tpl
@@ -114,7 +114,10 @@
                     </div>
                     <div class="modal-footer">
                         <button type="button" class="btn btn-secondary" data-dismiss="modal">{$NO}</button>
-                        <a href="{$PURGE_LINK}" class="btn btn-primary">{$YES}</a>
+                        <form action="{$PURGE_LINK}" method="post" style="display: inline">
+                            <input type="hidden" name="token" value="{$TOKEN}" />
+                            <input type="submit" class="btn btn-primary" value="{$YES}" />
+                        </form>
                     </div>
                 </div>
             </div>
@@ -135,7 +138,10 @@
                     </div>
                     <div class="modal-footer">
                         <button type="button" class="btn btn-secondary" data-dismiss="modal">{$NO}</button>
-                        <a href="" id="deleteLink" class="btn btn-primary">{$YES}</a>
+                        <form action="" id="deleteAction" method="post" style="display: inline">
+                            <input type="hidden" name="token" value="{$TOKEN}" />
+                            <input type="submit" class="btn btn-primary" value="{$YES}" />
+                        </form>
                     </div>
                 </div>
             </div>
@@ -152,7 +158,7 @@
         }
 
         function showDeleteModal(id) {
-            $('#deleteLink').attr('href', '{$DELETE_LINK}'.replace('{literal}{x}{/literal}', id));
+            $('#deleteAction').attr('action', '{$DELETE_LINK}'.replace('{literal}{x}{/literal}', id));
             $('#deleteModal').modal().show();
         }
     </script>
diff --git a/custom/panel_templates/Default/core/emails_errors_view.tpl b/custom/panel_templates/Default/core/emails_errors_view.tpl
index 9f50149723..b148539de0 100644
--- a/custom/panel_templates/Default/core/emails_errors_view.tpl
+++ b/custom/panel_templates/Default/core/emails_errors_view.tpl
@@ -132,7 +132,10 @@
                     </div>
                     <div class="modal-footer">
                         <button type="button" class="btn btn-secondary" data-dismiss="modal">{$NO}</button>
-                        <a href="{$DELETE_ERROR_LINK}" class="btn btn-primary">{$YES}</a>
+                        <form action="{$DELETE_ERROR_LINK}" method="post" style="display: inline">
+                            <input type="hidden" name="token" value="{$TOKEN}" />
+                            <input type="submit" class="btn btn-primary" value="{$YES}" />
+                        </form>
                     </div>
                 </div>
             </div>
diff --git a/custom/panel_templates/Default/core/errors_view.tpl b/custom/panel_templates/Default/core/errors_view.tpl
index 13575bc35e..409169a18e 100644
--- a/custom/panel_templates/Default/core/errors_view.tpl
+++ b/custom/panel_templates/Default/core/errors_view.tpl
@@ -43,6 +43,9 @@
                             </div>
                             <hr />
 
+                            <!-- Success and Error Alerts -->
+                            {include file='includes/alerts.tpl'}
+
                             {if isset($LOG)}
                             <pre class="error_log">
                                 {$LOG}
@@ -85,7 +88,10 @@
                     </div>
                     <div class="modal-footer">
                         <button type="button" class="btn btn-secondary" data-dismiss="modal">{$NO}</button>
-                        <a href="{$PURGE_LOG_LINK}" class="btn btn-primary">{$YES}</a>
+                        <form action="{$PURGE_LOG_LINK}" method="post">
+                            <input type="hidden" name="token" value="{$TOKEN}">
+                            <input type="submit" class="btn btn-primary" value="{$YES}">
+                        </form>
                     </div>
                 </div>
             </div>
diff --git a/custom/panel_templates/Default/core/users_reports_view.tpl b/custom/panel_templates/Default/core/users_reports_view.tpl
index 3be23bffdf..5b477e9796 100644
--- a/custom/panel_templates/Default/core/users_reports_view.tpl
+++ b/custom/panel_templates/Default/core/users_reports_view.tpl
@@ -109,9 +109,9 @@
                                     <input type="submit" value="{$SUBMIT}" class="btn btn-primary">
                                     <div class="float-md-right">
                                         {if isset($CLOSE_REPORT)}
-                                        <a href="{$CLOSE_LINK}" class="btn btn-danger">{$CLOSE_REPORT}</a>
+                                        <button type="button" onclick="closeReport()" class="btn btn-danger">{$CLOSE_REPORT}</button>
                                         {else}
-                                        <a href="{$REOPEN_LINK}" class="btn btn-danger">{$REOPEN_REPORT}</a>
+                                        <button type="button" onclick="reopenReport()" class="btn btn-danger">{$REOPEN_REPORT}</button>
                                         {/if}
                                     </div>
                                 </div>
@@ -139,6 +139,16 @@
 
     {include file='scripts.tpl'}
 
+    <script type="text/javascript">
+        function closeReport() {
+          $.post("{$CLOSE_LINK}", { token: "{$TOKEN}" }).done(function () { window.location.reload(); });
+        }
+
+        function reopenReport() {
+          $.post("{$REOPEN_LINK}", { token: "{$TOKEN}" }).done(function () { window.location.reload(); });
+        }
+    </script>
+
 </body>
 
 </html>
\ No newline at end of file
diff --git a/custom/panel_templates/Default/integrations/minecraft/minecraft_query_errors.tpl b/custom/panel_templates/Default/integrations/minecraft/minecraft_query_errors.tpl
index 886287dc7d..99ad3bc2af 100644
--- a/custom/panel_templates/Default/integrations/minecraft/minecraft_query_errors.tpl
+++ b/custom/panel_templates/Default/integrations/minecraft/minecraft_query_errors.tpl
@@ -126,13 +126,15 @@
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-secondary" data-dismiss="modal">{$NO}</button>
-                    <a href="{$PURGE_QUERY_ERRORS_LINK}" class="btn btn-primary">{$YES}</a>
+                    <form action="{$PURGE_QUERY_ERRORS_LINK}" method="post" style="display: inline">
+                        <input type="hidden" name="token" value="{$TOKEN}" />
+                        <input type="submit" class="btn btn-primary" value="{$YES}" />
+                    </form>
                 </div>
             </div>
         </div>
     </div>
 
-
     <!-- End Wrapper -->
 </div>
 
diff --git a/modules/Core/pages/panel/emails_errors.php b/modules/Core/pages/panel/emails_errors.php
index 8cf07c0e48..b5bcc42be3 100644
--- a/modules/Core/pages/panel/emails_errors.php
+++ b/modules/Core/pages/panel/emails_errors.php
@@ -21,21 +21,28 @@
 require_once(ROOT_PATH . '/core/templates/backend_init.php');
 
 if (isset($_GET['do'])) {
-    if ($_GET['do'] == 'purge') {
-        // Purge all errors
+    if (in_array($_GET['do'], ['delete', 'purge'])) {
+        if (Token::check()) {
+            if ($_GET['do'] == 'purge') {
+                // Purge all errors
 
-        DB::getInstance()->delete('email_errors', ['id', '<>', 0]);
+                DB::getInstance()->delete('email_errors', ['id', '<>', 0]);
 
-        Session::flash('emails_errors_success', $language->get('admin', 'email_errors_purged_successfully'));
-        Redirect::to(URL::build('/panel/core/emails/errors'));
-    }
+                Session::flash('emails_errors_success', $language->get('admin', 'email_errors_purged_successfully'));
+                Redirect::to(URL::build('/panel/core/emails/errors'));
+            }
 
-    if ($_GET['do'] == 'delete' && isset($_GET['id']) && is_numeric($_GET['id'])) {
+            if ($_GET['do'] == 'delete' && isset($_GET['id']) && is_numeric($_GET['id'])) {
 
-        DB::getInstance()->delete('email_errors', ['id', $_GET['id']]);
+                DB::getInstance()->delete('email_errors', ['id', $_GET['id']]);
 
-        Session::flash('emails_errors_success', $language->get('admin', 'error_deleted_successfully'));
-        Redirect::to(URL::build('/panel/core/emails/errors'));
+                Session::flash('emails_errors_success', $language->get('admin', 'error_deleted_successfully'));
+                Redirect::to(URL::build('/panel/core/emails/errors'));
+            }
+        } else {
+            Session::flash('emails_errors_error', $language->get('general', 'invalid_token'));
+            Redirect::to(URL::build('/panel/core/emails/errors'));
+        }
     }
 
     if ($_GET['do'] == 'view' && isset($_GET['id']) && is_numeric($_GET['id'])) {
@@ -216,6 +223,10 @@
     ]);
 }
 
+if (Session::exists('emails_errors_error')) {
+    $errors = [Session::flash('emails_errors_error')];
+}
+
 if (isset($errors) && count($errors)) {
     $smarty->assign([
         'ERRORS' => $errors,
@@ -231,7 +242,8 @@
     'EMAILS_LINK' => URL::build('/panel/core/emails'),
     'EMAIL_ERRORS' => $language->get('admin', 'email_errors'),
     'PAGE' => PANEL_PAGE,
-    'BACK' => $language->get('general', 'back')
+    'BACK' => $language->get('general', 'back'),
+    'TOKEN' => Token::get(),
 ]);
 
 $template->onPageLoad();
diff --git a/modules/Core/pages/panel/errors.php b/modules/Core/pages/panel/errors.php
index 3bd68e4901..500edddff0 100644
--- a/modules/Core/pages/panel/errors.php
+++ b/modules/Core/pages/panel/errors.php
@@ -21,9 +21,13 @@
 require_once(ROOT_PATH . '/core/templates/backend_init.php');
 
 if (isset($_GET['log'], $_GET['do']) && $_GET['do'] == 'purge') {
-    file_put_contents(implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'cache', 'logs', $_GET['log'] . '-log.log']), '');
-    Session::flash('error_log_success', $language->get('admin', 'log_purged_successfully'));
-    Redirect::to(URL::build('/panel/core/errors'));
+    if (Token::check()) {
+        file_put_contents(implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'cache', 'logs', $_GET['log'] . '-log.log']), '');
+        Session::flash('error_log_success', $language->get('admin', 'log_purged_successfully'));
+        Redirect::to(URL::build('/panel/core/errors'));
+    } else {
+        Session::flash('error_log_error', $language->get('general', 'invalid_token'));
+    }
 }
 
 // Load modules + template
@@ -69,6 +73,13 @@
         $smarty->assign('NO_LOG_FOUND', $language->get('admin', 'log_file_not_found'));
     }
 
+    if (Session::exists('error_log_error')) {
+        $smarty->assign([
+            'ERRORS' => [Session::flash('error_log_error')],
+            'ERRORS_TITLE' => $language->get('general', 'error')
+        ]);
+    }
+
     $smarty->assign([
         'BACK_LINK' => URL::build('/panel/core/errors'),
         'LOG_NAME' => $title,
@@ -101,7 +112,8 @@
     'DEBUGGING_AND_MAINTENANCE' => $language->get('admin', 'debugging_and_maintenance'),
     'PAGE' => PANEL_PAGE,
     'ERROR_LOGS' => $language->get('admin', 'error_logs'),
-    'BACK' => $language->get('general', 'back')
+    'BACK' => $language->get('general', 'back'),
+    'TOKEN' => Token::get(),
 ]);
 
 $template->onPageLoad();
diff --git a/modules/Core/pages/panel/minecraft_query_errors.php b/modules/Core/pages/panel/minecraft_query_errors.php
index dc326deed9..5a67691198 100644
--- a/modules/Core/pages/panel/minecraft_query_errors.php
+++ b/modules/Core/pages/panel/minecraft_query_errors.php
@@ -23,8 +23,13 @@
 
 if (!isset($_GET['id'])) {
     if (isset($_GET['action']) && $_GET['action'] == 'purge') {
-        DB::getInstance()->delete('query_errors', ['id', '<>', 0]);
-        Session::flash('panel_query_errors_success', $language->get('admin', 'query_errors_purged_successfully'));
+        if (Token::check()) {
+            DB::getInstance()->delete('query_errors', ['id', '<>', 0]);
+            Session::flash('panel_query_errors_success', $language->get('admin', 'query_errors_purged_successfully'));
+        } else {
+            Session::flash('panel_query_errors_error', $language->get('general', 'invalid_token'));
+        }
+
         Redirect::to(URL::build('/panel/minecraft/query_errors'));
     }
 
@@ -119,6 +124,10 @@
     $success = Session::flash('panel_query_errors_success');
 }
 
+if (Session::exists('panel_query_errors_error')) {
+    $errors = [Session::flash('panel_query_errors_error')];
+}
+
 if (isset($success)) {
     $smarty->assign([
         'SUCCESS' => $success,
diff --git a/modules/Core/pages/panel/users_reports.php b/modules/Core/pages/panel/users_reports.php
index 31d6e24a65..f52fe06513 100644
--- a/modules/Core/pages/panel/users_reports.php
+++ b/modules/Core/pages/panel/users_reports.php
@@ -306,9 +306,16 @@
             // Close report
             if (is_numeric($_GET['id'])) {
                 // Get report
-                $report = DB::getInstance()->get('reports', ['id', $_GET['id']])->results();
-                if (count($report)) {
-                    DB::getInstance()->update('reports', $report[0]->id, [
+                $report = DB::getInstance()->get('reports', ['id', $_GET['id']]);
+                if ($report->count()) {
+                    $report = $report->first();
+
+                    if (!Token::check()) {
+                        Session::flash('report_error', $language->get('general', 'invalid_token'));
+                        die();
+                    }
+
+                    DB::getInstance()->update('reports', $report->id, [
                         'status' => 1,
                         'date_updated' => date('Y-m-d H:i:s'),
                         'updated' => date('U'),
@@ -316,16 +323,16 @@
                     ]);
 
                     DB::getInstance()->insert('reports_comments', [
-                        'report_id' => $report[0]->id,
+                        'report_id' => $report->id,
                         'commenter_id' => $user->data()->id,
                         'comment_date' => date('Y-m-d H:i:s'),
                         'date' => date('U'),
-                        'comment_content' => $language->get('moderator', 'x_closed_report', ['user' => Output::getClean($user->data()->username)])
+                        'comment_content' => $language->get('moderator', 'x_closed_report', ['user' => $user->getDisplayname()])
                     ]);
                 }
 
                 Session::flash('report_success', $language->get('moderator', 'report_closed'));
-                Redirect::to(URL::build('/panel/users/reports/', 'id=' . urlencode($report[0]->id)));
+                Redirect::to(URL::build('/panel/users/reports/', 'id=' . urlencode($report->id)));
             }
 
             Redirect::to(URL::build('/panel/users/reports'));
@@ -335,9 +342,16 @@
             // Reopen report
             if (is_numeric($_GET['id'])) {
                 // Get report
-                $report = DB::getInstance()->get('reports', ['id', $_GET['id']])->results();
-                if (count($report)) {
-                    DB::getInstance()->update('reports', $report[0]->id, [
+                $report = DB::getInstance()->get('reports', ['id', $_GET['id']]);
+                if ($report->count()) {
+                    $report = $report->first();
+
+                    if (!Token::check()) {
+                        Session::flash('report_error', $language->get('general', 'invalid_token'));
+                        die();
+                    }
+
+                    DB::getInstance()->update('reports', $report->id, [
                         'status' => false,
                         'date_updated' => date('Y-m-d H:i:s'),
                         'updated' => date('U'),
@@ -345,16 +359,16 @@
                     ]);
 
                     DB::getInstance()->insert('reports_comments', [
-                        'report_id' => $report[0]->id,
+                        'report_id' => $report->id,
                         'commenter_id' => $user->data()->id,
                         'comment_date' => date('Y-m-d H:i:s'),
                         'date' => date('U'),
-                        'comment_content' => $language->get('moderator', 'x_reopened_report', ['user' => $user->data()->username])
+                        'comment_content' => $language->get('moderator', 'x_reopened_report', ['user' => $user->getDisplayname()])
                     ]);
                 }
 
                 Session::flash('report_success', $language->get('moderator', 'report_reopened'));
-                Redirect::to(URL::build('/panel/users/reports/', 'id=' . urlencode($report[0]->id)));
+                Redirect::to(URL::build('/panel/users/reports/', 'id=' . urlencode($report->id)));
             }
 
             Redirect::to(URL::build('/panel/users/reports'));
@@ -371,6 +385,10 @@
     $success = Session::flash('report_success');
 }
 
+if (Session::exists('report_error')) {
+    $errors = [Session::flash('report_error')];
+}
+
 if (isset($success)) {
     $smarty->assign([
         'SUCCESS' => $success,

From c35ac6c3992541a4c52f0f4fc700ff7229b4ad00 Mon Sep 17 00:00:00 2001
From: samerton <samerton@users.noreply.github.com>
Date: Fri, 5 Aug 2022 18:45:43 +0100
Subject: [PATCH 321/337] Change settings table value column from varchar to
 text Closes #2880

---
 .../20220805174255_settings_value_text.php         | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 core/migrations/20220805174255_settings_value_text.php

diff --git a/core/migrations/20220805174255_settings_value_text.php b/core/migrations/20220805174255_settings_value_text.php
new file mode 100644
index 0000000000..b227792701
--- /dev/null
+++ b/core/migrations/20220805174255_settings_value_text.php
@@ -0,0 +1,14 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class SettingsValueText extends AbstractMigration
+{
+    public function change(): void
+    {
+        $table = $this->table('nl2_settings');
+        $table->changeColumn('value', 'text');
+        $table->update();
+    }
+}

From 254a2853c400daf60861d417f58dcd142549e1a2 Mon Sep 17 00:00:00 2001
From: samerton <samerton@users.noreply.github.com>
Date: Fri, 5 Aug 2022 19:00:12 +0100
Subject: [PATCH 322/337] Disable specific PHPStan check in certain file

---
 phpstan.neon | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/phpstan.neon b/phpstan.neon
index c213c307cf..01f78b78b1 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -15,4 +15,8 @@ parameters:
         # because php is dumb
         - '#Call to an undefined method ReflectionType::getName\(\).#'
         - '#Call to an undefined method ReflectionType::isBuiltin\(\).#'
+        # DB::first() has been checked beforehand with DB::count() - probably need a better long term solution!
+        -
+            message: '#Cannot access property $id on object|false.#'
+            path: modules/Core/pages/panel/users_reports.php
     reportUnmatchedIgnoredErrors: false

From 0d7645d06804b5c4513b7907f481075f02bbacdc Mon Sep 17 00:00:00 2001
From: samerton <samerton@users.noreply.github.com>
Date: Fri, 5 Aug 2022 19:02:29 +0100
Subject: [PATCH 323/337] Escape characters in PHPStan config

---
 phpstan.neon | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpstan.neon b/phpstan.neon
index 01f78b78b1..8876aff620 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -17,6 +17,6 @@ parameters:
         - '#Call to an undefined method ReflectionType::isBuiltin\(\).#'
         # DB::first() has been checked beforehand with DB::count() - probably need a better long term solution!
         -
-            message: '#Cannot access property $id on object|false.#'
+            message: '#Cannot access property \$id on object\|false.#'
             path: modules/Core/pages/panel/users_reports.php
     reportUnmatchedIgnoredErrors: false

From 7fd1b53fd0c92a856c8a4d263c7f03ab27663f67 Mon Sep 17 00:00:00 2001
From: Robin <robin+git@rkslot.nl>
Date: Fri, 5 Aug 2022 20:15:27 +0200
Subject: [PATCH 324/337] Add Vietnamese language

---
 core/classes/Core/Language.php                  | 4 ++++
 custom/languages/vi_VN.json                     | 1 +
 modules/Cookie Consent/language/vi_VN.json      | 1 +
 modules/Discord Integration/language/vi_VN.json | 1 +
 modules/Forum/language/vi_VN.json               | 1 +
 5 files changed, 8 insertions(+)
 create mode 100644 custom/languages/vi_VN.json
 create mode 100644 modules/Cookie Consent/language/vi_VN.json
 create mode 100644 modules/Discord Integration/language/vi_VN.json
 create mode 100644 modules/Forum/language/vi_VN.json

diff --git a/core/classes/Core/Language.php b/core/classes/Core/Language.php
index f85b3fb419..0d458ae847 100644
--- a/core/classes/Core/Language.php
+++ b/core/classes/Core/Language.php
@@ -128,6 +128,10 @@ class Language {
             'name' => 'Korean (Korea)',
             'htmlCode' => 'ko',
         ],
+        'vi_VN' => [
+            'name' => 'Vietnamese',
+            'htmlCode' => 'vi',
+        ],
     ];
 
     /**
diff --git a/custom/languages/vi_VN.json b/custom/languages/vi_VN.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/custom/languages/vi_VN.json
@@ -0,0 +1 @@
+{}
diff --git a/modules/Cookie Consent/language/vi_VN.json b/modules/Cookie Consent/language/vi_VN.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Cookie Consent/language/vi_VN.json	
@@ -0,0 +1 @@
+{}
diff --git a/modules/Discord Integration/language/vi_VN.json b/modules/Discord Integration/language/vi_VN.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Discord Integration/language/vi_VN.json	
@@ -0,0 +1 @@
+{}
diff --git a/modules/Forum/language/vi_VN.json b/modules/Forum/language/vi_VN.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/modules/Forum/language/vi_VN.json
@@ -0,0 +1 @@
+{}

From 7c7f93626599a4f0a24827e817b104bcd7703f57 Mon Sep 17 00:00:00 2001
From: PadowYT2 <me@padow.ru>
Date: Thu, 4 Aug 2022 12:51:59 +0000
Subject: [PATCH 325/337] Translated using Weblate (Russian)

Currently translated at 100.0% (1235 of 1235 strings)

Translation: NamelessMC/Website - Core
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/nameless/ru/
---
 custom/languages/ru_RU.json | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/custom/languages/ru_RU.json b/custom/languages/ru_RU.json
index e7acb22c94..bc81214bdb 100644
--- a/custom/languages/ru_RU.json
+++ b/custom/languages/ru_RU.json
@@ -314,11 +314,11 @@
     "admin/message_required": "Напишите текст объявления",
     "admin/metadata_updated_successfully": "Метаданные успешно обновлены.",
     "admin/method": "Метод",
-    "admin/minecraft": "Майнкрафт",
+    "admin/minecraft": "Minecraft",
     "admin/minecraft_avatar": "Minecraft аватар",
     "admin/minecraft_avatar_perspective": "Тип отображения аватарки",
     "admin/minecraft_avatar_source": "Источник аватарок Minecraft",
-    "admin/minecraft_servers": "Серверы Minecraft",
+    "admin/minecraft_servers": "Сервера Minecraft",
     "admin/minecraft_settings_updated_successfully": "Настройки успешно обновлены.",
     "admin/minecraft_uuid": "Minecraft UUID",
     "admin/missing_contact_address": "Пожалуйста, введите контактный адрес электронной почты длинной от 3 до 255 символов.",
@@ -713,7 +713,7 @@
     "general/no_online_staff": "Сейчас нет участников команды форума онлайн.",
     "general/no_online_users": "Сейчас нет пользователей онлайн.",
     "general/no_players_online": "Сейчас нет игроков онлайн.",
-    "general/no_servers": "Сейчас нет серверов для отображения!",
+    "general/no_servers": "Сейчас нет серверов для отображения. Администратор сайта может добавить Minecraft сервер в > Админ Панель > Интеграции > Minecraft > Сервера Minecraft.",
     "general/none": "Нет",
     "general/not_registered_yet": "Еще не зарегистрированы?",
     "general/oauth_message_continue": "Продолжить регистрироваться с {{provider}}",
@@ -1018,7 +1018,7 @@
     "user/message_title": "Заголовок сообщения",
     "user/messages": "Сообщения",
     "user/messaging": "Сообщения",
-    "user/minecraft_username": "Ник-нейм в майнкрафте",
+    "user/minecraft_username": "Ник-нейм в Minecraft",
     "user/must_input_email": "Вы должны ввести адрес электронной почты.",
     "user/must_input_email_or_username": "Вы должны вписать почту или имя пользователя.",
     "user/must_input_password": "Вы должны ввести пароль.",
@@ -1227,6 +1227,11 @@
     "user/avatar_set_successfully": "Аватарка успешно поставлена.",
     "admin/pre_custom_page_create_hook_info": "Создание при кастом страницы",
     "admin/pre_custom_page_edit_hook_info": "Изменение при кастом страницы",
-    "admin/render_custom_page_hook_info": "Зарендерить кастомную страницу",
-    "general/user_object": "Объект пользователя"
+    "admin/render_custom_page_hook_info": "Прогрузить кастомную страницу",
+    "general/user_object": "Объект пользователя",
+    "general/normal": "Обычный",
+    "user/banned_from_registering": "Ваш IP был заблокирован, вы не можете зарегистрироваться.",
+    "admin/render_custom_page_edit_hook_info": "Изменить прогружённую кастомную страницу",
+    "general/oauth_failed_setup": "Что то пошло не так. OAuth2 настройка не верная. Сообщите администратору",
+    "general/oauth_failed": "Что то пошло не так при использовании OAuth. Попробуйте ещё раз."
 }

From ec81a64c2684fcbbefc1e5c8e7c582845b469ec6 Mon Sep 17 00:00:00 2001
From: PadowYT2 <me@padow.ru>
Date: Fri, 5 Aug 2022 08:11:52 +0000
Subject: [PATCH 326/337] Translated using Weblate (Russian)

Currently translated at 100.0% (51 of 51 strings)

Translation: NamelessMC/Website - Discord Integration
Translate-URL: https://translate.namelessmc.com/projects/namelessmc/website-discord-integration/ru/
---
 modules/Discord Integration/language/ru_RU.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/Discord Integration/language/ru_RU.json b/modules/Discord Integration/language/ru_RU.json
index 91e346de2b..9159f517ae 100644
--- a/modules/Discord Integration/language/ru_RU.json	
+++ b/modules/Discord Integration/language/ru_RU.json	
@@ -17,7 +17,7 @@
     "discord_integration/discord_guild_id": "Discord Сервер ID",
     "discord_integration/discord_id_confirm": "Введите команду \"/verify {{token}}\" в Discord для завершения привязки.",
     "discord_integration/discord_id_help": "Чтобы найти ваш ID сервера в Discord, прочитайте это {{linkStart}}руководство{{linkEnd}}",
-    "discord_integration/discord_id_length": "Убедитесь что ваш Discord Сервер ID длинее 18 символов.",
+    "discord_integration/discord_id_length": "Убедитесь что ваш Discord Сервер ID между {{min}} и {{max}} символами.",
     "discord_integration/discord_id_numeric": "Убедитесь что ваш Discord Сервер ID состоит из цифр.",
     "discord_integration/discord_id_set": "Discord ID установлен",
     "discord_integration/discord_id_taken": "Этот User ID в Discord уже занят.",
@@ -27,7 +27,7 @@
     "discord_integration/discord_invalid_id": "Этот User ID не был найден в Discord.",
     "discord_integration/discord_invite_info": "Чтобы пригласить бота Nameless Link на ваш Discord сервер, нажмите {{inviteLinkStart}}сюда{{inviteLinkEnd}}. Затем, следуйте инструкции которую вы получите после подключения бота. Как вариант, вы можете разместить {{selfHostLinkStart}}свою версию бота{{selfHostLinkEnd}}.",
     "discord_integration/discord_role_id": "ID роли",
-    "discord_integration/discord_role_id_length": "ID роли имеет длину в 18 символов.",
+    "discord_integration/discord_role_id_length": "ID роли имеет длину между {{min}} и {{max}} символами.",
     "discord_integration/discord_role_id_numeric": "ID роли имеет только цифры.",
     "discord_integration/discord_settings_updated": "Настройки в Discord обновлены",
     "discord_integration/discord_unknown_error": "Произошла ошибка во время сихронизации привилегий на сервере. Свяжитесь с администрацией.",

From d694137cc237701770d74b0c943c6c7f76d6ae8c Mon Sep 17 00:00:00 2001
From: samerton <samerton@users.noreply.github.com>
Date: Fri, 5 Aug 2022 19:20:07 +0100
Subject: [PATCH 327/337] Do not prevent saving captcha if unable to validate
 credentials Closes #2847

---
 .../Default/core/registration.tpl             | 13 +++++++
 modules/Core/pages/panel/registration.php     | 38 ++++++++++---------
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/custom/panel_templates/Default/core/registration.tpl b/custom/panel_templates/Default/core/registration.tpl
index 840a5d0c3d..30759b497a 100644
--- a/custom/panel_templates/Default/core/registration.tpl
+++ b/custom/panel_templates/Default/core/registration.tpl
@@ -39,6 +39,19 @@
                             <!-- Success and Error Alerts -->
                             {include file='includes/alerts.tpl'}
 
+                            <!-- Captcha warning -->
+                            {if isset($CAPTCHA_WARNING)}
+                                <div class="alert alert-warning alert-dismissible">
+                                    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                                        <span aria-hidden="true">&times;</span>
+                                    </button>
+                                    <h5><i class="icon fas fa-exclamation-triangle"></i> {$WARNING}</h5>
+                                    <ul>
+                                        <li>{$CAPTCHA_WARNING}</li>
+                                    </ul>
+                                </div>
+                            {/if}
+
                             <form id="enableRegistration" action="" method="post">
                                 <div class="form-group custom-control custom-switch">
                                     <input type="hidden" name="enable_registration" value="0">
diff --git a/modules/Core/pages/panel/registration.php b/modules/Core/pages/panel/registration.php
index 04aef273a7..59021dafac 100644
--- a/modules/Core/pages/panel/registration.php
+++ b/modules/Core/pages/panel/registration.php
@@ -66,31 +66,28 @@
 
                     $provider = CaptchaBase::getActiveProvider();
                     if ($provider->validateSecret(Input::get('recaptcha_secret')) == false || $provider->validateKey(Input::get('recaptcha')) == false) {
-                        $errors[] = $language->get('admin', 'invalid_recaptcha_settings', [
+                        $captcha_warning = $language->get('admin', 'invalid_recaptcha_settings', [
                             'recaptchaProvider' => Text::bold(Input::get('captcha_type'))
                         ]);
-
-                    } else {
-                        Util::setSetting('recaptcha_key', Input::get('recaptcha'));
-                        Util::setSetting('recaptcha_secret', Input::get('recaptcha_secret'));
                     }
+
+                    Util::setSetting('recaptcha_key', Input::get('recaptcha'));
+                    Util::setSetting('recaptcha_secret', Input::get('recaptcha_secret'));
+
                 } else if (empty(Input::get('recaptcha_key')) && empty(Input::get('recaptcha_secret'))) {
                     Util::setSetting('recaptcha_key', '');
                     Util::setSetting('recaptcha_secret', '');
                 }
 
-                // Can enable captcha?
-                if (!count($errors)) {
-                    Util::setSetting('recaptcha', (isset($_POST['enable_recaptcha']) && $_POST['enable_recaptcha'] == '1') ? '1' : '0');
-                    Util::setSetting('recaptcha_login', (isset($_POST['enable_recaptcha_login']) && $_POST['enable_recaptcha_login'] == '1') ? '1' : '0');
-
-                    // Config value
-                    if (Input::get('enable_recaptcha') == 1 || Input::get('enable_recaptcha_login') == 1) {
-                        if (is_writable(ROOT_PATH . '/' . implode(DIRECTORY_SEPARATOR, ['core', 'config.php']))) {
-                            Config::set('core.captcha', true);
-                        } else {
-                            $errors = [$language->get('admin', 'config_not_writable')];
-                        }
+                Util::setSetting('recaptcha', (isset($_POST['enable_recaptcha']) && $_POST['enable_recaptcha'] == '1') ? '1' : '0');
+                Util::setSetting('recaptcha_login', (isset($_POST['enable_recaptcha_login']) && $_POST['enable_recaptcha_login'] == '1') ? '1' : '0');
+
+                // Config value
+                if (Input::get('enable_recaptcha') == 1 || Input::get('enable_recaptcha_login') == 1) {
+                    if (is_writable(ROOT_PATH . '/' . implode(DIRECTORY_SEPARATOR, ['core', 'config.php']))) {
+                        Config::set('core.captcha', true);
+                    } else {
+                        $errors = [$language->get('admin', 'config_not_writable')];
                     }
                 }
 
@@ -120,6 +117,13 @@
     ]);
 }
 
+if (isset($captcha_warning)) {
+    $smarty->assign([
+        'CAPTCHA_WARNING' => $captcha_warning,
+        'WARNING' => $language->get('general', 'warning')
+    ]);
+}
+
 if (isset($errors) && count($errors)) {
     $smarty->assign([
         'ERRORS' => $errors,

From 9053993bcbaef5f9dbd18f61676bac8dc63a4707 Mon Sep 17 00:00:00 2001
From: samerton <samerton@users.noreply.github.com>
Date: Fri, 5 Aug 2022 19:24:40 +0100
Subject: [PATCH 328/337] Add additional info to captcha validation failure

---
 custom/languages/en_UK.json                          | 1 +
 custom/panel_templates/Default/core/registration.tpl | 6 ++++--
 modules/Core/pages/panel/registration.php            | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/custom/languages/en_UK.json b/custom/languages/en_UK.json
index cc74190f05..b289aa538a 100644
--- a/custom/languages/en_UK.json
+++ b/custom/languages/en_UK.json
@@ -310,6 +310,7 @@
     "admin/invalid_hook_name": "Invalid Webhook name",
     "admin/invalid_hook_url": "Invalid Webhook URL",
     "admin/invalid_recaptcha_settings": "Invalid {{recaptchaProvider}} credentials. Ensure the site key and site secret are correct.",
+    "admin/invalid_recaptcha_settings_info": "Consider testing login/registration in an incognito/private window to ensure that your Captcha is working!",
     "admin/ip_address": "IP Address",
     "admin/ip_ban": "IP ban?",
     "admin/is_verified": "Is Verified?",
diff --git a/custom/panel_templates/Default/core/registration.tpl b/custom/panel_templates/Default/core/registration.tpl
index 30759b497a..819ff8703b 100644
--- a/custom/panel_templates/Default/core/registration.tpl
+++ b/custom/panel_templates/Default/core/registration.tpl
@@ -40,14 +40,16 @@
                             {include file='includes/alerts.tpl'}
 
                             <!-- Captcha warning -->
-                            {if isset($CAPTCHA_WARNING)}
+                            {if isset($CAPTCHA_WARNINGS)}
                                 <div class="alert alert-warning alert-dismissible">
                                     <button type="button" class="close" data-dismiss="alert" aria-label="Close">
                                         <span aria-hidden="true">&times;</span>
                                     </button>
                                     <h5><i class="icon fas fa-exclamation-triangle"></i> {$WARNING}</h5>
                                     <ul>
-                                        <li>{$CAPTCHA_WARNING}</li>
+                                        {foreach from=$CAPTCHA_WARNINGS item=warning}
+                                            <li>{$warning}</li>
+                                        {/foreach}
                                     </ul>
                                 </div>
                             {/if}
diff --git a/modules/Core/pages/panel/registration.php b/modules/Core/pages/panel/registration.php
index 59021dafac..e3e27fa983 100644
--- a/modules/Core/pages/panel/registration.php
+++ b/modules/Core/pages/panel/registration.php
@@ -119,7 +119,7 @@
 
 if (isset($captcha_warning)) {
     $smarty->assign([
-        'CAPTCHA_WARNING' => $captcha_warning,
+        'CAPTCHA_WARNINGS' => [$captcha_warning, $language->get('admin', 'invalid_recaptcha_settings_info')],
         'WARNING' => $language->get('general', 'warning')
     ]);
 }

From 8d6bc071dfb02b69e91451e891ff11e6c8d7d3b4 Mon Sep 17 00:00:00 2001
From: DominikSLK <74055080+DominikSLK@users.noreply.github.com>
Date: Fri, 5 Aug 2022 21:09:10 +0200
Subject: [PATCH 329/337] Add userGroupAdded and userGroupRemoved to discord
 webhook formatter (#2958)

* Add userGroupAdded and userGroupRemoved to discord webhook formatter

* Fix hardcoded New Announcement

* use $this->getAvatar(128, true), instead of  AvatarSource::getAvatarFromUserData($this->data()),
---
 core/classes/Core/User.php                     |  6 ++++++
 core/classes/Misc/Announcements.php            |  2 ++
 custom/languages/en_UK.json                    |  4 +++-
 .../hooks/DiscordFormatterHook.php             | 18 +++++++++++++++++-
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/core/classes/Core/User.php b/core/classes/Core/User.php
index 5a0415c834..ee4c890eba 100644
--- a/core/classes/Core/User.php
+++ b/core/classes/Core/User.php
@@ -181,11 +181,14 @@ public function addGroup(int $group_id, int $expire = 0, $group_data = null): bo
             $this->_groups[$group_id] = new Group($group_data);
         }
 
+        $default_language = new Language('core', DEFAULT_LANGUAGE);
         EventHandler::executeEvent('userGroupAdded', [
             'username' => $this->data()->username,
             'user_id' => $this->data()->id,
             'group_id' => $group_id,
             'group_name' => $this->_groups[$group_id]->name,
+            'avatar_url' => $this->getAvatar(128, true),
+            'language' => $default_language,
         ]);
 
         return true;
@@ -708,11 +711,14 @@ public function removeGroup(?int $group_id): bool {
             ]
         );
 
+        $default_language = new Language('core', DEFAULT_LANGUAGE);
         EventHandler::executeEvent('userGroupRemoved', [
             'username' => $this->data()->username,
             'user_id' => $this->data()->id,
             'group_id' => $group_id,
             'group_name' => $this->_groups[$group_id]->name,
+            'avatar_url' => $this->getAvatar(128, true),
+            'language' => $default_language,
         ]);
 
         unset($this->_groups[$group_id]);
diff --git a/core/classes/Misc/Announcements.php b/core/classes/Misc/Announcements.php
index 42739a0c6a..477de2733f 100644
--- a/core/classes/Misc/Announcements.php
+++ b/core/classes/Misc/Announcements.php
@@ -183,12 +183,14 @@ public function create(User $user, array $pages, array $groups, string $text_col
 
         $this->resetCache();
 
+        $default_language = new Language('core', DEFAULT_LANGUAGE);
         EventHandler::executeEvent('createAnnouncement', [
             'announcement_id' => DB::getInstance()->lastId(),
             'username' => $user->data()->username,
             'header' => $header,
             'message' => $message,
             'avatar_url' => $user->getAvatar(128, true),
+            'language' => $default_language,
         ]);
 
         return true;
diff --git a/custom/languages/en_UK.json b/custom/languages/en_UK.json
index b289aa538a..ef173525bb 100644
--- a/custom/languages/en_UK.json
+++ b/custom/languages/en_UK.json
@@ -1234,5 +1234,7 @@
     "user/x_replies": "{{count}} replies",
     "user/you_have_been_banned": "You have been banned!",
     "user/banned_from_registering": "Your IP has been banned, you cannot register.",
-    "user/you_have_received_a_warning": "You have received a warning!"
+    "user/you_have_received_a_warning": "You have received a warning!",
+    "user/group_has_been_added": "Group {{group}} has been added to user {{user}}",
+    "user/group_has_been_removed": "Group {{group}} has been removed from user {{user}}"
 }
diff --git a/modules/Discord Integration/hooks/DiscordFormatterHook.php b/modules/Discord Integration/hooks/DiscordFormatterHook.php
index f0de556c29..df255e4386 100644
--- a/modules/Discord Integration/hooks/DiscordFormatterHook.php	
+++ b/modules/Discord Integration/hooks/DiscordFormatterHook.php	
@@ -35,10 +35,26 @@ public static function format(array $params = []): array {
             $format['username'] = $data['username'] . ' | ' . SITE_NAME;
             $format['avatar_url'] = $data['avatar_url'];
             $format['embeds'] = [[
-                'title' => 'New Announcement: ' . $data['header'],
+                'title' => $data['language']->get('admin', 'new_announcement') . ': ' . $data['header'],
                 'description' => $content,
             ]];
 
+            $params['format'] = $format;
+        } else if ($data['event'] == 'userGroupAdded') {
+            $format['username'] = $data['username'] . ' | ' . SITE_NAME;
+            $format['avatar_url'] = $data['avatar_url'];
+            $format['embeds'] = [[
+                'description' => $data['language']->get('user', 'group_has_been_added', ['group' => "`" . $data['group_name'] . "`", 'user' => Output::getClean($data['username'])]),
+            ]];
+
+            $params['format'] = $format;
+        } else if ($data['event'] == 'userGroupRemoved') {
+            $format['username'] = $data['username'] . ' | ' . SITE_NAME;
+            $format['avatar_url'] = $data['avatar_url'];
+            $format['embeds'] = [[
+                'description' => $data['language']->get('user', 'group_has_been_removed', ['group' => "`" . $data['group_name'] . "`", 'user' => Output::getClean($data['username'])]),
+            ]];
+
             $params['format'] = $format;
         }
 

From 9e241613656925c360e05002b528af58a3148768 Mon Sep 17 00:00:00 2001
From: Partydragen <adrian_kili@outlook.com>
Date: Fri, 5 Aug 2022 21:17:34 +0200
Subject: [PATCH 330/337] Fix group sync issue

---
 core/classes/Group_Sync/GroupSyncManager.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/core/classes/Group_Sync/GroupSyncManager.php b/core/classes/Group_Sync/GroupSyncManager.php
index 5b620a1d64..6136fc2f07 100644
--- a/core/classes/Group_Sync/GroupSyncManager.php
+++ b/core/classes/Group_Sync/GroupSyncManager.php
@@ -153,10 +153,6 @@ public function broadcastChange(User $user, string $sending_injector_class, arra
             return [];
         }
 
-        if (count($group_ids) === 0) {
-            return [];
-        }
-
         $logs = [];
 
         $modified = [];
@@ -166,6 +162,17 @@ public function broadcastChange(User $user, string $sending_injector_class, arra
 
         // Get all group sync rules where this injector is not null
         $rules = DB::getInstance()->query("SELECT * FROM nl2_group_sync WHERE {$sending_injector->getColumnName()} IS NOT NULL")->results();
+        foreach ($rules as $rule) {
+            if ($rule->website_group_id == PRE_VALIDATED_DEFAULT) {
+                // Require atleast 1 group if default group is synced
+                if (count($group_ids) === 0) {
+                    return [];
+                }
+                
+                break;
+            }
+        }
+
         foreach ($rules as $rule) {
 
             foreach ($this->getEnabledInjectors() as $injector) {

From 52fead8f68cc7661396bde06a264d6bb0636cb52 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Fri, 5 Aug 2022 14:05:11 -0600
Subject: [PATCH 331/337] Update changelog

---
 CHANGELOG.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ad4be8aab..412094d5c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@
 - Respect light/dark mode for captcha popups
 - Added `ProfileUtils::getOfflineModeUuid()` & `ProfileUtils::formatUuid()`
 - Added `discordWebhookFormatter` event so modules can define how a Discord webhook embed looks
+- Add `userGroupAdded` and `userGroupRemoved` events to Discord webhook formatter
+- Block banned IPs from registering
 
 ### Changed
 - Better Discord widget error display
@@ -26,6 +28,9 @@
 - "OR" in login page is no longer hardcoded
 - Better TinyMCE image uploading errors + logging
 - Add form token to announcement order change
+- Captcha key failure will still allow values in DB to be updated, incase the test request fails
+- Support 2FA with OAuth2 logging in
+- Only show source code option in staffcp pages in text editor
 
 ### Fixed
 - Fix MariaDB version detection
@@ -64,6 +69,14 @@
 - Fix /rewrite_test not being accessible during installation
 - Fix exception when no user tries to login with OAuth and no Nameless user is linked
 - Fix some special chars in DB/email password getting escaped
+- Fix forum post avatars not matching rest of site
+- Fix Twitter and Facebook widget
+- Fix Discord role IDs length
+- Fix issues converting groups and reports from v1
+- Handle OAuth2 errors properly during login/registration
+- Fix exception when trying to login with non-existent oauth account
+- Add slashes to saved config values
+  - Passwords with slashes would escape the strings
 
 ### Deprecated
 *These will be removed in 2.1.0*

From 5b9fc90432583c03bac5c0f29edc930ba247193a Mon Sep 17 00:00:00 2001
From: samerton <samerton@users.noreply.github.com>
Date: Fri, 5 Aug 2022 22:36:27 +0100
Subject: [PATCH 332/337] Fix panel upgrade page

---
 modules/Core/pages/panel/upgrade.php | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/modules/Core/pages/panel/upgrade.php b/modules/Core/pages/panel/upgrade.php
index 3f7193b40b..8c7f796731 100644
--- a/modules/Core/pages/panel/upgrade.php
+++ b/modules/Core/pages/panel/upgrade.php
@@ -2,7 +2,7 @@
 /*
  *  Made by Samerton
  *  https://github.com/NamelessMC/Nameless/
- *  NamelessMC version 2.0.0-pr8
+ *  NamelessMC version 2.0.0
  *
  *  License: MIT
  *
@@ -10,23 +10,27 @@
  */
 
 // Ensure an update is needed
-$update_needed = Util::getSetting('version_update');
+$update_needed = DB::getInstance()->query('SELECT `value` FROM nl2_settings WHERE `name` = \'version_update\'')->first();
 
-if ($update_needed !== 'true' && $update_needed !== 'urgent') {
+if (!$update_needed || $update_needed->value !== 'true' && $update_needed->value !== 'urgent') {
     Redirect::to(URL::build('/panel/update'));
 }
 
 $cache = new Cache(['name' => 'nameless', 'extension' => '.cache', 'path' => ROOT_PATH . '/cache/']);
 
-// Perform the update
-$upgradeScript = UpgradeScript::get(Util::getSetting('nameless_version'));
-if ($upgradeScript instanceof UpgradeScript) {
-    $upgradeScript->run();
-}
+$version = DB::getInstance()->query('SELECT `value` FROM nl2_settings WHERE `name` = \'nameless_version\'')->first();
+
+if ($version) {
+    // Perform the update
+    $upgradeScript = UpgradeScript::get($version->value);
+    if ($upgradeScript instanceof UpgradeScript) {
+        $upgradeScript->run();
+    }
 
-$cache->setCache('update_check');
-if ($cache->isCached('update_check')) {
-    $cache->erase('update_check');
+    $cache->setCache('update_check');
+    if ($cache->isCached('update_check')) {
+        $cache->erase('update_check');
+    }
 }
 
 Redirect::to(URL::build('/panel/update'));

From 0e26e6d079ce2eec29c324526e8efab9e2908171 Mon Sep 17 00:00:00 2001
From: samerton <samerton@users.noreply.github.com>
Date: Fri, 5 Aug 2022 22:37:24 +0100
Subject: [PATCH 333/337] Fix upgrade script log function

---
 core/classes/Misc/UpgradeScript.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/classes/Misc/UpgradeScript.php b/core/classes/Misc/UpgradeScript.php
index 28d1459af5..5253c23c6e 100644
--- a/core/classes/Misc/UpgradeScript.php
+++ b/core/classes/Misc/UpgradeScript.php
@@ -45,7 +45,7 @@ abstract public function run(): void;
      */
     protected function log(string $message): void {
         echo $message . '<br/>';
-        ErrorHandler::logWarning('UPGRADING EXCEPTION: ' . $exception->getMessage());
+        ErrorHandler::logWarning('UPGRADING EXCEPTION: ' . $message);
     }
 
     /**

From 8c2c98d64b4b0ec194647acc6934e8dc6d240c9f Mon Sep 17 00:00:00 2001
From: samerton <samerton@users.noreply.github.com>
Date: Fri, 5 Aug 2022 22:42:35 +0100
Subject: [PATCH 334/337] Fix settings migration

---
 core/migrations/20220805174255_settings_value_text.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/migrations/20220805174255_settings_value_text.php b/core/migrations/20220805174255_settings_value_text.php
index b227792701..ece78d9af0 100644
--- a/core/migrations/20220805174255_settings_value_text.php
+++ b/core/migrations/20220805174255_settings_value_text.php
@@ -8,7 +8,7 @@ final class SettingsValueText extends AbstractMigration
     public function change(): void
     {
         $table = $this->table('nl2_settings');
-        $table->changeColumn('value', 'text');
+        $table->changeColumn('value', 'text', ['null' => true]);
         $table->update();
     }
 }

From 010c60383b547d0667b12cf7524087ebd4b5942e Mon Sep 17 00:00:00 2001
From: samerton <samerton@users.noreply.github.com>
Date: Fri, 5 Aug 2022 23:15:04 +0100
Subject: [PATCH 335/337] Bump to 2.0.0

---
 README.md                                   | 19 ++++++++++---------
 core/includes/updates/200-pr13.php          |  9 +++++++++
 custom/panel_templates/Default/template.php |  8 ++++----
 custom/templates/DefaultRevamp/template.php |  8 ++++----
 modules/Cookie Consent/module.php           |  6 +++---
 modules/Core/module.php                     |  6 +++---
 modules/Discord Integration/module.php      |  4 ++--
 modules/Forum/module.php                    |  6 +++---
 package.json                                |  2 +-
 9 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index bcfe04743e..d1225fc7ac 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,7 @@
-# NamelessMC - v2 pre-release 13
+# NamelessMC - v2.0
 ![NamelessMC Banner](https://i.imgur.com/gt8uezk.png)
 NamelessMC is a free, easy to use & powerful website software for your Minecraft server, which includes a large range of features.
 
-NamelessMC version 2.0.0 is still a pre-release, and is not yet recommended for production use. Keep up to date with development in our [Spigot thread](https://www.spigotmc.org/threads/nameless-minecraft-website-software.34810) and our [Discord server](https://discord.gg/nameless).
-
 The official project website, providing support and additional downloads such as modules and templates, can be found at [https://namelessmc.com/](https://namelessmc.com/).
 
 ---
@@ -20,7 +18,7 @@ The following list is a brief summary of the features available in v2 pre-releas
   - [In-game plugin](https://plugin.namelessmc.com)
     - Require in-game verification for NamelessMC accounts
     - Allow registering for accounts in-game
-    - Synchronize Vault ranks with NamelessMC groups (unidirectional, game->website)
+    - Synchronise Vault ranks with NamelessMC groups (unidirectional, game->website)
     - Display website announcements in chat
     - Whitelist players who have a website account
     - Ban players who are banned from a website
@@ -29,7 +27,7 @@ The following list is a brief summary of the features available in v2 pre-releas
   - Webhook: receive updates for new members, forum posts, resources, etc.
   - [Nameless-Link Discord bot](https://github.com/NamelessMC/Nameless-Link/wiki/Setup)
     - Link Discord accounts with NamelessMC accounts
-    - Synchronize Discord roles with NamelessMC groups (bidirectional)
+    - Synchronise Discord roles with NamelessMC groups (bidirectional)
 - ⚙️ [API](https://docs.namelessmc.com/en/api-documentation) - Write your own integrations or use one of ours (see above)
 - 🧩 New powerful module system allowing for further NamelessMC integration.
 - ✏️ New template and language systems, allowing for total customisation.
@@ -39,7 +37,7 @@ The following list is a brief summary of the features available in v2 pre-releas
 
 
 #### Customising Nameless
-- Check out [this wiki article](https://docs.namelessmc.com/en/module-documentation) for the Module Developer Documenation.
+- Check out [this wiki article](https://docs.namelessmc.com/en/module-documentation) for the Module Developer Documentation.
 - Developer documentation is coming soon for template and widget development.
 
 ---
@@ -60,18 +58,21 @@ Support can be found in one of the following places:
 Feature requests can be posted on the [forum](https://namelessmc.com/forum/view/7-web-feature-requests/), and bugs can be reported in the [GitHub Issues](https://github.com/NamelessMC/Nameless/issues) tab.
 
 ## Plugin
-For Minecraft integration, you can install the Nameless Plugin in your Spigot server. Currently the plugin is only available for spigot, but we're working on bringing it to different server software, such as Sponge and BungeeCord. You can find a list of features and installation instructions in the [plugin readme](https://github.com/NamelessMC/Nameless-Plugin/blob/master/README.md).
+For Minecraft integration, you can install the Nameless Plugin. We offer support for BungeeCord, Paper, Spigot, Sponge and Velocity. You can find a list of features and installation instructions in the [plugin readme](https://github.com/NamelessMC/Nameless-Plugin/blob/master/README.md).
 
 ## Translations
-NamelessMC translations are kindly provided by the community. Please note, not all translations may be up to date. Progress for the core module is shown below.
+NamelessMC translations are kindly provided by the community. Please note, not all translations may be up-to-date. Progress for the core module is shown below.
 
-If you would like to assist with the NamelessMC development by translating to your language, please create an account on [translate.namelessmc.com](https://translate.namelessmc.com/projects/namelessmc/). To discuss with fellow translators, visit the [NamelessMC Translators](https://discord.gg/7Dku3fE) discord server.
+If you would like to assist with NamelessMC development by translating to your language, please create an account on [translate.namelessmc.com](https://translate.namelessmc.com/projects/namelessmc/). To discuss with fellow translators, visit the [NamelessMC Translators](https://discord.gg/7Dku3fE) Discord server.
 
 ![Translation progress](https://translate.namelessmc.com/widgets/namelessmc/-/nameless/multi-auto.svg)
 
 ## Contributing
 Please see the contributing document for information on how to contribute to NamelessMC.
 
+## Security Policy
+The security policy for NamelessMC can be found [here](https://github.com/NamelessMC/Nameless/blob/v2/SECURITY.md).
+
 ## Special Thanks
 - All NamelessMC [contributors](https://github.com/NamelessMC/Nameless/graphs/contributors).
 - [JetBrains](https://www.jetbrains.com/), whose products are used to develop the NamelessMC project.
diff --git a/core/includes/updates/200-pr13.php b/core/includes/updates/200-pr13.php
index 5c7f0bd62c..e3ce8d051f 100644
--- a/core/includes/updates/200-pr13.php
+++ b/core/includes/updates/200-pr13.php
@@ -23,6 +23,15 @@ public function run(): void {
 
         $this->runMigrations();
 
+        $this->deleteFiles([
+            'core/classes/Misc/OAuth.php',
+            'core/includes/constants/autoload.php',
+            'core/includes/constants/url.constants.php',
+            'core/integration/run_mcassoc.php',
+            'modules/Forum/hooks/MentionsHook.php',
+            'uploads/upload_image.php'
+        ]);
+
         $this->setVersion('2.0.0');
     }
 };
diff --git a/custom/panel_templates/Default/template.php b/custom/panel_templates/Default/template.php
index c5f9631d6b..2d7b25e04e 100644
--- a/custom/panel_templates/Default/template.php
+++ b/custom/panel_templates/Default/template.php
@@ -5,7 +5,7 @@
  *
  *  For NamelessMC
  *  https://github.com/NamelessMC/Nameless/
- *  NamelessMC version 2.0.0-pr12
+ *  NamelessMC version 2.0.0
  *
  *  License: MIT
  *
@@ -24,8 +24,8 @@ public function __construct(Smarty $smarty, Language $language) {
 
             parent::__construct(
                 'Default',  // Template name
-                '2.0.0-pr13',  // Template version
-                '2.0.0-pr13',  // Nameless version template is made for
+                '2.0.0',  // Template version
+                '2.0.0',  // Nameless version template is made for
                 '<a href="https://coldfiredzn.com" target="_blank">Coldfire</a>'  // Author, you can use HTML here
             );
 
@@ -40,7 +40,7 @@ public function __construct(Smarty $smarty, Language $language) {
             $this->addCSSFiles([
                 (defined('CONFIG_PATH') ? CONFIG_PATH : '') . '/custom/panel_templates/Default/assets/css/sb-admin-2.min.css' => [],
                 'https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i' => [],
-                (defined('CONFIG_PATH') ? CONFIG_PATH : '') . '/custom/panel_templates/Default/assets/css/custom.css?v=2pr13' => [],
+                (defined('CONFIG_PATH') ? CONFIG_PATH : '') . '/custom/panel_templates/Default/assets/css/custom.css?v=200' => [],
             ]);
 
             $this->addJSFiles([
diff --git a/custom/templates/DefaultRevamp/template.php b/custom/templates/DefaultRevamp/template.php
index 08692ea31b..7e92fd9d0b 100755
--- a/custom/templates/DefaultRevamp/template.php
+++ b/custom/templates/DefaultRevamp/template.php
@@ -2,7 +2,7 @@
 /*
  *  Made by Samerton | Revamped by Xemah
  *    https://github.com/NamelessMC/Nameless/
- *    NamelessMC version 2.0.0-pr13
+ *    NamelessMC version 2.0.0
  *
  *    License: MIT
  *
@@ -25,8 +25,8 @@ class DefaultRevamp_Template extends TemplateBase {
     public function __construct($cache, $smarty, $language, $user, $pages) {
         $template = [
             'name' => 'DefaultRevamp',
-            'version' => '2.0.0-pr13',
-            'nl_version' => '2.0.0-pr13',
+            'version' => '2.0.0',
+            'nl_version' => '2.0.0',
             'author' => '<a href="https://xemah.com/" target="_blank">Xemah</a>',
         ];
 
@@ -87,7 +87,7 @@ public function onPageLoad() {
         define('PAGE_LOAD_TIME', $this->_language->get('general', 'page_loaded_in', ['time' => round($page_load, 3)]));
 
         $this->addCSSFiles([
-            $this->_template['path'] . 'css/custom.css?v=2pr13' => []
+            $this->_template['path'] . 'css/custom.css?v=200' => []
         ]);
 
         $route = (isset($_GET['route']) ? rtrim($_GET['route'], '/') : '/');
diff --git a/modules/Cookie Consent/module.php b/modules/Cookie Consent/module.php
index 3070146485..4d95953862 100644
--- a/modules/Cookie Consent/module.php	
+++ b/modules/Cookie Consent/module.php	
@@ -2,7 +2,7 @@
 /*
  *  Made by Samerton
  *  https://github.com/NamelessMC/Nameless/
- *  NamelessMC version 2.0.0-pr12
+ *  NamelessMC version 2.0.0
  *
  *  License: MIT
  *
@@ -20,8 +20,8 @@ public function __construct(Language $language, Language $cookie_language, Pages
 
         $name = 'Cookie Consent';
         $author = '<a href="https://samerton.me" target="_blank" rel="nofollow noopener">Samerton</a>';
-        $module_version = '2.0.0-pr13';
-        $nameless_version = '2.0.0-pr13';
+        $module_version = '2.0.0';
+        $nameless_version = '2.0.0';
 
         parent::__construct($this, $name, $author, $module_version, $nameless_version);
 
diff --git a/modules/Core/module.php b/modules/Core/module.php
index 48834d8109..63617241de 100644
--- a/modules/Core/module.php
+++ b/modules/Core/module.php
@@ -2,7 +2,7 @@
 /*
  *  Made by Samerton
  *  https://github.com/NamelessMC/Nameless/
- *  NamelessMC version 2.0.0-pr13
+ *  NamelessMC version 2.0.0
  *
  *  License: MIT
  *
@@ -21,8 +21,8 @@ public function __construct(Language $language, Pages $pages, User $user, Naviga
 
         $name = 'Core';
         $author = '<a href="https://samerton.me" target="_blank" rel="nofollow noopener">Samerton</a>';
-        $module_version = '2.0.0-pr13';
-        $nameless_version = '2.0.0-pr13';
+        $module_version = '2.0.0';
+        $nameless_version = '2.0.0';
 
         parent::__construct($this, $name, $author, $module_version, $nameless_version);
 
diff --git a/modules/Discord Integration/module.php b/modules/Discord Integration/module.php
index e9e0bc5cdf..a6acf2e027 100644
--- a/modules/Discord Integration/module.php	
+++ b/modules/Discord Integration/module.php	
@@ -9,8 +9,8 @@ public function __construct(Language $language, Pages $pages, Endpoints $endpoin
 
         $name = 'Discord Integration';
         $author = '<a href="https://tadhg.sh" target="_blank" rel="nofollow noopener">Aberdeener</a>';
-        $module_version = '2.0.0-pr13';
-        $nameless_version = '2.0.0-pr13';
+        $module_version = '2.0.0';
+        $nameless_version = '2.0.0';
 
         parent::__construct($this, $name, $author, $module_version, $nameless_version);
 
diff --git a/modules/Forum/module.php b/modules/Forum/module.php
index 047940dae1..de3acf11f2 100644
--- a/modules/Forum/module.php
+++ b/modules/Forum/module.php
@@ -2,7 +2,7 @@
 /*
  *  Made by Samerton
  *  https://github.com/NamelessMC/Nameless/
- *  NamelessMC version 2.0.0-pr12
+ *  NamelessMC version 2.0.0
  *
  *  License: MIT
  *
@@ -20,8 +20,8 @@ public function __construct(Language $language, Language $forum_language, Pages
 
         $name = 'Forum';
         $author = '<a href="https://samerton.me" target="_blank" rel="nofollow noopener">Samerton</a>';
-        $module_version = '2.0.0-pr13';
-        $nameless_version = '2.0.0-pr13';
+        $module_version = '2.0.0';
+        $nameless_version = '2.0.0';
 
         parent::__construct($this, $name, $author, $module_version, $nameless_version);
 
diff --git a/package.json b/package.json
index 227c84da79..78974e9b05 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nameless",
-  "version": "2.0.0-pr13",
+  "version": "2.0.0",
   "repository": "https://github.com/NamelessMC/Nameless",
   "license": "MIT",
   "private": true,

From 6e9faa3ab5caeec208fabc45f4d80cba53922467 Mon Sep 17 00:00:00 2001
From: samerton <samerton@users.noreply.github.com>
Date: Fri, 5 Aug 2022 23:19:02 +0100
Subject: [PATCH 336/337] Further prep for 2.0.0

---
 .github/ISSUE_TEMPLATE/bug-report.yml          | 6 ++----
 SECURITY.md                                    | 9 ++++-----
 core/classes/Database/DatabaseInitialiser.php  | 2 +-
 core/installation/includes/upgrade_perform.php | 4 ++--
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index cef80dca35..9484585d1b 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -16,10 +16,8 @@ body:
       description: From StaffCP -> Overview
       options:
         - Development version
-        - 2.0.0-pr13
-        - <= 2.0.0-pr12
-        - 1.0.21
-        - <= 1.0.20
+        - 2.0.0
+        - < 2.0.0
     validations:
       required: true
 
diff --git a/SECURITY.md b/SECURITY.md
index 48392339c2..29aefc9a48 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -7,11 +7,10 @@ We endeavour to respond to and patch high-severity security vulnerabilities as s
 The following NamelessMC releases are supported by the development team
 
 | Version       | Supported          |
-|---------------| ------------------ |
-| 2.0.0-pr13    | :white_check_mark: |
-| <= 2.0.0-pr12 | :x:                |
-| 1.0.22        | :white_check_mark: |
-| <= 1.0.21     | :x:                |
+|---------------|--------------------|
+| 2.0.0         | :white_check_mark: |
+| <= 2.0.0-pr13 | :x:                |
+| <= 1.0.22     | :x:                |
 
 ## Reporting a Vulnerability
 
diff --git a/core/classes/Database/DatabaseInitialiser.php b/core/classes/Database/DatabaseInitialiser.php
index 134a6cd697..a2f240d09c 100644
--- a/core/classes/Database/DatabaseInitialiser.php
+++ b/core/classes/Database/DatabaseInitialiser.php
@@ -171,7 +171,7 @@ private function initialiseSettings(): void {
         Util::setSetting('recaptcha_type', 'Recaptcha3');
         Util::setSetting('recaptcha_login', '0');
         Util::setSetting('email_verification', '1');
-        Util::setSetting('nameless_version', '2.0.0-pr13');
+        Util::setSetting('nameless_version', '2.0.0');
         Util::setSetting('version_checked', date('U'));
         Util::setSetting('phpmailer', '0');
         Util::setSetting('phpmailer_type', 'smtp');
diff --git a/core/installation/includes/upgrade_perform.php b/core/installation/includes/upgrade_perform.php
index 833272468d..119acf35ec 100644
--- a/core/installation/includes/upgrade_perform.php
+++ b/core/installation/includes/upgrade_perform.php
@@ -776,13 +776,13 @@
 if (count($version)) {
     DB::getInstance()->update('settings', $version[0]->id, [
         'name' => 'nameless_version',
-        'value' => '2.0.0-pr13'
+        'value' => '2.0.0'
     ]);
     DB::getInstance()->delete('settings', ['name', 'version']);
 } else {
     DB::getInstance()->insert('settings', [
         'name' => 'nameless_version',
-        'value' => '2.0.0-pr13'
+        'value' => '2.0.0'
     ]);
 }
 

From da7efcb60c5337402b43746e7a2da7fab88ae4c5 Mon Sep 17 00:00:00 2001
From: Tadhg Boyle <tadhgsmboyle@gmail.com>
Date: Fri, 5 Aug 2022 15:24:39 -0700
Subject: [PATCH 337/337] Bump changelog

---
 CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 412094d5c3..69a944562f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # NamelessMC v2 Changelog
 
-## [Unreleased](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr13...v2)
+## [Unreleased](https://github.com/NamelessMC/Nameless/compare/v2.0.0...v2)
+> [Milestone](https://github.com/NamelessMC/Nameless/milestone/18)
+
+
+## [2.0.0](https://github.com/NamelessMC/Nameless/compare/v2.0.0-pr13...v2) - 2022-08-05
 > [Milestone](https://github.com/NamelessMC/Nameless/milestone/17)
 
 ### Added