[phpwiki-checkins] CVS: phpwiki/lib mysql.php,1.14,1.15

[Joel U. <uck...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv26047

Modified Files:
	mysql.php 
Log Message:
Minor cosmetic changes (removed some hard tabs).


Index: mysql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/mysql.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** mysql.php	2001/07/15 15:47:59	1.14
--- mysql.php	2001/07/18 01:06:29	1.15
***************
*** 8,19 ****
        MakePageHash($dbhash)
        RetrievePage($dbi, $pagename, $pagestore, $version)
! 		RetrievePageVersions($dbi, $pagename, $curstore, $archstore)
! 		GetMaxVersionNumber($dbi, $pagename, $pagestore)
        InsertPage($dbi, $pagename, $pagehash, $clobber)
! 		ReplaceCurrentPage($pagename, $pagehash)
        SavePageToArchive($pagename, $pagehash)
! 		SelectStore($dbi, $pagename, $version, $curstore, $archstore)
! 		IsVersionInWiki($dbi, $pagename, $version)
! 		IsVersionInArchive($dbi, $pagename, $version)
        IsWikiPage($dbi, $pagename)
        IsInArchive($dbi, $pagename)
--- 8,19 ----
        MakePageHash($dbhash)
        RetrievePage($dbi, $pagename, $pagestore, $version)
!       RetrievePageVersions($dbi, $pagename, $curstore, $archstore)
!       GetMaxVersionNumber($dbi, $pagename, $pagestore)
        InsertPage($dbi, $pagename, $pagehash, $clobber)
!       ReplaceCurrentPage($pagename, $pagehash)
        SavePageToArchive($pagename, $pagehash)
!       SelectStore($dbi, $pagename, $version, $curstore, $archstore)
!       IsVersionInWiki($dbi, $pagename, $version)
!       IsVersionInArchive($dbi, $pagename, $version)
        IsWikiPage($dbi, $pagename)
        IsInArchive($dbi, $pagename)
***************
*** 106,110 ****
        $pagename = addslashes($pagename);
  
! 		$version = $version ? " and version=$version" : '';
  
        if ($res = mysql_query("select * from $pagestore where pagename='$pagename'$version", $dbi['dbc'])) {
--- 106,110 ----
        $pagename = addslashes($pagename);
  
!       $version = $version ? " and version=$version" : '';
  
        if ($res = mysql_query("select * from $pagestore where pagename='$pagename'$version", $dbi['dbc'])) {
***************
*** 119,143 ****
  	// Return all versions of a page as an array of page hashes
  	function RetrievePageVersions($dbi, $pagename, $curstore, $archstore) {
! 		$pagename = addslashes($pagename);
! 		if (($page[0] = RetrievePage($dbi, $pagename, $curstore, 0)) != -1) {
! 			if ($res = mysql_query("select * from $archstore where pagename='$pagename' order by version desc", $dbi['dbc'])) {
! 				while ($dbhash = mysql_fetch_array($res)) {
! 					array_push($page, MakePageHash($dbhash));
! 				}
! 				return $page;
! 			}
! 		}
! 		return -1;
! 	}
  
  
  	// Get maximum version number of a page in pagestore
! 	function GetMaxVersionNumber($dbi, $pagename, $pagestore) {
! 		$pagename = addslashes($pagename);
! 		if ($res = mysql_query("select max(version) from $pagestore where pagename='$pagename'", $dbi['dbc'])) {
! 			return mysql_result($res, 0);
! 		}
! 		return -1;
! 	}
  
  
--- 119,143 ----
  	// Return all versions of a page as an array of page hashes
  	function RetrievePageVersions($dbi, $pagename, $curstore, $archstore) {
!         $pagename = addslashes($pagename);
!         if (($page[0] = RetrievePage($dbi, $pagename, $curstore, 0)) != -1) {
!             if ($res = mysql_query("select * from $archstore where pagename='$pagename' order by version desc", $dbi['dbc'])) {
!                 while ($dbhash = mysql_fetch_array($res)) {
!                     array_push($page, MakePageHash($dbhash));
!                 }
!                 return $page;
!             }
!         }
!         return -1;
!     }
  
  
  	// Get maximum version number of a page in pagestore
!     function GetMaxVersionNumber($dbi, $pagename, $pagestore) {
!         $pagename = addslashes($pagename);
!         if ($res = mysql_query("select max(version) from $pagestore where pagename='$pagename'", $dbi['dbc'])) {
!             return mysql_result($res, 0);
!         }
!         return -1;
!     }
  
  
***************
*** 168,202 ****
  
  
! 	// Adds to or replaces a page in the current pagestore
! 	function ReplaceCurrentPage($pagename, $pagehash) {
! 		global $WikiPageStore;
! 		$dbi = OpenDataBase($WikiPageStore);
! 		$linklist = ExtractWikiPageLinks($pagehash['content']);
! 		SetWikiPageLinks($dbi, $pagename, $linklist);
! 		InsertPage($dbi, $pagename, $pagehash, true);
  	}
  
  
! 	// Adds a page to the archive pagestore
! 	function SavePageToArchive($pagename, $pagehash) {
! 		global $ArchivePageStore;
! 		$dbi = OpenDataBase($ArchivePageStore);
! 		InsertPage($dbi, $pagename, $pagehash, false);
! 	}
  
  
  	// Returns store where version of page resides
  	function SelectStore($dbi, $pagename, $version, $curstore, $archstore) {
! 		if ($version) {
! 			if (IsVersionInWiki($dbi, $pagename, $version)) return $curstore;
! 			elseif (IsVersionInArchive($dbi, $pagename, $version)) return $archstore;
! 			else return -1; 
! 		}
! 		elseif (IsWikiPage($dbi, $pagename)) return $curstore;
! 		else return -1;	
! 	}
  
  
! 	function IsVersionInWiki($dbi, $pagename, $version) {
        $pagename = addslashes($pagename);
        if ($res = mysql_query("select count(*) from $dbi[table] where pagename='$pagename' and version='$version'", $dbi['dbc'])) {
--- 168,202 ----
  
  
!     // Adds to or replaces a page in the current pagestore
!     function ReplaceCurrentPage($pagename, $pagehash) {
!         global $WikiPageStore;
!         $dbi = OpenDataBase($WikiPageStore);
!         $linklist = ExtractWikiPageLinks($pagehash['content']);
!         SetWikiPageLinks($dbi, $pagename, $linklist);
!         InsertPage($dbi, $pagename, $pagehash, true);
  	}
  
  
!     // Adds a page to the archive pagestore
!     function SavePageToArchive($pagename, $pagehash) {
!         global $ArchivePageStore;
!         $dbi = OpenDataBase($ArchivePageStore);
!         InsertPage($dbi, $pagename, $pagehash, false);
!     }
  
  
  	// Returns store where version of page resides
  	function SelectStore($dbi, $pagename, $version, $curstore, $archstore) {
!     if ($version) {
!         if (IsVersionInWiki($dbi, $pagename, $version)) return $curstore;
!             elseif (IsVersionInArchive($dbi, $pagename, $version)) return $archstore;
!             else return -1; 
!         }
!         elseif (IsWikiPage($dbi, $pagename)) return $curstore;
!         else return -1;	
!     }
  
  
!     function IsVersionInWiki($dbi, $pagename, $version) {
        $pagename = addslashes($pagename);
        if ($res = mysql_query("select count(*) from $dbi[table] where pagename='$pagename' and version='$version'", $dbi['dbc'])) {
***************
*** 207,211 ****
  
  	function IsVersionInArchive($dbi, $pagename, $version) {
! 		global $ArchivePageStore;
  
        $pagename = addslashes($pagename);
--- 207,211 ----
  
  	function IsVersionInArchive($dbi, $pagename, $version) {
!         global $ArchivePageStore;
  
        $pagename = addslashes($pagename);