phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.

[phpwiki-checkins] CVS: phpwiki/lib .htaccess,NONE,1.1

[Geoffrey T. D. <da...@us...>]

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

Added Files:
	.htaccess 
Log Message:
For security add .htaccess files to subdirectories.

For people with (suitably configured) apache web servers, these
will deny direct web access to the files in the subdirectories:
lib, locale, pgsrc, schemas, and templates.



--- NEW FILE ---
order allow,deny
Deny from all

[phpwiki-checkins] CVS: phpwiki/locale .htaccess,NONE,1.1

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale
In directory usw-pr-cvs1:/tmp/cvs-serv6391/locale

Added Files:
	.htaccess 
Log Message:
For security add .htaccess files to subdirectories.

For people with (suitably configured) apache web servers, these
will deny direct web access to the files in the subdirectories:
lib, locale, pgsrc, schemas, and templates.



--- NEW FILE ---
order allow,deny
Deny from all

[phpwiki-checkins] CVS: phpwiki/pgsrc ConvertSpacesToTabs,1.5,NONE

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv2635/pgsrc

Removed Files:
	ConvertSpacesToTabs 
Log Message:
This is obsolete.  Deleted.


--- ConvertSpacesToTabs DELETED ---

[phpwiki-checkins] CVS: phpwiki/lib/WikiDB/backend cvs.php,1.2,1.3

[Gerrit R. <ri...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend
In directory usw-pr-cvs1:/tmp/cvs-serv23113/lib/WikiDB/backend

Modified Files:
	cvs.php 
Log Message:
extended the functionality of the cvs backend, extended the unit test
for the backend. have yet to start on th


Index: cvs.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/cvs.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** cvs.php	2001/10/01 21:55:54	1.2
--- cvs.php	2001/11/08 11:01:16	1.3
***************
*** 54,60 ****
       *                              set this to false and check out the 
       *                              document base beforehand
!      *   . debug_file ==> file name where debug information should be set.
       *                    If file doesn't exist then it's created, if this
!      *                    is empty, then no debugging is done.
       *   . pgsrc ==> directory name where the default wiki pages are stored.
       *               This is only required if the backend is to create a
--- 54,60 ----
       *                              set this to false and check out the 
       *                              document base beforehand
!      *   . debug_file ==> file name where debug information should be sent.
       *                    If file doesn't exist then it's created, if this
!      *                    is empty, then debugging is turned off.
       *   . pgsrc ==> directory name where the default wiki pages are stored.
       *               This is only required if the backend is to create a
***************
*** 145,149 ****
          // the metadata information about a page is stored in the 
          // CVS directory of the document root in serialized form. The
!         // file always has the name _$pagename.
          $metaFile = $this->_docDir . "/CVS/_" . $pagename;
    
--- 145,149 ----
          // the metadata information about a page is stored in the 
          // CVS directory of the document root in serialized form. The
!         // file always has the name, i.e. '_$pagename'.
          $metaFile = $this->_docDir . "/CVS/_" . $pagename;
    
***************
*** 179,184 ****
       * exist.
       */
!     function update_pagedata($pagename, $newdata) 
      {
          // retrieve the meta data
          $metaData = $this->get_pagedata( $pagename );
--- 179,190 ----
       * exist.
       */
!     function update_pagedata($pagename, $newdata = array() ) 
      {
+         // check argument
+         if ( ! is_array( $newdata ) ) {
+             trigger_error("update_pagedata: Argument 'newdata' was not array", 
+                           E_USER_WARNING);
+         }
+ 
          // retrieve the meta data
          $metaData = $this->get_pagedata( $pagename );
***************
*** 193,197 ****
              $metaData[CMD_VERSION] = "1";
  
!             if ( ! isset($newdata[$CONTENT])) {
                  $metaData[CMD_CONTENT] = "";
              } else {
--- 199,203 ----
              $metaData[CMD_VERSION] = "1";
  
!             if ( ! isset($newdata[CMD_CONTENT])) {
                  $metaData[CMD_CONTENT] = "";
              } else {
***************
*** 217,222 ****
          }
  
!         // update the page data, if required
!         if ( isset( $metaData[CMD_CONTENT] ) ) {
              $this->_writePage( $pagename, $newdata[CMD_CONTENT] );
          }
--- 223,229 ----
          }
  
!         // update the page data, if required. Use newdata because it could
!         // be empty and thus unset($metaData[CMD_CONTENT]).
!         if ( isset( $newdata[CMD_CONTENT] ) ) {
              $this->_writePage( $pagename, $newdata[CMD_CONTENT] );
          }
***************
*** 225,231 ****
          unset( $metaData[CMD_CONTENT] );
          $metaData[CMD_LAST_MODIFIED] = time();
-         $this->_writeMetaInfo( $pagename, $metaData );
  
!         $this->_commitPage( $pagename, serialize( $metaData ) );
      }
  
--- 232,238 ----
          unset( $metaData[CMD_CONTENT] );
          $metaData[CMD_LAST_MODIFIED] = time();
  
!         $metaData[CMD_VERSION] = $this->_commitPage( $pagename, $metaData );
!         $this->_writeMetaInfo( $pagename, $metaData );
      }
  
***************
*** 234,238 ****
          $metaData = $this->get_pagedata( $pagename );
          if ( $metaData ) {
!             // the version number is everything about the '1.'
              return $metaData[CMD_VERSION];
          } else {
--- 241,245 ----
          $metaData = $this->get_pagedata( $pagename );
          if ( $metaData ) {
!             // the version number is everything after the '1.'
              return $metaData[CMD_VERSION];
          } else {
***************
*** 249,258 ****
  
      /**
!      * the version parameter is assumed to be everything about the '1.'
       * in the CVS versioning system.
       */
      function get_versiondata($pagename, $version, $want_content = false) 
      {
!         $this->_cvsDebug( "get_versiondata: [$pagename] [$version] [$want_content]" );
        
          $filedata = "";
--- 256,266 ----
  
      /**
!      * the version parameter is assumed to be everything after the '1.'
       * in the CVS versioning system.
       */
      function get_versiondata($pagename, $version, $want_content = false) 
      {
!         $this->_cvsDebug( "get_versiondata: [$pagename] "
!                           . "[$version] [$want_content]" );
        
          $filedata = "";
***************
*** 285,289 ****
          // shift log data until we get to the 'revision X.X' line
          // FIXME: ensure that we don't enter an endless loop here
!         while ( !ereg( "^revision ([^ ]+)$", $logdata[0], $revInfo ) ) {
              array_shift( $logdata );
          }
--- 293,297 ----
          // shift log data until we get to the 'revision X.X' line
          // FIXME: ensure that we don't enter an endless loop here
!         while ( !ereg( "^revision 1.([0-9]+)$", $logdata[0], $revInfo ) ) {
              array_shift( $logdata );
          }
***************
*** 293,297 ****
  
          // version information is incorrect
!         $rVal[CMD_VERSION] = ereg_replace( "^1[.]", "", $revInfo[1] );
          $rVal[CMD_CONTENT] = $filedata;
  
--- 301,305 ----
  
          // version information is incorrect
!         $rVal[CMD_VERSION] = $revInfo[1];
          $rVal[CMD_CONTENT] = $filedata;
  
***************
*** 305,309 ****
      /**
       * This returns false if page was not deleted or could not be deleted
!      * else true is returned.
       */
      function delete_page($pagename) 
--- 313,317 ----
      /**
       * This returns false if page was not deleted or could not be deleted
!      * else return true.
       */
      function delete_page($pagename) 
***************
*** 322,327 ****
          $this->_removePage( $pagename );
  
-         $this->_cvsDebug( "CvsRemoveOutput [$cmdRemoveOutput]" );
- 
          return true;
      }
--- 330,333 ----
***************
*** 375,379 ****
          // FIXME: this ignores the include_defaulted parameter.
          return new Cvs_Backend_Array_Iterator( 
!                                     $this->_getAllFileNamesInDir( $this->_docDir ));
      }
  
--- 381,385 ----
          // FIXME: this ignores the include_defaulted parameter.
          return new Cvs_Backend_Array_Iterator( 
!                               $this->_getAllFileNamesInDir( $this->_docDir ));
      }
  
***************
*** 382,392 ****
          if ( $fullsearch ) {
              return new Cvs_Backend_Full_Search_Iterator(
!                                     $this->_getAllFileNamesInDir( $this->_docDir ), 
!                                     $search, 
!                                     $this->_docDir );
          } else {
              return new Cvs_Backend_Title_Search_Iterator(
!                                     $this->_getAllFileNamesInDir( $this->_docDir ),
!                                     $search);
          }
      }
--- 388,398 ----
          if ( $fullsearch ) {
              return new Cvs_Backend_Full_Search_Iterator(
!                                $this->_getAllFileNamesInDir( $this->_docDir ), 
!                                $search, 
!                                $this->_docDir );
          } else {
              return new Cvs_Backend_Title_Search_Iterator(
!                                $this->_getAllFileNamesInDir( $this->_docDir ),
!                                $search);
          }
      }
