cvs: php4 /pear System.php

pajoye          Thu Aug 29 06:08:37 2002 EDT

  Modified files:              
    /php4/pear  System.php 
  Log:
  Hope to finnally got it, fixes notice (Thx to Sebastian)
  
  
Index: php4/pear/System.php
diff -u php4/pear/System.php:1.19 php4/pear/System.php:1.20
--- php4/pear/System.php:1.19   Sun Aug 25 20:18:00 2002
+++ php4/pear/System.php        Thu Aug 29 06:08:37 2002
@@ -16,7 +16,7 @@
 // | Authors: Tomas V.V.Cox <cox@xxxxxxxxxxx>                             |
 // +----------------------------------------------------------------------+
 //
-// $Id: System.php,v 1.19 2002/08/26 00:18:00 pajoye Exp $
+// $Id: System.php,v 1.20 2002/08/29 10:08:37 pajoye Exp $
 //
 
 require_once 'PEAR.php';
@@ -43,7 +43,7 @@
 *
 * @package  System
 * @author   Tomas V.V.Cox <cox@xxxxxxxxxxx>
-* @version  $Revision: 1.19 $
+* @version  $Revision: 1.20 $
 * @access   public
 * @see      http://pear.php.net/manual/
 */
@@ -385,43 +385,30 @@
     /**
     * Get the path of the temporal directory set in the system
     * by looking in its environments variables.
+    * Note: php.ini-recommended removes the "E" from the variables_order 
setting,
+    * making unavaible the $_ENV array, that s why we do tests with _ENV
     *
     * @return string The temporal directory on the system
     */
     function tmpdir()
     {
         if (OS_WINDOWS) {
-            if (($var=$_ENV['TEMP']) || $var=getenv('TEMP')) {
-                 return $var;
+            if ($var = isset($_ENV['TEMP']) ? $_ENV['TEMP'] : getenv('TEMP')) {
+                return $var;
             }
-            if (($var=$_ENV['TMP']) || $var=getenv('TMP')) {
-                 return $var;
+            if ($var = isset($_ENV['TMP']) ? $_ENV['TMP'] : getenv('TMP')) {
+                return $var;
             }
-            if (($var=$_ENV['windir']) || $var=getenv('windir')) {
-                 return $var;
+            if ($var = isset($_ENV['windir']) ? $_ENV['windir'] : 
getenv('windir')) {
+                return $var;
             }
             return getenv('SystemRoot') . '\temp';
         }
-        if (($var=$_ENV['TMPDIR']) || $var=getenv('TMPDIR')) {
-             return $var;
+        if ($var = isset($_ENV['TMPDIR']) ? $_ENV['TMPDIR'] : 
getenv('TMPDIR')) {
+            return $var;
         }
         return '/tmp';
     }
-
-    /**
-    * (pajoye) Removed, problem with php.ini-recommanded, E removed
-    *
-    * (cox) I always get $_ENV empty in both Windows and Linux
-    * with all PHP version <= 4.2.1
-
-    function _myenv($var)
-    {
-        if (!empty($_ENV)) {
-            return isset($_ENV[$var]) ? $_ENV[$var] : false;
-        }
-        return getenv($var);
-    }
-    */
 
     /**
     * The "type" command (show the full path of a command)



-- 
PEAR CVS Mailing List (http://pear.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php