From 9d53c04df0bcadbe77e0711f4eff06d5ff29b572 Mon Sep 17 00:00:00 2001
From: short <>
Date: Sun, 19 Aug 2001 22:23:15 +0000
Subject: [PATCH] common.php/img() implemented to fully get rid of absolute
 image sizes   - external image sources are further solved by raw
 common.php/img_size()

---
 common.php | 19 +++++++++++--------
 index.php  | 11 +++--------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/common.php b/common.php
index db02711..449c87b 100644
--- a/common.php
+++ b/common.php
@@ -124,16 +124,21 @@ function month_a($year,$month,$month_last=0)
 	return($r);
 }
 
-function img_size($width,$height=0)
+function img_size($width,$height)
 {
-	if (!$height)
-		list($width,$height)=getimagesize($width);
 	return("style=\"border:0;width:${width}px;height:${height}px\" width=\"$width\" height=\"$height\"");
 }
 
+function img($file,$alt,$attrs="")
+{
+	list($width,$height)=getimagesize($file);
+	return("<img src=\"$file\" alt=\"".htmlspecialchars($alt)."\" ".img_size($width,$height)
+			.($attrs=="" ? "" : " ".$attrs)." />");
+}
+
 function gsm_banking()
 {
-	return("<img src=\"img/sluzby_bankovni_pggsm.gif\" ".img_size(89,31)." alt=\"Paegas GSM banking\" class=\"img-align\" />");
+	return(img("img/sluzby_bankovni_pggsm.gif","Paegas GSM banking","class=\"img-align\""));
 }
 
 function price_a()
@@ -170,8 +175,7 @@ function title_month($year,$month)
 	return(""
 			."<table border=\"0\" width=\"100%\">\n"
 			."<tr><td align=\"center\"><table border=\"1\" cellpadding=\"10\">\n"
-			."<tr><td align=\"center\"><img src=\"".$month_a["img"]."\" ".img_size($month_a["img"])
-			." alt=\"titulní stránka ".$month_a["name"]."\" /></td></tr>\n"
+			."<tr><td align=\"center\">".img($month_a["img"],"titulní stránka ".$month_a["name"])."</td></tr>\n"
 			."</table></td></tr>\n"
 			."</table>\n"
 			);
@@ -181,8 +185,7 @@ function title_icons_table_month($year,$month,$month_last)
 {
 	$month_a=month_a($year,$month,$month_last);
 	print("<a href=\"title.php?year=$year&amp;month=$month\">"
-				."<img src=\"".$month_a["icon"]."\" ".img_size($month_a["icon"])
-				." alt=\"titulní stránka ".$month_a["name"]."\" /></a><br />"
+				.img($month_a["icon"],"titulní stránka ".$month_a["name"])."</a><br />"
 			."<a href=\"obsah.php?year=$year&amp;month=$month\">obsah ".$month_a["name"]."</a>"
 			);
 }
diff --git a/index.php b/index.php
index 1a066f3..823e33f 100644
--- a/index.php
+++ b/index.php
@@ -16,14 +16,9 @@
 ";
 	heading();
 ?>
-<h1 class="centered"><img src="img/eap-title<?php
-
-	if (image_supported("image/png"))
-		print(".png");
-	else
-		print(".gif");
-
-		?>" <?php print(img_size(522,60)); ?> alt="Energie &amp; Peníze" /></h1>
+<h1 class="centered"><?php
+	print(img("img/eap-title.".(image_supported("image/png") ? "png" : "gif"),"Energie & Peníze"));
+	?></h1>
 <ul>
 	<li><a href="obsah.php">Obsahy v¹ech roèníkù</a></li>
 	<li><a href="title.php">V¹echny roèníky</a></li>
-- 
1.8.3.1