phpwiki-checkins

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

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

Modified Files:
	index.php 
Log Message:
Changed errant # comments to //; also disabled logging, since this was
causing me problems since my 4.0.6 runs as user 'apache' and my 4.1
runs as user 'nobody'.


Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -r1.51 -r1.52
*** index.php	2002/01/03 22:55:56	1.51
--- index.php	2002/01/03 23:04:19	1.52
***************
*** 57,61 ****
  //   lib/FileFinder.php:82: Fatal[256]: DB.php: file not found
  //
! #ini_set('include_path', '.:/where/you/installed/phpwiki');
  
  /////////////////////////////////////////////////////////////////////
--- 57,61 ----
  //   lib/FileFinder.php:82: Fatal[256]: DB.php: file not found
  //
! //ini_set('include_path', '.:/where/you/installed/phpwiki');
  
  /////////////////////////////////////////////////////////////////////
***************
*** 104,108 ****
  // PhpWiki can generate an access_log (in "NCSA combined log" format)
  // for you.  If you want one, define this to the name of the log file.
! define('ACCESS_LOG', '/tmp/wiki_access_log');
  
  
--- 104,108 ----
  // PhpWiki can generate an access_log (in "NCSA combined log" format)
  // for you.  If you want one, define this to the name of the log file.
! //define('ACCESS_LOG', '/tmp/wiki_access_log');
  
  
***************
*** 121,125 ****
  // in this directory):
  
! #ini_set('session.save_path', 'some_other_directory');
  
  
--- 121,125 ----
  // in this directory):
  
! //ini_set('session.save_path', 'some_other_directory');
  
  
***************
*** 138,142 ****
  $DBParams = array(
     // Select the database type:
!    #'dbtype' => 'SQL',
     'dbtype' => 'dba',
     
--- 138,142 ----
  $DBParams = array(
     // Select the database type:
!    //'dbtype' => 'SQL',
     'dbtype' => 'dba',
     
***************
*** 152,158 ****
     // FIXME: My version Pear::DB seems to be broken enough that there is
     //    no way to connect to a mysql server over a socket right now.
!    #'dsn' => 'mysql://guest@:/var/lib/mysql/mysql.sock/test',
!    #'dsn' => 'mysql://guest@localhost/test',
!    'dsn' => 'pgsql://localhost/test',
     
     // Used by all DB types:
--- 152,158 ----
     // FIXME: My version Pear::DB seems to be broken enough that there is
     //    no way to connect to a mysql server over a socket right now.
!    //'dsn' => 'mysql://guest@:/var/lib/mysql/mysql.sock/test',
!    //'dsn' => 'mysql://guest@localhost/test',
!    //'dsn' => 'pgsql://localhost/test',
     
     // Used by all DB types:
***************
*** 164,176 ****
      * installation.
     */
!    #'prefix' => 'phpwiki_',
     
     // Used by 'dba'
     'directory' => "/tmp",
     'dba_handler' => 'gdbm',   // Either of 'gdbm' or 'db2' work great for me.
!    #'dba_handler' => 'db2',
!    #'dba_handler' => 'db3',    // doesn't work at all for me....
     'timeout' => 20,
!    #'timeout' => 5
  );
  
--- 164,176 ----
      * installation.
     */
!    //'prefix' => 'phpwiki_',
     
     // Used by 'dba'
     'directory' => "/tmp",
     'dba_handler' => 'gdbm',   // Either of 'gdbm' or 'db2' work great for me.
!    //'dba_handler' => 'db2',
!    //'dba_handler' => 'db3',    // doesn't work at all for me....
     'timeout' => 20,
!    //'timeout' => 5
  );
  
***************
*** 279,283 ****
  // 'nl_NL'.
  $LANG='C';
! #$LANG='nl_NL';
  
  // Setting the LANG environment variable (accomplished above) may or
--- 279,283 ----
  // 'nl_NL'.
  $LANG='C';
! //$LANG='nl_NL';
  
  // Setting the LANG environment variable (accomplished above) may or
***************
*** 323,327 ****
  // Signature image which is shown after saving an edited page
  // If this is left blank (or unset), the signature will be omitted.
! #$SignatureImg = "images/signature.png";
  
  // this turns on url indicator icons, inserted before embedded links
--- 323,327 ----
  // Signature image which is shown after saving an edited page
  // If this is left blank (or unset), the signature will be omitted.
! //$SignatureImg = "images/signature.png";
  
  // this turns on url indicator icons, inserted before embedded links
***************
*** 367,374 ****
  // comment out the $theme= lines to revert to the standard interface
  // which defaults to /templates and /images
! #$theme="default";
! #$theme="Hawaiian";
! #$theme="MacOSX";
! #$theme="WikiTrek";
  if (!empty($theme)) {
      if (file_exists("themes/$theme/themeinfo.php")) {
--- 367,374 ----
  // comment out the $theme= lines to revert to the standard interface
  // which defaults to /templates and /images
! //$theme="default";
! //$theme="Hawaiian";
! //$theme="MacOSX";
! //$theme="WikiTrek";
  if (!empty($theme)) {
      if (file_exists("themes/$theme/themeinfo.php")) {
***************
*** 418,422 ****
  // Uncomment this to automatically split WikiWords by inserting spaces.
  // The default is to leave WordsSmashedTogetherLikeSo in the body text.
! #define("autosplit_wikiwords", 1);
  
  // Perl regexp for WikiNames ("bumpy words")
--- 418,422 ----
  // Uncomment this to automatically split WikiWords by inserting spaces.
  // The default is to leave WordsSmashedTogetherLikeSo in the body text.
! //define("autosplit_wikiwords", 1);
  
  // Perl regexp for WikiNames ("bumpy words")
***************
*** 454,459 ****
   * PhpWiki resides.
   */
! #define('SERVER_NAME', 'some.host.com');
! #define('SERVER_PORT', 80);
  
  /*
--- 454,459 ----
   * PhpWiki resides.
   */
! //define('SERVER_NAME', 'some.host.com');
! //define('SERVER_PORT', 80);
  
  /*
***************
*** 471,475 ****
   * are interpreted.
   */
! #define('DATA_PATH', '/some/where');
  
  /*
--- 471,475 ----
   * are interpreted.
   */
! //define('DATA_PATH', '/some/where');
  
  /*
***************
*** 479,483 ****
   * FIXME: more docs (maybe in README).
   */
! #define('USE_PATH_INFO', false);
  
  /*
--- 479,483 ----
   * FIXME: more docs (maybe in README).
   */
! //define('USE_PATH_INFO', false);
  
  /*
***************
*** 504,508 ****
   * (VIRTUAL_PATH is only used if USE_PATH_INFO is true.)
   */
! #define('VIRTUAL_PATH', '/SomeWiki');
  
  
--- 504,508 ----
   * (VIRTUAL_PATH is only used if USE_PATH_INFO is true.)
   */
! //define('VIRTUAL_PATH', '/SomeWiki');