Changeset 17656
- Timestamp:
- Aug 29, 2012, 5:11:53 PM (12 years ago)
- Location:
- extensions/BatchDownloader
- Files:
-
- 1 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/BatchDownloader/include/BatchDownloader.class.php
r17517 r17656 325 325 foreach ($images_to_add as $row) 326 326 { 327 $zip->addFile(PHPWG_ROOT_PATH . $row['path'], $row['id'].'_'. str2url($row['name']).'.'.get_extension($row['file']));327 $zip->addFile(PHPWG_ROOT_PATH . $row['path'], $row['id'].'_'.get_filename_wo_extension($row['file']).'.'.get_extension($row['path'])); 328 328 329 329 array_push($images_added, $row['id']); -
extensions/BatchDownloader/include/events.inc.php
r17517 r17656 3 3 4 4 # this file contains all functions directly called by the triggers # 5 6 /* unserialize conf and load language */7 function batch_download_init()8 {9 global $conf;10 11 $conf['batch_download'] = unserialize($conf['batch_download']);12 load_language('plugin.lang', BATCH_DOWNLOAD_PATH);13 }14 15 5 16 6 /* define page section from url */ -
extensions/BatchDownloader/main.inc.php
r17517 r17656 13 13 global $conf, $prefixeTable; 14 14 15 define('BATCH_DOWNLOAD_PATH', PHPWG_PLUGINS_PATH . basename(dirname(__FILE__)) . '/');15 define('BATCH_DOWNLOAD_PATH', PHPWG_PLUGINS_PATH . 'BatchDownloader/'); 16 16 define('BATCH_DOWNLOAD_TSETS', $prefixeTable . 'download_sets'); 17 17 define('BATCH_DOWNLOAD_TIMAGES', $prefixeTable . 'download_sets_images'); 18 18 define('BATCH_DOWNLOAD_LOCAL', PHPWG_ROOT_PATH . $conf['data_location'] . 'download_archives/'); 19 define('BATCH_DOWNLOAD_ADMIN', get_root_url() . 'admin.php?page=plugin- ' . basename(dirname(__FILE__)));19 define('BATCH_DOWNLOAD_ADMIN', get_root_url() . 'admin.php?page=plugin-BatchDownloader'); 20 20 define('BATCH_DOWNLOAD_PUBLIC', get_absolute_root_url() . make_index_url(array('section' => 'download')) . '/'); 21 define('BATCH_DOWNLOAD_VERSION', '1.0.3'); 21 22 23 24 add_event_handler('init', 'batch_download_init'); 22 25 23 26 if (class_exists('ZipArchive')) 24 27 { 25 add_event_handler('init', 'batch_download_init');26 27 28 add_event_handler('loc_end_section_init', 'batch_download_section_init'); 28 29 add_event_handler('loc_end_index', 'batch_download_page'); … … 35 36 add_event_handler('blockmanager_apply', 'batch_download_applymenu'); 36 37 37 require(BATCH_DOWNLOAD_PATH . 'include/functions.inc.php'); 38 require(BATCH_DOWNLOAD_PATH . 'include/BatchDownloader.class.php'); 39 require(BATCH_DOWNLOAD_PATH . 'include/events.inc.php'); 38 include_once(BATCH_DOWNLOAD_PATH . 'include/BatchDownloader.class.php'); 39 include_once(BATCH_DOWNLOAD_PATH . 'include/functions.inc.php'); 40 include_once(BATCH_DOWNLOAD_PATH . 'include/events.inc.php'); 41 } 42 43 if (defined('IN_ADMIN')) 44 { 45 add_event_handler('get_admin_plugin_menu_links', 'batch_download_admin_menu'); 40 46 } 41 47 42 48 43 add_event_handler('get_admin_plugin_menu_links', 'batch_download_admin_menu');44 49 45 /* admin plugins menu */ 50 /** 51 * unserialize conf and load language 52 */ 53 function batch_download_init() 54 { 55 global $conf, $pwg_loaded_plugins; 56 57 if ( 58 $pwg_loaded_plugins['BatchDownloader']['version'] == 'auto' or 59 version_compare($pwg_loaded_plugins['BatchDownloader']['version'], BATCH_DOWNLOAD_VERSION, '<') 60 ) 61 { 62 include_once(BATCH_DOWNLOAD_PATH . 'include/install.inc.php'); 63 batch_download_install(); 64 65 if ($pwg_loaded_plugins['BatchDownloader']['version'] != 'auto') 66 { 67 $query = ' 68 UPDATE '. PLUGINS_TABLE .' 69 SET version = "'. BATCH_DOWNLOAD_VERSION .'" 70 WHERE id = "BatchDownloader"'; 71 pwg_query($query); 72 73 $pwg_loaded_plugins['BatchDownloader']['version'] = BATCH_DOWNLOAD_VERSION; 74 75 if (defined('IN_ADMIN')) 76 { 77 $_SESSION['page_infos'][] = 'BatchDownloader updated to version '. BATCH_DOWNLOAD_VERSION; 78 } 79 } 80 } 81 82 $conf['batch_download'] = unserialize($conf['batch_download']); 83 load_language('plugin.lang', BATCH_DOWNLOAD_PATH); 84 } 85 86 /** 87 * admin plugins menu 88 */ 46 89 function batch_download_admin_menu($menu) 47 90 { -
extensions/BatchDownloader/maintain.inc.php
r16689 r17656 2 2 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!'); 3 3 4 define( 5 'batch_download_default_config', 6 serialize(array( 7 'groups' => array(), 8 'level' => 0, 9 'photo_size' => 'original', 10 'archive_prefix' => 'piwigo', 11 'archive_timeout' => 48, /* hours */ 12 'max_elements' => 500, 13 'max_size' => 100, /* MB */ 14 'last_clean' => time(), 15 )) 16 ); 4 include_once(PHPWG_PLUGINS_PATH . 'BatchDownloader/include/install.inc.php'); 17 5 18 6 function plugin_install() 19 7 { 20 global $conf, $prefixeTable;8 batch_download_install(); 21 9 22 $query = ' 23 CREATE TABLE IF NOT EXISTS `' . $prefixeTable . 'download_sets` ( 24 `id` mediumint(8) NOT NULL AUTO_INCREMENT, 25 `user_id` smallint(5) NOT NULL, 26 `date_creation` datetime NOT NULL, 27 `type` varchar(16) CHARACTER SET utf8 NOT NULL, 28 `type_id` varchar(64) CHARACTER SET utf8 NOT NULL, 29 `nb_zip` smallint(3) NOT NULL DEFAULT 0, 30 `last_zip` smallint(3) NOT NULL DEFAULT 0, 31 `nb_images` mediumint(8) NOT NULL DEFAULT 0, 32 `total_size` int(10) NOT NULL DEFAULT 0, 33 `status` enum("new","download","done") CHARACTER SET utf8 NOT NULL DEFAULT "new", 34 PRIMARY KEY (`id`) 35 ) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 36 ;'; 37 pwg_query($query); 38 39 $query = ' 40 CREATE TABLE IF NOT EXISTS `' . $prefixeTable . 'download_sets_images` ( 41 `set_id` mediumint(8) NOT NULL, 42 `image_id` mediumint(8) NOT NULL, 43 `zip` smallint(5) NOT NULL DEFAULT 0, 44 UNIQUE KEY `UNIQUE` (`set_id`,`image_id`) 45 ) DEFAULT CHARSET=utf8 46 ;'; 47 pwg_query($query); 48 49 conf_update_param('batch_download', batch_download_default_config); 50 conf_update_param('batch_download_comment', null); 51 52 mkdir($conf['data_location'] . 'download_archives/', 0755); 10 define('batch_download_installed', true); 53 11 } 54 12 55 13 function plugin_activate() 56 14 { 57 global $conf; 58 59 if (empty($conf['batch_download_comment'])) 15 if (!defined('batch_download_installed')) 60 16 { 61 $new_conf = unserialize($conf['batch_download']); 62 unset($new_conf['archive_comment']); 63 conf_update_param('batch_download', serialize($new_conf)); 64 conf_update_param('batch_download_comment', null); 65 } 66 67 if (!file_exists($conf['data_location'] . 'download_archives/')) 68 { 69 mkdir($conf['data_location'] . 'download_archives/', 0755); 17 batch_download_install(); 70 18 } 71 19 } … … 82 30 } 83 31 84 function rrmdir($dir) 32 33 if (!function_exists('rrmdir')) 85 34 { 86 if (!is_dir($dir))35 function rrmdir($dir) 87 36 { 88 return false; 89 } 90 $dir = rtrim($dir, '/'); 91 $objects = scandir($dir); 92 $return = true; 93 94 foreach ($objects as $object) 95 { 96 if ($object !== '.' && $object !== '..') 37 if (!is_dir($dir)) 97 38 { 98 $path = $dir.'/'.$object; 99 if (filetype($path) == 'dir') 39 return false; 40 } 41 $dir = rtrim($dir, '/'); 42 $objects = scandir($dir); 43 $return = true; 44 45 foreach ($objects as $object) 46 { 47 if ($object !== '.' && $object !== '..') 100 48 { 101 $return = $return && rrmdir($path); 102 } 103 else 104 { 105 $return = $return && @unlink($path); 49 $path = $dir.'/'.$object; 50 if (filetype($path) == 'dir') 51 { 52 $return = $return && rrmdir($path); 53 } 54 else 55 { 56 $return = $return && @unlink($path); 57 } 106 58 } 107 59 } 60 61 return $return && @rmdir($dir); 108 62 } 109 110 return $return && @rmdir($dir); 111 } 63 } 112 64 113 65 ?>
Note: See TracChangeset
for help on using the changeset viewer.