Changeset 16697 for extensions

Timestamp:

Jul 13, 2012, 8:42:34 PM (12 years ago)

Author:

mistic100

Message:

-button on admin page to purge download list
-confirmation is properly updated on UserCollection page

Location:

extensions/BatchDownloader

Files:

• admin/sets.php (modified) (2 diffs)
• admin/template/config.tpl (modified) (1 diff)
• admin/template/sets.tpl (modified) (2 diffs)
• admin/template/style.css (modified) (1 diff)
• include/BatchDownloader.class.php (modified) (1 diff)
• include/events.inc.php (modified) (1 diff)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (2 diffs)

extensions/BatchDownloader/admin/sets.php

@@ -17 +17 @@
   $BatchDownloader->deleteLastArchive();
   $BatchDownloader->clearImages();
+}
+if (isset($_POST['delete_done']))
+{
+  $query = '
+DELETE s, i
+  FROM '.BATCH_DOWNLOAD_TSETS.' AS s
+    LEFT JOIN '.BATCH_DOWNLOAD_TIMAGES.' AS i
+    ON i.set_id = s.id
+  WHERE
+    status = "done" AND
+    date_creation < DATE_SUB(NOW(), INTERVAL 1 HOUR)
+;';
+  pwg_query($query);
 }
 
@@ -62 +75 @@
 {
   $set = new BatchDownloader($set_id);
+  
   $template->append('sets', array_merge(
     $set->getSetInfo(),

extensions/BatchDownloader/admin/template/config.tpl

@@ -90 +90 @@
       <label>
         <span class="property">{'Maximum number of photos per download set'|@translate}</span>
-        <div id="max_elements""></div>
+        <div id="max_elements"></div>
         <input type="text" name="max_elements" value="{$batch_download.max_elements}" size="5">
       </label>

extensions/BatchDownloader/admin/template/sets.tpl

@@ -64 +64 @@
     <td>{$set.NB_ARCHIVES}</td>
     <td>
-      {$set.STATUS}
-      {if $set.STATUS == 'download'}({$set.LAST_ZIP}/{$set.NB_ARCHIVES}){/if}
+      {$set.STATUS|@translate}
+      {if $set.STATUS == 'download'}<i style="font-size:0.8em;">({$set.LAST_ZIP}/{$set.NB_ARCHIVES})</i>{/if}
     </td>
     <td style="padding-left:25px;">
@@ -80 +80 @@
   {/if}
 </table>
+
+<form action="{$F_FILTER_ACTION}" method="post">
+<p><label><input type="checkbox" name="delete_done" value="1"> {'Remove all finished downloads'|@translate}</label>
+<input type="submit" value="{'Submit'|@translate}"></p>
+</form>

extensions/BatchDownloader/admin/template/style.css

@@ -44 +44 @@
 }
 .table2 .status {
-  width:80px;
+  width:120px;
 }
 

extensions/BatchDownloader/include/BatchDownloader.class.php

@@ -607 +607 @@
         try
         {
+          if (!class_exists('UserCollection')) throw new Exception();
           $UserCollection = new UserCollection($this->data['type_id']);
           $set['NAME'] = l10n('Collection').': <a href="'.USER_COLLEC_PUBLIC.'view/'.$UserCollection->getParam('id').'">'.$UserCollection->getParam('name').'</a>';

extensions/BatchDownloader/include/events.inc.php

@@ -106 +106 @@
   
   // toolbar button
-  $button = '<li><a href="'. $url .'&amp;action=advdown_set" title="'.l10n('Download all pictures of this selection').'" class="pwg-state-default pwg-button" rel="nofollow"
-    onClick="return confirm(\''.sprintf(l10n('Confirm the download of %d pictures?'), count($page['items'])).'\');">
+  $button = '<script type="text/javascript">var batchdown_count = '.count($page['items']).'; var batchdown_string = "'.l10n('Confirm the download of %d pictures?').'";</script>
+    <li><a href="'. $url .'&amp;action=advdown_set" title="'.l10n('Download all pictures of this selection').'" class="pwg-state-default pwg-button" rel="nofollow"
+    onClick="return confirm(batchdown_string.replace(\'%d\', batchdown_count));">
                         <span class="pwg-icon batch-downloader-icon" style="background:url(\'' . BATCH_DOWNLOAD_PATH . 'template/zip.png\') center center no-repeat;">&nbsp;</span><span class="pwg-button-text">'.l10n('Batch Downloader').'</span>
                 </a></li>';

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

@@ -43 +43 @@
 $lang['Remove from download set'] = 'Remove from download set';
 $lang['Confirm the download of %d pictures?'] = 'Confirm the download of %d pictures?';
+$lang['Remove all finished downloads'] = 'Remove all finished downloads';
+$lang['hours'] = 'hours';
 
 ?>

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

@@ -23 +23 @@
 $lang['Archives'] = 'Archives';
 $lang['Maximum photo size'] = 'Taille maximale des photo';
-$lang['Delete unterminated downloads after'] = 'Supprimer les téléchargements après';
+$lang['Delete downloads after'] = 'Supprimer les téléchargements après';
 $lang['Maximum number of photos per download set'] = 'Nombre maximal de photos par lot';
 $lang['Maximum size of each archive (in Megabytes)'] = 'Taille maximale de chaque archive (en Megaoctets)';
@@ -43 +43 @@
 $lang['Remove from download set'] = 'Supprimer du lot';
 $lang['Confirm the download of %d pictures?'] = 'Confirmer le téléchargementde %d photos ?';
+$lang['Remove all finished downloads'] = 'Supprimer tous les téléchargements terminés';
+$lang['hours'] = 'heures';
 
 ?>