Re: Notices in System.php

Sebastian Bergmann wrote:
> The following code gives a notive for every

  Have a look at this patch.

-- 
  Sebastian Bergmann
  http://sebastian-bergmann.de/                 http://phpOpenTracker.de/

  Did I help you? Consider a gift: http://wishlist.sebastian-bergmann.de/

Index: System.php
===================================================================
RCS file: /repository/php4/pear/System.php,v
retrieving revision 1.19
diff -u -r1.19 System.php
--- System.php  26 Aug 2002 00:18:00 -0000      1.19
+++ System.php  28 Aug 2002 11:04:15 -0000
@@ -390,37 +390,42 @@
     */
     function tmpdir()
     {
+        $var = false;
+
         if (OS_WINDOWS) {
-            if (($var=$_ENV['TEMP']) || $var=getenv('TEMP')) {
-                 return $var;
+            $var = isset($_ENV['TEMP']) ? $_ENV['TEMP'] : getenv('TEMP');
+
+            if (!$var) {
+              $var = isset($_ENV['TMP']) ? $_ENV['TMP'] : getenv('TMP');
             }
-            if (($var=$_ENV['TMP']) || $var=getenv('TMP')) {
-                 return $var;
+
+            if (!$var) {
+              $var = isset($_ENV['windir']) ? $_ENV['windir'] : 
getenv('windir');
             }
-            if (($var=$_ENV['windir']) || $var=getenv('windir')) {
-                 return $var;
+
+            if (!$var) {
+              $var = getenv('SystemRoot') . '\temp';
             }
-            return getenv('SystemRoot') . '\temp';
-        }
-        if (($var=$_ENV['TMPDIR']) || $var=getenv('TMPDIR')) {
-             return $var;
-        }
-        return '/tmp';
+        } else {
+            $var = isset($_ENV['TMPDIR']) ? $_ENV['TMPDIR'] : getenv('TMPDIR');
+        }        
+        
+        return $var ? $var : '/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);

-    }

+    * (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);
+    }
     */
 
     /**

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