Changeset 23292

Timestamp:

Jun 17, 2013, 8:08:42 PM (11 years ago)

Author:

mistic100

Message:

fix batch deletion

File:

• extensions/BatchDownloader/admin/sets.php (modified) (1 diff)

extensions/BatchDownloader/admin/sets.php

@@ -5 +5 @@
 if (isset($_GET['delete']))
 {
-  $BatchDownloader = new BatchDownloader($_GET['delete']);
-  $BatchDownloader->delete();
-  unset($BatchDownloader);
+  $set = new BatchDownloader($_GET['delete']);
+  $set->delete();
+  unset($set);
 }
 if (isset($_GET['cancel']))
 {
-  $BatchDownloader = new BatchDownloader($_GET['cancel']);  
-  $BatchDownloader->updateParam('total_size', $BatchDownloader->getEstimatedTotalSize());
-  $BatchDownloader->updateParam('status', 'done');
-  $BatchDownloader->deleteLastArchive();
-  $BatchDownloader->clearImages();
-  unset($BatchDownloader);
+  $set = new BatchDownloader($_GET['cancel']);  
+  $set->updateParam('total_size', $set->getEstimatedTotalSize());
+  $set->updateParam('nb_zip', $set->getEstimatedArchiveNumber());
+  $set->updateParam('status', 'done');
+  $set->deleteLastArchive();
+  $set->clearImages();
+  unset($set);
 }
 if (isset($_POST['delete_done']))
 {
   $query = '
-DELETE s, i
-  FROM '.BATCH_DOWNLOAD_TSETS.' AS s
-    LEFT JOIN '.BATCH_DOWNLOAD_TIMAGES.' AS i
-    ON i.set_id = s.id
+SELECT id
+  FROM '.BATCH_DOWNLOAD_TSETS.'
   WHERE
     status = "done" AND
     date_creation < DATE_SUB(NOW(), INTERVAL 1 HOUR)
 ;';
-  pwg_query($query);
+  
+  $sets = array_from_query($query, 'id');
+  
+  foreach ($sets as $set_id)
+  {
+    $set = new BatchDownloader($set_id);
+    $set->delete();
+    unset($set);
+  }
 }