X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/6c79f21725f4ed25c11a1961194c10e6ef72ab58..5600a277102bf0b0c75b9a78c3bd731e6a7e12dd:/lib/template/header.php?ds=sidebyside diff --git a/lib/template/header.php b/lib/template/header.php index 53c8a0e..83cc6ba 100644 --- a/lib/template/header.php +++ b/lib/template/header.php @@ -8,9 +8,15 @@ if (stristr ($_SERVER['HTTP_ACCEPT'], 'application/xhtml+xml')) header('Content-Type: ' . $content_type); +$protocol = (bool)is_ssl() ? 'https' : 'http'; + +if ( !empty($cfg['web_root']) ) { + $cfg['web_root'] = preg_replace('#https?://#', $protocol . '://', $cfg['web_root'], 1); +} + /* Avoids irritating errors with the installer (no conf file is present then). */ if (!isset ($cfg['web_root'])) - $web_root = 'http://' . $_SERVER['HTTP_HOST'] . '/'; + $web_root = $protocol+'://' . $_SERVER['HTTP_HOST'] . '/'; else $web_root = $cfg['web_root']; @@ -29,6 +35,6 @@ else - +