Changeset 25932 for extensions/BatchDownloader/admin/sets.php

Timestamp:

Dec 12, 2013, 2:41:53 PM (10 years ago)

Author:

mistic100

Message:

update for Piwigo 2.6 + code cleaning + fix unable to cancel set during generation

File:

• extensions/BatchDownloader/admin/sets.php (modified) (8 diffs)

extensions/BatchDownloader/admin/sets.php

@@ -1 +1 @@
 <?php
-if (!defined('BATCH_DOWNLOAD_PATH')) die('Hacking attempt!');
+defined('BATCH_DOWNLOAD_PATH') or die('Hacking attempt!');
 
 // actions
@@ -11 +11 @@
 if (isset($_GET['cancel']))
 {
-  $set = new BatchDownloader($_GET['cancel']);  
+  $set = new BatchDownloader($_GET['cancel']);
   $set->updateParam('total_size', $set->getEstimatedTotalSize());
   $set->updateParam('nb_zip', $set->getEstimatedArchiveNumber());
@@ -28 +28 @@
     date_creation < DATE_SUB(NOW(), INTERVAL 1 HOUR)
 ;';
-  
+
   $sets = array_from_query($query, 'id');
-  
+
   foreach ($sets as $set_id)
   {
@@ -48 +48 @@
   if (!empty($_POST['username']))
   {
-    array_push($where_clauses, 'username LIKE "%'.$_POST['username'].'%"');
+    $where_clauses[] = 'username LIKE "%'.$_POST['username'].'%"';
   }
-  
+
   if ($_POST['type'] != -1)
   {
-    array_push($where_clauses, 'type = "'.$_POST['type'].'"');
+    $where_clauses[] = 'type = "'.$_POST['type'].'"';
   }
-  
+
   if ($_POST['status'] != -1)
   {
     if ($_POST['status'] == 'new')
-      array_push($where_clauses, '(status = "new" OR status = "ready")');
+      $where_clauses[] = '(status = "new" OR status = "ready")';
     else
-      array_push($where_clauses, 'status = "'.$_POST['status'].'"');
+      $where_clauses[] = 'status = "'.$_POST['status'].'"';
   }
-  
+
   if ($_POST['size'] != -1)
   {
-    array_push($where_clauses, 'size = "'.$_POST['size'].'"');
+    $where_clauses[] = 'size = "'.$_POST['size'].'"';
   }
-  
+
   if ($_POST['order_by'] == 'size')
   {
@@ -82 +82 @@
 // get sets
 $query = '
-SELECT 
+SELECT
     s.id,
     u.'.$conf['user_fields']['username'].' AS username
@@ -97 +97 @@
 {
   $set = new BatchDownloader($set_id);
-  
+
   $template->append('sets', array_merge(
     $set->getSetInfo(),
@@ -106 +106 @@
     )
     ));
-  
+
   unset($set);
 }
@@ -173 +173 @@
 
 
-$template->set_filename('batch_download', dirname(__FILE__) . '/template/sets.tpl');
-
-?>
+$template->set_filename('batch_download', realpath(BATCH_DOWNLOAD_PATH . 'admin/template/sets.tpl'));