Changeset 16392 for extensions/BatchDownloader/include/BatchDownloader.class.php

Timestamp:

Jul 6, 2012, 1:03:39 PM (12 years ago)

Author:

mistic100

Message:

• stylish download page
• if there is only one archive, the file is downloaded directly
• improve configuration page + add sliders (needs Piwigo 2.4.2)

File:

• extensions/BatchDownloader/include/BatchDownloader.class.php (modified) (9 diffs)

extensions/BatchDownloader/include/BatchDownloader.class.php

@@ -260 +260 @@
    * createNextArchive
    */
-  function createNextArchive()
+  function createNextArchive($force_one_archive=false)
   {
     // set already downloaded
@@ -329 +329 @@
         
         $total_size+= $row['filesize'];
-        if ($total_size >= $this->conf['max_size']*1024) break;
+        if ($total_size >= $this->conf['max_size']*1024 and !$force_one_archive) break;
       }
       
@@ -358 +358 @@
       {
         $this->updateParam('status', 'done');
+        $this->clear(false);
       }
       
@@ -417 +418 @@
     $nb_archives = $this->getEstimatedArchiveNumber();
     
-    $out = '<ul id="download_list">';
-    if ($this->data['status'] == 'done')
+    $out = '';
+    /*if ($this->data['status'] == 'done')
     {
       $out.= '<li id="zip-1">Already downloaded</li>';
-    }
-    else
+    }*/
+    if (true)
     {
       for ($i=1; $i<=$this->data['nb_zip']; $i++)
@@ -430 +431 @@
         if ($i < $this->data['last_zip']+1)
         {
-          $out.= 'Archive #'.$i.' (already downloaded)';
+          $out.= '<img src="'.BATCH_DOWNLOAD_PATH.'template/drive.png"> Archive #'.$i.' (already downloaded)';
         }
         else if ($i == $this->data['last_zip']+1)
         {
-            $out.= '<a href="'.add_url_params($url, array('set_id'=>$this->data['set_id'],'zip'=>$i)).'" rel="nofollow"' 
+            $out.= '<a href="'.add_url_params($url, array('set_id'=>$this->data['set_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).
-              '>Archive #'.$i.' (ready)</a>';
+              '><img src="'.BATCH_DOWNLOAD_PATH.'template/drive_go.png"> Archive #'.$i.' (ready)</a>';
         }
         else
         {
-          $out.= 'Archive #'.$i.' (pending)';
+          $out.= '<img src="'.BATCH_DOWNLOAD_PATH.'template/drive.png"> Archive #'.$i.' (pending)';
         }
         
@@ -446 +447 @@
       }
     }
-    $out.= '</ul>';
     
     return $out;
@@ -472 +472 @@
           $this->data['type'] .'-'. $this->data['type_id'] .'_'.
           $this->data['user_id'] . $this->data['set_id'] .'_'.
-          'part'. $i .'.zip';
+          ($this->data['nb_zip']!=1 ? 'part'. $i : null).
+          '.zip';
   }
   
@@ -505 +506 @@
       {
         $category = get_cat_info($this->data['type_id']);
-        $set['NAME'] = get_cat_display_name($category['upper_names']);
-        $set['sNAME'] = $category['name'];
-        $set['COMMENT'] = trigger_action('render_category_description', $category['comment']);
+        $set['NAME'] = l10n('Album').': '.get_cat_display_name($category['upper_names']);
+        $set['sNAME'] = l10n('Album').': '.trigger_event('render_category_name', $category['name']);
+        $set['COMMENT'] = trigger_event('render_category_description', $category['comment']);
         break;
       }
@@ -532 +533 @@
             .'</a>';
         }
+        
+        $set['sNAME'] = l10n('Tags').': '.strip_tags($set['COMMENT']);
         break;
       }