X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/18c82ef56dce9c9eb30b0f2318024d320d878a47..261af8ac3be2c4d9fbdae0f25c036440833d746c:/lib/template/header.php diff --git a/lib/template/header.php b/lib/template/header.php index 264cf34..2edb4ea 100644 --- a/lib/template/header.php +++ b/lib/template/header.php @@ -1,5 +1,5 @@ <?php -header("Vary: Accept"); +header('Vary: Accept'); $content_type = 'text/html; charset=utf-8'; @@ -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']; @@ -21,14 +27,14 @@ else ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> +<!DOCTYPE html> +<html> <head> <title><?php echo t('Jirafeau, your web file repository'); ?></title> <meta http-equiv="Content-Type" content="<?php echo $content_type; ?>" /> <link href="<?php echo $web_root . 'media/' . $style . '/style.css.php'; ?>" rel="stylesheet" type="text/css" /> </head> <body> -<script language="Javascript" src="lib/functions.js"></script> +<script type="text/javascript" language="Javascript" src="lib/functions_v7.js"></script> <div id="content"> <h1><a href="<?php echo $web_root; ?>"><?php echo t('Jirafeau, your web file repository'); ?></a></h1>