From 7dc2e404edcd9e3fa3f8c1388d148bbe9c1cccb3 Mon Sep 17 00:00:00 2001 From: slawkens Date: Mon, 29 May 2023 00:00:34 +0200 Subject: [PATCH] Fixed many links to admin panel, if ADMIN_PANEL_FOLDER is changed --- admin/pages/accounts.php | 2 +- admin/pages/phpinfo.php | 2 +- admin/pages/players.php | 2 +- system/pages/news.php | 6 +++--- system/templates/admin.pages.links.html.twig | 8 ++++---- system/templates/characters.html.twig | 4 ++-- system/templates/tinymce.html.twig | 2 +- templates/tibiacom/news.featured_article.html.twig | 8 ++++---- templates/tibiacom/news.tickers.html.twig | 6 +++--- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/admin/pages/accounts.php b/admin/pages/accounts.php index 759b9361..550ea670 100644 --- a/admin/pages/accounts.php +++ b/admin/pages/accounts.php @@ -10,7 +10,7 @@ defined('MYAAC') or die('Direct access not allowed!'); $title = 'Account editor'; -$admin_base = BASE_URL . 'admin/?p=accounts'; +$admin_base = ADMIN_URL . '?p=accounts'; $use_datatable = true; if ($config['account_country']) diff --git a/admin/pages/phpinfo.php b/admin/pages/phpinfo.php index bc747a2d..43942bfd 100644 --- a/admin/pages/phpinfo.php +++ b/admin/pages/phpinfo.php @@ -16,4 +16,4 @@ if (!function_exists('phpinfo')) { ?> - + diff --git a/admin/pages/players.php b/admin/pages/players.php index d9a5dece..b32d5445 100644 --- a/admin/pages/players.php +++ b/admin/pages/players.php @@ -10,7 +10,7 @@ defined('MYAAC') or die('Direct access not allowed!'); $title = 'Player editor'; -$player_base = BASE_URL . 'admin/?p=players'; +$player_base = ADMIN_URL . '?p=players'; $use_datatable = true; require_once LIBS . 'forum.php'; diff --git a/system/pages/news.php b/system/pages/news.php index 92d2e7ab..db04092d 100644 --- a/system/pages/news.php +++ b/system/pages/news.php @@ -182,13 +182,13 @@ if(!$news_cached) $admin_options = ''; if($canEdit) { - $admin_options = '

+ $admin_options = '

 Edit - + Delete - + ' . ($news['hidden'] != 1 ? 'Hide' : 'Show') . ' '; diff --git a/system/templates/admin.pages.links.html.twig b/system/templates/admin.pages.links.html.twig index 135055c0..d8529e3e 100644 --- a/system/templates/admin.pages.links.html.twig +++ b/system/templates/admin.pages.links.html.twig @@ -1,14 +1,14 @@
- + Edit - Delete - {% if page.hidden != 1 %}Hide{% else %}Show{% endif %}
-
\ No newline at end of file + diff --git a/system/templates/characters.html.twig b/system/templates/characters.html.twig index aad31aa8..6eed98ec 100644 --- a/system/templates/characters.html.twig +++ b/system/templates/characters.html.twig @@ -11,7 +11,7 @@ {{ hook(constant('HOOK_CHARACTERS_BEFORE_INFORMATIONS')) }} {% if canEdit %} - + Edit {% endif %} @@ -418,7 +418,7 @@ {% endif %} {{ hook(constant('HOOK_CHARACTERS_AFTER_CHARACTERS')) }} {% if canEdit %} - + Edit {% endif %} diff --git a/system/templates/tinymce.html.twig b/system/templates/tinymce.html.twig index adc1e3c9..02ad29bb 100644 --- a/system/templates/tinymce.html.twig +++ b/system/templates/tinymce.html.twig @@ -11,7 +11,7 @@ toolbar1: 'formatselect | bold italic strikethrough forecolor backcolor | emoticons link | alignleft aligncenter alignright alignjustify | numlist bullist outdent indent | removeformat code', resize: 'both', image_advtab: true, - images_upload_url: '{{ constant('BASE_URL') }}admin/tools/upload_image.php', + images_upload_url: '{{ constant('ADMIN_URL') }}tools/upload_image.php', images_upload_credentials: true, relative_urls: true, diff --git a/templates/tibiacom/news.featured_article.html.twig b/templates/tibiacom/news.featured_article.html.twig index ad82dcaf..fa704814 100644 --- a/templates/tibiacom/news.featured_article.html.twig +++ b/templates/tibiacom/news.featured_article.html.twig @@ -20,13 +20,13 @@

{{ article.title|raw }} {% if canEdit %} - + Edit - + Delete - + {% if article.hidden != 1 %}Hide{% else %}Show{% endif %} @@ -42,4 +42,4 @@

- \ No newline at end of file + diff --git a/templates/tibiacom/news.tickers.html.twig b/templates/tibiacom/news.tickers.html.twig index c0cf1cdf..48e62a49 100644 --- a/templates/tibiacom/news.tickers.html.twig +++ b/templates/tibiacom/news.tickers.html.twig @@ -20,15 +20,15 @@
{{ ticker.body_short|raw }}