***************
*** 420,431 ****
      }
  
      function check() 
      {
      }
  
      function rebuild() 
      {
      }
! 
      // 
      // ..-.-..-.-..-.-.. .--..-......-.--. --.-....----.....
--- 426,468 ----
      }
  
+     /**
+      * What we do here is take a listing of the documents directory and
+      * check that each page has metadata file. If not, then a metadata
+      * file is created for the page.
+      *
+      * This can happen if rebuild() was called and someone has added
+      * files to the CVS repository not via PhpWiki. These files are 
+      * added to the document directory but without any metadata files.
+      */
      function check() 
      {
+         // TODO:
+         // TODO: test this .... i.e. add test to unit test file.
+         // TODO:
+         $page_names = $this->_getAllFileNamesInDir($this->_docDir);
+         $meta_names = $this->_getAllFileNamesInDir($this->_docDir . "/CVS");
+ 
+         array_walk( $meta_names, '_strip_leading_underscore' );
+         reset( $meta_names );
+         $no_meta_files = array_diff( $page_names, $meta_names );
+ 
+         array_walk( $no_meta_files, '_create_meta_file', $this );
+ 
+         return true;
      }
  
+     /**
+      * Do an update of the CVS repository 
+      */
      function rebuild() 
      {
+         // TODO:
+         // TODO: test this .... i.e. add test to unit test file.
+         // TODO:
+         $cmdLine = sprintf( "cd %s; cvs update -d 2>&1", $this->_docDir );
+         $this->_execCommand( $cmdLine, $cmdOutput, true );
+         return true;
      }
!     
      // 
      // ..-.-..-.-..-.-.. .--..-......-.--. --.-....----.....
***************
*** 434,442 ****
      // ..-.-..-.-..-.-.. .--..-......-.--. --.-....----.....
      //
!    
      function _writeMetaInfo( $pagename, $hashInfo )
      {
          $this->_writeFileWithPath( $this->_docDir . "/CVS/_" . $pagename, 
!                             serialize( $hashInfo ) );
      }
      function _writePage( $pagename, $content )
--- 471,489 ----
      // ..-.-..-.-..-.-.. .--..-......-.--. --.-....----.....
      //
!     function _create_meta_file( $page_name, $key, &$backend )
!     {
!         $backend->_cvsDebug( "Creating meta file for [$page_name]" );
!         $backend->update_pagedata( $page_name, array() );
!     }
! 
!     function _strip_leading_underscore( &$item ) 
!     {
!         $item = ereg_replace( "^_", "", $item );
!     }
! 
      function _writeMetaInfo( $pagename, $hashInfo )
      {
          $this->_writeFileWithPath( $this->_docDir . "/CVS/_" . $pagename, 
!                                    serialize( $hashInfo ) );
      }
      function _writePage( $pagename, $content )
***************
*** 452,461 ****
          $this->_execCommand( $cmdLine, $cmdRemoveOutput, true );
      }
!     function _commitPage( $pagename, $commitMsg = "no_message" )
      {
          $cmdLine = sprintf( "cd %s; cvs commit -m \"%s\" %s 2>&1", 
!                             $this->_docDir, escapeshellcmd( $commitMsg ), 
                              $pagename );
          $this->_execCommand( $cmdLine, $cmdOutput, true );
      }
      function _addPage( $pagename )
--- 499,533 ----
          $this->_execCommand( $cmdLine, $cmdRemoveOutput, true );
      }
! 
!     /**
!      * this returns the new version number of the file.
!      */
!     function _commitPage( $pagename, &$meta_data )
      {
          $cmdLine = sprintf( "cd %s; cvs commit -m \"%s\" %s 2>&1", 
!                             $this->_docDir, 
!                             escapeshellcmd( serialize( $meta_data ) ),
                              $pagename );
          $this->_execCommand( $cmdLine, $cmdOutput, true );
+ 
+         $cmdOutput = implode( "\n", $cmdOutput );
+         $revInfo = array();
+         ereg( "\nnew revision: 1[.]([0-9]+); previous revision: ", $cmdOutput,
+               $revInfo );
+ 
+         $this->_cvsDebug( "CP: revInfo 0: $revInfo[0]" );
+         $this->_cvsDebug( "CP: $cmdOutput" );
+         if ( isset( $revInfo[1] ) ) {
+             $this->_cvsDebug( "CP: got revision information" );
+             return $revInfo[1];
+         } else {
+             ereg( "\ninitial revision: 1[.]([0-9]+)", $cmdOutput, $revInfo );
+             if ( isset( $revInfo[1] ) ) {
+                 $this->_cvsDebug( "CP: is initial release" );
+                 return 1;
+             }
+             $this->_cvsDebug( "CP: returning old version" );
+             return $meta_data[CMD_VERSION];
+         }
      }
      function _addPage( $pagename )
***************
*** 511,514 ****
--- 583,587 ----
          chmod( $path, $mode );
      }
+ 
      /**
       * The lord giveth, and the lord taketh.
***************
*** 521,531 ****
  
              if (!$locked) { 
!                 $this->_cvsError("Unable to delete file, lock was not obtained.",
!                           __LINE__, $filename, EM_NOTICE_ERRORS );
              } 
  
!             if ( ($rVal = unlink( $filename )) == 0 ) {
!                 /* if successful, then do nothing */
!             } else {
                  $this->_cvsDebug( "[$filename] --> Unlink returned [$rVal]" );
              }
--- 594,603 ----
  
              if (!$locked) { 
!                 $this->_cvsError("Unable to delete file, "
!                                  . "lock was not obtained.",
!                                  __LINE__, $filename, EM_NOTICE_ERRORS );
              } 
  
!             if ( ($rVal = unlink( $filename )) != 0 ) {
                  $this->_cvsDebug( "[$filename] --> Unlink returned [$rVal]" );
              }
***************
*** 597,604 ****
          exec( $cmdLine, $cmdOutput, $cmdReturnVal );
          if ( $exitOnNonZero && ($cmdReturnVal != 0) ) {
-             $this->_cvsError("Command failed [$cmdLine], Return value: $cmdReturnVal",
-                       __LINE__ );
              $this->_cvsDebug( "Command failed [$cmdLine], Output: [" . 
!                        join("\n",$cmdOutput) . "]" );
          }
          $this->_cvsDebug( "Done execution [" . join("\n", $cmdOutput ) . "]" );
--- 669,677 ----
          exec( $cmdLine, $cmdOutput, $cmdReturnVal );
          if ( $exitOnNonZero && ($cmdReturnVal != 0) ) {
              $this->_cvsDebug( "Command failed [$cmdLine], Output: [" . 
!                               join("\n",$cmdOutput) . "]" );
!             $this->_cvsError("Command failed [$cmdLine], "
!                              . "Return value: $cmdReturnVal",
!                              __LINE__ );
          }
          $this->_cvsDebug( "Done execution [" . join("\n", $cmdOutput ) . "]" );

[phpwiki-checkins] CVS: phpwiki/tests unit_test_backend_cvs.php,1.1,1.2

[Gerrit R. <ri...@us...>]

Update of /cvsroot/phpwiki/phpwiki/tests
In directory usw-pr-cvs1:/tmp/cvs-serv23113/tests

Modified Files:
	unit_test_backend_cvs.php 
Log Message:
extended the functionality of the cvs backend, extended the unit test
for the backend. have yet to start on th


Index: unit_test_backend_cvs.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/tests/unit_test_backend_cvs.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unit_test_backend_cvs.php	2001/10/01 21:58:32	1.1
--- unit_test_backend_cvs.php	2001/11/08 11:01:16	1.2
***************
*** 1,13 ****
  <?php
- 
  /**
   * Unit tests the 'lib/WikiDB/backend/cvs.php' file and with it
!  * the class WikiDB_backend_cvs
   *
   * Author: Gerrit Riessen, ger...@op...
   */
  
! // need to set this to be something sensible ....
! ini_set('include_path', '/www/development/phpwiki' );
  
  function rcs_id()
