Changeset 25932 for extensions/BatchDownloader/main.inc.php

Timestamp:

Dec 12, 2013, 2:41:53 PM (10 years ago)

Author:

mistic100

Message:

update for Piwigo 2.6 + code cleaning + fix unable to cancel set during generation

File:

• extensions/BatchDownloader/main.inc.php (modified) (6 diffs)

extensions/BatchDownloader/main.inc.php

@@ -1 @@
-<?php 
+<?php
 /*
 Plugin Name: Batch Downloader
@@ -33 +33 @@
 {
   add_event_handler('init', 'batch_downloader_remove_image');
-  
+
   add_event_handler('loc_end_section_init', 'batch_download_section_init');
   add_event_handler('loc_end_index', 'batch_download_page');
@@ -40 +40 @@
 
   add_event_handler('loc_end_index', 'batch_download_index_button', EVENT_HANDLER_PRIORITY_NEUTRAL+10);
+}
 
-  add_event_handler('blockmanager_register_blocks', 'batch_download_add_menublock');
-  add_event_handler('blockmanager_apply', 'batch_download_applymenu');
-}
+add_event_handler('blockmanager_register_blocks', 'batch_download_add_menublock');
+add_event_handler('blockmanager_apply', 'batch_download_applymenu');
 
 
@@ -57 +57 @@
 function batch_download_init()
 {
-  global $conf, $pwg_loaded_plugins;
-  
-  if (
-    BATCH_DOWNLOAD_VERSION == 'auto' or
-    $pwg_loaded_plugins[BATCH_DOWNLOAD_ID]['version'] == 'auto' or
-    version_compare($pwg_loaded_plugins[BATCH_DOWNLOAD_ID]['version'], BATCH_DOWNLOAD_VERSION, '<')
-  )
-  {
-    include_once(BATCH_DOWNLOAD_PATH . 'include/install.inc.php');
-    batch_download_install();
-    
-    if ( $pwg_loaded_plugins[BATCH_DOWNLOAD_ID]['version'] != 'auto' and BATCH_DOWNLOAD_VERSION != 'auto' )
-    {
-      $query = '
-UPDATE '. PLUGINS_TABLE .'
-SET version = "'. BATCH_DOWNLOAD_VERSION .'"
-WHERE id = "'. BATCH_DOWNLOAD_ID .'"';
-      pwg_query($query);
-      
-      $pwg_loaded_plugins[BATCH_DOWNLOAD_ID]['version'] = BATCH_DOWNLOAD_VERSION;
-      
-      if (defined('IN_ADMIN'))
-      {
-        $_SESSION['page_infos'][] = 'BatchDownloader updated to version '. BATCH_DOWNLOAD_VERSION;
-      }
-    }
-  }
-  
+  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']['file_pattern'] = isset($conf['batch_download_file_pattern']) ? $conf['batch_download_file_pattern'] : '%id%_%filename%_%dimensions%';
@@ -92 +70 @@
     $conf['batch_download']['allowed_ext'] = array_merge($conf['batch_download']['allowed_ext'], $conf['batch_download_additional_ext']);
   }
-  
+
   load_language('plugin.lang', BATCH_DOWNLOAD_PATH);
 }
@@ -99 +77 @@
  * admin plugins menu
  */
-function batch_download_admin_menu($menu) 
+function batch_download_admin_menu($menu)
 {
-  array_push($menu, array(
+  $menu[] = array(
     'NAME' => 'Batch Downloader',
     'URL' => BATCH_DOWNLOAD_ADMIN,
-  ));
+  );
   return $menu;
 }
-
-?>