Changeset 23280 for extensions/BatchDownloader/include/BatchDownloader.class.php

Timestamp:

Jun 17, 2013, 2:46:12 AM (11 years ago)

Author:

mistic100

Message:

new advanced param $confbatch_download_additional_ext, default is $confpicture_ext

File:

• extensions/BatchDownloader/include/BatchDownloader.class.php (modified) (2 diffs)

extensions/BatchDownloader/include/BatchDownloader.class.php

@@ -209 +209 @@
   function addImages($image_ids)
   {
+    global $conf;
+    
     if (empty($image_ids) or !is_array($image_ids)) return;
     
-    $image_ids = array_unique($image_ids);
+    $query = '
+SELECT id, file
+  FROM '.IMAGES_TABLE.'
+  WHERE id IN('.implode(',', array_unique($image_ids)).')
+;';
+    $images = simple_hash_from_query($query, 'id', 'file');
+    
     $inserts = array();
     
-    foreach ($image_ids as $image_id)
+    foreach ($images as $image_id => $file)
     {
       if ($this->isInSet($image_id)) continue;
+      if (!in_array(get_extension($file), $conf['batch_download']['allowed_ext'])) continue;
       
       $this->images[ $image_id ] = 0;
@@ -681 +690 @@
     return array_merge($set, $this->getNames());
   }
+  
+  /**
+   * delete
+   */
+  function delete()
+  {
+    $this->deleteLastArchive();
+    $this->clearImages();
+    pwg_query('DELETE FROM '.BATCH_DOWNLOAD_TSETS.' WHERE id = '.$this->data['id'].';');
+  }
 }