Changeset 16689 for extensions
- Timestamp:
- Jul 13, 2012, 12:12:21 PM (12 years ago)
- Location:
- extensions/BatchDownloader
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/BatchDownloader/admin.php
r16392 r16689 14 14 $tabsheet->assign(); 15 15 16 if (!class_exists('ZipArchive')) 17 { 18 array_push($page['errors'], l10n('Unable to find ZipArchive PHP extension, Batch Downloader can\'t work without this extension.')); 19 } 20 16 21 // include page 17 22 include(BATCH_DOWNLOAD_PATH . 'admin/' . $page['tab'] . '.php'); -
extensions/BatchDownloader/admin/config.php
r16392 r16689 9 9 'photo_size' => $_POST['photo_size'], 10 10 'archive_prefix' => trim($_POST['archive_prefix']), 11 'archive_comment' => trim($_POST['archive_comment']),12 11 'archive_timeout' => intval($_POST['archive_timeout']), 13 12 'max_elements' => intval($_POST['max_elements']), … … 15 14 'last_clean' => $conf['batch_download']['last_clean'], 16 15 ); 16 $conf['batch_download_comment'] = trim($_POST['archive_comment']); 17 17 18 18 conf_update_param('batch_download', serialize($conf['batch_download'])); 19 conf_update_param('batch_download_comment', $conf['batch_download_comment']); 19 20 } 20 21 … … 43 44 // max values 44 45 $conf['batch_download']['max_elements_value'] = isset($conf['batch_download_max_elements']) ? $conf['batch_download_max_elements'] : 1000; 45 $conf['batch_download']['max_size_value'] = isset($conf['batch_download_max_size']) ? $conf['batch_download_max_size'] : 1000;46 $conf['batch_download']['max_size_value'] = isset($conf['batch_download_max_size']) ? $conf['batch_download_max_size'] : 500; 46 47 47 48 $template->assign(array( … … 50 51 'sizes_options' => $sizes_options, 51 52 'batch_download' => $conf['batch_download'], 53 'batch_download_comment' => stripslashes($conf['batch_download_comment']), 52 54 )); 53 55 -
extensions/BatchDownloader/admin/sets.php
r16598 r16689 68 68 'STATUS' => $set->getParam('status'), 69 69 'LAST_ZIP' => $set->getParam('last_zip'), 70 'U_DELETE' => BATCH_DOWNLOAD_ADMIN . '-sets&delete='.$set->getParam(' set_id'),71 'U_CANCEL' => BATCH_DOWNLOAD_ADMIN . '-sets&cancel='.$set->getParam(' set_id'),70 'U_DELETE' => BATCH_DOWNLOAD_ADMIN . '-sets&delete='.$set->getParam('id'), 71 'U_CANCEL' => BATCH_DOWNLOAD_ADMIN . '-sets&cancel='.$set->getParam('id'), 72 72 ) 73 73 )); -
extensions/BatchDownloader/admin/template/config.tpl
r16622 r16689 110 110 <label> 111 111 <span class="property">{'Archive comment'|@translate} :</span><br> 112 <textarea name="archive_comment" rows="5" style="width:450px;">{$batch_download .archive_comment}</textarea>112 <textarea name="archive_comment" rows="5" style="width:450px;">{$batch_download_comment}</textarea> 113 113 </label> 114 <br> 115 <i>{'Warning: ZipArchive doesn\'t accept special characters like accentuated ones, angle quotes (») and non-latin alphabets.'|@translate}</i> 114 116 </li> 115 117 </ul> -
extensions/BatchDownloader/include/BatchDownloader.class.php
r16626 r16689 20 20 21 21 $this->conf = $conf['batch_download']; 22 $this->conf['archive_acomment'] = $conf['batch_download_comment']; 22 23 $this->data = array( 23 ' set_id' => 0,24 'id' => 0, 24 25 'user_id' => $user['id'], 25 26 'date_creation' => '0000-00-00 00:00:00', … … 39 40 $query = ' 40 41 SELECT 42 id, 41 43 user_id, 42 44 date_creation, … … 57 59 if (pwg_db_num_rows($result)) 58 60 { 59 $this->data['set_id'] = $set_id; 60 list( 61 $this->data['user_id'], 62 $this->data['date_creation'], 63 $this->data['type'], 64 $this->data['type_id'], 65 $this->data['nb_zip'], 66 $this->data['last_zip'], 67 $this->data['nb_images'], 68 $this->data['total_size'], 69 $this->data['status'] 70 ) = pwg_db_fetch_row($result); 61 $this->data = array_merge( 62 $this->data, 63 pwg_db_fetch_assoc($result) 64 ); 71 65 72 66 // make sur all pictures of the set exist … … 84 78 zip 85 79 FROM '.BATCH_DOWNLOAD_TIMAGES.' 86 WHERE set_id = '.$this->data[' set_id'].'80 WHERE set_id = '.$this->data['id'].' 87 81 ;'; 88 82 $this->images = simple_hash_from_query($query, 'image_id', 'zip'); … … 129 123 ;'; 130 124 pwg_query($query); 131 $this->data[' set_id'] = pwg_db_insert_id();125 $this->data['id'] = pwg_db_insert_id(); 132 126 133 127 $date = pwg_query('SELECT FROM_UNIXTIME(NOW());'); … … 153 147 { 154 148 $this->data[$name] = $value; 155 pwg_query('UPDATE '.BATCH_DOWNLOAD_TSETS.' SET '.$name.' = "'.$value.'" WHERE id = '.$this->data[' set_id'].';');149 pwg_query('UPDATE '.BATCH_DOWNLOAD_TSETS.' SET '.$name.' = "'.$value.'" WHERE id = '.$this->data['id'].';'); 156 150 } 157 151 … … 201 195 DELETE FROM '.BATCH_DOWNLOAD_TIMAGES.' 202 196 WHERE 203 set_id = '.$this->data[' set_id'].'197 set_id = '.$this->data['id'].' 204 198 AND image_id IN('.implode(',', $image_ids).') 205 199 ;'; … … 225 219 226 220 $this->images[ $image_id ] = 0; 227 array_push($inserts, array('set_id'=>$this->data[' set_id'], 'image_id'=>$image_id, 'zip'=>0));221 array_push($inserts, array('set_id'=>$this->data['id'], 'image_id'=>$image_id, 'zip'=>0)); 228 222 } 229 223 … … 246 240 $query = ' 247 241 DELETE FROM '.BATCH_DOWNLOAD_TIMAGES.' 248 WHERE set_id = '.$this->data[' set_id'].'242 WHERE set_id = '.$this->data['id'].' 249 243 ;'; 250 244 pwg_query($query); … … 348 342 if (!empty($this->conf['archive_comment'])) 349 343 { 350 $comment.= "\n\n". $this->conf['archive_comment'];344 $comment.= "\n\n".wordwrap(remove_accents($this->conf['archive_comment']), 60); 351 345 } 352 346 $zip->setArchiveComment($comment); … … 359 353 SET zip = '.$this->data['last_zip'].' 360 354 WHERE 361 set_id = '.$this->data[' set_id'].'355 set_id = '.$this->data['id'].' 362 356 AND image_id IN('.implode(',', $images_added).') 363 357 ;'; … … 442 436 else if ($i == $this->data['last_zip']+1) 443 437 { 444 $out.= '<a href="'.add_url_params($url, array('set_id'=>$this->data[' set_id'],'zip'=>$i)).'" rel="nofollow" style="font-weight:bold;"'438 $out.= '<a href="'.add_url_params($url, array('set_id'=>$this->data['id'],'zip'=>$i)).'" rel="nofollow" style="font-weight:bold;"' 445 439 .($i!=1 ? 'onClick="return confirm(\'Starting download Archive #'.$i.' will destroy Archive #'.($i-1).', be sure you finish the download. Continue ?\');"' : null). 446 440 '><img src="'.BATCH_DOWNLOAD_PATH.'template/drive_go.png"> Archive #'.$i.' (ready)</a>'; … … 477 471 get_username($this->data['user_id']) .'_'. 478 472 $this->data['type'] .'-'. $this->data['type_id'] .'_'. 479 $this->data['user_id'] . $this->data[' set_id'] .473 $this->data['user_id'] . $this->data['id'] . 480 474 ($this->data['nb_zip']!=1 ? '_part'. $i : null). 481 475 '.zip'; -
extensions/BatchDownloader/include/events.inc.php
r16609 r16689 81 81 $BatchDownloader->createNextArchive(true); // make sure we have only one zip, even if 'max_size' is exceeded 82 82 83 $u_download = BATCH_DOWNLOAD_PATH . 'download.php?set_id='.$BatchDownloader->getParam(' set_id').'&zip=1';83 $u_download = BATCH_DOWNLOAD_PATH . 'download.php?set_id='.$BatchDownloader->getParam('id').'&zip=1'; 84 84 85 85 $null = null; … … 91 91 else 92 92 { 93 redirect(BATCH_DOWNLOAD_PUBLIC . 'init_zip&set_id='.$BatchDownloader->getParam(' set_id'));93 redirect(BATCH_DOWNLOAD_PUBLIC . 'init_zip&set_id='.$BatchDownloader->getParam('id')); 94 94 } 95 95 } … … 106 106 107 107 // toolbar button 108 $button = '<li><a href="'. $url .'&action=advdown_set" title="'.l10n('Download all pictures of this selection').'" class="pwg-state-default pwg-button" rel="nofollow"> 109 <span class="pwg-icon" style="background:url(\'' . BATCH_DOWNLOAD_PATH . 'template/zip.png\') center center no-repeat;"> </span><span class="pwg-button-text">'.l10n('Batch Downloader').'</span> 108 $button = '<li><a href="'. $url .'&action=advdown_set" title="'.l10n('Download all pictures of this selection').'" class="pwg-state-default pwg-button" rel="nofollow" 109 onClick="return confirm(\''.sprintf(l10n('Confirm the download of %d pictures?'), count($page['items'])).'\');"> 110 <span class="pwg-icon batch-downloader-icon" style="background:url(\'' . BATCH_DOWNLOAD_PATH . 'template/zip.png\') center center no-repeat;"> </span><span class="pwg-button-text">'.l10n('Batch Downloader').'</span> 110 111 </a></li>'; 111 112 $template->concat('PLUGIN_INDEX_ACTIONS', $button); … … 163 164 164 165 array_push($data, array( 165 'URL' => BATCH_DOWNLOAD_PUBLIC . 'init_zip&set_id='.$BatchDownloader->getParam(' set_id'),166 'URL' => BATCH_DOWNLOAD_PUBLIC . 'init_zip&set_id='.$BatchDownloader->getParam('id'), 166 167 'TITLE' => str_replace('"', "'", strip_tags($set['COMMENT'])), 167 168 'NAME' => $set['sNAME'], -
extensions/BatchDownloader/language/en_UK/plugin.lang.php
r16609 r16689 39 39 $lang['Cancel this download'] = 'Cancel this download'; 40 40 $lang['Return to download page'] = 'Return to download page'; 41 $lang['Warning: ZipArchive doesn\'t accept special characters like accentuated ones, angle quotes (») and non-latin alphabets.'] = 'Warning: ZipArchive doesn\'t accept special characters like accentuated ones, angle quotes (») and non-latin alphabets.'; 42 $lang['Unable to find ZipArchive PHP extension, Batch Downloader can\'t work without this extension.'] = 'Unable to find ZipArchive PHP extension, Batch Downloader can\'t work without this extension.'; 43 $lang['Remove from download set'] = 'Remove from download set'; 44 $lang['Confirm the download of %d pictures?'] = 'Confirm the download of %d pictures?'; 41 45 42 46 ?> -
extensions/BatchDownloader/language/fr_FR/plugin.lang.php
r16622 r16689 39 39 $lang['Cancel this download'] = 'Annuler ce téléchargement'; 40 40 $lang['Return to download page'] = 'Retourner à la page de téléchargement'; 41 $lang['Warning: ZipArchive doesn\'t accept special characters like accentuated ones, angle quotes (») and non-latin alphabets.'] = 'Attention: ZipArchive n\'accepte pas les caractères spéciaux comme les caractères accentués, les guillemets (») et les alphabets non-latin.'; 42 $lang['Unable to find ZipArchive PHP extension, Batch Downloader can\'t work without this extension.'] = 'Impossible de trouver l\'extension PHP ZipArchive, Batch Downloader ne peut fonctionner sans cette extension'; 43 $lang['Remove from download set'] = 'Supprimer du lot'; 44 $lang['Confirm the download of %d pictures?'] = 'Confirmer le téléchargementde %d photos ?'; 41 45 42 46 ?> -
extensions/BatchDownloader/maintain.inc.php
r16400 r16689 9 9 'photo_size' => 'original', 10 10 'archive_prefix' => 'piwigo', 11 'archive_comment' => null,12 11 'archive_timeout' => 48, /* hours */ 13 12 'max_elements' => 500, … … 49 48 50 49 conf_update_param('batch_download', batch_download_default_config); 50 conf_update_param('batch_download_comment', null); 51 51 52 52 mkdir($conf['data_location'] . 'download_archives/', 0755); … … 57 57 global $conf; 58 58 59 if (empty($conf['batch_download ']))59 if (empty($conf['batch_download_comment'])) 60 60 { 61 conf_update_param('batch_download', batch_download_default_config); 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); 62 65 } 63 66 -
extensions/BatchDownloader/template/thumbnails_css_js.tpl
r16626 r16689 1 1 {html_style} 2 2 .thumbnails .wrap1 {ldelim} position:relative; } 3 . removeSet {ldelim} width:100%;height:16px;display:none;position:absolute;top:0;background:rgba(0,0,0,0.8);padding:2px;border-radius:2px;font-size:0.8em;z-index:100;color:#eee;white-space:nowrap; }3 .wrap1 .removeSet {ldelim} width:100%;height:16px;display:none;position:absolute;top:0;background:rgba(0,0,0,0.8);padding:2px;border-radius:2px;font-size:10px;z-index:100;color:#eee;white-space:nowrap; } 4 4 .wrap1:hover .removeSet {ldelim} display:block; 5 5 {/html_style} -
extensions/BatchDownloader/template/view.tpl
r16626 r16689 22 22 {assign var="nb_images" value='<span class="nbImagesSet">'|@cat:$set.NB_IMAGES|@cat:'</span>'} 23 23 {'%d photos'|@translate|replace:'%d':'%s'|sprintf:$nb_images} 24 <br> 25 <b><a href="{$U_INIT_ZIP}" rel="nofollow">{'Return to download page'|@translate} →</a></b> 24 26 </fieldset> 25 27 … … 34 36 35 37 {if !empty($navbar)}{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if} 36 37 <p style="text-align:center;font-weight:bold;margin:20px;"><a href="{$U_INIT_ZIP}" rel="nofollow">{'Return to download page'|@translate}</a></p>38 38 {/if} 39 39
Note: See TracChangeset
for help on using the changeset viewer.