iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

- better code in filter.inc.php (remove unused code + filter is not reseted

Browse Source 
when going to an unfiltered page)
- removed unnecessary filtered pages from config_default (especially admin !!!)
- removed flat recent category icon from irrelevant pages
- mysterious code comment appeared in picture.php

git-svn-id: http://piwigo.org/svn/trunk@1711 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2007-01-11 05:10:16 +00:00
parent 2a9c48225d
commit 7397c8d4c2
7 changed files with 180 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
include/section_init.inc.php
View File

@@ -278,7 +278,8 @@ while (isset($tokens[$i]))
$page['start'] = $matches[1];
}
if (preg_match('/^flat_recent_cat-(\d+)/', $tokens[$i], $matches))
if ('categories'==$page['section'] and
preg_match('/^flat_recent_cat-(\d+)/', $tokens[$i], $matches))
{
// indicate a special list of images
$page['flat_recent_cat'] = $matches[1];
@@ -326,6 +327,16 @@ if (pwg_get_session_var('image_order',0) > 0)
$page['super_order_by'] = true;
}
$forbidden = get_sql_condition_FandF(
array
(
'forbidden_categories' => 'category_id',
'visible_categories' => 'category_id',
'visible_images' => 'image_id'
),
'AND'
);
// +-----------------------------------------------------------------------+
// | category |
// +-----------------------------------------------------------------------+
@@ -401,16 +412,7 @@ WHERE
CURRENT_DATE,INTERVAL '.$page['flat_recent_cat'].' DAY)'.
(isset($page['category']) ? '
AND uppercats REGEXP \'(^|,)'.$page['category'].'(,|$)\'' : '' ).'
'.get_sql_condition_FandF
(
array
(
'forbidden_categories' => 'category_id',
'visible_categories' => 'category_id',
'visible_images' => 'image_id'
),
'AND'
).'
'.$forbidden.'
;';
$where_sql = array_from_query($query, 'image_id');
@@ -429,21 +431,12 @@ WHERE
{
// Main query
$query = '
SELECT distinct image_id
SELECT DISTINCT(image_id)
FROM '.IMAGE_CATEGORY_TABLE.'
INNER JOIN '.IMAGES_TABLE.' ON id = image_id
WHERE
'.$where_sql.'
'.get_sql_condition_FandF
(
array
(
'forbidden_categories' => 'category_id',
'visible_categories' => 'category_id',
'visible_images' => 'image_id'
),
'AND'
).'
'.$forbidden.'
'.$conf['order_by'].'
;';
@@ -458,18 +451,6 @@ SELECT distinct image_id
// special sections
else
{
$forbidden =
get_sql_condition_FandF
(
array
(
'forbidden_categories' => 'category_id',
'visible_categories' => 'category_id',
'visible_images' => 'image_id'
),
'AND'
);
// +-----------------------------------------------------------------------+
// | tags section |
// +-----------------------------------------------------------------------+