Changeset 32183

Timestamp:

May 6, 2020, 11:10:47 PM (4 years ago)

Author:

ddtddt

Message:

[photos_from_one_year_ago]

File:

• extensions/photos_from_one_year_ago/blockhome/main.inc.php (modified) (4 diffs)

extensions/photos_from_one_year_ago/blockhome/main.inc.php

@@ -7 +7 @@
 $page_save = $page;
 $tpl_save = $template->get_template_vars('THUMBNAILS');
-$pfoyanip = (isset($conf['pfoya_nip'])) ? $conf['pfoya_nip'] : 6;
+$pfoyanip = (isset($conf['pfoya_nip'])) ? $conf['pfoya_nip'] : 5;
+$datepfoya = (isset($conf['pfoya_dateb'])) ? $conf['pfoya_dateb'] : "date_available";
+$daydate= (isset($conf['pfoya_date'])) ? $conf['pfoya_date'] : date("Y-m-d", strtotime('-1 year'));
 
 if (script_basename() == 'picture'
@@ -18 +20 @@
 
  $query = '
-SELECT DISTINCT image_id
-    FROM ' . IMAGE_CATEGORY_TABLE . ' AS ic ';
-if (isset($page['category'])){  
- $query .= 'INNER JOIN '.CATEGORIES_TABLE.' AS c ON ic.category_id = c.id ';
-}
+SELECT DISTINCT(i.id)
+  FROM '.IMAGES_TABLE.' AS i
+    INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON i.id = ic.image_id
+    INNER JOIN '.CATEGORIES_TABLE.' AS c ON ic.category_id = c.id ';
+
  $query .= 'WHERE ' .  
       get_sql_condition_FandF(
@@ -32 +34 @@
         '', true
         );
+  $query .= '
+       and DATE ('.$datepfoya.') ="'.$daydate.'"';
+
 if (isset($page['category'])){
   $query .= '
@@ -41 +46 @@
   ;';
 
-
-
-  $img = query2array($query, null, 'image_id');
-
-  if (empty($img))
-  {
-    $page['items'] = array();
-  }
-  else
-  {
-        $datepfoya = (isset($conf['pfoya_dateb'])) ? $conf['pfoya_dateb'] : "date_available";
-        $daydate= (isset($conf['pfoya_date'])) ? $conf['pfoya_date'] : date("Y-m-d", strtotime('-1 year'));
-    $query = 'SELECT id,date_available FROM ' . IMAGES_TABLE . ' AS img WHERE img.id IN (' . implode(',', $img) . ') and DATE('.$datepfoya.') ="'.$daydate.'"';
-    $page['items'] = query2array($query, null, 'id');
     $page['items'] = array_from_query($query, 'id');
         $page['start'] = 0;
+        $page['section'] = ' Photos_from_one_year_ago';
         $page['nb_image_page']=$pfoyanip;
-  }
+