X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=common.php;h=d66927fbaa3ccd1f1e5240f7a2ff07086cd46f2c;hb=b6706dbfce855578ede6abdc3a810f17c81d61f7;hp=4c6a1aad33d89f510de5c18a2fbfbf138ea722a0;hpb=5edc2041acd486869b4b5644afb800bcc3e71b7f;p=www.energie.vellum.cz.git

diff --git a/common.php b/common.php
index 4c6a1aa..d66927f 100644
--- a/common.php
+++ b/common.php
@@ -10,7 +10,7 @@
 	$cvs_id_split=split(" ",$cvs_id);
 	if (count($cvs_id_split)==8) {
 		$cvs_id_split[1]="<a href=\"$viewcvs\">".$cvs_id_split[1]."</a>";
-		$cvs_id_split[5]="<a href=\"mailto:".$cvs_id_split[5]."@".$HTTP_SERVER_VARS["HTTP_HOST"]."\">".$cvs_id_split[5]."</a>";
+		$cvs_id_split[5]="<a href=\"mailto:".$cvs_id_split[5]."@$cvs_mailhost\">".$cvs_id_split[5]."</a>";
 		}
 	$cvs_id_html=join(" ",$cvs_id_split);
 
@@ -19,7 +19,7 @@
 	if (isset($detect_js) && !$have_js)
 		$head.='<script type="text/javascript" src="have_js.js"></script>'."\n";
 
-	$user_agent=$HTTP_SERVER_VARS["HTTP_USER_AGENT"];
+	$user_agent=(!isset($HTTP_SERVER_VARS["HTTP_USER_AGENT"]) ? "" : $HTTP_SERVER_VARS["HTTP_USER_AGENT"]);
 	if (ereg("[[:<:]]MSIE ([0-9]+)\\.",$user_agent,$msie_major_a))
 		$msie_major=$msie_major_a[1];
 	else if (ereg("[[:<:]]Mozilla/([0-9]+)\\.",$user_agent,$mozilla_major_a))
@@ -233,7 +233,7 @@ function title_icons($year,$month)
 	global $tb_obsah;
 
 	print("<h2>"
-		.(isset($year) ? "<a name=\"year_$year\">" : "")
+		.(isset($year) ? "<a id=\"year_$year\">" : "")
 		.title_name(&$year,&$month)
 		.(isset($year) ? "</a>" : "")
 		."</h2>\n");
@@ -262,7 +262,7 @@ function title_icons($year,$month)
 
 			$year=$row["year"];
 			print(""
-					.(!isset($wanted_year) ? "<p><a name=\"year_$year\">&nbsp;</a></p>" : "")
+					.(!isset($wanted_year) ? "<p><a id=\"year_$year\">&nbsp;</a></p>" : "")
 					."<table border=\"0\" width=\"100%\"><tr><td align=\"center\"><table border=\"1\" cellpadding=\"5\">\n"
 					."<tr><th colspan=\"$split\">Roèník $year (<a href=\"obsah.php?year=$year\">obsahy èísel</a>)</th></tr>\n"
 					);
@@ -281,7 +281,7 @@ function title_icons($year,$month)
 			print("<td></td>");
 			$month++;
 			}
-		print("<td align=\"center\""
+		print("<td align=\"center\" valign=\"top\""
 				.($row["month_last"]!=$row["month"] ? " colspan=\"".($row["month_last"]+1-$row["month"])."\"" : "")
 				.">");
 		title_icons_table_month($year,$row["month"]+1,$row["month_last"]+1,$row["sequential"]);
@@ -324,6 +324,21 @@ function dirnameslashed($filename)
 	return($r);
 }
 
