diff options
| -rw-r--r-- | doc/ChangeLog | 8 | ||||
| -rw-r--r-- | include/category_calendar.inc.php | 33 | ||||
| -rw-r--r-- | include/functions_category.inc.php | 26 |
3 files changed, 54 insertions, 13 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index b61202dcf..4994ae99f 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,11 @@ +2005-03-31 Pierrick LE GALL <pierrick at phpwebgallery dot net> + + * 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. + 2005-03-26 Pierrick LE GALL <pierrick at phpwebgallery dot net> * "add to caddie" link is visible only when categories contains diff --git a/include/category_calendar.inc.php b/include/category_calendar.inc.php index fd6c11861..827897b85 100644 --- a/include/category_calendar.inc.php +++ b/include/category_calendar.inc.php @@ -245,12 +245,18 @@ SELECT file,tn_ext,'.$conf['calendar_datefield'].',path 'IMAGE'=>$thumbnail_src, 'IMAGE_ALT'=>$row['file'], 'IMAGE_TITLE'=>$thumbnail_title, - 'IMAGE_NAME'=>$name, 'U_IMG_LINK'=>add_session_id($url_link) ) ); + $template->assign_block_vars( + 'thumbnails.line.thumbnail.category_name', + array( + 'NAME' => $name + ) + ); + // create a new line ? if (++$row_number == $user['nb_image_line']) { @@ -299,12 +305,18 @@ SELECT file,tn_ext,'.$conf['calendar_datefield'].',path 'IMAGE'=>$thumbnail_src, 'IMAGE_ALT'=>$row['file'], 'IMAGE_TITLE'=>$thumbnail_title, - 'IMAGE_NAME'=>$name, 'U_IMG_LINK'=>add_session_id($url_link) ) ); + $template->assign_block_vars( + 'thumbnails.line.thumbnail.category_name', + array( + 'NAME' => $name + ) + ); + // create a new line ? if (++$row_number == $user['nb_image_line']) { @@ -347,12 +359,18 @@ SELECT file,tn_ext,'.$conf['calendar_datefield'].',path 'IMAGE'=>$thumbnail_src, 'IMAGE_ALT'=>$row['file'], 'IMAGE_TITLE'=>$thumbnail_title, - 'IMAGE_NAME'=>$name, 'U_IMG_LINK'=>add_session_id($url_link) ) ); + $template->assign_block_vars( + 'thumbnails.line.thumbnail.category_name', + array( + 'NAME' => $name + ) + ); + // create a new line ? if (++$row_number == $user['nb_image_line']) { @@ -415,12 +433,17 @@ SELECT file,tn_ext,'.$conf['calendar_datefield'].',path 'IMAGE'=>$thumbnail_src, 'IMAGE_ALT'=>$row['file'], 'IMAGE_TITLE'=>$thumbnail_title, - 'IMAGE_NAME'=>$name, 'U_IMG_LINK'=>add_session_id($url_link) ) ); - $template->assign_block_vars('thumbnails.line.thumbnail.bullet',array()); + + $template->assign_block_vars( + 'thumbnails.line.thumbnail.category_name', + array( + 'NAME' => $name + ) + ); // create a new line ? if (++$row_number == $user['nb_image_line']) diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php index 9c4e1ebab..00a379b9f 100644 --- a/include/functions_category.inc.php +++ b/include/functions_category.inc.php @@ -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; } /** |