Changeset 497

Timestamp:

Aug 27, 2004, 1:00:28 AM (20 years ago)

Author:

z0rglub

Message:

possibility to choose the date field you want to use for calendar category
(date_available or date_creation).

Location:

trunk/include

Files:

• category_calendar.inc.php (modified) (9 diffs)
• config.inc.php (modified) (1 diff)
• functions_category.inc.php (modified) (1 diff)

trunk/include/category_calendar.inc.php

@@ -34 +34 @@
 // years of image availability
 $query = '
-SELECT YEAR(date_available) AS year, COUNT(id) AS count
+SELECT YEAR('.$conf['calendar_datefield'].') AS year, COUNT(id) AS count
   FROM '.IMAGES_TABLE.', '.IMAGE_CATEGORY_TABLE.'
   '.$page['where'].'
@@ -85 +85 @@
   // the number of picture for this month : $calendar_months
   $query = '
-SELECT DISTINCT(MONTH(date_available)) AS month, COUNT(id) AS count
-  FROM '.IMAGES_TABLE.', '.IMAGE_CATEGORY_TABLE.'
-  '.$page['where'].'
-    AND id = image_id
-    AND YEAR(date_available) = '.$page['calendar_year'].'
-  GROUP BY MONTH(date_available)
+SELECT DISTINCT(MONTH('.$conf['calendar_datefield'].')) AS month
+     , COUNT(id) AS count
+  FROM '.IMAGES_TABLE.', '.IMAGE_CATEGORY_TABLE.'
+  '.$page['where'].'
+    AND id = image_id
+    AND YEAR('.$conf['calendar_datefield'].') = '.$page['calendar_year'].'
+  GROUP BY MONTH('.$conf['calendar_datefield'].')
 ;';
   $result = mysql_query($query);
@@ -156 +157 @@
   // the number of picture for this day : $calendar_days
   $query = '
-SELECT DISTINCT(date_available) AS day, COUNT(id) AS count
-  FROM '.IMAGES_TABLE.', '.IMAGE_CATEGORY_TABLE.'
-  '.$page['where'].'
-    AND id = image_id
-    AND YEAR(date_available) = '.$page['calendar_year'].'
-    AND MONTH(date_available) = '.$page['calendar_month'].'
+SELECT DISTINCT('.$conf['calendar_datefield'].') AS day, COUNT(id) AS count
+  FROM '.IMAGES_TABLE.', '.IMAGE_CATEGORY_TABLE.'
+  '.$page['where'].'
+    AND id = image_id
+    AND YEAR('.$conf['calendar_datefield'].') = '.$page['calendar_year'].'
+    AND MONTH('.$conf['calendar_datefield'].') = '.$page['calendar_month'].'
   GROUP BY day
 ;';
@@ -184 +185 @@
   FROM '.IMAGES_TABLE.', '.IMAGE_CATEGORY_TABLE.'
   '.$page['where'].'
-    AND date_available = \''.$page['calendar_date'].'\'
+    AND '.$conf['calendar_datefield'].' = \''.$page['calendar_date'].'\'
     AND id = image_id
   GROUP BY category_id
@@ -219 +220 @@
   {
     $query = '
-SELECT file,tn_ext,date_available,storage_category_id
-  FROM '.IMAGES_TABLE.', '.IMAGE_CATEGORY_TABLE.'
-  '.$page['where'].'
-    AND YEAR(date_available) = '.$calendar_year.'
+SELECT file,tn_ext,'.$conf['calendar_datefield'].',storage_category_id
+  FROM '.IMAGES_TABLE.', '.IMAGE_CATEGORY_TABLE.'
+  '.$page['where'].'
+    AND YEAR('.$conf['calendar_datefield'].') = '.$calendar_year.'
     AND id = image_id
   ORDER BY RAND()
@@ -277 +278 @@
   {
     $query = '
-SELECT file,tn_ext,date_available,storage_category_id
-  FROM '.IMAGES_TABLE.', '.IMAGE_CATEGORY_TABLE.'
-  '.$page['where'].'
-    AND YEAR(date_available) = '.$page['calendar_year'].'
-    AND MONTH(date_available) = '.$calendar_month.'
+SELECT file,tn_ext,'.$conf['calendar_datefield'].',storage_category_id
+  FROM '.IMAGES_TABLE.', '.IMAGE_CATEGORY_TABLE.'
+  '.$page['where'].'
+    AND YEAR('.$conf['calendar_datefield'].') = '.$page['calendar_year'].'
+    AND MONTH('.$conf['calendar_datefield'].') = '.$calendar_month.'
     AND id = image_id
   ORDER BY RAND()
@@ -344 +345 @@
   {
     $query = '
-SELECT file,tn_ext,date_available,storage_category_id
-  FROM '.IMAGES_TABLE.', '.IMAGE_CATEGORY_TABLE.'
-  '.$page['where'].'
-    AND date_available = \''.$calendar_day.'\'
+SELECT file,tn_ext,'.$conf['calendar_datefield'].',storage_category_id
+  FROM '.IMAGES_TABLE.', '.IMAGE_CATEGORY_TABLE.'
+  '.$page['where'].'
+    AND '.$conf['calendar_datefield'].' = \''.$calendar_day.'\'
     AND id = image_id
   ORDER BY RAND()
@@ -418 +419 @@
     
     $query = '
-SELECT file,tn_ext,date_available,storage_category_id
-  FROM '.IMAGES_TABLE.', '.IMAGE_CATEGORY_TABLE.'
-  '.$page['where'].'
-    AND date_available = \''.$page['calendar_date'].'\'';
+SELECT file,tn_ext,'.$conf['calendar_datefield'].',storage_category_id
+  FROM '.IMAGES_TABLE.', '.IMAGE_CATEGORY_TABLE.'
+  '.$page['where'].'
+    AND '.$conf['calendar_datefield'].' = \''.$page['calendar_date'].'\'';
     if ($calendar_category != 0)
     {
@@ -452 +453 @@
 
     $url_link = PHPWG_ROOT_PATH.'category.php?cat=search';
-    $url_link.= '&search=date_available:'.$_GET['day'];
+    $url_link.= '&search='.$conf['calendar_datefield'].':'.$_GET['day'];
     if ($calendar_category != 0)
     {

trunk/include/config.inc.php

@@ -89 +89 @@
 // for PHP version newer than 4.1.2 :
 // $conf['show_exif_fields'] = array('CameraMake','CameraModel','DateTime');
+
+$conf['calendar_datefield'] = 'date_creation';
 ?>

trunk/include/functions_category.inc.php

@@ -687 +687 @@
           $page['title'] .= ')';
         }
+        
+        $page['where'] = 'WHERE '.$conf['calendar_datefield'].' IS NOT NULL';
         if (isset($forbidden))
         {
-          $page['where'] = 'WHERE '.$forbidden;
-        }
-        else
-        {
-          $page['where'] = 'WHERE 1=1';
+          $page['where'].= ' AND '.$forbidden;
         }
       }