From 0a513224e7774652cc8aa123b389b9a2ed45c26e Mon Sep 17 00:00:00 2001
From: ahollosi <ahollosi@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Wed, 21 Jun 2000 22:57:17 +0000
Subject: [PATCH] adapted to new $pagehash structure ("refs" and
 "lastmodified")

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@84 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 wiki_config.php3    | 16 ++++++++++------
 wiki_pageinfo.php3  |  8 ++++++--
 wiki_savepage.php3  |  6 +++---
 wiki_setupwiki.php3 |  6 +++---
 wiki_stdlib.php3    | 24 ++++++++++--------------
 5 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/wiki_config.php3 b/wiki_config.php3
index 90970bcb4..c1a36fd8c 100644
--- a/wiki_config.php3
+++ b/wiki_config.php3
@@ -1,4 +1,4 @@
-<!-- $Id: wiki_config.php3,v 1.9 2000-06-20 01:38:42 wainstead Exp $ -->
+<!-- $Id: wiki_config.php3,v 1.10 2000-06-21 22:57:17 ahollosi Exp $ -->
 <?
    /*
       Constants and settings. Edit the values below for
@@ -34,8 +34,8 @@
 
    // MySQL settings (thanks Arno Hollosi! <ahollosi@iname.com>)
    // Comment out the lines above (for the DBM) if you use these
-/*
-   include "wiki_mysql.php3";
+
+/*   include "wiki_mysql.php3";
    $WikiDataBase = "wiki";
    $ArchiveDataBase = "archive";
    $mysql_server = 'localhost';
@@ -67,7 +67,14 @@
    $SignatureImg = "$ServerAddress/signature.png";
    $logo = "wikibase.png";
 
+   // date & time formats used to display modification times, etc.
+   // formats are given as format strings to PHP date() function
+   $datetimeformat = "F j, Y";	// may contain time of day
+   $dateformat = "F j, Y";	// must not contain time
 
+   // allowed protocols for links - be careful not to allow "javscript:"
+   $AllowedProtocols = "http|https|mailto|ftp|news|gopher";
+   
    // you shouldn't have to edit anyting below this line
 
    $ScriptUrl = $ServerAddress . $ScriptName;
@@ -76,9 +83,6 @@
 
    $FieldSeparator = "\263";
 
-   // allowed protocols for links - be careful not to allow "javscript:"
-   $AllowedProtocols = "http|https|mailto|ftp|news|gopher";
-   
    // Apache won't show REMOTE_HOST unless the admin configured it
    // properly. We'll be nice and see if it's there.
    empty($REMOTE_HOST) ?
diff --git a/wiki_pageinfo.php3 b/wiki_pageinfo.php3
index 98d675c37..ad25e8179 100644
--- a/wiki_pageinfo.php3
+++ b/wiki_pageinfo.php3
@@ -1,4 +1,4 @@
-<!-- $Id: wiki_pageinfo.php3,v 1.1 2000-06-21 19:32:33 ahollosi Exp $ -->
+<!-- $Id: wiki_pageinfo.php3,v 1.2 2000-06-21 22:57:17 ahollosi Exp $ -->
 <!-- Display the internal structure of a page. Steve Wainstead, June 2000 -->
 <?
    $encname = htmlspecialchars($info);
@@ -21,7 +21,7 @@
 
    function ViewpageProps($name)
    {
-      global $dbi, $showpagesource;
+      global $dbi, $showpagesource, $datetimeformat;
 
       $pagehash = RetrievePage($dbi, $name);
       if ($pagehash == -1) {
@@ -31,9 +31,13 @@
 	 $table = "<table border=1 bgcolor=white>\n";
 
 	 while (list($key, $val) = each($pagehash)) {
+	    if ($key > 0 || !$key) #key is an array index
+	       continue;
             if ((gettype($val) == "array") && ($showpagesource == "on")) {
                $val = implode($val, "<br>\n");
             }
+	    if (($key == 'lastmodified') || ($key == 'created'))
+	       $val = date($datetimeformat, $val);
             $table .= "<tr><td>$key</td><td>$val</td></tr>\n";
 	 }
 
diff --git a/wiki_savepage.php3 b/wiki_savepage.php3
index 1ace1d45e..470f24e0d 100644
--- a/wiki_savepage.php3
+++ b/wiki_savepage.php3
@@ -1,4 +1,4 @@
-<!-- $Id: wiki_savepage.php3,v 1.8 2000-06-18 15:12:13 ahollosi Exp $ -->
+<!-- $Id: wiki_savepage.php3,v 1.9 2000-06-21 22:57:17 ahollosi Exp $ -->
 <?
 
 /*
@@ -49,7 +49,7 @@
       $newpage = 0;
    }
 
-   $pagehash["date"] = GetCurrentDate();
+   $pagehash["lastmodified"] = time();
    $pagehash["version"]++;
    $pagehash["author"] = $remoteuser;
 
@@ -75,7 +75,7 @@
    for ($i = 1; $i <= NUM_LINKS; $i++) {
         if (! empty(${'r'.$i})) {
 	   if (preg_match("#^($AllowedProtocols):#", ${'r'.$i}))
-              $pagehash['r'.$i] = ${'r'.$i};
+              $pagehash['refs'][$i] = ${'r'.$i};
 	   else
 	      $html .= "<P>Link [$i]: <B>unknown protocol</B>" .
 	           " - use one of $AllowedProtocols - link discarded.</P>\n";
diff --git a/wiki_setupwiki.php3 b/wiki_setupwiki.php3
index 0c7f1e181..43e90c364 100644
--- a/wiki_setupwiki.php3
+++ b/wiki_setupwiki.php3
@@ -1,13 +1,13 @@
-<!-- $Id: wiki_setupwiki.php3,v 1.8 2000-06-20 03:27:41 wainstead Exp $ -->
+<!-- $Id: wiki_setupwiki.php3,v 1.9 2000-06-21 22:57:17 ahollosi Exp $ -->
 <?
 
    /* Add the very first pages to a wiki */
 
    $page = array();
    $page["author"] = "The PhpWiki programming team";
