Changeset 761

Timestamp:

Mar 31, 2005, 11:53:24 PM (19 years ago)

Author:

plg

Message:

• 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.

Location:

trunk

Files:

• doc/ChangeLog (modified) (1 diff)
• include/category_calendar.inc.php (modified) (5 diffs)
• include/functions_category.inc.php (modified) (1 diff)

trunk/doc/ChangeLog

@@ +1 @@
+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>
 

trunk/include/category_calendar.inc.php

@@ -246 +246 @@
         '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 ?
@@ -300 +306 @@
         '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 ?
@@ -348 +360 @@
         'IMAGE_ALT'=>$row['file'],
         'IMAGE_TITLE'=>$thumbnail_title,
-        'IMAGE_NAME'=>$name,
           
         'U_IMG_LINK'=>add_session_id($url_link)
@@ -354 +365 @@
        );
 
+    $template->assign_block_vars(
+      'thumbnails.line.thumbnail.category_name',
+      array(
+        'NAME' => $name
+        )
+      );
+
     // create a new line ?
     if (++$row_number == $user['nb_image_line'])
@@ -416 +434 @@
         '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 ?

trunk/include/functions_category.inc.php

@@ -156 +156 @@
 }
 
+/**
+ * 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 ) );
-
-  if ( !isset( $row['total'] ) ) $row['total'] = 0;
-  return $row['total'];
+  $row = mysql_fetch_array(pwg_query($query));
+
+  return isset($row['total']) ? $row['total'] : 0;
 }