#9 make current cvs work on windows

[Anonymous]

i just got the latest version from cvs and found that
it doesnt work on windows out of the box ("[...]
phpwiki\lib\FileFinder.php:82: Fatal[256]:
templates/browse.html: file not found
"). problem is that FileFinder.php in getting the
include_path doesnt consider windows path separators
(";"). the following patch fixes that.

-- ax, ax@condat.de

Index: FileFinder.php

============
RCS file: /cvsroot/phpwiki/phpwiki/lib/FileFinder.php,v
retrieving revision 1.2
diff -u -w -r1.2 FileFinder.php
--- FileFinder.php 2001/09/20 18:26:14 1.2
+++ FileFinder.php 2001/10/21 19:10:42
@@ -100,6 +100,18 @@
}

 /**

• • The system-dependent path-separator character.
    On UNIX systems,
• • this character is ':'; on Win32 systems it
    is ';'.
• *
• • @access private
• • @return array path_separator.
• */
• function _get_path_separator() {
• global $WINDIR;
• return $WINDIR ? ';' : ':';
• }
  +
• /**
  • Get the value of PHP's include_path.
    *
  • @access private
    @@ -109,7 +121,7 @@
    $path = ini_get('include_path');
    if (empty($path))
    $path = '.';
• return explode(':', $path);

• return explode($this->_get_path_separator(),
  $path);
  }

  /*
  @@ -138,7 +150,7 @@
  * This following line should be in the above
  if-block,
  * but we put it here, as it seems to work-
  around the bug.
  /
  - ini_set('include_path', implode(':', $path));
  + ini_set('include_path', implode($this-
  >_get_path_separator(), $path));
  }
  }

[Geoffrey T. Dairiki]

Logged In: YES
user_id=45814

I have checked these patches into the CVS with one modification:

To detect windows I'm using:
preg_match('/^Windows/', php_uname())
rather than testing for $WINDIR.

This makes me happier since $WINDIR is not a direct test for
windows-ness --- it's presence does not guarantee that we're
not running on linux (or whatever) box.

On the other hand, my method is completely untested, and so
will probably need some (regexp) modifications before it
works reliably. (I do not have access to a windows box with
PHP installed.)