X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/6165f1ef9bf8abf6d07caff88f14a36f368832c6..34eb26eb03c1d2915eccb43e3afdd7fdf7ebd0bf:/lib/template/header.php?ds=sidebyside

diff --git a/lib/template/header.php b/lib/template/header.php
index f9a4904..7e4b96d 100644
--- a/lib/template/header.php
+++ b/lib/template/header.php
@@ -8,15 +8,33 @@ 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 = $protocol+'://' . $_SERVER['HTTP_HOST'] . '/';
+else
+    $web_root = $cfg['web_root'];
+
+if (!isset ($cfg['style']))
+    $style = 'default';
+else
+    $style = $cfg['style'];
+
+
 ?>
 <!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 _('Jirafeau, your web file repository'); ?></title>
+  <title><?php echo t('Jirafeau, your web file repository'); ?></title>
   <meta http-equiv="Content-Type" content="<?php echo $content_type; ?>" />
-  <link href="<?php echo $cfg['web_root'] . 'media/' . $cfg['style'] . '/style.css.php'; ?>" rel="stylesheet" type="text/css" />
+  <link href="<?php echo $web_root . 'media/' . $style . '/style.css.php'; ?>" rel="stylesheet" type="text/css" />
 </head>
 <body>
-
+<script language="Javascript" src="lib/functions_v7.js"></script>
 <div id="content">
-<h1><a href="<?php echo $cfg['web_root']; ?>"><?php echo _('Jirafeau, your web file repository'); ?></a></h1>
+<h1><a href="<?php echo $web_root; ?>"><?php echo t('Jirafeau, your web file repository'); ?></a></h1>