Changeset 18973

Timestamp:

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

Author:

mistic100

Message:

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

Location:

extensions/BatchDownloader

Files:

• download.php (modified) (1 diff)
• include/BatchDownloader.class.php (modified) (3 diffs)
• include/install.inc.php (modified) (1 diff)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (1 diff)
• main.inc.php (modified) (4 diffs)
• maintain.inc.php (modified) (1 diff)

extensions/BatchDownloader/download.php

@@ -25 +25 @@
   echo $e->getMessage();
 }
-    
+
 exit(0);
 

extensions/BatchDownloader/include/BatchDownloader.class.php

@@ -322 +322 @@
       foreach ($images_to_add as $row)
       {        
-        $zip->addFile(PHPWG_ROOT_PATH . $row['path'], $row['id'].'_'.get_filename_wo_extension($row['file']).'.'.get_extension($row['path']));
+        $zip->addFile(PHPWG_ROOT_PATH . $row['path'], $row['id'].'_'.stripslashes(get_filename_wo_extension($row['file'])).'.'.get_extension($row['path']));
         
         array_push($images_added, $row['id']);
@@ -437 +437 @@
       {
           $out.= '<a href="'.add_url_params($url, array('set_id'=>$this->data['id'],'zip'=>$i)).'" rel="nofollow" style="font-weight:bold;"' 
-            .($i!=1 ? 'onClick="return confirm(\'Starting download Archive #'.$i.' will destroy Archive #'.($i-1).', be sure you finish the download. Continue ?\');"' : null).
+            .($i!=1 ? ' onClick="return confirm(\''.addslashes(sprintf(l10n('Starting download Archive #%d will destroy Archive #%d, be sure you finish the download. Continue ?'), $i, $i-1)).'\');"' : null).
             '><img src="'.$root_url.BATCH_DOWNLOAD_PATH.'template/drive_go.png"> Archive #'.$i.' (ready)</a>';
       }
@@ -460 +460 @@
     if (!file_exists(BATCH_DOWNLOAD_LOCAL . 'u-' .$this->data['user_id']. '/'))
     {
-      mkdir(BATCH_DOWNLOAD_LOCAL . 'u-' .$this->data['user_id']. '/', 0755, true);
+      mkgetdir(BATCH_DOWNLOAD_LOCAL . 'u-' .$this->data['user_id']. '/');
     }
     

extensions/BatchDownloader/include/install.inc.php

@@ -28 +28 @@
 
   // archives directory
-  if ( file_exists($conf['data_location']) and !file_exists($conf['data_location'] . 'download_archives/') )
+  if ( file_exists($conf['data_location']) )
   {
-    mkdir($conf['data_location'] . 'download_archives/', 0755);
+    mkgetdir($conf['data_location'] . 'download_archives/', MKGETDIR_DEFAULT&~MKGETDIR_DIE_ON_ERROR);
   }
 

extensions/BatchDownloader/language/en_UK/plugin.lang.php

@@ -45 +45 @@
 $lang['Remove all finished downloads'] = 'Remove all finished downloads';
 $lang['hours'] = 'hours';
+$lang['Starting download Archive #%d will destroy Archive #%d, be sure you finish the download. Continue ?'] = 'Starting download Archive #%d will destroy Archive #%d, be sure you finish the download. Continue ?';
 
 ?>

extensions/BatchDownloader/language/fr_FR/plugin.lang.php

@@ -45 +45 @@
 $lang['Remove all finished downloads'] = 'Supprimer tous les téléchargements terminés';
 $lang['hours'] = 'heures';
+$lang['Starting download Archive #%d will destroy Archive #%d, be sure you finish the download. Continue ?'] = 'Le démarrage du téléchargement de l\'archive #%d détruira l\'archive #%d, soyez sûr de terminer le téléchargement avant de continuer.';
 
 ?>

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'))

extensions/BatchDownloader/maintain.inc.php

@@ -2 +2 @@
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-include_once(PHPWG_PLUGINS_PATH . 'BatchDownloader/include/install.inc.php');
+defined('BATCH_DOWNLOAD_ID') or define('BATCH_DOWNLOAD_ID', basename(dirname(__FILE__)));
+include_once(PHPWG_PLUGINS_PATH . BATCH_DOWNLOAD_ID . '/include/install.inc.php');
 
 function plugin_install()