paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Nginx] Add qhandler rewrite 

[Web] Move theme header include, fixes #2267
master
andryyy 2019-02-06 10:14:56 +01:00
parent 030d5068f3
commit 5efdf71120
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/conf/nginx/site.conf
View File

@ -63,6 +63,10 @@ server {
try_files $uri $uri/ @strip-ext; try_files $uri $uri/ @strip-ext;
} }
location /qhandler {
rewrite ^/qhandler/(.*)/(.*) /qhandler.php?action=$1&hash=$2;
}
location /edit { location /edit {
rewrite ^/edit/(.*)/(.*) /edit.php?$1=$2; rewrite ^/edit/(.*)/(.*) /edit.php?$1=$2;
} }

7
data/web/inc/header.inc.php
View File

@ -7,9 +7,7 @@
<meta name="theme-color" content="#F5D76E"/> <meta name="theme-color" content="#F5D76E"/>
<meta http-equiv="Referrer-Policy" content="same-origin"> <meta http-equiv="Referrer-Policy" content="same-origin">
<title><?=$UI_TEXTS['title_name'];?></title> <title><?=$UI_TEXTS['title_name'];?></title>
<?php if (strtolower(trim($DEFAULT_THEME)) != "lumen"): ?> <?php
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bootswatch/3.3.7/<?= strtolower(trim($DEFAULT_THEME)); ?>/bootstrap.min.css">
<?php endif;
if (preg_match("/mailbox/i", $_SERVER['REQUEST_URI'])) { if (preg_match("/mailbox/i", $_SERVER['REQUEST_URI'])) {
$css_minifier->add('/web/css/site/mailbox.css'); $css_minifier->add('/web/css/site/mailbox.css');
} }
@ -30,6 +28,9 @@
} }
?> ?>
<style><?=$css_minifier->minify();?></style> <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="shortcut icon" href="/favicon.png" type="image/png">
<link rel="icon" href="/favicon.png" type="image/png"> <link rel="icon" href="/favicon.png" type="image/png">
</head> </head>