[phpwiki-checkins] CVS: phpwiki index.php,1.42,1.43

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	index.php 
Log Message:
changed CSS_URL from constant into a variable for themes

Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** index.php	2001/12/21 03:15:22	1.42
--- index.php	2001/12/26 14:00:37	1.43
***************
*** 33,37 ****
  //   lib/FileFinder.php:82: Fatal[256]: DB.php: file not found
  //
! //ini_set('include_path', '.:/where/you/installed/phpwiki');

  /////////////////////////////////////////////////////////////////////
--- 33,37 ----
  //   lib/FileFinder.php:82: Fatal[256]: DB.php: file not found
  //
! #ini_set('include_path', '.:/where/you/installed/phpwiki');

  /////////////////////////////////////////////////////////////////////
***************
*** 97,101 ****
  // in this directory):

! // ini_set('session.save_path', 'some_other_directory');

--- 97,101 ----
  // in this directory):

! #ini_set('session.save_path', 'some_other_directory');

***************
*** 114,118 ****
  $DBParams = array(
     // Select the database type:
!    //'dbtype' => 'SQL',
     'dbtype' => 'dba',

--- 114,118 ----
  $DBParams = array(
     // Select the database type:
!    #'dbtype' => 'SQL',
     'dbtype' => 'dba',

***************
*** 128,133 ****
     // 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',

--- 128,133 ----
     // 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',

***************
*** 140,152 ****
      * 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
  );

--- 140,152 ----
      * 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
  );

***************
*** 237,241 ****
  // 'nl_NL'.
  $LANG='C';
! //$LANG='nl_NL';

  // Setting the LANG environment variable (accomplished above) may or
--- 237,241 ----
  // 'nl_NL'.
  $LANG='C';
! #$LANG='nl_NL';

  // Setting the LANG environment variable (accomplished above) may or
***************
*** 266,270 ****
  // you should make sure that it's companion 'phpwiki-heavy.css'
  // is installed in the same directory that the base style file is.
! define("CSS_URL", "phpwiki.css");

  // logo image (path relative to index.php)
--- 266,270 ----
  // you should make sure that it's companion 'phpwiki-heavy.css'
  // is installed in the same directory that the base style file is.
! $CSS_URL = "phpwiki.css";

  // logo image (path relative to index.php)
***************
*** 273,277 ****
  // 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
--- 273,277 ----
  // 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
***************
*** 315,322 ****
  // The themeinfo file can be used to override default settings above this line
  // (i.e. templates, logo, signature etc.)
! $theme="";
! if ( !$theme == "" ) {
!     if ( file_exists( "themes/$theme/themeinfo.php" ) ) {
          include "themes/$theme/themeinfo.php";
      }
  }
--- 315,330 ----
  // The themeinfo file can be used to override default settings above this line
  // (i.e. templates, logo, signature etc.)
! // comment out the $theme= lines to revert to the standard interface
! // which defaults to /templates and /images
! #$theme="default";
! #$theme="MacOSX";
! #$theme="WikiTrek";
! if (!empty($theme)) {
!     if (file_exists("themes/$theme/themeinfo.php")) {
          include "themes/$theme/themeinfo.php";
+     } else {
+       //FIXME: gettext doesn't work in index.php or themeinfo.php
+         trigger_error(sprintf(("Unable to open file '%s' for reading"),
+                                "themes/$theme/themeinfo.php"), E_USER_NOTICE);
      }
  }
***************
*** 359,363 ****
  // 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")
--- 367,371 ----
  // 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")
***************
*** 395,400 ****
   * PhpWiki resides.
   */
! //define('SERVER_NAME', 'some.host.com');
! //define('SERVER_PORT', 80);

  /*
--- 403,408 ----
   * PhpWiki resides.
   */
! #define('SERVER_NAME', 'some.host.com');
! #define('SERVER_PORT', 80);

  /*
***************
*** 402,405 ****
--- 410,416 ----
   * script.
   */
+ // Is this still required? Wiki seems to work fine without it,
+ // both with the server configured using alias directives
+ // or using SetHandler + virtual & data paths.
  //define('SCRIPT_NAME', '/some/where/index.php');

***************
*** 409,413 ****
   * are interpreted.
   */
! //define('DATA_PATH', '/some/where');

  /*
--- 420,424 ----
   * are interpreted.
   */
! #define('DATA_PATH', '/some/where');

  /*
***************
*** 417,421 ****
   * FIXME: more docs (maybe in README).
   */
! //define('USE_PATH_INFO', false);

  /*
--- 428,432 ----
   * FIXME: more docs (maybe in README).
   */
! #define('USE_PATH_INFO', false);

  /*
***************
*** 442,446 ****
   * (VIRTUAL_PATH is only used if USE_PATH_INFO is true.)
   */
! //define('VIRTUAL_PATH', '/SomeWiki');

--- 453,457 ----
   * (VIRTUAL_PATH is only used if USE_PATH_INFO is true.)
   */
! #define('VIRTUAL_PATH', '/SomeWiki');