Remove custom panel template support

NamelessMC · Aug 7, 2022 · e6a7013 · e6a7013
1 parent c1e179c
commit e6a7013
Show file tree

Hide file tree

Showing 30 changed files with 22 additions and 747 deletions.
diff --git a/core/classes/Database/DatabaseInitialiser.php b/core/classes/Database/DatabaseInitialiser.php
@@ -42,7 +42,7 @@ private function initialiseGroups(): void {
             'group_username_color' => '#ff0000',
             'group_username_css' => '',
             'admin_cp' => true,
-            'permissions' => '{"administrator":1,"admincp.core":1,"admincp.core.api":1,"admincp.core.seo":1,"admincp.core.general":1,"admincp.core.avatars":1,"admincp.core.fields":1,"admincp.core.debugging":1,"admincp.core.emails":1,"admincp.core.navigation":1,"admincp.core.announcements":1,"admincp.core.reactions":1,"admincp.core.registration":1,"admincp.core.social_media":1,"admincp.core.terms":1,"admincp.errors":1,"admincp.core.placeholders":1,"admincp.integrations":1,"admincp.integrations.edit":1,"admincp.discord":1,"admincp.minecraft":1,"admincp.minecraft.authme":1,"admincp.minecraft.verification":1,"admincp.minecraft.servers":1,"admincp.minecraft.query_errors":1,"admincp.minecraft.banners":1,"admincp.modules":1,"admincp.pages":1,"admincp.security":1,"admincp.security.acp_logins":1,"admincp.security.template":1,"admincp.styles":1,"admincp.styles.panel_templates":1,"admincp.styles.templates":1,"admincp.styles.templates.edit":1,"admincp.styles.images":1,"admincp.update":1,"admincp.users":1,"admincp.users.edit":1,"admincp.groups":1,"admincp.groups.self":1,"admincp.widgets":1,"modcp.ip_lookup":1,"modcp.punishments":1,"modcp.punishments.warn":1,"modcp.punishments.ban":1,"modcp.punishments.banip":1,"modcp.punishments.revoke":1,"modcp.reports":1,"modcp.profile_banner_reset":1,"usercp.messaging":1,"usercp.signature":1,"admincp.forums":1,"usercp.private_profile":1,"usercp.nickname":1,"usercp.profile_banner":1,"profile.private.bypass":1, "admincp.security.all":1,"admincp.core.hooks":1,"admincp.security.group_sync":1,"admincp.core.emails_mass_message":1,"modcp.punishments.reset_avatar":1,"usercp.gif_avatar":1}',
+            'permissions' => '{"administrator":1,"admincp.core":1,"admincp.core.api":1,"admincp.core.seo":1,"admincp.core.general":1,"admincp.core.avatars":1,"admincp.core.fields":1,"admincp.core.debugging":1,"admincp.core.emails":1,"admincp.core.navigation":1,"admincp.core.announcements":1,"admincp.core.reactions":1,"admincp.core.registration":1,"admincp.core.social_media":1,"admincp.core.terms":1,"admincp.errors":1,"admincp.core.placeholders":1,"admincp.integrations":1,"admincp.integrations.edit":1,"admincp.discord":1,"admincp.minecraft":1,"admincp.minecraft.authme":1,"admincp.minecraft.verification":1,"admincp.minecraft.servers":1,"admincp.minecraft.query_errors":1,"admincp.minecraft.banners":1,"admincp.modules":1,"admincp.pages":1,"admincp.security":1,"admincp.security.acp_logins":1,"admincp.security.template":1,"admincp.styles":1,"admincp.styles.templates":1,"admincp.styles.templates.edit":1,"admincp.styles.images":1,"admincp.update":1,"admincp.users":1,"admincp.users.edit":1,"admincp.groups":1,"admincp.groups.self":1,"admincp.widgets":1,"modcp.ip_lookup":1,"modcp.punishments":1,"modcp.punishments.warn":1,"modcp.punishments.ban":1,"modcp.punishments.banip":1,"modcp.punishments.revoke":1,"modcp.reports":1,"modcp.profile_banner_reset":1,"usercp.messaging":1,"usercp.signature":1,"admincp.forums":1,"usercp.private_profile":1,"usercp.nickname":1,"usercp.profile_banner":1,"profile.private.bypass":1, "admincp.security.all":1,"admincp.core.hooks":1,"admincp.security.group_sync":1,"admincp.core.emails_mass_message":1,"modcp.punishments.reset_avatar":1,"usercp.gif_avatar":1}',
             'order' => 1,
             'staff' => true,
         ]);
