From 0933e8ee719b87927df37fffecf55155f72c8c3b Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Fri, 7 Jan 2005 14:00:00 +0000
Subject: [PATCH] 2004-11-28 19:19 rurban Release 1.2.5 * admin.php, index.php,
 lib/config.php(global, compute_default_scripturl):   import _SERVER and
 _GET/_POST to support register_globals=off * admin.php: on (un)lock=pagename
 display the (un)lock'ed page not FrontPage * lib/pgsql.php, lib/config.php:
 add pg_user and pg_pass   (patch #1001339 by Jack Twilley) * lib/dbalib.php,
 lib/dbmlib.php, lib/db_filesystem: fix GetAllWikiPagenames()   using
 $dbi['wiki']. This fixes zip and dumpserial on dba, dbm and file. *
 lib/msql.php: typo in GetAllWikiPageNames().   This fixes zip and dumpserial
 on msql.

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/branches/release-1_2_4@4360 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 admin/dumpserial.php       |  4 ++--
 admin/loadserial.php       |  4 ++--
 admin/lockpage.php         |  4 ++--
 admin/shrinkdbm.pl         |  2 +-
 admin/wiki_dumpHTML.php    |  4 ++--
 admin/wiki_port1_0.php     |  5 ++---
 admin/wiki_rebuilddbms.php |  4 ++--
 admin/zip.php              |  4 ++--
 lib/config.php             | 15 ++++++++++++---
 lib/dbalib.php             | 12 ++++++------
 lib/pageinfo.php           |  4 ++--
 lib/savepage.php           |  4 ++--
 lib/stdlib.php             |  4 ++--
 lib/ziplib.php             |  7 ++++---
 pgsrc/ReleaseNotes         | 15 +++++++++++----
 15 files changed, 54 insertions(+), 38 deletions(-)

diff --git a/admin/dumpserial.php b/admin/dumpserial.php
index 60c6269f3..e33f8f5cb 100755
--- a/admin/dumpserial.php
+++ b/admin/dumpserial.php
@@ -1,4 +1,4 @@
-<!-- $Id: dumpserial.php,v 1.1.2.1.2.1 2005-01-07 13:48:42 rurban Exp $ -->
+<!-- $Id: dumpserial.php,v 1.1.2.1.2.2 2005-01-07 13:59:57 rurban Exp $ -->
 
 <?php
    /*
@@ -41,4 +41,4 @@
    $html .= "<p><b>Dump complete.</b>";
    GeneratePage('MESSAGE', $html, 'Dump serialized pages', 0);
    ExitWiki('');
-?>
+?>
\ No newline at end of file
diff --git a/admin/loadserial.php b/admin/loadserial.php
index eab61e879..36ded51e3 100755
--- a/admin/loadserial.php
+++ b/admin/loadserial.php
@@ -1,4 +1,4 @@
-<!-- $Id: loadserial.php,v 1.1.2.1.2.1 2005-01-07 13:48:42 rurban Exp $ -->
+<!-- $Id: loadserial.php,v 1.1.2.1.2.2 2005-01-07 13:59:57 rurban Exp $ -->
 <?php
    /*
       Load a set of pages that have been serialized with 
@@ -39,4 +39,4 @@
    $html .= "<p><b>Load complete.</b>";
    GeneratePage('MESSAGE', $html, 'Load serialized pages', 0);
    ExitWiki('');
-?>
+?>
\ No newline at end of file
diff --git a/admin/lockpage.php b/admin/lockpage.php
index 4853b3a0c..0b50ac432 100755
--- a/admin/lockpage.php
+++ b/admin/lockpage.php
@@ -1,4 +1,4 @@
-<!-- $Id: lockpage.php,v 1.1.2.1.2.1 2005-01-07 13:48:42 rurban Exp $ -->
+<!-- $Id: lockpage.php,v 1.1.2.1.2.2 2005-01-07 13:59:57 rurban Exp $ -->
 <?php
    if(isset($lock)) $page = $lock;
    elseif(isset($unlock)) $page = $unlock;
@@ -19,4 +19,4 @@
       InsertPage($dbi, $pagename, $pagehash);
       // echo htmlspecialchars($page) . " unlocked\n";
    }
-?>
+?>
\ No newline at end of file
diff --git a/admin/shrinkdbm.pl b/admin/shrinkdbm.pl
index 6aded3d74..c447ca16a 100755
--- a/admin/shrinkdbm.pl
+++ b/admin/shrinkdbm.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# $Id: shrinkdbm.pl,v 1.1.2.1.2.1 2005-01-07 13:48:42 rurban Exp $
+# $Id: shrinkdbm.pl,v 1.1.2.1.2.2 2005-01-07 13:59:57 rurban Exp $
 
 # shrink a DBM file
 # Steve Wainstead, July 2000
diff --git a/admin/wiki_dumpHTML.php b/admin/wiki_dumpHTML.php
index ff529e6d2..4feed4cc9 100755
--- a/admin/wiki_dumpHTML.php
+++ b/admin/wiki_dumpHTML.php
@@ -1,7 +1,7 @@
-<!-- $Id: wiki_dumpHTML.php,v 1.1.2.1.2.1 2005-01-07 13:48:42 rurban Exp $ -->
+<!-- $Id: wiki_dumpHTML.php,v 1.1.2.1.2.2 2005-01-07 13:59:57 rurban Exp $ -->
 <?php
 
    echo "Dump HTML called.<p>\n";
    echo "Got: $dumpHTML $directory<br>\n";
 
-?>
+?>
\ No newline at end of file
diff --git a/admin/wiki_port1_0.php b/admin/wiki_port1_0.php
index 30b04635c..01585c43e 100755
--- a/admin/wiki_port1_0.php
+++ b/admin/wiki_port1_0.php
@@ -1,10 +1,9 @@
-<!-- $Id: wiki_port1_0.php,v 1.1.2.1.2.1 2005-01-07 13:48:42 rurban Exp $ -->
-
 <html>
 <head>
 <title>Importing phpwiki 1.0.x dbm files</title>
 </head>
 <body bgcolor="navajowhite">
+<!-- $Id: wiki_port1_0.php,v 1.1.2.1.2.2 2005-01-07 13:59:57 rurban Exp $ -->
 
 <?php
    function port1_0RenderHash($dbi, $dbmh, $pagename) {
@@ -66,4 +65,4 @@
 
 <p><b>Done.</b>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/admin/wiki_rebuilddbms.php b/admin/wiki_rebuilddbms.php
index b835ca513..e06fdcca8 100755
--- a/admin/wiki_rebuilddbms.php
+++ b/admin/wiki_rebuilddbms.php
@@ -1,6 +1,6 @@
-<!-- $Id: wiki_rebuilddbms.php,v 1.1.2.1.2.1 2005-01-07 13:48:42 rurban Exp $ -->
+<!-- $Id: wiki_rebuilddbms.php,v 1.1.2.1.2.2 2005-01-07 13:59:57 rurban Exp $ -->
 <?php
 
    echo "Rebuild DBM files called.<p>\n";
 
-?>
+?>
\ No newline at end of file
diff --git a/admin/zip.php b/admin/zip.php
index 2e1f8179b..9be06e630 100755
--- a/admin/zip.php
+++ b/admin/zip.php
@@ -1,4 +1,4 @@
-<?php // $Id: zip.php,v 1.1.2.1.2.1 2005-01-07 13:48:42 rurban Exp $
+<?php // $Id: zip.php,v 1.1.2.1.2.2 2005-01-07 13:59:57 rurban Exp $
 
 function encode_pagename_for_wikizip ($pagename) {
   $enc = rawurlencode($pagename);
@@ -81,4 +81,4 @@ if(defined('WIKI_ADMIN'))
 
 CloseDataBase($dbi);
 exit;
-?>
+?>
\ No newline at end of file
diff --git a/lib/config.php b/lib/config.php
index 335ab0ac3..5cf9811d3 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -6,11 +6,14 @@
 
    set_magic_quotes_runtime(0);
    error_reporting(E_ALL ^ E_NOTICE);
+   if (!ini_get('register_globals')) {
+       extract($HTTP_SERVER_VARS);
+   }
 
    if (!function_exists('rcs_id')) {
       function rcs_id($id) { echo "<!-- $id -->\n"; };
    }
-   rcs_id('$Id: config.php,v 1.24.2.13.2.1 2005-01-07 13:48:42 rurban Exp $'); 
+   rcs_id('$Id: config.php,v 1.24.2.13.2.2 2005-01-07 13:59:58 rurban Exp $'); 
    // end essential internal stuff
 
 
@@ -113,6 +116,8 @@
    } elseif ($WhichDatabase == 'pgsql') {
       $pg_dbhost    = "localhost";
       $pg_dbport    = "5432";
+      $pg_dbuser    = "";      // username as used in step 2 of INSTALL.mysql
+      $pg_dbpass    = "";      // password of above user (or leave blank if none)	
       $WikiDataBase  = "wiki"; // name of the database in Postgresql
       $WikiPageStore = "wiki";
       $ArchivePageStore = "archive";
@@ -268,7 +273,11 @@
    //////////////////////////////////////////////////////////////////////
    // you shouldn't have to edit anyting below this line
    function compute_default_scripturl() {
-      global $SERVER_PORT, $SERVER_NAME, $SCRIPT_NAME, $HTTPS;
+      global $HTTP_SERVER_VARS, $SERVER_PORT, $SERVER_NAME, $SCRIPT_NAME, $HTTPS;
+      if (!ini_get('register_globals')) {
+          extract($HTTP_SERVER_VARS);
+      }
+      
       if (!empty($HTTPS) && $HTTPS != 'off') {
          $proto = 'https';
          $dflt_port = 443;
@@ -307,4 +316,4 @@
 
    // constants for flags in $pagehash
    define("FLAG_PAGE_LOCKED", 1);
-?>
+?>
\ No newline at end of file
diff --git a/lib/dbalib.php b/lib/dbalib.php
index 91480168e..4de338265 100644
--- a/lib/dbalib.php
+++ b/lib/dbalib.php
@@ -1,6 +1,6 @@
 <?php  
 
-   rcs_id('$Id: dbalib.php,v 1.2.2.5.2.1 2005-01-07 13:48:42 rurban Exp $');
+   rcs_id('$Id: dbalib.php,v 1.2.2.5.2.2 2005-01-07 13:59:58 rurban Exp $');
 
    /*
       Database functions:
@@ -388,11 +388,11 @@
       $namelist = array();
       $ctr = 0;
 
-      $namelist[$ctr] = $key = dba_firstkey($dbi);
+      $namelist[$ctr] = $key = dba_firstkey($dbi['wiki']);
 
-      while ($key = dba_nextkey($dbi)) {
-         $ctr++;
-         $namelist[$ctr] = $key;
+      while ($key = dba_nextkey($dbi['wiki'])) {
+          $ctr++;
+          $namelist[$ctr] = $key;
       }
 
       return $namelist;
@@ -559,4 +559,4 @@
 
    }
 
-?>
+?>
\ No newline at end of file
diff --git a/lib/pageinfo.php b/lib/pageinfo.php
index 43ef8a4d7..ed597334f 100644
--- a/lib/pageinfo.php
+++ b/lib/pageinfo.php
@@ -1,4 +1,4 @@
-<!-- $Id: pageinfo.php,v 1.5.4.1 2005-01-07 13:48:42 rurban Exp $ -->
+<!-- $Id: pageinfo.php,v 1.5.4.2 2005-01-07 13:59:58 rurban Exp $ -->
 <!-- Display the internal structure of a page. Steve Wainstead, June 2000 -->
 <?php
    if (get_magic_quotes_gpc()) {
@@ -73,4 +73,4 @@
    $html .= ViewPageProps($info, $ArchivePageStore);
 
    GeneratePage('MESSAGE', $html, gettext("PageInfo").": '$info'", 0);
-?>
+?>
\ No newline at end of file
diff --git a/lib/savepage.php b/lib/savepage.php
index f01124074..882a1b32a 100644
--- a/lib/savepage.php
+++ b/lib/savepage.php
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: savepage.php,v 1.7.2.3.2.1 2005-01-07 13:48:42 rurban Exp $');
+<?php rcs_id('$Id: savepage.php,v 1.7.2.3.2.2 2005-01-07 13:59:58 rurban Exp $');
 
 /*
    All page saving events take place here.
@@ -205,4 +205,4 @@
    include('lib/transform.php');
 
    GeneratePage('BROWSE', $html, $pagename, $pagehash);
-?>
+?>
\ No newline at end of file
diff --git a/lib/stdlib.php b/lib/stdlib.php
index 647bed0d3..49f560bc9 100644
--- a/lib/stdlib.php
+++ b/lib/stdlib.php
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: stdlib.php,v 1.21.2.12.2.1 2005-01-07 13:48:42 rurban Exp $');
+<?php rcs_id('$Id: stdlib.php,v 1.21.2.12.2.2 2005-01-07 13:59:59 rurban Exp $');
 
    /*
       Standard functions for Wiki functionality
@@ -518,4 +518,4 @@
       _dotoken('CONTENT', $content, $page);
       print $page;
    }
-?>
+?>
\ No newline at end of file
diff --git a/lib/ziplib.php b/lib/ziplib.php
index 15a4efc59..65f01938b 100644
--- a/lib/ziplib.php
+++ b/lib/ziplib.php
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: ziplib.php,v 1.2.2.5.2.1 2005-01-07 13:48:42 rurban Exp $');
+rcs_id('$Id: ziplib.php,v 1.2.2.5.2.2 2005-01-07 13:59:59 rurban Exp $');
 
 //FIXME: get rid of this.
 function warn ($msg)
@@ -522,7 +522,8 @@ function MimeifyPage ($pagehash) {
 
   if (($flags & FLAG_PAGE_LOCKED) != 0)
       $params['flags'] = 'PAGE_LOCKED';
-  for ($i = 1; $i <= NUM_LINKS; $i++) 
+  if (!empty($refs))
+    for ($i = 1; $i <= NUM_LINKS; $i++) 
       if ($ref = $refs[$i])
 	  $params["ref$i"] = rawurlencode($ref);
   
@@ -684,4 +685,4 @@ function ParseMimeifiedPages ($data)
   return array($pagehash);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/pgsrc/ReleaseNotes b/pgsrc/ReleaseNotes
index f1c2709d3..e2bd90621 100644
--- a/pgsrc/ReleaseNotes
+++ b/pgsrc/ReleaseNotes
@@ -1,9 +1,16 @@
-PhpWiki 1.2.4 improves possible deadlocks in DBA, and fixes problems
-  with DBA open failures.
+PhpWiki 1.2.5 supports now register_globals=off, 
+* adds user/password to pgsql, 
+* fix zip and dumpserial on dba, dbm, msql and file,
+* and fixes a minor (un)lock issue, displaying the (un)locked page afterwards and not the FrontPage.
+
+PhpWiki 1.2.4 improves possible deadlocks in DBA, 
+* and fixes problems with DBA open failures.
 
 PhpWiki 1.2.3 just adds the RELATEDPAGES footer support to dba, 
-  adds remove to dba,
-  and fixes one minor aesthetic error on info w/o "Show the page source"
+* adds remove to dba,
+* and fixes one minor aesthetic error on info w/o "Show the page source" 
+
+--[ReiniUrban|http://phpwiki.org/ReiniUrban]
 
 PhpWiki 1.2 is a huge advance over version 1.0:
 
-- 
2.45.0