X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/6c79f21725f4ed25c11a1961194c10e6ef72ab58..682d291ea80c3a43b0cbdcb210dfb12261cbf33b:/lib/template/header.php?ds=sidebyside

diff --git a/lib/template/header.php b/lib/template/header.php
index 53c8a0e..275e3f0 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'];
 
@@ -19,16 +25,27 @@ if (!isset ($cfg['style']))
 else
     $style = $cfg['style'];
 
-
+if (stristr ($_SERVER['HTTP_ACCEPT'], 'application/xhtml+xml'))
+{
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">    
+<?php
+}
+else
+{
+?>
+<!DOCTYPE html>
+<html>
+<?php
+}
 ?>
-<!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">
 <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 type="text/javascript" language="Javascript" src="lib/functions.js.php"></script>
 <div id="content">
 <h1><a href="<?php echo $web_root; ?>"><?php echo t('Jirafeau, your web file repository'); ?></a></h1>