[Tikiwiki-cvs] tiki tiki-setup.php,1.138,1.139

[<jen...@us...>]

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs1:/tmp/cvs-serv21716

Modified Files:
	tiki-setup.php 
Log Message:
Fix for bug # 798550

Empty temp files left sitting in the root directory of windows systems 

Index: tiki-setup.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-setup.php,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- tiki-setup.php	22 Aug 2003 05:51:26 -0000	1.138
+++ tiki-setup.php	7 Sep 2003 00:07:59 -0000	1.139
@@ -16,7 +16,7 @@
 class TikiSetup {
 	/*!
 		Return 'windows' if windows, otherwise 'unix'
-		
+
 		\static
 	*/
 	function os() {
@@ -35,7 +35,7 @@
 
 	/*!
 		Return true if windows, otherwise false
-		
+
 		\static
 	*/
 	function isWindows() {
@@ -50,7 +50,7 @@
 
 	/*!
 		Return ';' if windows otherwise ':'
-		
+
 		\static
 	*/
 	function pathSeparator() {
@@ -102,7 +102,7 @@
 
 	/*!
 		Return system defined temporary directory.
-		
+
 		In Unix, this is usually /tmp
 		In Windows, this is usually c:\windows\temp or c:\winnt\temp
 
@@ -112,7 +112,9 @@
 		static $tempdir;
 
 		if (!$tempdir) {
-			$tempdir = dirname(tempnam(false, ''));
+			$tempfile = tempnam( false, '' );
+			$tempdir = dirname( $tempfile );
+			unlink( $tempfile );
 		}
 
 		return $tempdir;
@@ -120,7 +122,7 @@
 
 	/*!
 		Check that everything is set up properly
-		
+
 		\static
 	*/
 	function check() {
@@ -245,7 +247,7 @@
 	\$ chmod +x setup.sh
 	\$ su -c './setup.sh $wwwuser'
 
-If you have problems accessing a directory, check the open_basedir entry in 
+If you have problems accessing a directory, check the open_basedir entry in
 $PHP_CONFIG_FILE_PATH/php.ini or $httpd_conf.
 
 Once you have executed these commands, this message will disappear!
@@ -1397,7 +1399,7 @@
     $smarty->assign('mnu_mapsmenu','display:block;');
   }
 }
-	
+
 $smarty->assign('mnu_layermenu','display:none;');
 if(isset($_COOKIE["layermenu"])) {
   if($_COOKIE["layermenu"]=='o') {
@@ -1539,7 +1541,7 @@
 $smarty->assign('ownurl', httpPrefix(). $_SERVER["REQUEST_URI"]);
 
 
-	
+
 $allowMsgs = 'n';
 
 if ($user) {