[phpwiki-checkins] CVS: phpwiki/pgsrc PhpWikiAdministration,1.5,1.6

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

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

Modified Files:
	PhpWikiAdministration 
Log Message:
log

Index: PhpWikiAdministration
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/PhpWikiAdministration,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** PhpWikiAdministration	2001/02/10 22:41:29	1.5
--- PhpWikiAdministration	2001/02/12 01:43:10	1.6
***************
*** 1,3 ****
! __Note__: The actions on this page require administrative privileges.
  They won't work unless you have set an admin username and password in the PhpWiki config file.
  
--- 1,13 ----
! From hos...@da...  Sat Feb 10 21:28:19 2001
! Subject: PhpWikiAdministration
! From: hos...@da... (PhpWiki)
! Date: Sat, 10 Feb 2001 20:11:14 -0800
! Mime-Version: 1.0 (Produced by PhpWiki 1.1.x)
! Content-Type: application/x-phpwiki;
!   pagename=PhpWikiAdministration;
!   flags=PAGE_LOCKED
! Content-Transfer-Encoding: binary
! 
! __Note__: Most of the actions on this page require administrative privileges.
  They won't work unless you have set an admin username and password in the PhpWiki config file.
  
***************
*** 13,51 ****
  ----------
  
! ! ZIP files of database
  
!  __[ZIP Snapshot | phpwiki:?action=zip]__ : contains only the latest versions
  
!  __[ZIP Dump | phpwiki:?action=zip&include=all]__ : contains all archived versions
  
! These links lead to zip files, generated on the fly, which contain the most
! recent versions of all pages in the PhpWiki. The pages are stored, one per
! file, as MIME (RFC2045) e-mail (RFC822) messages, with the content type
! application/x-phpwiki for the snapshot and content type multipart/mixed for
! the dump. In the latter case, there is one subpart (with type
! application/x-phpwiki) for each version of the
! page (in chronological order). The message body contains the page text,
! while the page meta-data is included as parameters in the
! Content-Type: header field.
  
! -----------
  
! ! Load / Dump Serialized Pages
  
! Here you can load or dump pages of your Wiki into a directory of your
! choice.
  
! __Dump__
  
! [ Dump Serialized Pages | phpwiki:?action=dumpserial&directory=(/tmp/wikidump) ]
  
! Pages will be written out as "serialized" strings of a PHP
! associative array, meaning they will not be human readable. If
! the directory does not exist PhpWiki will try to create one for you.
! Ensure that your server has write permissions to the directory!
  
! __Load__
  
! [ Load Serialized Pages | phpwiki:?action=loadserial&directory=(/tmp/wikidump) ]
  
  If you have dumped a set of pages from PhpWiki, you can reload them here.
--- 23,55 ----
  ----------
  
! !! Making Snapshots or Backups
  
! ! ZIP files of database
  
! These links lead to zip files, generated on the fly, which contain all
! the  pages in your Wiki.  The zip file will be downloaded to your local computer.
  
! This __[ZIP Snapshot | phpwiki:?action=zip]__ contains only the latest versions
! of each page, while this __[ZIP Dump | phpwiki:?action=zip&include=all]__ contains all
! archived versions.
  
! (If the PhpWiki is configured to allow it,) anyone can download a zip file.
  
! If your php has ''zlib'' support, the files in the archive will be compressed,
! otherwise they will just be stored.
  
! ! Dump to directory
  
! Here you can dump pages of your Wiki into a directory of your choice.
  
! [ Dump Pages | phpwiki:?action=dumpserial&directory=(/tmp/wikidump) ]
  
! The most recent version of each page will written out to the
! directory, one page per file.
! Your server must have write permissions to the directory!
  
! -----------
  
! !! Restoring
  
  If you have dumped a set of pages from PhpWiki, you can reload them here.
***************
*** 53,57 ****
  your FrontPage when you load it from this form it will overwrite the one
  in your database now. If you want to be selective just delete
! the pages from the directory you don't want to load.
  
  -----------
--- 57,107 ----
  your FrontPage when you load it from this form it will overwrite the one
  in your database now. If you want to be selective just delete
! the pages from the directory (or zip file) which you don't want to load.
! 
! ! Upload File
! 
! Here you can upload ZIP archives, or individual files from
! your (client) machine.
  
+ [ Upload | phpwiki:?action=upload&file=()upload ]
+ 
+ ! Load File
+ 
+ Here you can load ZIP archives, individual files or entire directories.
+ The file or directory must be local to the http server.
+ You can also use this form to load from an http: or ftp: URL.
+ 
+ [ Load | phpwiki:?action=loadfile&source=(/tmp/wikidump) ]
+ 
  -----------
+ 
+ !! Format of the files
+ 
+ Currently the pages are stored, one per
+ file, as MIME ([ RFC2045 | http://www.faqs.org/rfcs/rfc2045.html ]) e-mail 
+ ([ RFC822 | http://www.faqs.org/rfcs/rfc822.html ]) messages.
+ The content-type ''application/x-phpwiki'' is used, and page meta-data
+ is encoded in the content-type parameters.
+ (If the file contains several versions of a page, it will have
+ type ''multipart/mixed'', and contain several sub-parts, each
+ with type ''application/x-phpwiki''.)
+ The message body contains the page text.
+ 
+ ! Old Formats
+ 
+ __Serialized Files__
+ 
+ The dump to directory command used to dump the pages as
+ php ''serialized()'' strings.  For humans, this made the files very hard
+ to read, and nearly impossible to edit.
+ 
+ __Plain Files__
+ 
+ Before that the page text was just dumped to a file --- this means
+ that all page meta-data was lost.
+ 
+ The upload and load functions will automatically recognize each of these
+ three types of files, and handle them accordingly.
+ Note that when loading ''plain files'', the page name is deduced from the
+ file name.
+