[Openfirst-cvscommit] photogallery/admin edit.php,1.2,1.3

[<xt...@us...>]

Update of /cvsroot/openfirst/photogallery/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv17381

Modified Files:
	edit.php 
Log Message:
Make gallery removal prompt for certainty, and recursively remove files and directories from within the gallery before attempting to remove it.  Also fix some broken links.

Index: edit.php
===================================================================
RCS file: /cvsroot/openfirst/photogallery/admin/edit.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** edit.php	21 Aug 2003 14:17:28 -0000	1.2
--- edit.php	21 Aug 2003 14:32:58 -0000	1.3
***************
*** 36,49 ****
    
    // Check if user initiated delete and run delete process
!   if(ISSET($_GET['DELETE'])){
  
!   $query = mysql_query("SELECT * FROM ofirst_photogallery_galleries WHERE ID = '".$_GET['DELETE']."'") or die(mysql_error());
!   $gallery = mysql_fetch_object($query);
!   
!   rmdir("../".$gallerydir.$gallery->GalleryName."/thumbs") or die("<br><br><center>Can't remove gallery! [ <a href='index.php'>Manage</a> ]");
!   rmdir("../".$gallerydir.$gallery->GalleryName) or die("<br><br><center>Can't remove gallery! [ <a href='index.php'>Manage</a> ]");
  
    mysql_query("DELETE FROM ofirst_photogallery_galleries WHERE ID = '".$_GET['DELETE']."'") or die(mysql_error());
!   echo "<br><br><center>The gallery has been deleted! [ <a href='manage.php'>Manage</a> ]</center><br>";
    die(include($footer));
    }
--- 36,68 ----
    
    // Check if user initiated delete and run delete process
!   if(ISSET($_GET['DELETE']) == true && isset($_GET["CONFIRMED"]) == false) {
!     echo("<p>Are you absolutely sure you want to delete this gallery?  All pictures in the gallery will be removed from the server.</p> <a href='edit.php?DELETE=" . $_GET["DELETE"] . "&amp;CONFIRMED=1'>Yes, I am sure</a> <a href='edit.php'>No, I've changed my mind</a>");
!     die(include($footer));
!   } elseif(isset($_GET["DELETE"]) == true && isset($_GET["CONFIRMED"]) == true) {
!     $query = mysql_query("SELECT * FROM ofirst_photogallery_galleries WHERE ID = '".$_GET['DELETE']."'") or die(mysql_error());
!     $gallery = mysql_fetch_object($query);
!    
!     function deldir($dir){
!       $current_dir = opendir($dir);
!         while($entryname = readdir($current_dir)){
!           if(is_dir("$dir/$entryname") and ($entryname != "." and $entryname!="..")){
!             deldir("${dir}/${entryname}");
!           } elseif($entryname != "." and $entryname!="..") {
!             unlink("${dir}/${entryname}");
!         }
!       }
!       closedir($current_dir);
!       rmdir(${dir});
!     }
  
!     if(file_exists("../" . $gallerydir.$gallery->GalleryName."/thumbs")) {
!       deldir("../".$gallerydir.$gallery->GalleryName."/thumbs");
!     }
!     if(file_exists("../" . $gallerydir.$gallery->GalleryName)) {
!       deldir("../".$gallerydir.$gallery->GalleryName);
!     }
  
    mysql_query("DELETE FROM ofirst_photogallery_galleries WHERE ID = '".$_GET['DELETE']."'") or die(mysql_error());
!   echo "<br><br><center>The gallery has been deleted! [ <a href='index.php'>Manage</a> ]</center><br>";
    die(include($footer));
    }
***************
*** 55,64 ****
    $gallery = mysql_fetch_object($query);
    
!   unlink("../".$gallerydir.$gallery->GalleryName."/".$_GET['PHOTO']) or die("<br><br><center>Can't remove gallery! [ <a href='manage.php'>Manage</a> ]");
    if (file_exists("../".$gallerydir.$gallery->GalleryName."/thumbs/".$_GET['PHOTO'])){
!   unlink("../".$gallerydir.$gallery->GalleryName."/thumbs/".$_GET['PHOTO']) or die("<br><br><center>Can't remove gallery! [ <a href='manage.php'>Manage</a> ]");
!   die("<br><br><center>The photo and its thumbnail have been deleted! [ <a href='edit.php?ID=".$_GET['ID']."'>Manage</a> ]</center>");
      }else{
!     die("<br><br><center>The photo has been deleted! [ <a href='edit.php?ID=".$_GET['ID']."'>Manage</a> ]</center>");
    }
    }
--- 74,83 ----
    $gallery = mysql_fetch_object($query);
    
!   unlink("../".$gallerydir.$gallery->GalleryName."/".$_GET['PHOTO']) or die("<br><br><center>Can't remove gallery! [ <a href='index.php'>Manage</a> ]");
    if (file_exists("../".$gallerydir.$gallery->GalleryName."/thumbs/".$_GET['PHOTO'])){
!   unlink("../".$gallerydir.$gallery->GalleryName."/thumbs/".$_GET['PHOTO']) or die("<br><br><center>Can't remove gallery! [ <a href='index.php'>Manage</a> ]");
!   die("<br><br><center>The photo and its thumbnail have been deleted! [ <a href='index.php?ID=".$_GET['ID']."'>Manage</a> ]</center>");
      }else{
!     die("<br><br><center>The photo has been deleted! [ <a href='index.php?ID=".$_GET['ID']."'>Manage</a> ]</center>");
    }
    }