D3Public/daux.io
8
0
Fork 0
Code Pull-Requests Releases Aktivität

Merge pull request #224 from laughn-man/master

Quellcode durchsuchen 
Resolve theme issues with https behind reverse proxy
Dieser Commit ist enthalten in:
Denis Kisselev 2014-10-07 14:40:02 -07:00
Commit bc2f2c33d4
5 geänderte Dateien mit 6 neuen und 8 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

6
libs/daux.php
Datei anzeigen

@ -198,8 +198,7 @@
$params['error_type'] = ErrorPage::NORMAL_ERROR_TYPE;
$params['index_key'] = 'index';
$params['docs_path'] = $this->docs_path;
$protocol = ((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') || $_SERVER['SERVER_PORT'] == 443) ?
'https://' : 'http://';
$protocol = '//';
$params['base_url'] = $protocol . $this->base_url . '/';
$params['base_page'] = $params['base_url'];
$params['host'] = $this->host;
@ -228,8 +227,7 @@
case Daux::LIVE_MODE:
$params['docs_path'] = $this->docs_path;
$params['index_key'] = 'index';
$protocol = ((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') || $_SERVER['SERVER_PORT'] == 443) ?
'https://' : 'http://';
$protocol = '//';
$params['base_url'] = $protocol . $this->base_url . '/';
$params['base_page'] = $params['base_url'];
$params['host'] = $this->host;

2
themes/daux-blue.thm
Datei anzeigen

@ -1,7 +1,7 @@
{
"favicon": "<base_url>themes/daux-blue/img/favicon-blue.png",
"css": ["<base_url>themes/daux-blue/css/daux-blue.css"],
"fonts": ["http://fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic"],
"fonts": ["//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic"],
"js": [],
"require-jquery": true,
"bootstrap-js": false

2
themes/daux-green.thm
Datei anzeigen

@ -1,7 +1,7 @@
{
"favicon": "<base_url>themes/daux-green/img/favicon-green.png",
"css": ["<base_url>themes/daux-green/css/daux-green.css"],
"fonts": ["http://fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic"],
"fonts": ["//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic"],
"js": [],
"require-jquery": true,
"bootstrap-js": false

2
themes/daux-navy.thm
Datei anzeigen

@ -1,7 +1,7 @@
{
"favicon": "<base_url>themes/daux-navy/img/favicon-navy.png",
"css": ["<base_url>themes/daux-navy/css/daux-navy.css"],
"fonts": ["http://fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic"],
"fonts": ["//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic"],
"js": [],
"require-jquery": true,
"bootstrap-js": false

2
themes/daux-red.thm
Datei anzeigen

@ -1,7 +1,7 @@
{
"favicon": "<base_url>themes/daux-red/img/favicon-red.png",
"css": ["<base_url>themes/daux-red/css/daux-red.css"],
"fonts": ["http://fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic"],
"fonts": ["//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic"],
"js": [],
"require-jquery": true,
"bootstrap-js": false