[Tikiwiki-cvs] tiki tiki-edit_submission.php,1.33.2.4,1.33.2.5 tiki-index.php,1.77.2.11,1.77.2.12 tiki-upload_file.php,1.23.2.6,1.23.2.7

[<re...@us...>]

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11346

Modified Files:
      Tag: BRANCH-1-8
	tiki-edit_submission.php tiki-index.php tiki-upload_file.php 
Log Message:
delete uploaded files


Index: tiki-edit_submission.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-edit_submission.php,v
retrieving revision 1.33.2.4
retrieving revision 1.33.2.5
diff -u -d -r1.33.2.4 -r1.33.2.5
--- tiki-edit_submission.php	16 May 2004 12:51:23 -0000	1.33.2.4
+++ tiki-edit_submission.php	25 Dec 2004 14:01:13 -0000	1.33.2.5
@@ -200,7 +200,7 @@
 		
 		$file_name = $_FILES['userfile1']['name'];
 		$file_tmp_name = $_FILES['userfile1']['tmp_name'];
-		$tmp_dest = $tmpDir . "/" . $file_name;
+		$tmp_dest = $tmpDir . "/" . $file_name.".tmp";
 		if (!move_uploaded_file($file_tmp_name, $tmp_dest)) {
 			$smarty->assign('msg', tra('Errors detected'));
 			$smarty->display("error.tpl");
@@ -211,6 +211,7 @@
 		$data = fread($fp, filesize($tmp_dest));
 		
 		fclose ($fp);
+		unlink($tmp_dest);
 		$imgtype = $_FILES['userfile1']['type'];
 		$imgsize = $_FILES['userfile1']['size'];
 		$imgname = $_FILES['userfile1']['name'];

Index: tiki-index.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-index.php,v
retrieving revision 1.77.2.11
retrieving revision 1.77.2.12
diff -u -d -r1.77.2.11 -r1.77.2.12
--- tiki-index.php	17 Jul 2004 01:40:24 -0000	1.77.2.11
+++ tiki-index.php	25 Dec 2004 14:01:13 -0000	1.77.2.12
@@ -356,7 +356,7 @@
 	
       $file_name = $_FILES['userfile1']['name'];	
       $file_tmp_name = $_FILES['userfile1']['tmp_name'];
-      $tmp_dest = $tmpDir . "/" . $file_name;
+      $tmp_dest = $tmpDir . "/" . $file_name.".tmp";
       if (!move_uploaded_file($file_tmp_name, $tmp_dest)) {
       		$smarty->assign('msg', tra('Errors detected'));
 		$smarty->display("error.tpl");
@@ -384,6 +384,7 @@
         }
       }
       fclose($fp);
+      unlink($tmp_dest);
       if($w_use_db == 'n') {
         fclose($fw);
         $data='';
@@ -503,5 +504,25 @@
 $smarty->display("tiki.tpl");
 
 // xdebug_dump_function_profile(XDEBUG_PROFILER_CPU);
+// debug: print all objects
+
+echo "<pre>";
+$defvar=get_defined_vars();
+echo "Number of Variables: ".count($defvar)."\n";
+foreach ($defvar as $defn=>$defv) {
+	$deft=gettype($defv);
+	switch($deft) {
+		case 'object':
+			$x=get_class_methods ( $defv);
+			$y=get_class_vars ($defv);
+			$defs=count($x)."M ".count($y)."V";
+			break;
+		default:
+			$defs=count($defv);
+			break;
+		}
+	echo "type: $deft\tSize: $defs\tVariable: $defn\n";
+}
+echo "</pre>";
 
 ?>

Index: tiki-upload_file.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-upload_file.php,v
retrieving revision 1.23.2.6
retrieving revision 1.23.2.7
diff -u -d -r1.23.2.6 -r1.23.2.7
--- tiki-upload_file.php	27 May 2004 23:02:26 -0000	1.23.2.6
+++ tiki-upload_file.php	25 Dec 2004 14:01:13 -0000	1.23.2.7
@@ -131,7 +131,7 @@
 
 			$file_name = $_FILES["userfile$i"]['name'];
 			$file_tmp_name = $_FILES["userfile$i"]['tmp_name'];
-			$tmp_dest = $tmpDir . "/" . $file_name;
+			$tmp_dest = $tmpDir . "/" . $file_name.".tmp";
 			if (!move_uploaded_file($file_tmp_name, $tmp_dest)) {
 				$smarty->assign('msg', tra('Errors detected'));
 				$smarty->display("error.tpl");