From 5efdf71120847d792a49aa55e31a4afbcf9a7481 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Wed, 6 Feb 2019 10:14:56 +0100
Subject: [PATCH] [Nginx] Add qhandler rewrite [Web] Move theme header include,
 fixes #2267

---
 data/conf/nginx/site.conf   | 4 ++++
 data/web/inc/header.inc.php | 7 ++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/data/conf/nginx/site.conf b/data/conf/nginx/site.conf
index 6693dbcb..8b8959d5 100644
--- a/data/conf/nginx/site.conf
+++ b/data/conf/nginx/site.conf
@@ -63,6 +63,10 @@ server {
     try_files $uri $uri/ @strip-ext;
   }
 
+  location /qhandler {
+    rewrite ^/qhandler/(.*)/(.*) /qhandler.php?action=$1&hash=$2;
+  }
+
   location /edit {
     rewrite ^/edit/(.*)/(.*) /edit.php?$1=$2;
   }
diff --git a/data/web/inc/header.inc.php b/data/web/inc/header.inc.php
index 8f343d0b..47e53dc5 100644
--- a/data/web/inc/header.inc.php
+++ b/data/web/inc/header.inc.php
@@ -7,9 +7,7 @@
   <meta name="theme-color" content="#F5D76E"/>
   <meta http-equiv="Referrer-Policy" content="same-origin">
   <title><?=$UI_TEXTS['title_name'];?></title>
-  <?php if (strtolower(trim($DEFAULT_THEME)) != "lumen"): ?>
-  <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bootswatch/3.3.7/<?= strtolower(trim($DEFAULT_THEME)); ?>/bootstrap.min.css">
-  <?php endif;
+  <?php
     if (preg_match("/mailbox/i", $_SERVER['REQUEST_URI'])) {
       $css_minifier->add('/web/css/site/mailbox.css');
     }
@@ -30,6 +28,9 @@
     }
   ?>
   <style><?=$css_minifier->minify();?></style>
+  <?php if (strtolower(trim($DEFAULT_THEME)) != "lumen"): ?>
+  <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bootswatch/3.3.7/<?= strtolower(trim($DEFAULT_THEME)); ?>/bootstrap.min.css">
+  <?php endif; ?>
   <link rel="shortcut icon" href="/favicon.png" type="image/png">
   <link rel="icon" href="/favicon.png" type="image/png">
 </head>