[phpwiki-checkins] CVS: phpwiki index.php,1.9,1.10

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

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

Modified Files:
	index.php 
Log Message:
Various minor bug fixes and cleanups.

Also added the following new minor featurelets:
  Comments in index.php indicating how to set the PHP include_path if
  necessary.

  New config variable $DisabledActions --- one can list actions (eg. 
  dumpserial) which should not be allowed, even by the administrator.


Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** index.php	2001/02/14 05:22:49	1.9
--- index.php	2001/02/14 22:02:05	1.10
***************
*** 1,6 ****
  <?php
  /////////////////////////////////////////////////////////////////////
! // Part Zero: Don't touch this!
  /////////////////////////////////////////////////////////////////////
  define ('PHPWIKI_VERSION', '1.3.0pre');
  require "lib/prepend.php";
--- 1,13 ----
  <?php
  /////////////////////////////////////////////////////////////////////
! // Part Zero: If PHP needs help in finding where you installed the
! //   rest of the PhpWiki code, you can set the include_path here.
  /////////////////////////////////////////////////////////////////////
+ 
+ //ini_set('include_path', '.:/where/you/installed/phpwiki');
+ 
+ /////////////////////////////////////////////////////////////////////
+ // Part Null: Don't touch this!
+ /////////////////////////////////////////////////////////////////////
  define ('PHPWIKI_VERSION', '1.3.0pre');
  require "lib/prepend.php";
***************
*** 35,38 ****
--- 42,48 ----
  define("MINOR_EDIT_TIMEOUT", 7 * 24 * 3600);
  
+ // Actions listed in this array will not be allowed.
+ //$DisabledActions = array('dumpserial', 'loadfile');
+ 
  /////////////////////////////////////////////////////////////////////
  //
***************
*** 121,128 ****
  define("NUM_RELATED_PAGES", 5);
  
- // This path is searched when trying to read WIKI_PGSRC
- // or template files.
- $DataPath = array(".", "locale/$LANG");
- 
  // Template files (filenames are relative to script position)
  // (These filenames will be passed through gettext() before use.)
--- 131,134 ----
***************
*** 130,134 ****
  		   "EDITPAGE" =>  "templates/editpage.html",
  		   "MESSAGE" =>   "templates/message.html");
- 
  
  /* WIKI_PGSRC -- specifies the source for the initial page contents
--- 136,139 ----