mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-07-20 00:23:40 +02:00
- apply category name and element name separation in calendar special
category - change method of counting total number of viewable pictures : pictures linked to more than one category are not counted twice. git-svn-id: http://piwigo.org/svn/trunk@761 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
@@ -155,20 +155,30 @@ SELECT name,id,date_last,nb_images,global_rank
|
||||
return get_html_menu_category($cats);
|
||||
}
|
||||
|
||||
/**
|
||||
* returns the total number of elements viewable in the gallery by the
|
||||
* connected user
|
||||
*
|
||||
* @return int
|
||||
*/
|
||||
function count_user_total_images()
|
||||
{
|
||||
global $user;
|
||||
|
||||
$query = 'SELECT SUM(nb_images) AS total';
|
||||
$query.= ' FROM '.CATEGORIES_TABLE;
|
||||
if ( count( $user['restrictions'] ) > 0 )
|
||||
$query.= ' WHERE id NOT IN ('.$user['forbidden_categories'].')';
|
||||
$query.= ';';
|
||||
$query = '
|
||||
SELECT COUNT(DISTINCT(image_id)) as total
|
||||
FROM '.IMAGE_CATEGORY_TABLE;
|
||||
if (count($user['restrictions']) > 0)
|
||||
{
|
||||
$query.= '
|
||||
WHERE category_id NOT IN ('.$user['forbidden_categories'].')';
|
||||
}
|
||||
$query.= '
|
||||
;';
|
||||
|
||||
$row = mysql_fetch_array( pwg_query( $query ) );
|
||||
$row = mysql_fetch_array(pwg_query($query));
|
||||
|
||||
if ( !isset( $row['total'] ) ) $row['total'] = 0;
|
||||
return $row['total'];
|
||||
return isset($row['total']) ? $row['total'] : 0;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user