Changeset 32184 for extensions

Timestamp:

May 6, 2020, 11:50:47 PM (5 years ago)

Author:

ddtddt

Message:

[photos_from_one_year_ago]

File:

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

extensions/photos_from_one_year_ago/main.inc.php

@@ -62 +62 @@
   global $tokens, $page, $conf,$template;
   $template->assign('PFOAYALINK',make_index_url(array('section' => 'photos_from_one_year_ago')));
+  
+  $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 (!in_array('photos_from_one_year_ago', $tokens))
   {
@@ -74 +78 @@
 
   $query = '
-SELECT DISTINCT image_id
-    FROM ' . IMAGE_CATEGORY_TABLE . '
+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 
     WHERE ' .  
       get_sql_condition_FandF(
@@ -84 +90 @@
           ),
         '', true
-        )
-    . '
-;';
-
-  $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.'"';
+        );
+  $query .= '
+       and DATE ('.$datepfoya.') ="'.$daydate.'";';
+  
     $page['items'] = query2array($query, null, 'id');
-    
-  add_event_handler('loc_end_index_thumbnails', 'add_nb_pfoya');
-}
-
-function add_nb_pfoya($tpl_thumbnails_var){
-  global $template, $user, $selection;
-
-  // unsed sort order
-  $template->clear_assign('image_orders');
-
-    $query = 'SELECT id, date_available FROM '.IMAGES_TABLE.' WHERE id IN ('.implode(',', $selection).');';
-    $nb_download = query2array($query, 'id', 'date_available');
-    
-    foreach ($tpl_thumbnails_var as &$row)
-    {
-      $row['date_available'] = $nb_download[$row['id']];
-    }
-    unset($row);
-  
-
-  return $tpl_thumbnails_var;
-}
   
 }