aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/category_calendar.inc.php37
-rw-r--r--include/config.inc.php2
-rw-r--r--include/functions_category.inc.php8
3 files changed, 24 insertions, 23 deletions
diff --git a/include/category_calendar.inc.php b/include/category_calendar.inc.php
index 20ccd1a16..2d559ace7 100644
--- a/include/category_calendar.inc.php
+++ b/include/category_calendar.inc.php
@@ -33,7 +33,7 @@
// 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'].'
AND id = image_id
@@ -84,12 +84,13 @@ if (isset($page['calendar_year']))
// creation of hash associating the number of the month in the year with
// the number of picture for this month : $calendar_months
$query = '
-SELECT DISTINCT(MONTH(date_available)) AS month, COUNT(id) AS count
+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(date_available) = '.$page['calendar_year'].'
- GROUP BY MONTH(date_available)
+ AND YEAR('.$conf['calendar_datefield'].') = '.$page['calendar_year'].'
+ GROUP BY MONTH('.$conf['calendar_datefield'].')
;';
$result = mysql_query($query);
$calendar_months = array();
@@ -155,12 +156,12 @@ elseif (!isset($page['calendar_day']))
// creation of hash associating the number of the day in the month with
// the number of picture for this day : $calendar_days
$query = '
-SELECT DISTINCT(date_available) AS day, COUNT(id) AS count
+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(date_available) = '.$page['calendar_year'].'
- AND MONTH(date_available) = '.$page['calendar_month'].'
+ AND YEAR('.$conf['calendar_datefield'].') = '.$page['calendar_year'].'
+ AND MONTH('.$conf['calendar_datefield'].') = '.$page['calendar_month'].'
GROUP BY day
;';
$result = mysql_query($query);
@@ -183,7 +184,7 @@ elseif (isset($page['calendar_day']))
SELECT category_id AS category, COUNT(id) AS count
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
;';
@@ -218,10 +219,10 @@ if (!isset($page['calendar_year']))
foreach ($calendar_years as $calendar_year => $nb_pics)
{
$query = '
-SELECT file,tn_ext,date_available,storage_category_id
+SELECT file,tn_ext,'.$conf['calendar_datefield'].',storage_category_id
FROM '.IMAGES_TABLE.', '.IMAGE_CATEGORY_TABLE.'
'.$page['where'].'
- AND YEAR(date_available) = '.$calendar_year.'
+ AND YEAR('.$conf['calendar_datefield'].') = '.$calendar_year.'
AND id = image_id
ORDER BY RAND()
LIMIT 0,1
@@ -276,11 +277,11 @@ elseif (!isset($page['calendar_month']))
foreach ($calendar_months as $calendar_month => $nb_pics)
{
$query = '
-SELECT file,tn_ext,date_available,storage_category_id
+SELECT file,tn_ext,'.$conf['calendar_datefield'].',storage_category_id
FROM '.IMAGES_TABLE.', '.IMAGE_CATEGORY_TABLE.'
'.$page['where'].'
- AND YEAR(date_available) = '.$page['calendar_year'].'
- AND MONTH(date_available) = '.$calendar_month.'
+ AND YEAR('.$conf['calendar_datefield'].') = '.$page['calendar_year'].'
+ AND MONTH('.$conf['calendar_datefield'].') = '.$calendar_month.'
AND id = image_id
ORDER BY RAND()
LIMIT 0,1
@@ -343,10 +344,10 @@ elseif (!isset($page['calendar_day']))
foreach ($calendar_days as $calendar_day => $nb_pics)
{
$query = '
-SELECT file,tn_ext,date_available,storage_category_id
+SELECT file,tn_ext,'.$conf['calendar_datefield'].',storage_category_id
FROM '.IMAGES_TABLE.', '.IMAGE_CATEGORY_TABLE.'
'.$page['where'].'
- AND date_available = \''.$calendar_day.'\'
+ AND '.$conf['calendar_datefield'].' = \''.$calendar_day.'\'
AND id = image_id
ORDER BY RAND()
LIMIT 0,1
@@ -417,10 +418,10 @@ elseif (isset($page['calendar_day']))
$name.= ' ('.$nb_pics.')';
$query = '
-SELECT file,tn_ext,date_available,storage_category_id
+SELECT file,tn_ext,'.$conf['calendar_datefield'].',storage_category_id
FROM '.IMAGES_TABLE.', '.IMAGE_CATEGORY_TABLE.'
'.$page['where'].'
- AND date_available = \''.$page['calendar_date'].'\'';
+ AND '.$conf['calendar_datefield'].' = \''.$page['calendar_date'].'\'';
if ($calendar_category != 0)
{
$query.= '
@@ -451,7 +452,7 @@ SELECT file,tn_ext,date_available,storage_category_id
$thumbnail_title = $lang['calendar_picture_hint'].$name;
$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)
{
$url_link.= ';cat:'.$calendar_category.'|AND';
diff --git a/include/config.inc.php b/include/config.inc.php
index 2c3fdae81..bda7fff8a 100644
--- a/include/config.inc.php
+++ b/include/config.inc.php
@@ -88,4 +88,6 @@ $conf['show_exif_fields'] = array('Make',
'COMPUTED;ApertureFNumber');
// for PHP version newer than 4.1.2 :
// $conf['show_exif_fields'] = array('CameraMake','CameraModel','DateTime');
+
+$conf['calendar_datefield'] = 'date_creation';
?>
diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php
index 1b075f70a..da3e5e31e 100644
--- a/include/functions_category.inc.php
+++ b/include/functions_category.inc.php
@@ -686,13 +686,11 @@ SELECT COUNT(DISTINCT(id)) AS nb_total_images
$page['title'] .= $page['calendar_year'];
$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;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 17:03:50 +0000