Changeset 23280 for extensions/BatchDownloader/include/events.inc.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/events.inc.php (modified) (1 diff)

extensions/BatchDownloader/include/events.inc.php

@@ -88 +88 @@
     {
       $BatchDownloader = new BatchDownloader('new', $page['items'], $set['type'], $set['id']);
-      $BatchDownloader->getEstimatedArchiveNumber();
       
-      // if we plan only one zip with less elements than 'max_elements', the download starts immediately
-      if (
-        $BatchDownloader->getParam('nb_images') <= $conf['batch_download']['max_elements']
-        and $BatchDownloader->getParam('nb_zip') == 1
-      )
+      if ($BatchDownloader->getParam('nb_images') != 0)
       {
-        $BatchDownloader->createNextArchive(true); // make sure we have only one zip, even if 'max_size' is exceeded
+        $BatchDownloader->getEstimatedArchiveNumber();
         
-        $u_download = get_root_url().BATCH_DOWNLOAD_PATH . 'download.php?set_id='.$BatchDownloader->getParam('id').'&amp;zip=1';
-        
-        $null = null;
-        $template->block_footer_script(null, 'setTimeout("document.location.href = \''.$u_download.'\';", 1000);', $null, $null);
-        
-        array_push($page['infos'], sprintf(l10n('The archive is downloading, if the download doesn\'t start automatically please <a href="%s">click here</a>'), $u_download));
+        // if we plan only one zip with less elements than 'max_elements', the download starts immediately
+        if (
+          $BatchDownloader->getParam('nb_images') <= $conf['batch_download']['max_elements']
+          and $BatchDownloader->getParam('nb_zip') == 1
+        )
+        {
+          $BatchDownloader->createNextArchive(true); // make sure we have only one zip, even if 'max_size' is exceeded
+          
+          $u_download = get_root_url().BATCH_DOWNLOAD_PATH . 'download.php?set_id='.$BatchDownloader->getParam('id').'&amp;zip=1';
+          
+          $null = null;
+          $template->block_footer_script(null, 'setTimeout("document.location.href = \''.$u_download.'\';", 1000);', $null, $null);
+          
+          $page['infos'][] = sprintf(l10n('The archive is downloading, if the download doesn\'t start automatically please <a href="%s">click here</a>'), $u_download);
+        }
+        // otherwise we go to summary page
+        else
+        {
+          redirect(add_url_params(BATCH_DOWNLOAD_PUBLIC . 'init_zip', array('set_id'=>$BatchDownloader->getParam('id'))));
+        }
       }
-      // oterwise we go to summary page
       else
       {
-        redirect(add_url_params(BATCH_DOWNLOAD_PUBLIC . 'init_zip', array('set_id'=>$BatchDownloader->getParam('id'))));
+        $BatchDownloader->delete();
+        unset($BatchDownloader);
+        
+        $page['errors'][] = sprintf(l10n('Sorry, there is nothing to download. Some files may have been excluded because of <i title="Authorized types are : %s">filetype restrictions</i>.'), implode(', ', $conf['batch_download']['allowed_ext']));
       }
     }