--- 1,13 ----
  <?php
  /**
   * Unit tests the 'lib/WikiDB/backend/cvs.php' file and with it
!  * the class WikiDB_backend_cvs. This isn't based on the PhpUnit, and
!  * is designed to be run directly using the php4 command.
   *
   * Author: Gerrit Riessen, ger...@op...
   */
  
! // assume that the we've cd'ed to the tests directory
! ini_set('include_path', '..' );
  
  function rcs_id()
***************
*** 18,22 ****
    // root user can't check in to a CVS repository
    print( "can not be run as root\n" );
!   exit(1);
  }
  
--- 18,22 ----
    // root user can't check in to a CVS repository
    print( "can not be run as root\n" );
!   exit();
  }
  
***************
*** 30,34 ****
   * These are the parameters required by the backend. 
   */
! $db_params[CVS_PAGE_SOURCE]          = "/www/development/phpwiki/pgsrc";
  $db_params[CVS_CHECK_FOR_REPOSITORY] = true;
  // the following three are removed if the test succeeds.
--- 30,34 ----
   * These are the parameters required by the backend. 
   */
! $db_params[CVS_PAGE_SOURCE]          = "../pgsrc";
  $db_params[CVS_CHECK_FOR_REPOSITORY] = true;
  // the following three are removed if the test succeeds.
***************
*** 64,78 ****
  // Check that the meta data files were created
  //
! function get_pagedata( $item, $key, $cvsdb ) 
  {
      global $REMOVE_DEBUG;
!     $pageHash = $cvsdb->get_pagedata( $item );
      if ( $pageHash[CMD_VERSION] != "2" ) {
!         print "*** Error: [$item] version wrong (". $pageHash[CMD_VERSION]
!             .")\n";
          $REMOVE_DEBUG = false;
      }
  }
  array_walk( $allPageNames, 'get_pagedata', $cvsdb );
  
  //
--- 64,109 ----
  // Check that the meta data files were created
  //
! function get_pagedata( $page_name, $key, &$cvsdb ) 
  {
      global $REMOVE_DEBUG;
!     $pageHash = $cvsdb->get_pagedata( $page_name );
!     if ( $pageHash[CMD_VERSION] != "1" ) {
!         print ( "*** Error: [$page_name] version wrong 1 != "
!                 . $pageHash[CMD_VERSION] ."\n" );
!         $REMOVE_DEBUG = false;
!     }
! 
!     $new_data = array();
!     $new_data[CMD_CONTENT] = "";
!     $cvsdb->update_pagedata( $page_name, $new_data );
! 
!     $pageHash = $cvsdb->get_pagedata( $page_name );
      if ( $pageHash[CMD_VERSION] != "2" ) {
!         print ( "*** Error: [$page_name] version wrong 2 != "
!                 . $pageHash[CMD_VERSION] ."\n" );
          $REMOVE_DEBUG = false;
      }
  }
  array_walk( $allPageNames, 'get_pagedata', $cvsdb );
+ 
+ //
+ // test the add and delete pages
+ //
+ $new_page_data = array();
+ $pname = "Hello_World_Fubar";
+ 
+ $new_page_data[CMD_CONTENT] = "hello world\nPlease to meet you\n\n";
+ $cvsdb->update_pagedata( $pname, $new_page_data );
+ if ( $cvsdb->get_latest_version( $pname ) != "1" ) {
+     print( "***Error Line " . __LINE__ . ": expecting version number 1\n");
+     $REMOVE_DEBUG=false;
+ }
+ 
+ $new_page_data[CMD_CONTENT] = "goodbye cruel world\nbye bye....\n";
+ $cvsdb->update_pagedata( $pname, $new_page_data );
+ if ( $cvsdb->get_latest_version( $pname ) != "2" ) {
+     print( "***Error Line " . __LINE__ . ": expecting version number 2\n");
+     $REMOVE_DEBUG=false;
+ }
  
  //

[phpwiki-checkins] CVS: phpwiki/lib/WikiDB cvs.php,1.1,1.2

[Gerrit R. <ri...@us...>]

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

Modified Files:
	cvs.php 
Log Message:
extended the functionality of the cvs backend, extended the unit test
for the backend. have yet to start on th


Index: cvs.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/cvs.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** cvs.php	2001/09/28 14:28:21	1.1
--- cvs.php	2001/11/08 11:01:16	1.2
***************
*** 11,19 ****
   * Author: Gerrit Riessen, ger...@op...
   */
! class WikiDB_cvs 
  extends WikiDB
! {
!     function WikiDB_cvs( $dbparams ) {
! 	$backend = new WikiDB_backend_cvs( $dbparams );
      }
  }
--- 11,25 ----
   * Author: Gerrit Riessen, ger...@op...
   */
! class WikiDB_cvs
  extends WikiDB
! {  
!     var $_backend;
! 
!     /**
!      * Constructor requires the DB parameters. 
!      */
!     function WikiDB_cvs( $dbparams ) 
!     {
!         $this->_backend = new WikiDB_backend_cvs( $dbparams );
      }
  }

[phpwiki-checkins] CVS: phpwiki/pgsrc RecentEdits,NONE,1.1

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv24242/pgsrc

Added Files:
	RecentEdits 
Log Message:
New page.  This one show all recent edits.


--- NEW FILE ---
>From hos...@da...  Sat Feb 10 21:28:19 2001
Subject: RecentEdits
From: hos...@da... (PhpWiki)
Date: Fri, 31 Aug 2001 22:07:14 -0700
Mime-Version: 1.0
Content-Type: application/x-phpwiki;
  pagename=RecentEdits;
  flags=PAGE_LOCKED
Content-Transfer-Encoding: binary

Here's a list of recently edited pages on this wiki.  All recent edits (not just the most recent) are listed here.  Minor changes are listed as well.  (For a list of just the most recent non-minor changes, see RecentChanges.)

<?plugin RecentChanges  days=4 show_all=1 show_minor=1?>

[phpwiki-checkins] CVS: phpwiki/lib dbalib.php,1.2.2.4,1.2.2.5 db_filesystem.php,1.4.2.6,1.4.2.7 dbmlib.php,1.7.2.3,1.7.2.4

[Geoffrey T. D. <da...@us...>]

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

Modified Files:
      Tag: release-1_2-branch
	dbalib.php db_filesystem.php dbmlib.php 
Log Message:
Fix the backlink code which I just broke.


Index: dbalib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/dbalib.php,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -C2 -r1.2.2.4 -r1.2.2.5
*** dbalib.php	2001/11/07 20:30:47	1.2.2.4
--- dbalib.php	2001/11/07 23:19:16	1.2.2.5
***************
*** 203,207 ****
     // setup for back-link search
     function InitBackLinkSearch($dbi, $pagename) {
!       return InitTitleSearch($dbi, MakeBackLinkSearchRegexp($pagename));
     }
  
--- 203,210 ----
     // setup for back-link search
     function InitBackLinkSearch($dbi, $pagename) {
!       $pos['search'] = MakeBackLinkSearchRegexp($pagename);
!       $pos['key'] = dba_firstkey($dbi['wiki']);
!       
!       return $pos;
     }
  

Index: db_filesystem.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/db_filesystem.php,v
retrieving revision 1.4.2.6
retrieving revision 1.4.2.7
diff -C2 -r1.4.2.6 -r1.4.2.7
*** db_filesystem.php	2001/11/07 20:30:47	1.4.2.6
--- db_filesystem.php	2001/11/07 23:19:16	1.4.2.7
***************
*** 211,215 ****
     // setup for back-link search
     function InitBackLinkSearch($dbi, $pagename) {
!       return InitTitleSearch($dbi, MakeBackLinkSearchRegexp($pagename));
     }
  
--- 211,218 ----
     // setup for back-link search
     function InitBackLinkSearch($dbi, $pagename) {
!       $pos['search'] = MakeBackLinkSearchRegexp($pagename);
!       $pos['data'] = GetAllWikiPageNames($dbi['wiki']);
! 
!       return $pos;
     }
  

Index: dbmlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/dbmlib.php,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -C2 -r1.7.2.3 -r1.7.2.4
*** dbmlib.php	2001/11/07 20:30:47	1.7.2.3
--- dbmlib.php	2001/11/07 23:19:16	1.7.2.4
***************
*** 244,248 ****
     // setup for back-link search
     function InitBackLinkSearch($dbi, $pagename) {
!       return InitTitleSearch($dbi, MakeBackLinkSearchRegexp($pagename));
     }
  
--- 244,251 ----
     // setup for back-link search
     function InitBackLinkSearch($dbi, $pagename) {
!       $pos['search'] = MakeBackLinkSearchRegexp($pagename);
!       $pos['key'] = dbmfirstkey($dbi['wiki']);
! 
!       return $pos;
     }
  

