Changeset 28834

Timestamp:

Jun 29, 2014, 4:17:09 PM (10 years ago)

Author:

mistic100

Message:

use new maintain class

Location:

extensions/BatchDownloader

Files:

• admin/config.php (modified) (1 diff)
• include/BatchDownloader.class.php (modified) (3 diffs)
• include/events.inc.php (modified) (1 diff)
• main.inc.php (modified) (3 diffs)
• maintain.class.php (added)
• maintain.inc.php (deleted)

extensions/BatchDownloader/admin/config.php

@@ -21 +21 @@
     'last_clean'      => $conf['batch_download']['last_clean'],
     );
-  $conf['batch_download_comment'] = trim($_POST['archive_comment']);
 
-  conf_update_param('batch_download', serialize($conf['batch_download']));
-  conf_update_param('batch_download_comment', $conf['batch_download_comment']);
+  conf_update_param('batch_download', $conf['batch_download']);
+  conf_update_param('batch_download_comment', trim($_POST['archive_comment']), true);
 
   $page['infos'][] = l10n('Information data registered in database');

extensions/BatchDownloader/include/BatchDownloader.class.php

@@ -524 +524 @@
         else
         {
-          $src_image = new SrcImage($row); // don't give representive_ext
+          $src_image = new SrcImage($row); // don't give representative_ext
 
           // no-image files
@@ -536 +536 @@
           {
             $derivative = new DerivativeImage($this->data['size'], $src_image);
+            
+            if (!file_exists($derivative->get_path()))
+            {
+              // we shouldn't be here
+              // TODO : generate missing derivative (if generation where not performed) or remove
+            }
 
             $zip->addFile($derivative->get_path(), $this->getFilename($row, $filesizes[ $row['id'] ]));
@@ -577 +583 @@
       {
         if ($this->conf['one_archive']) $this->updateParam('status', 'done');
-        $done = true;
 
         // over estimed
         $this->updateParam('nb_zip', $this->data['last_zip']);
       }
-
       // under estimed
-      if (!isset($done) && $this->data['status'] != 'done' && $this->data['last_zip'] == $this->data['nb_zip'])
+      else if ($this->data['status'] != 'done' && $this->data['last_zip'] == $this->data['nb_zip'])
       {
         $this->updateParam('nb_zip', $this->data['last_zip']+1);

extensions/BatchDownloader/include/events.inc.php

@@ -252 +252 @@
 
   $conf['batch_download']['last_clean'] = $time;
-  conf_update_param('batch_download', serialize($conf['batch_download']));
+  conf_update_param('batch_download', $conf['batch_download']);
 
   // set old sets as done and clean images table

extensions/BatchDownloader/main.inc.php

@@ -13 +13 @@
 global $conf, $prefixeTable;
 
-defined('BATCH_DOWNLOAD_ID') or define('BATCH_DOWNLOAD_ID', basename(dirname(__FILE__)));
+define('BATCH_DOWNLOAD_ID',      basename(dirname(__FILE__)));
 define('BATCH_DOWNLOAD_PATH',    PHPWG_PLUGINS_PATH . BATCH_DOWNLOAD_ID . '/');
 define('BATCH_DOWNLOAD_TSETS',   $prefixeTable . 'download_sets');
@@ -21 +21 @@
 define('BATCH_DOWNLOAD_ADMIN',   get_root_url() . 'admin.php?page=plugin-' . BATCH_DOWNLOAD_ID);
 define('BATCH_DOWNLOAD_PUBLIC',  get_absolute_root_url() . make_index_url(array('section' => 'download')) . '/');
-define('BATCH_DOWNLOAD_VERSION', 'auto');
 
 
@@ -59 +58 @@
   global $conf;
 
-  include_once(BATCH_DOWNLOAD_PATH . 'maintain.inc.php');
-  $maintain = new BatchDownloader_maintain(BATCH_DOWNLOAD_ID);
-  $maintain->autoUpdate(BATCH_DOWNLOAD_VERSION, 'install');
-
-  $conf['batch_download'] = unserialize($conf['batch_download']);
+  $conf['batch_download'] = safe_unserialize($conf['batch_download']);
   $conf['batch_download']['file_pattern'] = isset($conf['batch_download_file_pattern']) ? $conf['batch_download_file_pattern'] : '%id%_%filename%_%dimensions%';
   $conf['batch_download']['allowed_ext'] = $conf['picture_ext'];