Mercurial > hg > batmud > maputils
changeset 818:8b0c0dba7350
Sync.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Fri, 18 Sep 2009 23:52:58 +0000 |
| parents | eaba088b5424 |
| children | fe58d1a44681 |
| files | www/common.inc.php www/config.inc.php www/loc.php www/query.php |
| diffstat | 4 files changed, 38 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/www/common.inc.php Fri Sep 18 17:25:56 2009 +0000 +++ b/www/common.inc.php Fri Sep 18 23:52:58 2009 +0000 @@ -1,39 +1,4 @@ <? -function printPageHeader($title, $extra = "") -{ -global $pageCSS, $pageCharset, $pageAuthor; -echo "<?xml version=\"1.0\" encoding=\"".$pageCharset."\"?>\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" lang="en" xml:lang="en"> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=<? echo $pageCharset ?>" /> - <meta name="Author" content="<? echo $pageAuthor ?>" /> - <title><? echo $title ?></title> - <link href="<? echo $pageCSS; ?>" rel="stylesheet" type="text/css" /> - <meta name="keywords" content="batmud,map,laenor,lucentium,rothikgen,desolathya,furnachia,mud,mush,mmorpg,mmo,massively,multiplayer,online,network,game,ggr,pupunen"/> - <link rel="shortcut icon" href="/maps/favicon.ico" type="image/x-icon" /> - <? echo $extra; ?> -</head> -<body> -<!-- ============================================= --> -<? -} - - -function fingerURL($name) -{ - return "http://www.bat.org/char/".$name; -} - - -function burl($name) -{ -// echo "<a href=\"".fingerURL($name)."\">".$name."</a>"; - echo "<b>".$name."</b>"; -} - - $locationTypes = array( "" => array(FALSE, "ALL", "ALL", "EVERYTHING"), "S" => array(TRUE, "SHRINE", "Shrines", "Shrines"), @@ -112,6 +77,7 @@ } } $s .= $names[0]; + unset($names[0]); // Add location to array of locations $locations[$id] = array(
--- a/www/config.inc.php Fri Sep 18 17:25:56 2009 +0000 +++ b/www/config.inc.php Fri Sep 18 23:52:58 2009 +0000 @@ -26,6 +26,41 @@ "wizards.txt" ); +function printPageHeader($title, $extra = "") +{ +global $pageCSS, $pageCharset, $pageAuthor; +echo "<?xml version=\"1.0\" encoding=\"".$pageCharset."\"?>\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" lang="en" xml:lang="en"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=<? echo $pageCharset ?>" /> + <meta name="Author" content="<? echo $pageAuthor ?>" /> + <title><? echo $title ?></title> + <link href="<? echo $pageCSS; ?>" rel="stylesheet" type="text/css" /> + <meta name="keywords" content="batmud,map,laenor,lucentium,rothikgen,desolathya,furnachia,mud,mush,mmorpg,mmo,massively,multiplayer,online,network,game,ggr,pupunen"/> + <link rel="shortcut icon" href="/maps/favicon.ico" type="image/x-icon" /> + <? echo $extra; ?> +</head> +<body> +<!-- ============================================= --> +<? +} + + +function fingerURL($name) +{ + return "http://www.bat.org/char/".$name; +} + + +function burl($name) +{ +// echo "<a href=\"".fingerURL($name)."\">".$name."</a>"; + echo "<b>".$name."</b>"; +} + + function printURL($url) { global $pageMapURL;
--- a/www/loc.php Fri Sep 18 17:25:56 2009 +0000 +++ b/www/loc.php Fri Sep 18 23:52:58 2009 +0000 @@ -256,8 +256,7 @@ } // Alternative names - if (count($iv["names"]) > 1) { - unset($iv["names"][0]); + if (count($iv["names"]) > 0) { echo "<br />".implode(" | ", $iv["names"]); }
--- a/www/query.php Fri Sep 18 17:25:56 2009 +0000 +++ b/www/query.php Fri Sep 18 23:52:58 2009 +0000 @@ -1,6 +1,6 @@ <? /* PupuMaps OpenSearch database query code. - * This is a rather horrible glue, but it works. + * This is a rather ugly blob of glue, but it works. */ require "config.inc.php"; require "common.inc.php";