@@ -238,13 +238,6 @@ private function initialiseTemplates(): void {
         $this->_cache->setCache('templatecache');
         $this->_cache->store('default', 'DefaultRevamp');
 
-        $this->_db->insert('panel_templates', [
-            'name' => 'Default',
-            'enabled' => true,
-            'is_default' => true,
-        ]);
-        $this->_cache->store('panel_default', 'Default');
-
         $config_path = Config::get('core.path');
         if (!empty($config_path)) {
             $config_path = '/' . trim($config_path, '/');

diff --git a/core/init.php b/core/init.php
@@ -276,16 +276,6 @@
         }
     }
 
-    // Panel template
-    $cache->setCache('templatecache');
-    $template = $cache->retrieve('panel_default');
-
-    if (!$template) {
-        define('PANEL_TEMPLATE', 'Default');
-    } else {
-        define('PANEL_TEMPLATE', $template);
-    }
-
     // Smarty
     $securityPolicy = new Smarty_Security($smarty);
     $securityPolicy->php_modifiers = [

diff --git a/core/installation/includes/upgrade_perform.php b/core/installation/includes/upgrade_perform.php
@@ -173,7 +173,7 @@
         }
 
         DB::getInstance()->update('groups', 1, ['permissions' => '{"usercp.messaging":1,"usercp.signature":1,"usercp.nickname":1,"usercp.private_profile":1,"usercp.profile_banner":1}']);
