From 3949d84e5d7631f332111b6d00278bddbd0ad10a Mon Sep 17 00:00:00 2001 From: slawkens Date: Wed, 14 May 2025 10:22:25 +0200 Subject: [PATCH] Rename server-info -> ots-info, changelog -> change-log + move rules to admin panel Due to conflict with apache2 server-info mod --- common.php | 2 +- system/migrations/44.php | 39 +++++++++++++++++++ .../pages/{changelog.php => change-log.php} | 0 .../pages/{server-info.php => ots-info.php} | 0 system/pages/rules.php | 14 ------- system/templates/rules.html.twig | 2 - 6 files changed, 40 insertions(+), 17 deletions(-) create mode 100644 system/migrations/44.php rename system/pages/{changelog.php => change-log.php} (100%) rename system/pages/{server-info.php => ots-info.php} (100%) delete mode 100644 system/pages/rules.php delete mode 100644 system/templates/rules.html.twig diff --git a/common.php b/common.php index 4c903f5b..0cba1145 100644 --- a/common.php +++ b/common.php @@ -27,7 +27,7 @@ if (version_compare(phpversion(), '8.1', '<')) die('PHP version 8.1 or higher is const MYAAC = true; const MYAAC_VERSION = '1.4.1-dev'; -const DATABASE_VERSION = 43; +const DATABASE_VERSION = 44; const TABLE_PREFIX = 'myaac_'; define('START_TIME', microtime(true)); define('MYAAC_OS', stripos(PHP_OS, 'WIN') === 0 ? 'WINDOWS' : (strtoupper(PHP_OS) === 'DARWIN' ? 'MAC' : 'LINUX')); diff --git a/system/migrations/44.php b/system/migrations/44.php new file mode 100644 index 00000000..0d9d18bb --- /dev/null +++ b/system/migrations/44.php @@ -0,0 +1,39 @@ +update(['link' => 'ots-info']); + Menu::where('link', 'changelog')->update(['link' => 'change-log']); + + Pages::where('name', 'rules_on_the_page')->update(['hide' => 1]); + + $rules = Pages::where('name', 'rules')->first(); + if (!$rules) { + Pages::create([ + 'name' => 'rules', + 'title' => 'Server Rules', + 'body' => '{{ config.lua.serverName }} Rules
' . nl2br(file_get_contents(__DIR__ . '/30-rules.txt')), + 'date' => time(), + 'player_id' => 1, + 'php' => 0, + 'enable_tinymce' => 0, + 'access' => 0, + 'hide' => 0, + ]); + } +}; + +$down = function() { + Menu::where('link', 'ots-info')->update(['link' => 'server-info']); + Menu::where('link', 'change-log')->update(['link' => 'changelog']); + + Pages::where('name', 'rules_on_the_page')->update(['hide' => 0]); +}; + diff --git a/system/pages/changelog.php b/system/pages/change-log.php similarity index 100% rename from system/pages/changelog.php rename to system/pages/change-log.php diff --git a/system/pages/server-info.php b/system/pages/ots-info.php similarity index 100% rename from system/pages/server-info.php rename to system/pages/ots-info.php diff --git a/system/pages/rules.php b/system/pages/rules.php deleted file mode 100644 index 4ee0e4aa..00000000 --- a/system/pages/rules.php +++ /dev/null @@ -1,14 +0,0 @@ - - * @author Slawkens - * @copyright 2019 MyAAC - * @link https://my-aac.org - */ -defined('MYAAC') or die('Direct access not allowed!'); -$title = 'Server Rules'; - -$twig->display('rules.html.twig'); diff --git a/system/templates/rules.html.twig b/system/templates/rules.html.twig deleted file mode 100644 index 55490047..00000000 --- a/system/templates/rules.html.twig +++ /dev/null @@ -1,2 +0,0 @@ -{{ config.lua.serverName }} Rules
-{{ getCustomPage('rules_on_the_page') | nl2br }}