+function usersize($size)
+{
+	$suffix_a=array("","k","M","G","T");
+	while ($size>=1000 && sizeof($suffix_a)>=2) {
+		$size/=1000;
+		array_shift($suffix_a);
+		}
+	return(round($size)." ".$suffix_a[0]."B");
+}
+
+function data_href($filename,$text)
+{
+	return("<a href=\"$filename\">$text (".usersize(filesize($filename)).")</a>");
+}
+
 function footer($delimit=true)
 {
 	// deadlock prevention:
@@ -335,19 +350,20 @@ function footer($delimit=true)
 	global $cvs_id_html,$viewcvs,$viewcvs,$HTTP_SERVER_VARS;
 	if ($delimit)
 		print("<p>&nbsp;</p>\n");
+	$uri="uri=".addpercents("http://".$HTTP_SERVER_VARS["HTTP_HOST"].$HTTP_SERVER_VARS["REQUEST_URI"]);
 	?>
 <hr />
 <table border="0" width="100%">
 <tr><td align="left"><span class="cvs-id"><?php print($cvs_id_html); ?></span></td><td align="right"><a
-	href="http://validator.w3.org/check/referer"><img src="http://www.w3.org/Icons/valid-xhtml10"
-		<?php print(img_size(88,31)); ?> alt="Valid XHTML 1.0!" /></a><a
-	href="http://jigsaw.w3.org/css-validator/validator?warning=2&amp;profile=css2&amp;uri=<?php
-		print(addpercents("http://".$HTTP_SERVER_VARS["HTTP_HOST"].$HTTP_SERVER_VARS["REQUEST_URI"]));
-		?>"><img src="http://jigsaw.w3.org/css-validator/images/vcss"
+	href="http://validator.w3.org/check?<?php
+		print($uri); ?>"><img src="http://www.w3.org/Icons/valid-xhtml11"
+		<?php print(img_size(88,31)); ?> alt="Valid XHTML 1.1!" /></a><a
+	href="http://jigsaw.w3.org/css-validator/validator?warning=2&amp;profile=css2&amp;<?php
+		print($uri); ?>"><img src="http://jigsaw.w3.org/css-validator/images/vcss"
 		<?php print(img_size(88,31)); ?> alt="Valid CSS!" /></a></td></tr>
 </table>
 </body></html>
-	<?php
+<?php
 	exit();
 }
 
@@ -360,25 +376,28 @@ function no_cache()
 	header("Pragma: no-cache");                                // HTTP/1.0
 }
 
-function heading()
+function heading($title=false)
 {
-	global $msie_major,$mozilla_major,$title_tail,$head_css,$have_css,$head;
+	global $HTTP_SERVER_VARS,$msie_major,$mozilla_major,$title_tail,$head_css,$have_css,$head;
 
-	header("Content-type: text/html; charset=iso-8859-2");
+	header("Content-type: text/html");
+	header("Content-Style-Type: text/css");
 	if (!isset($msie_major) || $msie_major>=4)
-		print('<?xml version="1.0" encoding="iso-8859-2"?>'."\n");
+		print('<?xml version="1.0" encoding="'.$HTTP_SERVER_VARS["CLIENT_CHARSET"].'"?>'."\n");
 ?>
-<!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="cs" lang="cs">
+<!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" xml:lang="cs">
 <head><title>Energie &amp; peníze<?php
 	if (isset($title_tail))
 		print(": ".htmlspecialchars($title_tail));
 	print("</title>\n");
 	if ($have_css) {
 ?><style type="text/css"><!--
-.cvs-id  { font-family: monospace; }
-.error   { color: red;    background-color: transparent; }
-.quote   { font-family: monospace; }
+.cvs-id   { font-family: monospace; }
+.error    { color: red;   background-color: transparent; }
+.quote    { font-family: monospace; }
+.nowrap   { white-space: nowrap; }
+.centered { text-align: center; }
 body {
 		background-color: black;
 		color: white;
@@ -397,5 +416,9 @@ h1,h2    { color: yellow; background-color: transparent; }
 	if (isset($mozilla_major) && $mozilla_major==4)
 		print(" bgcolor=\"black\" text=\"white\" link=\"cyan\" vlink=\"teal\"");
 	print(">\n");
+	if ($title)
+		print("<h1 class=\"centered\">"
+				.img("img/eap-title.".(image_supported("image/png") ? "png" : "gif"),"Energie & Peníze")
+				."</h1>\n");
 }
 ?>