[php-blog-cvs] serendipity serendipity_admin_images.inc.php,1.5,1.6

[<tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv17647

Modified Files:
	serendipity_admin_images.inc.php 
Log Message:
w00ps... need to use GET

Index: serendipity_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_admin_images.inc.php	22 May 2003 23:19:33 -0000	1.5
+++ serendipity_admin_images.inc.php	25 May 2003 01:55:35 -0000	1.6
@@ -87,32 +87,33 @@
     		break;
 
 	case "DoDelete":
-		$fThumb = serendipity_parseFileName($serendipity["fname"]);
+		$file = $serendipity['GET']['fname'];
+		$fThumb = serendipity_parseFileName($file);
 		$fThumb = $fThumb[0].".".$serendipity["thumbSuffix"].".".$fThumb[1];
-		if ( file_exists($serendipity["serendipityPath"].$serendipity["uploadPath"].$serendipity["fname"]) ) {
-			if ( @unlink($serendipity["serendipityPath"].$serendipity["uploadPath"].$serendipity["fname"]) ) {
-				echo "Deleted the image entitled <b>". $serendipity['fname'] ."</b>";
+		if ( file_exists($serendipity["serendipityPath"].$serendipity["uploadPath"].$file) ) {
+			if ( @unlink($serendipity["serendipityPath"].$serendipity["uploadPath"].$file) ) {
+				echo "Deleted the image entitled <b>". $file ."</b>";
 			} else {
-				echo "Unable to delete <b>". $serendipity['fname'] ."</b>";
+				echo "Unable to delete <b>". $file ."</b>";
 			}
 			if ( @unlink($serendipity["serendipityPath"].$serendipity["uploadPath"].$fThumb) ) {
 				echo "<br>Deleted the thumbnail entitled <b>". $fThumb ."</b>";
 			}
 																	 
 		} else {
-			echo "I was unable to locate the file entitled <b>". $serendipity['fname'] ."</b>, maybe it has already been deleted?";
+			echo "I was unable to locate the file entitled <b>". $file ."</b>, maybe it has already been deleted?";
 		}
 
 		break;	
 	case "delete":
-		$file = $serendipity['fname'];
+		$file = $serendipity['GET']['fname'];
 		
 		
 		echo "You are about to delete <b>$file</b><br>";
 		echo "If you are using this file in some of your entries, it will cause dead images<br>";
 		echo "Are you sure you wish to proceed?<p>";
 		
-		$newLoc = $serendipity['serendipityHTTPPath'] ."serendipity_entries.php?serendipity[adminModule]=images&serendipity[adminAction]=DoDelete&serendipity[fname]=". $serendipity['fname'];
+		$newLoc = $serendipity['serendipityHTTPPath'] ."serendipity_entries.php?serendipity[adminModule]=images&serendipity[adminAction]=DoDelete&serendipity[fname]=". $file;
 		echo "<input type='button' value='Delete the image' onClick='location.href=\"$newLoc\"'>";
 			 	 
 		echo str_repeat("&nbsp;", 10);