-        DB::getInstance()->update('groups', 2, ['permissions' => '{"admincp.core":1,"admincp.core.api":1,"admincp.core.seo":1,"admincp.core.general":1,"admincp.core.avatars":1,"admincp.core.fields":1,"admincp.core.debugging":1,"admincp.core.emails":1,"admincp.core.navigation":1,"admincp.core.announcements":1,"admincp.core.reactions":1,"admincp.core.registration":1,"admincp.core.social_media":1,"admincp.core.terms":1,"admincp.errors":1,"admincp.integrations":1,"admincp.discord":1,"admincp.minecraft":1,"admincp.minecraft.authme":1,"admincp.minecraft.verification":1,"admincp.minecraft.servers":1,"admincp.minecraft.query_errors":1,"admincp.minecraft.banners":1,"admincp.modules":1,"admincp.pages":1,"admincp.security":1,"admincp.security.acp_logins":1,"admincp.security.template":1,"admincp.styles":1,"admincp.styles.panel_templates":1,"admincp.styles.templates":1,"admincp.styles.templates.edit":1,"admincp.styles.images":1,"admincp.update":1,"admincp.users":1,"admincp.users.edit":1,"admincp.groups":1,"admincp.groups.self":1,"admincp.widgets":1,"modcp.ip_lookup":1,"modcp.punishments":1,"modcp.punishments.warn":1,"modcp.punishments.ban":1,"modcp.punishments.banip":1,"modcp.punishments.revoke":1,"modcp.reports":1,"modcp.profile_banner_reset":1,"usercp.messaging":1,"usercp.signature":1,"admincp.forums":1,"usercp.private_profile":1,"usercp.nickname":1,"usercp.profile_banner":1,"profile.private.bypass":1, "admincp.security.all":1,"admincp.core.hooks":1,"admincp.core.emails_mass_message":1,"usercp.gif_avatar":1}']);
+        DB::getInstance()->update('groups', 2, ['permissions' => '{"admincp.core":1,"admincp.core.api":1,"admincp.core.seo":1,"admincp.core.general":1,"admincp.core.avatars":1,"admincp.core.fields":1,"admincp.core.debugging":1,"admincp.core.emails":1,"admincp.core.navigation":1,"admincp.core.announcements":1,"admincp.core.reactions":1,"admincp.core.registration":1,"admincp.core.social_media":1,"admincp.core.terms":1,"admincp.errors":1,"admincp.integrations":1,"admincp.discord":1,"admincp.minecraft":1,"admincp.minecraft.authme":1,"admincp.minecraft.verification":1,"admincp.minecraft.servers":1,"admincp.minecraft.query_errors":1,"admincp.minecraft.banners":1,"admincp.modules":1,"admincp.pages":1,"admincp.security":1,"admincp.security.acp_logins":1,"admincp.security.template":1,"admincp.styles":1,"admincp.styles.templates":1,"admincp.styles.templates.edit":1,"admincp.styles.images":1,"admincp.update":1,"admincp.users":1,"admincp.users.edit":1,"admincp.groups":1,"admincp.groups.self":1,"admincp.widgets":1,"modcp.ip_lookup":1,"modcp.punishments":1,"modcp.punishments.warn":1,"modcp.punishments.ban":1,"modcp.punishments.banip":1,"modcp.punishments.revoke":1,"modcp.reports":1,"modcp.profile_banner_reset":1,"usercp.messaging":1,"usercp.signature":1,"admincp.forums":1,"usercp.private_profile":1,"usercp.nickname":1,"usercp.profile_banner":1,"profile.private.bypass":1, "admincp.security.all":1,"admincp.core.hooks":1,"admincp.core.emails_mass_message":1,"usercp.gif_avatar":1}']);
         DB::getInstance()->update('groups', 3, ['permissions' => '{"modcp.ip_lookup":1,"modcp.punishments":1,"modcp.punishments.warn":1,"modcp.punishments.ban":1,"modcp.punishments.banip":1,"modcp.punishments.revoke":1,"modcp.reports":1,"admincp.users":1,"modcp.profile_banner_reset":1,"usercp.messaging":1,"usercp.signature":1,"usercp.private_profile":1,"usercp.nickname":1,"usercp.profile_banner":1,"profile.private.bypass":1}']);
     }
 } catch (Exception $e) {
@@ -949,13 +949,6 @@
 $cache->setCache('templatecache');
 $cache->store('default', 'DefaultRevamp');
 
-DB::getInstance()->insert('panel_templates', [
-    'name' => 'Default',
-    'enabled' => true,
-    'is_default' => true,
-]);
-$cache->store('panel_default', 'Default');
-
 // Widgets - initialise just a few default ones for now
 DB::getInstance()->insert('widgets', [
     'name' => 'Online Staff',

diff --git a/core/migrations/20220807035213_drop_panel_templates_table.php b/core/migrations/20220807035213_drop_panel_templates_table.php
@@ -0,0 +1,15 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class DropPanelTemplatesTable extends AbstractMigration
+{
+    public function change(): void
+    {
+        $table = $this->table('nl2_panel_templates');
+        $table->drop();
+
+        $table->update();
+    }
+}
diff --git a/core/templates/backend_init.php b/core/templates/backend_init.php
@@ -11,15 +11,11 @@
 
 const BACK_END = true;
 
-$template_path = ROOT_PATH . '/custom/panel_templates/' . PANEL_TEMPLATE;
+$template_path = ROOT_PATH . '/custom/panel_templates/Default';
 $smarty->setTemplateDir($template_path);
 $smarty->setCompileDir(ROOT_PATH . '/cache/templates_c');
 
-if (file_exists(ROOT_PATH . '/custom/panel_templates/' . PANEL_TEMPLATE . '/template.php')) {
-    require(ROOT_PATH . '/custom/panel_templates/' . PANEL_TEMPLATE . '/template.php');
-} else {
-    require(ROOT_PATH . '/custom/panel_templates/Default/template.php');
-}
+require(ROOT_PATH . '/custom/panel_templates/Default/template.php');
 
 $cache->setCache('backgroundcache');
 $logo_image = $cache->retrieve('logo_image');

diff --git a/custom/languages/cs_CZ.json b/custom/languages/cs_CZ.json
@@ -393,7 +393,6 @@
     "admin/page_url_minimum_2": "Cesta ke stránce musí obsahovat alespoň 2 znaky.",
     "admin/page_url_required": "Je vyžadována cesta ke stránce.",
     "admin/pages": "Stránky",
-    "admin/panel_templates": "Šablony panelu",
     "admin/parent_server": "Nadřazený server",
     "admin/parent_server_help": "Nadřazený server je většinou Bungee server, ke kterému je napojený daný server, pokud nějaký takový existuje.",
     "admin/permissions": "Oprávnění",
@@ -597,7 +596,6 @@
     "admin/verify_delete_announcement": "Opravdu chcete odstranit toto oznámení?",
     "admin/verify_with_mcassoc": "Ověřovat uživatelské účty pomocí MCAssoc?",
     "admin/view_all_modules": "Zobrazit všechny doplňky",
-    "admin/view_all_panel_templates": "Zobrazit všechny šablony panelu",
     "admin/view_all_templates": "Zobrazit všechny šablony",
     "admin/view_page": "Zobrazit stránku?",
     "admin/view_site": "Zobrazit web",

diff --git a/custom/languages/de_DE.json b/custom/languages/de_DE.json
@@ -384,7 +384,6 @@
     "admin/page_url_minimum_2": "Der Seitenpfad muss mindestens 2 Zeichen lang sein.",
     "admin/page_url_required": "Ein Seitenpfad ist erforderlich.",
     "admin/pages": "Seiten",
-    "admin/panel_templates": "Panel Vorlagen",
     "admin/parent_server": "Übergeordneter Server",
     "admin/parent_server_help": "Ein übergeordneter Server ist in der Regel die Bungee-Instanz, der mit dem Server verbunden ist.",
     "admin/permissions": "Berechtigungen",
@@ -569,7 +568,6 @@
     "admin/verify_delete_announcement": "Möchtest Du diese Ankündigung wirklich löschen?",
     "admin/verify_with_mcassoc": "Sollen sich Nutzer mit MCAssoc verifizieren?",
     "admin/view_all_modules": "Zeige alle Module",
-    "admin/view_all_panel_templates": "Alle Panel-Vorlagen anzeigen",
     "admin/view_all_templates": "Zeige alle Vorlagen",
     "admin/view_page": "Seite anzeigen?",
     "admin/view_site": "Seite ansehen",

diff --git a/custom/languages/en_UK.json b/custom/languages/en_UK.json
@@ -435,7 +435,6 @@
     "admin/page_url_required": "A page path is required.",
     "admin/page_url_contains_nameless_path": "Your custom page would overwrite a NamelessMC page.",
     "admin/pages": "Pages",
-    "admin/panel_templates": "Panel Templates",
     "admin/parent_server": "Parent Server",
     "admin/parent_server_help": "A parent server is typically the Bungee instance the server is connected to, if any.",
     "admin/permissions": "Permissions",
@@ -663,7 +662,6 @@
     "admin/verify_delete_announcement": "Are you sure you want to delete this announcement?",
     "admin/verify_with_mcassoc": "Verify user accounts with MCAssoc?",
     "admin/view_all_modules": "View all modules",
-    "admin/view_all_panel_templates": "View all panel templates",
     "admin/view_all_templates": "View all templates",
     "admin/view_page": "View Page?",
     "admin/view_site": "View Site",

diff --git a/custom/languages/en_US.json b/custom/languages/en_US.json
@@ -402,7 +402,6 @@
     "admin/page_url_minimum_2": "The page path must be a minimum of 2 characters.",
     "admin/page_url_required": "A page path is required.",
     "admin/pages": "Pages",
-    "admin/panel_templates": "Panel Templates",
     "admin/parent_server": "Parent Server",
     "admin/parent_server_help": "A parent server is typically the Bungee instance the server is connected to, if any.",
     "admin/permissions": "Permissions",
@@ -613,7 +612,6 @@
     "admin/verify_delete_announcement": "Are you sure you want to delete this announcement?",
     "admin/verify_with_mcassoc": "Verify user accounts with MCAssoc?",
     "admin/view_all_modules": "View all modules",
-    "admin/view_all_panel_templates": "View all panel templates",
     "admin/view_all_templates": "View all templates",
     "admin/view_page": "View Page?",
     "admin/view_site": "View Site",

diff --git a/custom/languages/es_419.json b/custom/languages/es_419.json
@@ -386,7 +386,6 @@
     "admin/page_url_minimum_2": "La ruta de la página debe tener un mínimo de 2 caracteres.",
     "admin/page_url_required": "Se requiere una ruta para la página.",
     "admin/pages": "Paginas",
-    "admin/panel_templates": "Plantillas del panel",
     "admin/parent_server": "Servidor principal",
     "admin/parent_server_help": "Un servidor principal es normalmente la instancia de Bungee a la que está conectado el servidor, si es que hay alguna.",
     "admin/permissions": "Permisos",
@@ -588,7 +587,6 @@
     "admin/verify_delete_announcement": "¿Estás seguro de que quieres borrar este anuncio?",
     "admin/verify_with_mcassoc": "¿Verificar las cuentas de usuario con MCAssoc?",
     "admin/view_all_modules": "Ver todos los modulos",
-    "admin/view_all_panel_templates": "Ver todas las plantillas",
     "admin/view_all_templates": "Ver todas las plantillas",
     "admin/view_page": "Ver página?",
     "admin/view_site": "Ver sitio",

diff --git a/custom/languages/es_ES.json b/custom/languages/es_ES.json
@@ -394,7 +394,6 @@
     "admin/page_url_minimum_2": "La ruta de la página debe tener un mínimo de 2 caracteres.",
     "admin/page_url_required": "Se requiere una ruta de acceso a la página.",
     "admin/pages": "Páginas",
-    "admin/panel_templates": "Plantillas del panel de control administrativo",
     "admin/parent_server": "Servidor principal",
     "admin/parent_server_help": "El servidor principal es normalmente la instancia de Bungee a la que está conectado el servidor, si es que hay alguna.",
     "admin/permissions": "Permisos",
@@ -598,7 +597,6 @@
     "admin/verify_delete_announcement": "¿Estás seguro de que quieres borrar este anuncio?",
     "admin/verify_with_mcassoc": "¿Verificar las cuentas de usuario con MCAssoc?",
     "admin/view_all_modules": "Ver todos los módulos",
-    "admin/view_all_panel_templates": "Ver todas las plantillas del panel de control administrativo",
     "admin/view_all_templates": "Ver todas las plantillas",
     "admin/view_page": "¿Ver la página?",
     "admin/view_site": "Ver el sitio web",

diff --git a/custom/languages/fr_FR.json b/custom/languages/fr_FR.json
@@ -337,7 +337,6 @@
     "admin/page_url_maximum_255": "Le chemin d’accès de la page doit comporter au maximum 255 caractères.",
     "admin/page_url_minimum_2": "Le chemin de la page doit être d’au moins 2 caractères.",
     "admin/page_url_required": "Un chemin de page est nécessaire.",
-    "admin/panel_templates": "Panel Modèles",
     "admin/parent_server": "Serveur parent",
     "admin/parent_server_help": "Un serveur parent est généralement l’instance Bungee à laquelle le serveur est connecté, le cas échéant.",
     "admin/permissions": "Permissions",

diff --git a/custom/languages/it_IT.json b/custom/languages/it_IT.json
@@ -364,7 +364,6 @@
     "admin/page_url_minimum_2": "Il percorso della pagina deve essere composto da almeno 2 caratteri.",
     "admin/page_url_required": "È richiesto il percorso della pagina.",
     "admin/pages": "Pagine",
-    "admin/panel_templates": "Modelli Pannello",
     "admin/parent_server": "Server principale",
     "admin/parent_server_help": "Un server principale è in genere l'istanza Bungee a cui è connesso il server, se presente.",
     "admin/permissions": "Permessi",
@@ -538,7 +537,6 @@
     "admin/verify_delete_announcement": "Sei sicuro di voler eliminare questo annuncio?",
     "admin/verify_with_mcassoc": "Verificare gli account utente con MCAssoc?",
     "admin/view_all_modules": "Visualizza tutti i moduli",
-    "admin/view_all_panel_templates": "Visualizza tutti i modelli di pannello",
     "admin/view_all_templates": "Visualizza tutti i modelli",
     "admin/view_page": "Visualizzare la Pagina?",
     "admin/view_site": "Visualizza sito",

diff --git a/custom/languages/ja_JP.json b/custom/languages/ja_JP.json
@@ -402,7 +402,6 @@
     "admin/page_url_minimum_2": "ページパスは2文字以上にする必要があります。",
     "admin/page_url_required": "ページパスが必要です。",
     "admin/pages": "ページ",
-    "admin/panel_templates": "パネルテンプレート",
     "admin/parent_server": "親サーバー",
     "admin/parent_server_help": "親サーバーは、Bungeecordの場合主幹サーバーとなっているものを選択してください。",
     "admin/permissions": "権限",
@@ -613,7 +612,6 @@
     "admin/verify_delete_announcement": "このお知らせを削除しても大丈夫ですか？",
     "admin/verify_with_mcassoc": "MCAssocで各ユーザーのMinecraftアカウントを検証しますか？",
     "admin/view_all_modules": "すべてのモジュールを見る",
-    "admin/view_all_panel_templates": "すべてのパネルテンプレートを見る",
     "admin/view_all_templates": "すべてのテンプレートを見る",
     "admin/view_page": "ページを表示しますか？",
     "admin/view_site": "ホームページ表示",

diff --git a/custom/languages/nl_NL.json b/custom/languages/nl_NL.json
@@ -386,7 +386,6 @@
     "admin/page_url_minimum_2": "Het pagina pad moet minimaal uit 2 karakters bestaan.",
     "admin/page_url_required": "Een pagina pad is nodig.",
     "admin/pages": "Pagina's",
-    "admin/panel_templates": "Paneel Sjablonen",
     "admin/parent_server": "Hoofd server",
     "admin/parent_server_help": "Een hoofd server is gewoonlijk de BungeeCord server waarmee de website is verbonden, als deze er is.",
     "admin/permissions": "Toestemmingen",
@@ -586,7 +585,6 @@
     "admin/verify_delete_announcement": "Weet je zeker dat je deze aankondiging wilt verwijderen?",
     "admin/verify_with_mcassoc": "Verifieer gebruiker accounts met MCAssoc?",
     "admin/view_all_modules": "Bekijk alle modules",
-    "admin/view_all_panel_templates": "Alle paneelsjablonen bekijken",
     "admin/view_all_templates": "Bekijk alle sjablonen",
     "admin/view_page": "Pagina bekijken?",
     "admin/view_site": "Terug naar de website",

diff --git a/custom/languages/no_NO.json b/custom/languages/no_NO.json
@@ -371,7 +371,6 @@
     "admin/page_url_minimum_2": "Sideplasseringen må inneholde minst 2 tegn.",
     "admin/page_url_required": "En sidesti er påkrevd.",
     "admin/pages": "Sider",
-    "admin/panel_templates": "Panelmal",
     "admin/parent_server": "Hovedserver",
     "admin/parent_server_help": "En hovedserver er som oftest BungeeCorden som serveren er koblet til, hvis den finnes.",
     "admin/permissions": "Rettigheter",
@@ -547,7 +546,6 @@
     "admin/verify_delete_announcement": "Er du sikker på at du vil slette denne kunngjøringen?",
     "admin/verify_with_mcassoc": "Verifiser bruker med MCAssoc-tillegget?",
     "admin/view_all_modules": "Vis alle moduler",
-    "admin/view_all_panel_templates": "Vis alle panelmaler",
     "admin/view_all_templates": "Vis alle maler",
     "admin/view_page": "Se side?",
     "admin/view_site": "Vis side",