-   $page["created"] = GetCurrentDate();
+   $page["created"] = time();
    $page["flags"] = 0;
-   $page["lastmodified"] = GetCurrentDate();
+   $page["lastmodified"] = time();
    $page["refs"] = array();
    $page["version"] = 1;
 
diff --git a/wiki_stdlib.php3 b/wiki_stdlib.php3
index 9b3813176..b8c657592 100644
--- a/wiki_stdlib.php3
+++ b/wiki_stdlib.php3
@@ -1,9 +1,8 @@
-<!-- $Id: wiki_stdlib.php3,v 1.14 2000-06-18 15:12:13 ahollosi Exp $ -->
+<!-- $Id: wiki_stdlib.php3,v 1.15 2000-06-21 22:57:17 ahollosi Exp $ -->
 <?
    /*
       Standard functions for Wiki functionality
 	 GeneratePage($template, $content, $name, $hash)
-         GetCurrentDate()
          LinkExistingWikiWord($wikiword) 
          LinkUnknownWikiWord($wikiword) 
          LinkURL($url)
@@ -21,6 +20,7 @@
    function GeneratePage($template, $content, $name, $hash)
    {
       global $ScriptUrl, $AllowedProtocols, $templates;
+      global $datetimeformat;
 
       if (!is_array($hash))
          unset($hash);
@@ -41,7 +41,7 @@
          $page = str_replace("#$FieldSeparator#PAGEURL#$FieldSeparator#",
 			rawurlencode($name), $page);
          $page = str_replace("#$FieldSeparator#LASTMODIFIED#$FieldSeparator#",
-			$hash['date'], $page);
+			date($datetimeformat, $hash['lastmodified']), $page);
          $page = str_replace("#$FieldSeparator#LASTAUTHOR#$FieldSeparator#",
 			$hash['author'], $page);
          $page = str_replace("#$FieldSeparator#VERSION#$FieldSeparator#",
@@ -52,7 +52,7 @@
       if ($template == 'EDITLINKS') {
 	 for ($i = 1; $i <= NUM_LINKS; $i++)
 	    $page = str_replace("#$FieldSeparator#R$i#$FieldSeparator#",
-			$hash["r$i"], $page);
+			$hash['refs'][$i], $page);
       }
 
       if ($hash['copy']) {
@@ -69,12 +69,6 @@
    }
 
 
-   function GetCurrentDate() {
-      // format is like December 13, 1999
-      return date("F j, Y");
-   }
-   
-
    function LinkExistingWikiWord($wikiword) {
       global $ScriptUrl;
       $enc_word = rawurlencode($wikiword);
@@ -245,6 +239,7 @@
    function UpdateRecentChanges($dbi, $pagename, $isnewpage) {
 
       global $remoteuser; // this is set in the config
+      global $dateformst;
 
       $recentchanges = RetrievePage($dbi, "RecentChanges");
 
@@ -254,11 +249,12 @@
          $recentchanges = array(); 
       }
 
-      $currentdate = GetCurrentDate();
+      $now = time();
+      $today = date($dateformat, $now);
 
-      if ($recentchanges["date"] != $currentdate) {
+      if (date($dateformat, $recentchanges["lastmodified"]) != $today) {
          $isNewDay = TRUE;
-         $recentchanges["date"] = $currentdate;
+         $recentchanges["lastmodified"] = $now;
       } else {
          $isNewDay = FALSE;
       }
@@ -281,7 +277,7 @@
       // name to the array
 
       if ($isNewDay) {
-         $newpage[$k++] = "$currentdate\r";
+         $newpage[$k++] = "$today\r";
       } else {
          $newpage[$k++] = $recentchanges["content"][$i++];
       }
-- 
2.45.0