Changeset 807

Timestamp:

Aug 7, 2005, 8:02:48 PM (19 years ago)

Author:

plg

Message:

• bug 133 corrected : 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).

File:

• branches/branch-1_4/include/functions_user.inc.php (modified) (1 diff)

branches/branch-1_4/include/functions_user.inc.php

@@ -234 +234 @@
     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'].')
-;';
-  $result = pwg_query($query);
-  $elements = array();
-  while ($row = mysql_fetch_array($result))
-  {
-    array_push($elements, $row['image_id']);
-  }
-
-  if (count($elements) > 0)
+    AND ic.category_id NOT IN ('.$user['forbidden_categories'].')
+;';
+  $result = pwg_query($query);
+  $authorizeds = array();
+  while ($row = mysql_fetch_array($result))
+  {
+    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'].'
 ;';