Changeset 832

Timestamp:

Aug 18, 2005, 11:40:59 PM (19 years ago)

Author:

plg

Message:

• bug 133 fixed : (report from branch 1.4) Deleting user favorites is too restrictive. Instead of deleting a favorite because it belongs to at least one forbidden category, a favorite is deletedif it belongs to no authorized category (which was the expected behaviour).

Location:

trunk

Files:

• doc/ChangeLog (modified) (1 diff)
• include/functions_user.inc.php (modified) (2 diffs)

trunk/doc/ChangeLog

@@ -1 +1 @@
 2005-08-18 Pierrick LE GALL
 
-        * bug 133 fixed : "Nb of images incorectly rendered in "tool tip"
+        * bug 133 fixed : (report from branch 1.4) Deleting user favorites
+        is too restrictive. Instead of deleting a favorite because it
+        belongs to at least one forbidden category, a favorite is deleted
+        if it belongs to no authorized category (which was the expected
+        behaviour).
+
+2005-08-18 Pierrick LE GALL
+
+        * bug 134 fixed : "Nb of images incorectly rendered in "tool tip"
         near category in category menu". Correction reported (and
         improved) from branch 1.4

trunk/include/functions_user.inc.php

@@ -9 +9 @@
 // | last update   : $Date$
 // | last modifier : $Author$
+// | revision      : $Revision$
 // | revision      : $Revision$
 // +-----------------------------------------------------------------------+
@@ -236 +237 @@
     return;
   }
-  
-  $query = '
-SELECT f.image_id
+
+  // retrieving images allowed : belonging to at least one authorized
+  // category
+  $query = '
+SELECT DISTINCT f.image_id
   FROM '.FAVORITES_TABLE.' AS f INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic
     ON f.image_id = ic.image_id
   WHERE f.user_id = '.$user['id'].'
-    AND ic.category_id IN ('.$user['forbidden_categories'].')
+    AND ic.category_id NOT IN ('.$user['forbidden_categories'].')
 ;';
   $result = pwg_query($query);
-  $elements = array();
+  $authorizeds = array();
   while ($row = mysql_fetch_array($result))
   {
-    array_push($elements, $row['image_id']);
-  }
-
-  if (count($elements) > 0)
+    array_push($authorizeds, $row['image_id']);
+  }
+
+  $query = '
+SELECT image_id
+  FROM '.FAVORITES_TABLE.'
+  WHERE user_id = '.$user['id'].'
+;';
+  $result = pwg_query($query);
+  $favorites = array();
+  while ($row = mysql_fetch_array($result))
+  {
+    array_push($favorites, $row['image_id']);
+  }
+
+  $to_deletes = array_diff($favorites, $authorizeds);
+
+  if (count($to_deletes) > 0)
   {
     $query = '
 DELETE FROM '.FAVORITES_TABLE.'
-  WHERE image_id IN ('.implode(',', $elements).')
+  WHERE image_id IN ('.implode(',', $to_deletes).')
     AND user_id = '.$user['id'].'
 ;';