changeset 1687:4fde474ea43e

Sync.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 12 Jun 2017 19:31:12 +0300
parents c1a4fc9c183a
children 723c7909a65c
files www/common.inc.php www/config.inc.php www/index.php www/info.php www/latest.php www/level.php www/loc.php www/query.php www/quests.php www/ss.php
diffstat 10 files changed, 10 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/www/common.inc.php	Mon Jun 12 19:29:38 2017 +0300
+++ b/www/common.inc.php	Mon Jun 12 19:31:12 2017 +0300
@@ -36,10 +36,17 @@
 
 function mpPrintPageHeader($title, $extra = "")
 {
+  global $pageMapURL, $pageTitle;
   cmPrintPageHeader($title,
     "  <meta name=\"keywords\" content=\"batmud,map,laenor,lucentium,rothikgen,desolathya,furnachia,mud,mush,mmorpg,mmo,massively,multiplayer,online,network,game,ggr,pupunen\"/>\n".
     "  <link rel=\"shortcut icon\" href=\"/maps/favicon.ico\" type=\"image/x-icon\" />\n".
     $extra, FALSE);
+
+  require "menu.inc.php";
+  
+  echo "<div id=\"contents\">\n";
+
+  echo "<div style=\"text-align: center;\"><a href=\"https://suomiceta.wordpress.com/\"><img src=\"/cropped-suomiceta_nettisivubanneri.png\" alt=\"Suomi-CETA\" /></a></div>\n";
 }
 
 
--- a/www/config.inc.php	Mon Jun 12 19:29:38 2017 +0300
+++ b/www/config.inc.php	Mon Jun 12 19:31:12 2017 +0300
@@ -1,10 +1,12 @@
 <?php
 $pageAuthor = "Matti H&auml;m&auml;l&auml;inen aka Ggr Pupunen";
 $pageTitle = "Pupunen BatMUD Maps";
+$pageLang = "en";
 $wizImageURL = "wiz/";
 
 $currTime = getdate();
 if ($currTime["mday"] == 1 && $currTime["mon"] == 4)
+//if (1)
 {
   $pageCSS = "aprilli.css";
   $specialDate = "aprilli";
--- a/www/index.php	Mon Jun 12 19:29:38 2017 +0300
+++ b/www/index.php	Mon Jun 12 19:31:12 2017 +0300
@@ -87,10 +87,7 @@
 //."  <script type=\"text/javascript\" src=\"search.js\"></script>\n"
 );
 
-require "menu.inc.php";
-
 echo
-  "<div id=\"contents\">\n".
   "<h1>".$pageTitle."</h1>\n".
   "<div class=\"advert\">".
 //  "<a href=\"https://www.hdd.fi/\"><img src=\"/luk/img/hdd_fi.gif\" alt=\"hdd.fi - Edullista etƤlevytilaa\" /></a>".
--- a/www/info.php	Mon Jun 12 19:29:38 2017 +0300
+++ b/www/info.php	Mon Jun 12 19:31:12 2017 +0300
@@ -7,10 +7,7 @@
  */
 mpPrintPageHeader($pageTitle." - Wizards of the Realm");
 
-require "menu.inc.php";
-
 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 ".
--- a/www/latest.php	Mon Jun 12 19:29:38 2017 +0300
+++ b/www/latest.php	Mon Jun 12 19:31:12 2017 +0300
@@ -9,13 +9,7 @@
  */
 mpPrintPageHeader($pageTitle." - Latest added locations");
 //echo "<div><b>DEVELOPMENT VERSION</b></div>";
-
-require "menu.inc.php";
-
-/* Header
- */
 ?>
-<div id="contents">
 <h1>Latest added locations</h1>
 
 <div class="attnbox">
--- a/www/level.php	Mon Jun 12 19:29:38 2017 +0300
+++ b/www/level.php	Mon Jun 12 19:31:12 2017 +0300
@@ -41,10 +41,7 @@
 //========================================================================
 mpPrintPageHeader($pageTitle." - Level restricted / limited areas");
 
-require "menu.inc.php";
-
 echo
-  "<div id=\"contents\">\n".
   "<h1>BatMUD Level restricted / limited areas</h1>\n";
 
 if (count($areaTable) > 0)
--- a/www/loc.php	Mon Jun 12 19:29:38 2017 +0300
+++ b/www/loc.php	Mon Jun 12 19:31:12 2017 +0300
@@ -191,10 +191,7 @@
   "<script type=\"text/javascript\" src=\"tooltip.js\"></script>\n".
   "<meta name=\"robots\" content=\"nofollow\" />\n");
 
-require "menu.inc.php";
-
 echo
-  "<div id=\"contents\">\n".
   "<h1>".$mtitle."BatMUD".(isset($coderName) ? " by ".chentities($coderName) : "")."</h1>\n".
   "<form action=\"".$_SERVER["PHP_SELF"]."\" method=\"get\">\n".
   "<div class=\"controls\">\n";
--- a/www/query.php	Mon Jun 12 19:29:38 2017 +0300
+++ b/www/query.php	Mon Jun 12 19:31:12 2017 +0300
@@ -13,9 +13,7 @@
   if ($locWebPage)
   {
     mpPrintPageHeader("Search results");
-    require "menu.inc.php";
     echo
-      "<div id=\"contents\">\n".
       "<h1>Search results</h1>\n".
       "<p>Location not found.</p>\n".
       "</div>\n".
--- a/www/quests.php	Mon Jun 12 19:29:38 2017 +0300
+++ b/www/quests.php	Mon Jun 12 19:31:12 2017 +0300
@@ -3,7 +3,6 @@
 require "world.inc.php";
 require "common.inc.php";
 
-mpPrintPageHeader($pageTitle." - Quests");
 
 if (isset($_GET["hcbat"]))
 {
@@ -54,11 +53,9 @@
 
 
 //========================================================================
-
-require "menu.inc.php";
+mpPrintPageHeader($pageTitle." - Quests");
 
 echo
-  "<div id=\"contents\">\n".
   "<h1>BatMUD Quests</h1>\n".
   "\n".
   "<div class=\"attnbox\">\n".
--- a/www/ss.php	Mon Jun 12 19:29:38 2017 +0300
+++ b/www/ss.php	Mon Jun 12 19:31:12 2017 +0300
@@ -18,10 +18,7 @@
 // Page start
 mpPrintPageHeader($pageTitle." - Secret societies");
 
-require "menu.inc.php";
-
 echo
-  "<div id=\"contents\">\n".
   "<h1>Secret societies of BatMUD</h1>\n";
 
 // Print list of societies