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

Timestamp:

Jul 13, 2012, 12:12:21 PM (12 years ago)

Author:

mistic100

Message:

-separate "archive_comment" in a new config parameter
-confirmation message before start download

File:

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

extensions/BatchDownloader/include/BatchDownloader.class.php

@@ -20 +20 @@
     
     $this->conf = $conf['batch_download'];
+    $this->conf['archive_acomment'] = $conf['batch_download_comment'];
     $this->data = array(
-      'set_id' => 0,
+      'id' => 0,
       'user_id' => $user['id'],
       'date_creation' => '0000-00-00 00:00:00',
@@ -39 +40 @@
       $query = '
 SELECT
+    id,
     user_id,
     date_creation,
@@ -57 +59 @@
       if (pwg_db_num_rows($result))
       {
-        $this->data['set_id'] = $set_id;
-        list(
-          $this->data['user_id'],
-          $this->data['date_creation'],
-          $this->data['type'], 
-          $this->data['type_id'], 
-          $this->data['nb_zip'], 
-          $this->data['last_zip'], 
-          $this->data['nb_images'], 
-          $this->data['total_size'],
-          $this->data['status']
-          ) = pwg_db_fetch_row($result);
+        $this->data = array_merge(
+          $this->data,
+          pwg_db_fetch_assoc($result)
+          );
         
         // make sur all pictures of the set exist
@@ -84 +78 @@
     zip
   FROM '.BATCH_DOWNLOAD_TIMAGES.'
-  WHERE set_id = '.$this->data['set_id'].'
+  WHERE set_id = '.$this->data['id'].'
 ;';
         $this->images = simple_hash_from_query($query, 'image_id', 'zip');
@@ -129 +123 @@
 ;';
       pwg_query($query);
-      $this->data['set_id'] = pwg_db_insert_id();
+      $this->data['id'] = pwg_db_insert_id();
       
       $date = pwg_query('SELECT FROM_UNIXTIME(NOW());');
@@ -153 +147 @@
   {
     $this->data[$name] = $value;
-    pwg_query('UPDATE '.BATCH_DOWNLOAD_TSETS.' SET '.$name.' = "'.$value.'" WHERE id = '.$this->data['set_id'].';');
+    pwg_query('UPDATE '.BATCH_DOWNLOAD_TSETS.' SET '.$name.' = "'.$value.'" WHERE id = '.$this->data['id'].';');
   }
   
@@ -201 +195 @@
 DELETE FROM '.BATCH_DOWNLOAD_TIMAGES.'
   WHERE 
-    set_id = '.$this->data['set_id'].'
+    set_id = '.$this->data['id'].'
     AND image_id IN('.implode(',', $image_ids).')
 ;';
@@ -225 +219 @@
       
       $this->images[ $image_id ] = 0;
-      array_push($inserts, array('set_id'=>$this->data['set_id'], 'image_id'=>$image_id, 'zip'=>0));
+      array_push($inserts, array('set_id'=>$this->data['id'], 'image_id'=>$image_id, 'zip'=>0));
     }
     
@@ -246 +240 @@
     $query = '
 DELETE FROM '.BATCH_DOWNLOAD_TIMAGES.'
-  WHERE set_id = '.$this->data['set_id'].'
+  WHERE set_id = '.$this->data['id'].'
 ;';
     pwg_query($query);
@@ -348 +342 @@
       if (!empty($this->conf['archive_comment']))
       {
-        $comment.= "\n\n".$this->conf['archive_comment'];
+        $comment.= "\n\n".wordwrap(remove_accents($this->conf['archive_comment']), 60);
       }
       $zip->setArchiveComment($comment);
@@ -359 +353 @@
   SET zip = '.$this->data['last_zip'].'
   WHERE
-    set_id = '.$this->data['set_id'].'
+    set_id = '.$this->data['id'].'
     AND image_id IN('.implode(',', $images_added).')
 ;';
@@ -442 +436 @@
       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" style="font-weight:bold;"' 
+          $out.= '<a href="'.add_url_params($url, array('set_id'=>$this->data['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).
             '><img src="'.BATCH_DOWNLOAD_PATH.'template/drive_go.png"> Archive #'.$i.' (ready)</a>';
@@ -477 +471 @@
           get_username($this->data['user_id']) .'_'. 
           $this->data['type'] .'-'. $this->data['type_id'] .'_'.
-          $this->data['user_id'] . $this->data['set_id'] .
+          $this->data['user_id'] . $this->data['id'] .
           ($this->data['nb_zip']!=1 ? '_part'. $i : null).
           '.zip';