[phpwiki-checkins] CVS: phpwiki UPGRADING,1.3,1.4

[Steve W. <wai...@us...>]

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

Modified Files:
	UPGRADING 
Log Message:
Added note about creating a HomePage before making a zip dump.


Index: UPGRADING
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/UPGRADING,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** UPGRADING	2001/09/18 19:16:23	1.3
--- UPGRADING	2001/11/07 22:27:54	1.4
***************
*** 30,34 ****
  
  Get either a zip dump, or a serialized dump from your
! old wiki.
  
  (If your using a zip dump, it must (for now) be
--- 30,36 ----
  
  Get either a zip dump, or a serialized dump from your
! old wiki. (But first, create a copy of FrontPage called HomePage, or
! else you will have trouble loading the new wiki. It will try to load
! the zip file every time since it doesn't detect a HomePage. --SW)
  
  (If your using a zip dump, it must (for now) be

[phpwiki-checkins] CVS: phpwiki/lib search.php,1.3.2.1,1.3.2.2 fullsearch.php,1.4.2.1,1.4.2.2

[Geoffrey T. D. <da...@us...>]

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

Modified Files:
      Tag: release-1_2-branch
	search.php fullsearch.php 
Log Message:
Fix SF bug #445108: Empty search string results in phpwiki error.


Index: search.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/search.php,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** search.php	2001/11/07 20:30:47	1.3.2.1
--- search.php	2001/11/07 21:42:34	1.3.2.2
***************
*** 15,25 ****
  
     // search matching pages
-    $query = InitTitleSearch($dbi, $search);
     $found = 0;
!    while ($page = TitleSearchNextMatch($dbi, $query)) {
!       $found++;
!       $html .= LinkExistingWikiWord($page) . "<br>\n";
     }
! 
     $html .= "<hr noshade>\n"
  	    . sprintf(gettext ("%d pages match your query."), $found)
--- 15,30 ----
  
     // search matching pages
     $found = 0;
!    if (strlen($search)) {           
!       $query = InitTitleSearch($dbi, $search);
!       while ($page = TitleSearchNextMatch($dbi, $query)) {
!          $found++;
!          $html .= LinkExistingWikiWord($page) . "<br>\n";
!       }
     }
!    else {
!       $html .= gettext("(You entered an empty search string)") . "<br>\n";
!    }   
!      
     $html .= "<hr noshade>\n"
  	    . sprintf(gettext ("%d pages match your query."), $found)

Index: fullsearch.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/fullsearch.php,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** fullsearch.php	2001/11/07 20:30:47	1.4.2.1
--- fullsearch.php	2001/11/07 21:42:34	1.4.2.2
***************
*** 11,40 ****
  		   htmlspecialchars($full))
  	   . "</B></P>\n<DL>\n";
- 
-    // search matching pages
-    $query = InitFullSearch($dbi, $full);
- 
-    // quote regexp chars (space are treated as "or" operator)
-    $full = preg_replace("/\s+/", "|", preg_quote($full));
- 
     $found = 0;
     $count = 0;
!    while ($pagehash = FullSearchNextMatch($dbi, $query)) {
!       $html .= "<DT><B>" . LinkExistingWikiWord($pagehash["pagename"]) . "</B>\n";
!       $count++;
  
!       // print out all matching lines, highlighting the match
!       for ($j = 0; $j < (count($pagehash["content"])); $j++) {
           if ($hits = preg_match_all(":$full:i", $pagehash["content"][$j], $dummy)) {
!             $matched = preg_replace(":$full:i",
! 				"${FieldSeparator}OT\\0${FieldSeparator}CT",
!                                 $pagehash["content"][$j]);
! 	    $matched = htmlspecialchars($matched);
! 	    $matched = str_replace("${FieldSeparator}OT", '<b>', $matched);
! 	    $matched = str_replace("${FieldSeparator}CT", '</b>', $matched);
!             $html .= "<dd><small>$matched</small></dd>\n";
!             $found += $hits;
           }
!       }
     }
  
--- 11,45 ----
  		   htmlspecialchars($full))
  	   . "</B></P>\n<DL>\n";
     $found = 0;
     $count = 0;
! 
!    if (strlen($full)) {           
!      // search matching pages
!      $query = InitFullSearch($dbi, $full);
!       
!      // quote regexp chars (space are treated as "or" operator)
!      $full = preg_replace("/\s+/", "|", preg_quote($full));
! 
!      while ($pagehash = FullSearchNextMatch($dbi, $query)) {
!        $html .= "<DT><B>" . LinkExistingWikiWord($pagehash["pagename"]) . "</B>\n";
!        $count++;
  
!        // print out all matching lines, highlighting the match
!        for ($j = 0; $j < (count($pagehash["content"])); $j++) {
           if ($hits = preg_match_all(":$full:i", $pagehash["content"][$j], $dummy)) {
!            $matched = preg_replace(":$full:i",
!                                    "${FieldSeparator}OT\\0${FieldSeparator}CT",
!                                    $pagehash["content"][$j]);
!            $matched = htmlspecialchars($matched);
!            $matched = str_replace("${FieldSeparator}OT", '<b>', $matched);
!            $matched = str_replace("${FieldSeparator}CT", '</b>', $matched);
!            $html .= "<dd><small>$matched</small></dd>\n";
!            $found += $hits;
           }
!        }
!      }
!    }
!    else {
!      $html .= "<dd>" . gettext("(You entered an empty search string)") . "</dd>\n";
     }
  

[phpwiki-checkins] CVS: phpwiki/lib/WikiDB/backend PearDB.php,1.7,1.8

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend
In directory usw-pr-cvs1:/tmp/cvs-serv7137/lib/WikiDB/backend

Modified Files:
	PearDB.php 
Log Message:
Fix quoting of search expressions.  (Searches for words containing
'%', '\', or '_' were broken prior to this fix.)



Index: PearDB.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/PearDB.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** PearDB.php	2001/10/29 17:57:24	1.7
--- PearDB.php	2001/11/07 21:12:47	1.8
***************
*** 458,461 ****
--- 458,462 ----
  
      function _sql_match_clause($word) {
+         $word = preg_replace('/(?=[%_\\\\])/', "\\", $word);
          $word = $this->_dbh->quoteString($word);
          return "LOWER(pagename) LIKE '%$word%'";
***************
*** 463,466 ****
--- 464,468 ----
  
      function _fullsearch_sql_match_clause($word) {
+         $word = preg_replace('/(?=[%_\\\\])/', "\\", $word);
          $word = $this->_dbh->quoteString($word);
          return "LOWER(pagename) LIKE '%$word%' OR content LIKE '%$word%'";

[phpwiki-checkins] CVS: phpwiki/lib ziplib.php,1.2.2.2,1.2.2.3

[Geoffrey T. D. <da...@us...>]

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

Modified Files:
      Tag: release-1_2-branch
	ziplib.php 
Log Message:
Minor fixage: preg_quote does not quote '/' by default.


Index: ziplib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/ziplib.php,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -r1.2.2.2 -r1.2.2.3
*** ziplib.php	2001/02/10 05:26:00	1.2.2.2
--- ziplib.php	2001/11/07 20:32:24	1.2.2.3
***************
*** 619,623 ****
    $boundary = preg_quote($boundary);
  
!   while (preg_match("/^(|.*?\n)--$boundary((?:--)?)[^\n]*\n/s",
  		     $data, $match))
      {
--- 619,623 ----
    $boundary = preg_quote($boundary);
  
!   while (preg_match("=^(|.*?\n)--$boundary((?:--)?)[^\n]*\n=s",
  		     $data, $match))
      {

[phpwiki-checkins] CVS: phpwiki/lib db_filesystem.php,1.4.2.5,1.4.2.6 dbalib.php,1.2.2.3,1.2.2.4 dbmlib.php,1.7.2.2,1.7.2.3 fullsearch.php,1.4,1.4.2.1 mysql.php,1.10.2.3,1.10.2.4 pgsql.php,1.4.2.4,1.4.2.5 search.php,1.3,1.3.2.1 msql.php,1.6.2.3,1.6.2.4 mssql.php,1.1.2.4,1.1.2.5

[Geoffrey T. D. <da...@us...>]

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

Modified Files:
      Tag: release-1_2-branch
	db_filesystem.php dbalib.php dbmlib.php fullsearch.php 
	mysql.php pgsql.php search.php msql.php mssql.php 
Log Message:
Cleanups of quoting details in the searches.
This fixes, among other thing, SF bug #456863.

Depending on the backend searches for pages and/or page names
containing '/', '\', '%', and/or '_' all failed in some way
or another.

The fixes to lib/dbmlib.php are untested, but parallel those in
lib/dbalib.php, so should be okay.

The fixes in lib/pgsql.php, lib/msql.php, and lib/mssql.php are
also untested.  They more or less parallel tested fixes in
lib/mysql.php, but it would probably be good if someone could
test them.



Index: db_filesystem.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/db_filesystem.php,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -C2 -r1.4.2.5 -r1.4.2.6
*** db_filesystem.php	2001/11/06 20:43:45	1.4.2.5
--- db_filesystem.php	2001/11/07 20:30:47	1.4.2.6
***************
*** 146,150 ****
     // setup for title-search
     function InitTitleSearch($dbi, $search) { 
!       $pos['search'] = $search;
        $pos['data'] = GetAllWikiPageNames($dbi['wiki']);
  
--- 146,150 ----
     // setup for title-search
     function InitTitleSearch($dbi, $search) { 
!       $pos['search'] = '=' . preg_quote($search) . '=i';
        $pos['data'] = GetAllWikiPageNames($dbi['wiki']);
  
***************
*** 155,159 ****
     function TitleSearchNextMatch($dbi, &$pos) { 
        while (list($key, $page) = each($pos['data'])) {
!          if (eregi($pos['search'], $page)) {
              return $page;
           }
--- 155,159 ----
     function TitleSearchNextMatch($dbi, &$pos) { 
        while (list($key, $page) = each($pos['data'])) {
!          if (preg_match($pos['search'], $page)) {
              return $page;
           }
***************
*** 172,179 ****
        while (list($key, $page) = each($pos['data'])) {
           $pagedata = RetrievePage($dbi, $page, $WikiPageStore);
!          if (eregi($pos['search'], serialize($pagedata))) {
  	        return $pagedata;
! 		 }
! 	  }
        return 0;
     }
--- 172,179 ----
        while (list($key, $page) = each($pos['data'])) {
           $pagedata = RetrievePage($dbi, $page, $WikiPageStore);
!          if (preg_match($pos['search'], serialize($pagedata))) {
  	        return $pagedata;
!          }
!       }
        return 0;
     }

Index: dbalib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/dbalib.php,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -r1.2.2.3 -r1.2.2.4
*** dbalib.php	2001/11/07 03:23:24	1.2.2.3
--- dbalib.php	2001/11/07 20:30:47	1.2.2.4
***************
*** 132,136 ****
     // setup for title-search
     function InitTitleSearch($dbi, $search) {
!       $pos['search'] = $search;
        $pos['key'] = dba_firstkey($dbi['wiki']);
  
--- 132,136 ----
     // setup for title-search
     function InitTitleSearch($dbi, $search) {
!       $pos['search'] = '=' . preg_quote($search) . '=i';
        $pos['key'] = dba_firstkey($dbi['wiki']);
  
***************
*** 144,148 ****
           $pos['key'] = dba_nextkey($dbi['wiki']);
  
!          if (eregi($pos['search'], $page)) {
              return $page;
           }
--- 144,148 ----
           $pos['key'] = dba_nextkey($dbi['wiki']);
  
!          if (preg_match($pos['search'], $page)) {
              return $page;
           }
***************
*** 164,168 ****
           $pagedata = dba_fetch($key, $dbi['wiki']);
           // test the serialized data
!          if (eregi($pos['search'], $pagedata)) {
  	    $page['pagename'] = $key;
              $pagedata = unserialize(UnPadSerializedData($pagedata));
--- 164,168 ----
           $pagedata = dba_fetch($key, $dbi['wiki']);
           // test the serialized data
!          if (preg_match($pos['search'], $pagedata)) {
  	    $page['pagename'] = $key;
              $pagedata = unserialize(UnPadSerializedData($pagedata));

Index: dbmlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/dbmlib.php,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -C2 -r1.7.2.2 -r1.7.2.3
*** dbmlib.php	2001/11/06 20:43:11	1.7.2.2
--- dbmlib.php	2001/11/07 20:30:47	1.7.2.3
***************
*** 166,170 ****
     // setup for title-search
     function InitTitleSearch($dbi, $search) {
!       $pos['search'] = $search;
        $pos['key'] = dbmfirstkey($dbi['wiki']);
  
--- 166,170 ----
     // setup for title-search
     function InitTitleSearch($dbi, $search) {
!       $pos['search'] = '=' . preg_quote($search) . '=i';
        $pos['key'] = dbmfirstkey($dbi['wiki']);
  
***************
*** 179,183 ****
           $pos['key'] = dbmnextkey($dbi['wiki'], $pos['key']);
  
!          if (eregi($pos['search'], $page)) {
              return $page;
           }
--- 179,183 ----
           $pos['key'] = dbmnextkey($dbi['wiki'], $pos['key']);
  
!          if (preg_match($pos['search'], $page)) {
              return $page;
           }
***************
*** 201,205 ****
           $pagedata = dbmfetch($dbi['wiki'], $key);
           // test the serialized data
!          if (eregi($pos['search'], $pagedata)) {
  	    $page['pagename'] = $key;
              $pagedata = unserialize(UnPadSerializedData($pagedata));
--- 201,205 ----
           $pagedata = dbmfetch($dbi['wiki'], $key);
           // test the serialized data
!          if (preg_match($pos['search'], $pagedata)) {
  	    $page['pagename'] = $key;
              $pagedata = unserialize(UnPadSerializedData($pagedata));

Index: fullsearch.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/fullsearch.php,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** fullsearch.php	2000/12/30 21:09:13	1.4
--- fullsearch.php	2001/11/07 20:30:47	1.4.2.1
***************
*** 5,9 ****
     if(get_magic_quotes_gpc())
        $full = stripslashes($full);
! 
     $html = "<P><B>"
  	   . sprintf(gettext ("Searching for \"%s\" ....."),
--- 5,10 ----
     if(get_magic_quotes_gpc())
        $full = stripslashes($full);
!    $full = trim($full);
!       
     $html = "<P><B>"
  	   . sprintf(gettext ("Searching for \"%s\" ....."),
***************
*** 25,30 ****
        // print out all matching lines, highlighting the match
        for ($j = 0; $j < (count($pagehash["content"])); $j++) {
!          if ($hits = preg_match_all("/$full/i", $pagehash["content"][$j], $dummy)) {
!             $matched = preg_replace("/$full/i",
  				"${FieldSeparator}OT\\0${FieldSeparator}CT",
                                  $pagehash["content"][$j]);
--- 26,31 ----
        // print out all matching lines, highlighting the match
        for ($j = 0; $j < (count($pagehash["content"])); $j++) {
!          if ($hits = preg_match_all(":$full:i", $pagehash["content"][$j], $dummy)) {
!             $matched = preg_replace(":$full:i",
  				"${FieldSeparator}OT\\0${FieldSeparator}CT",
                                  $pagehash["content"][$j]);

Index: mysql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/mysql.php,v
retrieving revision 1.10.2.3
retrieving revision 1.10.2.4
diff -C2 -r1.10.2.3 -r1.10.2.4
*** mysql.php	2001/11/07 18:54:07	1.10.2.3
--- mysql.php	2001/11/07 20:30:47	1.10.2.4
***************
*** 218,222 ****
     function MakeSQLSearchClause($search, $column)
     {
!       $search = addslashes(preg_replace("/\s+/", " ", $search));
        $term = strtok($search, ' ');
        $clause = '';
--- 218,225 ----
     function MakeSQLSearchClause($search, $column)
     {
!       $search = preg_replace("/\s+/", " ", trim($search));
!       $search = preg_replace('/(?=[%_\\\\])/', "\\", $search);
!       $search = addslashes($search);
!       
        $term = strtok($search, ' ');
        $clause = '';
***************
*** 232,235 ****
--- 235,239 ----
  	    $clause .= 'AND ';
        }
+       
        return $clause;
     }

Index: pgsql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/pgsql.php,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -C2 -r1.4.2.4 -r1.4.2.5
*** pgsql.php	2001/11/07 18:58:14	1.4.2.4
--- pgsql.php	2001/11/07 20:30:47	1.4.2.5
***************
*** 236,239 ****
--- 236,240 ----
  
        $search = strtolower($search);
+       $search = preg_replace('/(?=[%_\\\\])/', "\\", $search);
        $search = addslashes($search);
        $query = "select pagename from $dbi[table] where lower(pagename) " .
***************
*** 263,267 ****
        $search_counter = 0;
        $search = strtolower($search);
!       $search = addslashes($search);
        $search = addslashes($search);
        $query = "select pagename,content from $dbi[table] " .
--- 264,268 ----
        $search_counter = 0;
        $search = strtolower($search);
!       $search = preg_replace('/(?=[%_\\\\])/', "\\", $search);
        $search = addslashes($search);
        $query = "select pagename,content from $dbi[table] " .

Index: search.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/search.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** search.php	2001/01/02 00:10:28	1.3
--- search.php	2001/11/07 20:30:47	1.3.2.1
***************
*** 11,16 ****
  	   . "</B></P>\n";
  
!    // quote regexp chars
!    $search = preg_quote($search);
  
     // search matching pages
--- 11,16 ----
  	   . "</B></P>\n";
  
!    // quote regexp chars (backends should do this...) 
!    //$search = preg_quote($search);
  
     // search matching pages

Index: msql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/msql.php,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -C2 -r1.6.2.3 -r1.6.2.4
*** msql.php	2001/11/07 18:58:14	1.6.2.3
--- msql.php	2001/11/07 20:30:47	1.6.2.4
***************
*** 345,348 ****
--- 345,349 ----
     // setup for title-search
     function InitTitleSearch($dbi, $search) {
+       $search = preg_replace('/(?=[%_\\\\])/', "\\", $search);
        $search = addslashes($search);
        $query = "select pagename from $dbi[table] " .
***************
*** 369,372 ****
--- 370,374 ----
        // select unique page names from wikipages, and then 
        // retrieve all pages that come back.
+       $search = preg_replace('/(?=[%_\\\\])/', "\\", $search);
        $search = addslashes($search);
        $query = "select distinct pagename from $dbi[page_table] " .

Index: mssql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/mssql.php,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** mssql.php	2001/11/07 18:58:14	1.1.2.4
--- mssql.php	2001/11/07 20:30:47	1.1.2.5
***************
*** 248,252 ****
     function MakeSQLSearchClause($search, $column)
     {
!       $search = addslashes(preg_replace("/\s+/", " ", $search));
        $term = strtok($search, ' ');
        $clause = '';
--- 248,255 ----
     function MakeSQLSearchClause($search, $column)
     {
!       $search = preg_replace("/\s+/", " ", trim($search));
!       $search = preg_replace('/(?=[%_\\\\])/', "\\", $search);
!       $search = addslashes($search);
! 
        $term = strtok($search, ' ');
        $clause = '';

[phpwiki-checkins] CVS: phpwiki/lib pgsql.php,1.4.2.3,1.4.2.4 msql.php,1.6.2.2,1.6.2.3 mssql.php,1.1.2.3,1.1.2.4

[Geoffrey T. D. <da...@us...>]

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

Modified Files:
      Tag: release-1_2-branch
	pgsql.php msql.php mssql.php 
Log Message:
Fix SF bug #462168: hit count broken for pages with apostrophes in their names.

These fixes are untested, but they are entirely analogous to similar fixes
in mysql.php (which I have tested).  Barring typos on my part, I think
they're unlikely to cause problems.



Index: pgsql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/pgsql.php,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -r1.4.2.3 -r1.4.2.4
*** pgsql.php	2001/11/04 03:46:10	1.4.2.3
--- pgsql.php	2001/11/07 18:58:14	1.4.2.4
***************
*** 319,328 ****
     function IncreaseHitCount($dbi, $pagename) {
        global $HitCountPageStore;
!       $query = "update $HitCountPageStore set hits=hits+1 where pagename='$pagename'";
        $res = pg_exec($dbi['dbc'], $query);
  
        if (!pg_cmdtuples($res)) {
           $query = "insert into $HitCountPageStore (pagename, hits) " .
!                   "values ('$pagename', 1)";
  	 $res = pg_exec($dbi['dbc'], $query);
        }
--- 319,330 ----
     function IncreaseHitCount($dbi, $pagename) {
        global $HitCountPageStore;
! 
!       $qpagename = addslashes($pagename);
!       $query = "update $HitCountPageStore set hits=hits+1 where pagename='$qpagename'";
        $res = pg_exec($dbi['dbc'], $query);
  
        if (!pg_cmdtuples($res)) {
           $query = "insert into $HitCountPageStore (pagename, hits) " .
!                   "values ('$qpagename', 1)";
  	 $res = pg_exec($dbi['dbc'], $query);
        }
***************
*** 333,337 ****
     function GetHitCount($dbi, $pagename) {
        global $HitCountPageStore;
!       $query = "select hits from $HitCountPageStore where pagename='$pagename'";
        $res = pg_exec($dbi['dbc'], $query);
        if (pg_cmdtuples($res)) {
--- 335,340 ----
     function GetHitCount($dbi, $pagename) {
        global $HitCountPageStore;
!       $qpagename = addslashes($pagename);
!       $query = "select hits from $HitCountPageStore where pagename='$qpagename'";
        $res = pg_exec($dbi['dbc'], $query);
        if (pg_cmdtuples($res)) {

Index: msql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/msql.php,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -C2 -r1.6.2.2 -r1.6.2.3
*** msql.php	2001/11/04 03:46:10	1.6.2.2
--- msql.php	2001/11/07 18:58:14	1.6.2.3
***************
*** 455,469 ****
     function IncreaseHitCount($dbi, $pagename) {
  
!       $query = "select hits from hitcount where pagename='$pagename'";
        $res = msql_query($query, $dbi['dbc']);
        if (msql_num_rows($res)) {
           $hits = msql_result($res, 0, 'hits');
           $hits++;
!          $query = "update hitcount set hits=$hits where pagename='$pagename'";
           $res = msql_query($query, $dbi['dbc']);
  
        } else {
           $query = "insert into hitcount (pagename, hits) " .
!                   "values ('$pagename', 1)";
  	 $res = msql_query($query, $dbi['dbc']);
        }
--- 455,470 ----
     function IncreaseHitCount($dbi, $pagename) {
  
!       $qpagename = addslashes($pagename);
!       $query = "select hits from hitcount where pagename='$qpagename'";
        $res = msql_query($query, $dbi['dbc']);
        if (msql_num_rows($res)) {
           $hits = msql_result($res, 0, 'hits');
           $hits++;
!          $query = "update hitcount set hits=$hits where pagename='$qpagename'";
           $res = msql_query($query, $dbi['dbc']);
  
        } else {
           $query = "insert into hitcount (pagename, hits) " .
!                   "values ('$qpagename', 1)";
  	 $res = msql_query($query, $dbi['dbc']);
        }
***************
*** 474,478 ****
     function GetHitCount($dbi, $pagename) {
  
!       $query = "select hits from hitcount where pagename='$pagename'";
        $res = msql_query($query, $dbi['dbc']);
        if (msql_num_rows($res)) {
--- 475,480 ----
     function GetHitCount($dbi, $pagename) {
  
!       $qpagename = addslashes($pagename);
!       $query = "select hits from hitcount where pagename='$qpagename'";
        $res = msql_query($query, $dbi['dbc']);
        if (msql_num_rows($res)) {

Index: mssql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/mssql.php,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** mssql.php	2001/11/04 03:43:36	1.1.2.3
--- mssql.php	2001/11/07 18:58:14	1.1.2.4
***************
*** 218,230 ****
        global $HitCountStore;
  
        $rowexists = 0;
!       if ($res = mssql_query("select count(*) from $dbi[table] where pagename='$pagename'", $dbi['dbc'])) {
           $rowexists = (mssql_result($res, 0, 0));
        }
  
        if ($rowexists)
!          $res = mssql_query("update $HitCountStore set hits=hits+1 where pagename='$pagename'", $dbi['dbc']);
        else
! 	     $res = mssql_query("insert into $HitCountStore (pagename, hits) values ('$pagename', 1)", $dbi['dbc']);
  
        return $res;
--- 218,231 ----
        global $HitCountStore;
  
+       $qpagename = addslashes($pagename);
        $rowexists = 0;
!       if ($res = mssql_query("select count(*) from $dbi[table] where pagename='$qpagename'", $dbi['dbc'])) {
           $rowexists = (mssql_result($res, 0, 0));
        }
  
        if ($rowexists)
!          $res = mssql_query("update $HitCountStore set hits=hits+1 where pagename='$qpagename'", $dbi['dbc']);
        else
! 	     $res = mssql_query("insert into $HitCountStore (pagename, hits) values ('$qpagename', 1)", $dbi['dbc']);
  
        return $res;
***************
*** 235,239 ****
        global $HitCountStore;
  
!       $res = mssql_query("select hits from $HitCountStore where pagename='$pagename'", $dbi['dbc']);
        if (mssql_num_rows($res))
           $hits = mssql_result($res, 0, 0);
--- 236,241 ----
        global $HitCountStore;
  
!       $qpagename = addslashes($pagename);
!       $res = mssql_query("select hits from $HitCountStore where pagename='$qpagename'", $dbi['dbc']);
        if (mssql_num_rows($res))
           $hits = mssql_result($res, 0, 0);

[phpwiki-checkins] CVS: phpwiki/lib mysql.php,1.10.2.2,1.10.2.3

[Geoffrey T. D. <da...@us...>]

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

Modified Files:
      Tag: release-1_2-branch
	mysql.php 
Log Message:
Fix SF bug #462168: hit count broken for pages with apostrophes in their names.



Index: mysql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/mysql.php,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -C2 -r1.10.2.2 -r1.10.2.3
*** mysql.php	2001/08/18 03:57:27	1.10.2.2
--- mysql.php	2001/11/07 18:54:07	1.10.2.3
***************
*** 186,193 ****
        global $HitCountStore;
  
!       $res = mysql_query("update $HitCountStore set hits=hits+1 where pagename='$pagename'", $dbi['dbc']);
  
        if (!mysql_affected_rows($dbi['dbc'])) {
! 	 $res = mysql_query("insert into $HitCountStore (pagename, hits) values ('$pagename', 1)", $dbi['dbc']);
        }
  
--- 186,198 ----
        global $HitCountStore;
  
!       $qpagename = addslashes($pagename);
!       $res = mysql_query("update $HitCountStore set hits=hits+1"
!                          . " where pagename='$qpagename'",
!                          $dbi['dbc']);
  
        if (!mysql_affected_rows($dbi['dbc'])) {
! 	 $res = mysql_query("insert into $HitCountStore (pagename, hits)"
!                             . " values ('$qpagename', 1)",
!                             $dbi['dbc']);
        }
  
***************
*** 199,203 ****
        global $HitCountStore;
  
!       $res = mysql_query("select hits from $HitCountStore where pagename='$pagename'", $dbi['dbc']);
        if (mysql_num_rows($res))
           $hits = mysql_result($res, 0);
--- 204,211 ----
        global $HitCountStore;
  
!       $qpagename = addslashes($pagename);
!       $res = mysql_query("select hits from $HitCountStore"
!                          . " where pagename='$qpagename'",
!                          $dbi['dbc']);
        if (mysql_num_rows($res))
           $hits = mysql_result($res, 0);

[phpwiki-checkins] CVS: phpwiki/lib savepage.php,1.7.2.2,1.7.2.3

[Geoffrey T. D. <da...@us...>]

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

Modified Files:
      Tag: release-1_2-branch
	savepage.php 
Log Message:
Fix yet another magic_quote_gpc bug.


Index: savepage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/savepage.php,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -C2 -r1.7.2.2 -r1.7.2.3
*** savepage.php	2001/09/21 19:59:13	1.7.2.2
--- savepage.php	2001/11/07 18:52:14	1.7.2.3
***************
*** 118,122 ****
  
  
! 
     $pagename = rawurldecode($post);
     $pagehash = RetrievePage($dbi, $pagename, $WikiPageStore);
--- 118,124 ----
  
  
!    if (get_magic_quotes_gpc()) {
!       $post = stripslashes($post);
!    }
     $pagename = rawurldecode($post);
     $pagehash = RetrievePage($dbi, $pagename, $WikiPageStore);

[phpwiki-checkins] CVS: phpwiki/lib dbalib.php,1.2.2.2,1.2.2.3

[Steve W. <wai...@us...>]

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

Modified Files:
      Tag: release-1_2-branch
	dbalib.php 
Log Message:
Added a new constant, DBM_FILE_TYPE, defaulting to 'gdbm'. It's
defined in config.php and used in dbalib.php. INSTALL now notes the
setting of this constant, and how a blank page can occur the first
time the user tries to view PhpWiki.


Index: dbalib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/dbalib.php,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -r1.2.2.2 -r1.2.2.3
*** dbalib.php	2001/11/06 20:43:11	1.2.2.2
--- dbalib.php	2001/11/07 03:23:24	1.2.2.3
***************
*** 40,44 ****
        reset($WikiDB);
        while (list($key, $file) = each($WikiDB)) {
!          while (($dbi[$key] = @dba_open($file, "c", "gdbm")) < 1) {
              $numattempts++;
              if ($numattempts > MAX_DBM_ATTEMPTS) {
--- 40,44 ----
        reset($WikiDB);
        while (list($key, $file) = each($WikiDB)) {
!          while (($dbi[$key] = @dba_open($file, "c", DBM_FILE_TYPE)) < 1) {
              $numattempts++;
              if ($numattempts > MAX_DBM_ATTEMPTS) {

[phpwiki-checkins] CVS: phpwiki/lib config.php,1.24.2.3,1.24.2.4

[Steve W. <wai...@us...>]

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

Modified Files:
      Tag: release-1_2-branch
	config.php 
Log Message:
Added a new constant, DBM_FILE_TYPE, defaulting to 'gdbm'. It's
defined in config.php and used in dbalib.php. INSTALL now notes the
setting of this constant, and how a blank page can occur the first
time the user tries to view PhpWiki.


Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.24.2.3
retrieving revision 1.24.2.4
diff -C2 -r1.24.2.3 -r1.24.2.4
*** config.php	2001/11/02 05:11:16	1.24.2.3
--- config.php	2001/11/07 03:23:20	1.24.2.4
***************
*** 58,61 ****
--- 58,68 ----
        $WikiDB['hottopics'] = "$DBMdir/wikihottopicsdb";
        $WikiDB['hitcount']  = "$DBMdir/wikihitcountdb";
+ 
+       // this is the type of DBM file on your system. For most Linuxen
+       // 'gdbm' is fine; 'db2' is another common type. 'ndbm' appears
+       // on Solaris but won't work because it won't store pages larger
+       // than 1000 bytes.
+       define("DBM_FILE_TYPE", 'gdbm');
+ 
        // try this many times if the dbm is unavailable
        define("MAX_DBM_ATTEMPTS", 20);

[phpwiki-checkins] CVS: phpwiki INSTALL,1.8,1.8.2.1

[Steve W. <wai...@us...>]

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

Modified Files:
      Tag: release-1_2-branch
	INSTALL 
Log Message:
Added a new constant, DBM_FILE_TYPE, defaulting to 'gdbm'. It's
defined in config.php and used in dbalib.php. INSTALL now notes the
setting of this constant, and how a blank page can occur the first
time the user tries to view PhpWiki.


Index: INSTALL
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/INSTALL,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -r1.8 -r1.8.2.1
*** INSTALL	2001/02/01 02:50:51	1.8
--- INSTALL	2001/11/07 03:23:16	1.8.2.1
***************
*** 25,28 ****
--- 25,31 ----
  http://www.foo.com/phpwiki/
  
+ If you get a blank page, PhpWiki tried to open the wrong DBM file
+ type, most likely. Edit the file lib/config.php and set DBM_FILE_TYPE
+ to the correct type for your system. 'gdbm' or 'db2' usually work.
  
  1. CONFIGURATION

[phpwiki-checkins] CVS: phpwiki/lib db_filesystem.php,1.4.2.4,1.4.2.5

[Geoffrey T. D. <da...@us...>]

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

Modified Files:
      Tag: release-1_2-branch
	db_filesystem.php 
Log Message:
Fix encoding of page names '.' and '..'.
Ensure RetrievePage() sets $pagehash[pagename].


Index: db_filesystem.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/db_filesystem.php,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -C2 -r1.4.2.4 -r1.4.2.5
*** db_filesystem.php	2001/08/18 05:09:09	1.4.2.4
--- db_filesystem.php	2001/11/06 20:43:45	1.4.2.5
***************
*** 47,55 ****
     // urldecode.
     function EncodePagename($pagename) {
!      $bad_chars = '%/\\:'; // '%' must be first!
        for ($i = 0; $i < strlen($bad_chars); $i++) {
  	 $pagename = str_replace($bad_chars[$i],
  	                         rawurlencode($bad_chars[$i]), $pagename);
        }
        return $pagename;
     }
--- 47,61 ----
     // urldecode.
     function EncodePagename($pagename) {
!       if ($pagename == '.')
!         return '%2e';
!       else if ($pagename == '..')
!         return '%2e.';
!       
!       $bad_chars = '%/\\:'; // '%' must be first!
        for ($i = 0; $i < strlen($bad_chars); $i++) {
  	 $pagename = str_replace($bad_chars[$i],
  	                         rawurlencode($bad_chars[$i]), $pagename);
        }
+         
        return $pagename;
     }
***************
*** 66,69 ****
--- 72,76 ----
              // unserialize $data into a hash
              $pagehash = unserialize($data);
+             $pagehash['pagename'] = $pagename;
  	    if (!is_array($pagehash))
  		ExitWiki(sprintf(gettext("'%s': corrupt file"),

[phpwiki-checkins] CVS: phpwiki/lib dbalib.php,1.2.2.1,1.2.2.2 dbmlib.php,1.7.2.1,1.7.2.2

[Geoffrey T. D. <da...@us...>]

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

Modified Files:
      Tag: release-1_2-branch
	dbalib.php dbmlib.php 
Log Message:
Ensure RetrievePage() sets $pagehash[pagename].


Index: dbalib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/dbalib.php,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** dbalib.php	2001/08/18 00:35:10	1.2.2.1
--- dbalib.php	2001/11/06 20:43:11	1.2.2.2
***************
*** 86,89 ****
--- 86,90 ----
           // unserialize $data into a hash
           $pagehash = unserialize(UnPadSerializedData($data));
+          $pagehash['pagename'] = $pagename;
           return $pagehash;
        } else {

Index: dbmlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/dbmlib.php,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -C2 -r1.7.2.1 -r1.7.2.2
*** dbmlib.php	2001/08/18 00:35:10	1.7.2.1
--- dbmlib.php	2001/11/06 20:43:11	1.7.2.2
***************
*** 82,85 ****
--- 82,86 ----
           // unserialize $data into a hash
           $pagehash = unserialize(UnPadSerializedData($data));
+          $pagehash['pagename'] = $pagename;
           return $pagehash;
        } else {

[phpwiki-checkins] CVS: phpwiki/lib display.php,1.5.2.1,1.5.2.2

[Geoffrey T. D. <da...@us...>]

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

Modified Files:
      Tag: release-1_2-branch
	display.php 
Log Message:
Fix handling of pages with '.' and/or '_' in their names.


Index: display.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/display.php,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -r1.5.2.1 -r1.5.2.2
*** display.php	2001/02/08 18:28:31	1.5.2.1
--- display.php	2001/11/06 20:41:56	1.5.2.2
***************
*** 10,14 ****
        $QUERY_STRING = $argv[0];
    
!    if (isset($QUERY_STRING) && preg_match('/^[-+%\w]+$/', $QUERY_STRING)) {
        $pagename = urldecode($QUERY_STRING);
     } else { 
--- 10,14 ----
        $QUERY_STRING = $argv[0];
    
!    if (isset($QUERY_STRING) && preg_match('/^[-_.+%\w]+$/', $QUERY_STRING)) {
        $pagename = urldecode($QUERY_STRING);
     } else { 

[phpwiki-checkins] CVS: phpwiki/admin zip.php,1.1.2.1,1.1.2.2 dumpserial.php,1.1.2.1,1.1.2.2

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/admin
In directory usw-pr-cvs1:/tmp/cvs-serv27829/admin

Modified Files:
      Tag: release-1_2-branch
	zip.php dumpserial.php 
Log Message:
Fix SF bug #478449: (encoding of page names like '..')


Index: zip.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/admin/Attic/zip.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** zip.php	2001/02/08 18:28:31	1.1.2.1
--- zip.php	2001/11/06 20:41:24	1.1.2.2
***************
*** 1,4 ****
--- 1,11 ----
  <?php // $Id$
  
+ function encode_pagename_for_wikizip ($pagename) {
+   $enc = rawurlencode($pagename);
+   // URL encode leading dot:
+   $enc = preg_replace('/^\./', '%2e', $enc);
+   return $enc;
+ }
+ 
  function MailifyPage ($pagehash, $oldpagehash = false)
  {
***************
*** 8,12 ****
    
    $head = "From $from  " . ctime(time()) . "\r\n";
!   $head .= "Subject: " . rawurlencode($pagehash['pagename']) . "\r\n";
    $head .= "From: $from (PhpWiki)\r\n";
    $head .= "Date: " . rfc1123date($pagehash['lastmodified']) . "\r\n";
--- 15,19 ----
    
    $head = "From $from  " . ctime(time()) . "\r\n";
!   $head .= "Subject: " . encode_pagename_for_wikizip($pagehash['pagename']) . "\r\n";
    $head .= "From: $from (PhpWiki)\r\n";
    $head .= "Date: " . rfc1123date($pagehash['lastmodified']) . "\r\n";
***************
*** 44,47 ****
--- 51,55 ----
    for (reset($pages); $pagename = current($pages); next($pages))
    {
+       
       set_time_limit(30);	// Reset watchdog.
       $pagehash = RetrievePage($dbi, $pagename, $WikiPageStore);
***************
*** 62,70 ****
       $content = MailifyPage($pagehash, $oldpagehash);
  		     
!      $zip->addRegularFile( rawurlencode($pagehash['pagename']),
  			   $content, $attrib);
    }
    $zip->finish();
  }
  
  if(defined('WIKI_ADMIN'))
--- 70,79 ----
       $content = MailifyPage($pagehash, $oldpagehash);
  		     
!      $zip->addRegularFile( encode_pagename_for_wikizip($pagehash['pagename']),
  			   $content, $attrib);
    }
    $zip->finish();
  }
+ 
  
  if(defined('WIKI_ADMIN'))

Index: dumpserial.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/admin/Attic/dumpserial.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** dumpserial.php	2001/02/14 06:32:19	1.1.2.1
--- dumpserial.php	2001/11/06 20:41:24	1.1.2.2
***************
*** 25,29 ****
     for ($x = 0; $x < $numpages; $x++) {
        $pagename = htmlspecialchars($pages[$x]);
!       $filename = rawurlencode($pages[$x]);
        $html .= "<br>$pagename ... ";
        if($pagename != $filename)
--- 25,29 ----
     for ($x = 0; $x < $numpages; $x++) {
        $pagename = htmlspecialchars($pages[$x]);
!       $filename = preg_replace('/^\./', '%2e', rawurlencode($pages[$x]));
        $html .= "<br>$pagename ... ";
        if($pagename != $filename)

[phpwiki-checkins] CVS: phpwiki/lib ErrorManager.php,1.1,1.2

[Geoffrey T. D. <da...@us...>]

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

Modified Files:
	ErrorManager.php 
Log Message:
Fix typo.


Index: ErrorManager.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/ErrorManager.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ErrorManager.php	2001/09/18 19:16:23	1.1
--- ErrorManager.php	2001/11/06 17:13:22	1.2
***************
*** 324,328 ****
          $errstr = htmlspecialchars(array_shift($lines));
          foreach ($lines as $key => $line)
!             $lines[$key] = "<li>" . htmlspecialchars($line) . "<\li>";
          if ($lines)
              $errstr .= "<ul>\n" . join("\n", $lines) . "\n</ul>";
--- 324,328 ----
          $errstr = htmlspecialchars(array_shift($lines));
          foreach ($lines as $key => $line)
!             $lines[$key] = "<li>" . htmlspecialchars($line) . "</li>";
          if ($lines)
              $errstr .= "<ul>\n" . join("\n", $lines) . "\n</ul>";

[phpwiki-checkins] CVS: phpwiki/lib pgsql.php,1.4.2.2,1.4.2.3 msql.php,1.6.2.1,1.6.2.2

[Geoffrey T. D. <da...@us...>]

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

Modified Files:
      Tag: release-1_2-branch
	pgsql.php msql.php 
Log Message:
Fix bug reported by Roger Goun <ro...@bc...>:
Wrap RCS $Id$ in call to rcs_id().  (In some cases (admin.php) we must
not emit any output until we've set some HTTP headers.)


Index: pgsql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/pgsql.php,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -r1.4.2.2 -r1.4.2.3
*** pgsql.php	2001/09/21 21:57:07	1.4.2.2
--- pgsql.php	2001/11/04 03:46:10	1.4.2.3
***************
*** 1,4 ****
! <!-- $Id$ -->
! <?php
  
     /*
--- 1,3 ----
! <?php rcs_id('$Id$');
  
     /*

Index: msql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/msql.php,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -r1.6.2.1 -r1.6.2.2
*** msql.php	2001/08/18 00:34:27	1.6.2.1
--- msql.php	2001/11/04 03:46:10	1.6.2.2
***************
*** 1,4 ****
! <!-- $Id$ -->
! <?php
  
     /*
--- 1,3 ----
! <?php rcs_id('$Id$');
  
     /*