git.p6c8.net
/
jirafeau_mojo42.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master'
[jirafeau_mojo42.git]
/
lib
/
template
/
header.php
diff --git
a/lib/template/header.php
b/lib/template/header.php
index dd7ec3c6d87c0b23d3a85c56c1c55e9ef081dbbb..5a365b90a6dafaa59ddd8d5408b3e532ebc9fdb0 100644
(file)
--- a/
lib/template/header.php
+++ b/
lib/template/header.php
@@
-3,10
+3,14
@@
header('Vary: Accept');
$content_type = 'text/html; charset=utf-8';
$content_type = 'text/html; charset=utf-8';
-if (stristr ($_SERVER['HTTP_ACCEPT'], 'application/xhtml+xml'))
+if (isset ($_SERVER['HTTP_ACCEPT']) &&
+ stristr ($_SERVER['HTTP_ACCEPT'], 'application/xhtml+xml'))
+{
$content_type = 'application/xhtml+xml; charset=utf-8';
$content_type = 'application/xhtml+xml; charset=utf-8';
+}
header('Content-Type: ' . $content_type);
header('Content-Type: ' . $content_type);
+header('x-ua-compatible: ie=edge');
$protocol = (bool)is_ssl() ? 'https' : 'http';
$protocol = (bool)is_ssl() ? 'https' : 'http';
@@
-25,11
+29,11
@@
if (!isset ($cfg['style']))
else
$style = $cfg['style'];
else
$style = $cfg['style'];
-if (stristr ($_SERVER['HTTP_ACCEPT'], 'application/xhtml+xml'))
+if (isset ($_SERVER['HTTP_ACCEPT']) &&
+ 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">
+<!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
}
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
<?php
}
@@
-47,6
+51,6
@@
else
<link href="<?php echo $web_root . 'media/' . $style . '/style.css.php'; ?>" rel="stylesheet" type="text/css" />
</head>
<body>
<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
_v7.js
"></script>
+<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>
<div id="content">
<h1><a href="<?php echo $web_root; ?>"><?php echo t('Jirafeau, your web file repository'); ?></a></h1>
patrick-canterino.de