cvs: pear /File File.php
| From: | Richard Heyes | Date: | Thu, 25 Apr 2002 11:40:42 +0000 |
| Subject: | cvs: pear /File File.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-3547@lists.php.net to get a copy of this message | ||
richard Thu Apr 25 07:40:42 2002 EDT
Modified files:
/pear/File File.php
Log:
* Removed dependency on System::
Index: pear/File/File.php
diff -u pear/File/File.php:1.10 pear/File/File.php:1.11
--- pear/File/File.php:1.10 Wed Apr 24 11:22:28 2002
+++ pear/File/File.php Thu Apr 25 07:40:42 2002
@@ -39,7 +39,6 @@
*/
require_once('PEAR.php');
-require_once('System.php');
/**
* The default number of bytes for reading
@@ -464,7 +463,22 @@
*/
function getTempDir()
{
- return System::tmpdir();
+ if (OS_WINDOWS){
+ if (isset($_ENV['TEMP'])) {
+ return $_ENV['TEMP'];
+ }
+ if (isset($_ENV['TMP'])) {
+ return $_ENV['TMP'];
+ }
+ if (isset($_ENV['windir'])) {
+ return $_ENV['windir'] . '\temp';
+ }
+ return $_ENV['SystemRoot'] . '\temp';
+ }
+ if (isset($_ENV['TMPDIR'])) {
+ return $_ENV['TMPDIR'];
+ }
+ return '/tmp';
}
/*