changeset 1646:2cbce82aa3c3

Use full <?php ?> tag, misc cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 08 Aug 2016 23:18:46 +0300
parents 9abf59f70c69
children e7539466282b
files www/common.inc.php www/index.php www/info.php www/latest.php www/level.php www/loc.php www/menu.inc.php www/query.php www/quests.php www/ss.php www/world.inc.php
diffstat 11 files changed, 60 insertions(+), 65 deletions(-) [+]
line wrap: on
line diff
--- a/www/common.inc.php	Mon Aug 08 19:04:25 2016 +0300
+++ b/www/common.inc.php	Mon Aug 08 23:18:46 2016 +0300
@@ -1,4 +1,4 @@
-<?
+<?php
 require "mgeneric.inc.php";
 
 $wizFileList = array(
--- a/www/index.php	Mon Aug 08 19:04:25 2016 +0300
+++ b/www/index.php	Mon Aug 08 23:18:46 2016 +0300
@@ -1,4 +1,4 @@
-<?
+<?php
 require "config.inc.php";
 require "world.inc.php";
 require "common.inc.php";
@@ -157,7 +157,7 @@
   "   <td>".
   mpGetURLLink("hcbat.html", "HCBat map").
   " ".
-  mpGetURLLink("hcbat.htm", "*").
+  mpGetURLLink("hcbat.htm", "(*)").
   "</td>\n".
   "    <td>[<a href=\"loc.php?n=hcbat\">Locations</a>] ".
   "[<a href=\"loc.php?n=hcbat&amp;c\">PCities</a>] ".
--- a/www/info.php	Mon Aug 08 19:04:25 2016 +0300
+++ b/www/info.php	Mon Aug 08 23:18:46 2016 +0300
@@ -1,4 +1,4 @@
-<?
+<?php
 require "config.inc.php";
 require "world.inc.php";
 require "common.inc.php";
@@ -8,34 +8,33 @@
 mpPrintPageHeader($pageTitle." - Wizards of the Realm");
 
 require "menu.inc.php";
-?>
-<div id="contents">
-<h1>Wizards of the Realm</h1>
 
-<div class="attnbox">
-    <b>Notice #1</b>: The area counts are not really accurate, as the database only
-    lists areas accessible from outworld. Thus areas only accessible via some
-    other fashion are not listed. Also, maintainerships of some areas are not
-    clear, and may be credited to wrong wizard(s).
-    <br />
-   
-    <b>Notice #2</b>: Not everyone who has once been immortal is listed.
-    Some purged and/or remorted wizards without known contributions are unlisted.
-    <br />
-   
-    <b>Notice #3</b>: It is certainly possible, that some of this information is
-    incorrect. Sorry for that. Please report to <? echo burl("Ggr") ?>, if you have Knowledge(tm).
-</div>
-<hr />
-<div style="text-align: center;">
- <table style="background: black;">
-  <tr>
-   <td style="background: #474">Entry has information about the wizard.</td>
-   <td style="background: #744">No wizard information entry.</td>
-  </tr>
- </table>
-</div>
-<?
+echo
+  "<div id=\"contents\">\n".
+  "<h1>Wizards of the Realm</h1>\n".
+  "<div class=\"attnbox\">\n".
+  "  <b>Notice #1</b>: The area counts are not really accurate, as the database only ".
+  "lists areas accessible from outworld. Thus areas only accessible via some ".
+  "other fashion are not listed. Also, maintainerships of some areas are not ".
+  "clear, and may be credited to wrong wizard(s).\n".
+  "  <br />\n".
+  "\n".
+  "  <b>Notice #2</b>: Not everyone who has once been immortal is listed. ".
+  "Some purged and/or remorted wizards without known contributions are unlisted.\n".
+  "  <br />\n".
+  "\n".
+  "  <b>Notice #3</b>: It is certainly possible, that some of this information is ".
+  "incorrect. Sorry for that. Please report to ".burl("Ggr").", if you have Knowledge(tm).\n".
+  "</div>\n".
+  "<hr />\n".
+  "<div style=\"text-align: center;\">\n".
+  " <table style=\"background: black;\">\n".
+  "  <tr>\n".
+  "   <td style=\"background: #474\">Entry has information about the wizard.</td>\n".
+  "   <td style=\"background: #744\">No wizard information entry.</td>\n".
+  "  </tr>\n".
+  " </table>\n".
+  "</div>\n";
 
 $locTable = apc_fetch("info_locTable");
 if (empty($locTable))
--- a/www/latest.php	Mon Aug 08 19:04:25 2016 +0300
+++ b/www/latest.php	Mon Aug 08 23:18:46 2016 +0300
@@ -1,4 +1,4 @@
-<?
+<?php
 require "config.inc.php";
 require "world.inc.php";
 require "common.inc.php";
@@ -85,7 +85,7 @@
     
     echo
       " <tr>\n".
-      "  <td>".strftime("%d %b %Y", $iv["added"])."</td>\n".
+      "  <td>".(($iv["added"] <= 0) ? "?" : strftime("%d %b %Y", $iv["added"]))."</td>\n".
       "  <td class=\"".$iv["continent"]."\">".mpGetMapLink($iv, TRUE)."</td>\n".
       "  <td>".$continentList[$iv["continent"]][0]."</td>\n".
       "  <td>".implode(", ", $fs)."</td>\n".
--- a/www/level.php	Mon Aug 08 19:04:25 2016 +0300
+++ b/www/level.php	Mon Aug 08 23:18:46 2016 +0300
@@ -1,9 +1,8 @@
-<?
+<?php
 require "config.inc.php";
 require "world.inc.php";
 require "common.inc.php";
 
-mpPrintPageHeader($pageTitle." - Level limited areas");
 
 if (isset($_GET["hcbat"]))
 {
@@ -17,13 +16,6 @@
   $hcbat = FALSE;
 }
 
-require "menu.inc.php";
-
-?>
-<div id="contents">
-<h1>BatMUD Level limited areas</h1>
-
-<?
 //========================================================================
 // Create data tables
 $areaTable = array();
@@ -47,6 +39,13 @@
 ksort($areaTable, SORT_STRING);
 
 //========================================================================
+mpPrintPageHeader($pageTitle." - Level limited areas");
+
+require "menu.inc.php";
+
+echo
+  "<div id=\"contents\">\n".
+  "<h1>BatMUD Level limited areas</h1>\n";
 
 if (count($areaTable) > 0)
 {
--- a/www/loc.php	Mon Aug 08 19:04:25 2016 +0300
+++ b/www/loc.php	Mon Aug 08 23:18:46 2016 +0300
@@ -1,4 +1,4 @@
-<?
+<?php
 require "config.inc.php";
 require "world.inc.php";
 require "common.inc.php";
--- a/www/menu.inc.php	Mon Aug 08 19:04:25 2016 +0300
+++ b/www/menu.inc.php	Mon Aug 08 23:18:46 2016 +0300
@@ -1,5 +1,5 @@
 <div id="mainmenu">
- <h1><a href="<? echo $pageMapURL; ?>"><? echo $pageTitle; ?></a></h1>
+ <h1><a href="<?php echo $pageMapURL; ?>"><?php echo $pageTitle; ?></a></h1>
  <a class="item" href="loc.php">All locations</a>
  <a class="item" href="latest.php">Latest added locations</a>
  <a class="item" href="level.php">Limited areas</a>
--- a/www/query.php	Mon Aug 08 19:04:25 2016 +0300
+++ b/www/query.php	Mon Aug 08 23:18:46 2016 +0300
@@ -1,4 +1,4 @@
-<?
+<?php
 //
 // PupuMaps OpenSearch database query code.
 // This is a rather ugly blob of glue, but it works.
--- a/www/quests.php	Mon Aug 08 19:04:25 2016 +0300
+++ b/www/quests.php	Mon Aug 08 23:18:46 2016 +0300
@@ -1,4 +1,4 @@
-<?
+<?php
 require "config.inc.php";
 require "world.inc.php";
 require "common.inc.php";
@@ -30,23 +30,6 @@
 }
 
 
-require "menu.inc.php";
-
-?>
-<div id="contents">
-<h1>BatMUD Quests</h1>
-
-<div class="attnbox">
-<b>NOTICE!</b> The information herein may be considered as a mild "spoiler",
-but I've made it available for the reason that some quest descriptions are rather
-vague, confusing and in (rare) cases deprecated. <b>You should be aware that this list
-does not include all quests and never will, for reasons both technical
-and ethical</b>. Please refer to <a href="http://www.bat.org/help/quests">the official BatMUD quest list</a>
-for full details.
-</div>
-
-<?
-//========================================================================
 // Create quest data tables
 $lqTable = array();
 $aqTable = array();
@@ -69,9 +52,23 @@
 ksort($lqTable, SORT_NUMERIC);
 ksort($aqTable, SORT_STRING);
 
+
 //========================================================================
 
+require "menu.inc.php";
+
 echo
+  "<div id=\"contents\">\n".
+  "<h1>BatMUD Quests</h1>\n".
+  "\n".
+  "<div class=\"attnbox\">\n".
+  "<b>NOTICE!</b> The information herein may be considered as a mild \"spoiler\", ".
+  "but I've made it available for the reason that some quest descriptions are rather ".
+  "vague, confusing and in (rare) cases deprecated. <b>You should be aware that this list ".
+  "does not include all quests and never will, for reasons both technical and ethical</b>. ".
+  "Please refer to <a href=\"http://www.bat.org/help/quests\">the official BatMUD quest list</a> ".
+  "for full details.\n".
+  "</div>\n".
   "<div class=\"quests\">\n".
   " <h2>Level Quests</h2>\n";
 
--- a/www/ss.php	Mon Aug 08 19:04:25 2016 +0300
+++ b/www/ss.php	Mon Aug 08 23:18:46 2016 +0300
@@ -1,4 +1,4 @@
-<?
+<?php
 require "config.inc.php";
 require "world.inc.php";
 require "common.inc.php";
--- a/www/world.inc.php	Mon Aug 08 19:04:25 2016 +0300
+++ b/www/world.inc.php	Mon Aug 08 23:18:46 2016 +0300
@@ -1,4 +1,4 @@
-<?
+<?php
 //
 // BatMUD world map definitions
 //