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

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

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

Modified Files:
	mysql.php 
Log Message:
More cosmetic changes... wow did I not follow formating conventions the
first time around.


Index: mysql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/mysql.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** mysql.php	2001/07/18 01:06:29	1.15
--- mysql.php	2001/07/18 04:56:14	1.16
***************
*** 113,116 ****
--- 113,118 ----
           }
        }
+ 
+       // if we reach this the query failed
        return -1;
     }
***************
*** 188,202 ****
  	// 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'])) {
--- 190,204 ----
  	// 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'])) {
***************
*** 220,224 ****
        $pagename = addslashes($pagename);
        if ($res = mysql_query("select count(*) from $dbi[table] where pagename='$pagename'", $dbi['dbc'])) {
!          return(mysql_result($res, 0));
        }
        return 0;
--- 222,226 ----
        $pagename = addslashes($pagename);
        if ($res = mysql_query("select count(*) from $dbi[table] where pagename='$pagename'", $dbi['dbc'])) {
!          return mysql_result($res, 0);
        }
        return 0;
***************
*** 230,234 ****
        $pagename = addslashes($pagename);
        if ($res = mysql_query("select count(*) from $ArchivePageStore where pagename='$pagename'", $dbi['dbc'])) {
!          return(mysql_result($res, 0));
        }
        return 0;
--- 232,236 ----
        $pagename = addslashes($pagename);
        if ($res = mysql_query("select count(*) from $ArchivePageStore where pagename='$pagename'", $dbi['dbc'])) {
!          return mysql_result($res, 0);
        }
        return 0;