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

Timestamp:

Nov 7, 2012, 10:05:44 PM (11 years ago)

Author:

mistic100

Message:

small code cleaning, use mkgetdir(), add missing language string

File:

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

extensions/BatchDownloader/main.inc.php

@@ -13 +13 @@
 global $conf, $prefixeTable;
 
-define('BATCH_DOWNLOAD_PATH',    PHPWG_PLUGINS_PATH . 'BatchDownloader/');
+defined('BATCH_DOWNLOAD_ID') or define('BATCH_DOWNLOAD_ID', basename(dirname(__FILE__)));
+define('BATCH_DOWNLOAD_PATH',    PHPWG_PLUGINS_PATH . BATCH_DOWNLOAD_ID . '/');
 define('BATCH_DOWNLOAD_TSETS',   $prefixeTable . 'download_sets');
 define('BATCH_DOWNLOAD_TIMAGES', $prefixeTable . 'download_sets_images');
 define('BATCH_DOWNLOAD_LOCAL',   PHPWG_ROOT_PATH . $conf['data_location'] . 'download_archives/');
-define('BATCH_DOWNLOAD_ADMIN',   get_root_url() . 'admin.php?page=plugin-BatchDownloader');
+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');
@@ -24 +25 @@
 add_event_handler('init', 'batch_download_init');
 
-add_event_handler('loc_end_section_init', 'batch_download_section_init');
-add_event_handler('loc_end_index', 'batch_download_page');
+if (defined('IN_ADMIN'))
+{
+  add_event_handler('get_admin_plugin_menu_links', 'batch_download_admin_menu');
+}
+else
+{
+  add_event_handler('loc_end_section_init', 'batch_download_section_init');
+  add_event_handler('loc_end_index', 'batch_download_page');
 
-add_event_handler('loc_end_index', 'batch_download_clean');
+  add_event_handler('loc_end_index', 'batch_download_clean');
 
-add_event_handler('loc_end_index', 'batch_download_index_button', EVENT_HANDLER_PRIORITY_NEUTRAL+10);
+  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');
+}
+
 
 include_once(BATCH_DOWNLOAD_PATH . 'include/BatchDownloader.class.php');
 include_once(BATCH_DOWNLOAD_PATH . 'include/functions.inc.php');
 include_once(BATCH_DOWNLOAD_PATH . 'include/events.inc.php');
-
-if (defined('IN_ADMIN'))
-{
-  add_event_handler('get_admin_plugin_menu_links', 'batch_download_admin_menu');
-}
 
 
@@ -53 +57 @@
   
   if (
-    $pwg_loaded_plugins['BatchDownloader']['version'] == 'auto' or
-    version_compare($pwg_loaded_plugins['BatchDownloader']['version'], BATCH_DOWNLOAD_VERSION, '<')
+    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, '<')
   )
   {
@@ -60 +65 @@
     batch_download_install();
     
-    if ($pwg_loaded_plugins['BatchDownloader']['version'] != 'auto')
+    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 = "BatchDownloader"';
+WHERE id = "'. BATCH_DOWNLOAD_ID .'"';
       pwg_query($query);
       
-      $pwg_loaded_plugins['BatchDownloader']['version'] = BATCH_DOWNLOAD_VERSION;
+      $pwg_loaded_plugins[BATCH_DOWNLOAD_ID]['version'] = BATCH_DOWNLOAD_VERSION;
       
       if (defined('IN_ADMIN'))