From cfb26c260801b3a96caf661e0021d25b3b5050c1 Mon Sep 17 00:00:00 2001
From: Thorsten Rinne <thorsten@phpmyfaq.de>
Date: Sun, 29 Dec 2024 11:14:58 +0100
Subject: [PATCH] refactor: cleanup

---
 nginx.conf                                        |   6 ++++--
 phpmyfaq/.htaccess                                |   2 +-
 .../assets/src/tinymce/phpmyfaq.tinymce.plugin.js |   1 -
 phpmyfaq/admin/images/phpmyfaq.gif                | Bin 338 -> 0 bytes
 4 files changed, 5 insertions(+), 4 deletions(-)
 delete mode 100644 phpmyfaq/admin/images/phpmyfaq.gif

diff --git a/nginx.conf b/nginx.conf
index 042d513aeb..4a8059ffa1 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -10,7 +10,7 @@
 # obtain one at https://mozilla.org/MPL/2.0/.
 #
 # @author    Florian Anderiasch <florian@phpmyfaq.de>
-# @copyright 2011-2022 phpMyFAQ Team
+# @copyright 2011-2024 phpMyFAQ Team
 # @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
 # @link      https://www.phpmyfaq.de
 # @since     2011-01-14
@@ -138,7 +138,9 @@ server {
         }
     }
 
-    try_files $uri @php;
+    location /admin/assets {
+        try_files $uri $uri/ =404;
+    }
 
     location @php {
         fastcgi_pass    127.0.0.1:9000;
diff --git a/phpmyfaq/.htaccess b/phpmyfaq/.htaccess
index e9fc253b57..1e9396d342 100644
--- a/phpmyfaq/.htaccess
+++ b/phpmyfaq/.htaccess
@@ -99,7 +99,7 @@ Header set Access-Control-Allow-Headers "Content-Type, Authorization"
     # the path to your phpMyFAQ installation
     RewriteBase /
     # Exclude assets from being handled by Symfony Router
-    RewriteRule ^(admin/assets|admin/images)($|/) - [L]
+    RewriteRule ^(admin/assets)($|/) - [L]
     # Error pages
     ErrorDocument 404 /index.php?action=404
     # General pages
diff --git a/phpmyfaq/admin/assets/src/tinymce/phpmyfaq.tinymce.plugin.js b/phpmyfaq/admin/assets/src/tinymce/phpmyfaq.tinymce.plugin.js
index e6b52e45fb..9028503979 100644
--- a/phpmyfaq/admin/assets/src/tinymce/phpmyfaq.tinymce.plugin.js
+++ b/phpmyfaq/admin/assets/src/tinymce/phpmyfaq.tinymce.plugin.js
@@ -94,7 +94,6 @@ tinymce.PluginManager.add('phpmyfaq', function (editor, url) {
   // Add button to editor
   editor.ui.registry.addButton('phpmyfaq', {
     text: 'phpMyFAQ',
-    //image: 'images/phpmyfaq.gif',
     onAction: () => {
       const csrfToken = document.getElementById('pmf-csrf-token').value;
       openDialog(csrfToken);
diff --git a/phpmyfaq/admin/images/phpmyfaq.gif b/phpmyfaq/admin/images/phpmyfaq.gif
deleted file mode 100644
index 3166234bae6d06df71d0df7d685db0bd150472e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 338
zcmZ?wbhEHb6k!lyxXJ(l4Gawb8UFv*)^5<#tJO2CGc>F<GHNt7PBS*1X=2iCVcuh5
zKFPtM!Ns}DH*IDp2&@WS1w{X|LZ{|#yPd!6MB%DqMaxeWFFjha=wj)r(`6fvRIE8u
zvF<|ErYp7EZq@C$(*Oed8yfyMtXkEu>T1L0GYy+>HtgTu@c)0)-bXD5p0*!()p7Lo
z%rpO2t@?lU>eWyGK>+GN+?3)^7ET5RQwAN75|E!5*zym|D)7*e>YbDFX|fI9<OTd0
zvr-D@%n@T>^2ES$p>~nBnBLACMiX;tuGmCOjH)QG&OV#em}vj3lZ~6Lyxy6eo3*^i
zt(`s7kCmfNzqpOJFFUH-l!IeNh2B*6iB5^LXL~JomC=z`T9vJnvBAICk--`Orb&j(