Changeset 23321

Timestamp:

Jun 18, 2013, 1:08:10 PM (11 years ago)

Author:

mistic100

Message:

improve filenames, fix for calendar view

Location:

extensions/BatchDownloader/include

Files:

• BatchDownloader.class.php (modified) (5 diffs)
• events.inc.php (modified) (1 diff)
• functions.inc.php (modified) (1 diff)

extensions/BatchDownloader/include/BatchDownloader.class.php

@@ -448 +448 @@
       {
         $query = '
-SELECT image_id, filesize
+SELECT image_id, filesize, width, height
   FROM '.IMAGE_SIZES_TABLE.'
   WHERE image_id IN ('.implode(',', array_keys($images_to_add)).')
     AND type = "'.$this->data['size'].'"
 ;';
-        $filesizes = simple_hash_from_query($query, 'image_id', 'filesize');
+        $filesizes = hash_from_query($query, 'image_id');
       }
       
@@ -472 +472 @@
         }
         
+        $filename =  $row['id'].'_'.stripslashes(get_filename_wo_extension($row['file']));
+        
         if ($this->data['size'] == 'original')
         {
-          $zip->addFile(PHPWG_ROOT_PATH.$row['path'], $row['id'].'_'.stripslashes(get_filename_wo_extension($row['file'])).'.'.get_extension($row['path']));
+          $filename.= '_'.$row['width'].'x'.$row['height'];
+          $zip->addFile(PHPWG_ROOT_PATH.$row['path'], $filename.'.'.get_extension($row['path']));
           $total_size+= $row['filesize'];
         }
@@ -484 +487 @@
           if ($src_image->is_mimetype())
           {
-            $zip->addFile(PHPWG_ROOT_PATH.$row['path'], $row['id'].'_'.stripslashes(get_filename_wo_extension($row['file'])).'.'.get_extension($row['path']));
+            $zip->addFile(PHPWG_ROOT_PATH.$row['path'], $filename.'.'.get_extension($row['path']));
             $total_size+= $row['filesize'];
           }
@@ -492 +495 @@
             $derivative = new DerivativeImage($this->data['size'], $src_image);
             $path = $derivative->get_path();
-        
-            $zip->addFile($path, $row['id'].'_'.stripslashes(get_filename_wo_extension(basename($path))).'.'.get_extension($path));
-            $total_size+= $filesizes[ $row['id'] ];
+            
+            $filename.= '_'.$filesizes[ $row['id'] ]['width'].'x'.$filesizes[ $row['id'] ]['height'];
+            $zip->addFile($path, $filename.'.'.get_extension($path));
+            $total_size+= $filesizes[ $row['id'] ]['filesize'];
           }
         }
@@ -652 +656 @@
     $set = $this->getNames();
     
-    include_once(PHPWG_ROOT_PATH . 'admin/include/functions.php');
-    
     $path = BATCH_DOWNLOAD_LOCAL . 'u-'. $this->data['user_id'] . '/';
     $path.= !empty($this->conf['archive_prefix']) ? $this->conf['archive_prefix'] . '_' : null;
-    $path.= get_username($this->data['user_id']) . '_';
-    $path.= $set['BASENAME'] . '_';
+    $path.= $set['BASENAME'] . '_' . $this->data['size'] . '_';
     $path.= $this->data['user_id'] . $this->data['id'];
     $path.= '_part' . $i . '.zip';

extensions/BatchDownloader/include/events.inc.php

@@ -66 +66 @@
   {
   case 'categories':
-    if (!isset($page['category'])) return; // don't download the full gallery in flat mode !
+    if (!isset($page['category']) && !isset($page['chronology_field'])) return; // don't download the full gallery in flat mode !
     
     if (!in_array('categories', $conf['batch_download']['what'])) return;

extensions/BatchDownloader/include/functions.inc.php

@@ -33 +33 @@
       else if (isset($page['flat'])) // this is for the whole gallery only, flat mode for category is above
       {
-        $batch_type = 'flat';
-        $batch_id = null;
+        return false;
       }
       break;