[phpwiki-checkins] CVS: phpwiki HISTORY,1.15,1.16 index.php,1.7,1.8

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

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

Modified Files:
	HISTORY index.php 
Log Message:
log

Index: HISTORY
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/HISTORY,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** HISTORY	2001/02/12 01:43:09	1.15
--- HISTORY	2001/02/13 05:54:37	1.16
***************
*** 1,4 ****
--- 1,21 ----
  02/11/01 Jeff's hacks continue:
  
+ * User preferences can be stored in a cookie.  Currently the only user preference
+   is the size of the textarea on the edit page.  See the UserPreferences wiki page.
+ 
+ * When a zip/file is uploaded, set the author to the user who does the upload
+   (ie. the administrator).  Also enter the upload in RecentChanges.
+ * Don't load RecentChanges from zip or dir.  Only from file.
+ 
+ * Clean up error reporting.  Warning messages screw up header() and setcookie()
+   operations, and also corrupt the zip dumps.  New function
+   PostponeErrorMessages() allows one to postpone the reporting of selected warnings.
+ 
+ * Beginnings of CSS support.  Still in the ugly stage.
+ 
+ * More bug fixes.
+ 
+ 02/11/01 Jeff's hacks continue:
+ 
  * Moved user configuration stuff into index.php.  What was index.php is
    now in lib/main.php.

Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** index.php	2001/02/12 01:43:09	1.7
--- index.php	2001/02/13 05:54:38	1.8
***************
*** 1,8 ****
  <?php
  define ('PHPWIKI_VERSION', '1.3.0pre');
! error_reporting(E_ALL /* ^ E_NOTICE */);
! 
! $RCS_IDS = array("SCRIPT_NAME='$SCRIPT_NAME'",
! 		 '$Id$');
  
  /////////////////////////////////////////////////////////////////////
--- 1,9 ----
  <?php
+ /////////////////////////////////////////////////////////////////////
+ // Part Zero: Don't touch this!
+ /////////////////////////////////////////////////////////////////////
  define ('PHPWIKI_VERSION', '1.3.0pre');
! require "lib/prepend.php";
! rcs_id('$Id$');
  
  /////////////////////////////////////////////////////////////////////
***************
*** 41,54 ****
  /////////////////////////////////////////////////////////////////////
  
- // Pick one of 'dbm', 'dba', 'mysql', 'pgsql', 'msql', or 'file'.
- // (Or leaven DBTYPE undefined for default behavior (which is 'dba'
- // if supported, else 'dbm').
- 
- //define("DBTYPE", 'mysql');
- 
- // 'dbm' and 'dba create files named "$directory/${database}{$prefix}*".
- // 'file' creates files named "$directory/${database}/{$prefix}*/*".
- // The sql types use tables named "{$prefix}*"
- 
  //
  // This array holds the parameters which select the database to use.
--- 42,45 ----
***************
*** 57,60 ****
--- 48,61 ----
  //
  $DBParams = array(
+    // Select the database type:
+    // Uncomment one of these, or leave all commented for the default
+    // data base type ('dba' if supported, else 'dbm'.)
+    //'dbtype' => 'dba',
+    //'dbtype' => 'dbm',
+    //'dbtype' => 'mysql',
+    //'dbtype' => 'pgsql',
+    //'dbtype' => 'msql',
+    //'dbtype' => 'file',
+    
     // Used by all DB types:
     'database' => 'wiki',
***************
*** 64,67 ****
--- 65,72 ----
     'directory' => "/tmp",
  
+    // 'dbm' and 'dba create files named "$directory/${database}{$prefix}*".
+    // 'file' creates files named "$directory/${database}/{$prefix}*/*".
+    // The sql types use tables named "{$prefix}*"
+    
     // Used by 'dbm', 'dba'
     'timeout' => 20,
***************
*** 187,192 ****
   * PhpWiki resides.
   */
! //define('PHPWIKI_SERVER_NAME', 'some.host.com');
! //define('PHPWIKI_SERVER_PORT', 80);
  
  /*
--- 192,197 ----
   * PhpWiki resides.
   */
! //define('SERVER_NAME', 'some.host.com');
! //define('SERVER_PORT', 80);
  
  /*
***************
*** 194,198 ****
   * script.
   */
! //define('PHPWIKI_SCRIPT_NAME', '/some/where/index.php');
  
  /*
--- 199,203 ----
   * script.
   */
! //define('SCRIPT_NAME', '/some/where/index.php');
  
  /*
***************
*** 201,205 ****
   * are interpreted.
   */
! //define('PHPWIKI_DATA_PATH', '/some/where');
  
  /*
--- 206,210 ----
   * are interpreted.
   */
! //define('DATA_PATH', '/some/where');
  
  /*
***************
*** 212,219 ****
  
  /*
!  * FIXME: add docs
!  * (Only used if USE_PATH_INFO is true.)
   */
! //define('PHPWIKI_VIRTUAL_PATH', '/SomeWiki');
  
  
--- 217,243 ----
  
  /*
!  * VIRTUAL_PATH is the canonical URL path under which your
!  * your wiki appears.  Normally this is the same as
!  * dirname(SCRIPT_NAME), however using, e.g. apaches mod_actions
!  * (or mod_rewrite), you can make it something different.
!  *
!  * If you do this, you should set VIRTUAL_PATH here.
!  *
!  * E.g. your phpwiki might be installed at at /scripts/phpwiki/index.php,
!  * but  * you've made it accessible through eg. /wiki/FrontPage.
!  *
!  * One way to do this is to create a directory named 'wiki' in your
!  * server root.  The directory contains only one file: an .htaccess
!  * file which reads something like:
!  *
!  *    Action x-phpwiki-page /scripts/phpwiki/index.php
!  *    SetHandler x-phpwiki-page
!  *    DirectoryIndex /scripts/phpwiki/index.php
!  *
!  * In that case you should set VIRTUAL_PATH to '/wiki'.
!  *
!  * (VIRTUAL_PATH is only used if USE_PATH_INFO is true.)
   */
! //define('VIRTUAL_PATH', '/SomeWiki');