From: short <>
Date: Thu, 25 Apr 2002 17:01:40 +0000 (+0000)
Subject: a_href() fixed to return the value (not to print it)
X-Git-Url: http://git.jankratochvil.net/?p=www.energie.vellum.cz.git;a=commitdiff_plain;h=021593947b8e0052a1e15a1006a111c8749ba131

a_href() fixed to return the value (not to print it)
a_href() enhanced to generate optimal URLs for all types of clients
---

diff --git a/common.php b/common.php
index de6252b..048176a 100644
--- a/common.php
+++ b/common.php
@@ -631,10 +631,20 @@ function a_href($url,$contents)
 {
 	global $have_ent;
 
-	print("<a href=\"");
-	if (ereg("^[a-z]+://",$url) && !$have_ent)
-		$url="redirect.php?location=".urlencode($url);
-	print(htmlspecialchars($url)."\">$contents</a>");
+	$r="<a href=\"";
+	$urlent=htmlspecialchars($url);
+	     if ($url==$urlent)
+		$r.=$url;
+	else if (!ereg("^[a-z]+://",$url))	// $url is our resource
+		$r.=$urlent;
+	else if (isset($have_ent) && !$have_ent)	// non-ent client
+		$r.=$url;
+	else if ($have_ent) // ent client
+		$r.=$urlent;
+	else // unknown client, htmlspecialchars() should not be needed here
+		$r.=htmlspecialchars("redirect.php?location=".urlencode($url));
+	$r.="\">$contents</a>";
+	return($r);
 }
 
 function footer($delimit=true)