Changeset 782 for branches/branch-1_4/admin

Timestamp:

May 1, 2005, 4:16:43 PM (20 years ago)

Author:

plg

Message:

• bug 110 fixed : "return to element view from element edition fails depending on permissions". Correction is partial for branch 1.4 : a linked category is randomly chosen but if no linked category is authorized for the admin user, then the link is to the storage category (which can be forbidden).

File:

• branches/branch-1_4/admin/picture_modify.php (modified) (1 diff)

branches/branch-1_4/admin/picture_modify.php

@@ -160 +160 @@
 
 $url_img = PHPWG_ROOT_PATH.'picture.php?image_id='.$_GET['image_id'];
-$url_img .= '&cat='.$row['storage_category_id'];
+
+$query = '
+SELECT category_id
+  FROM '.IMAGE_CATEGORY_TABLE.'
+  WHERE image_id = '.$_GET['image_id'];
+
+if (isset($user['forbidden_categories'])
+    and !empty($user['forbidden_categories']))
+{
+  $query.= '
+    AND category_id NOT IN ('.$user['forbidden_categories'].')';
+}
+$query.= '
+  ORDER BY RAND()
+;';
+$result = pwg_query($query);
+
+if (mysql_num_rows($result) > 0)
+{
+  list($category_id) = mysql_fetch_array($result);
+  $url_img .= '&cat='.$category_id;
+}
+else
+{
+  $url_img .= '&cat='.$row['storage_category_id'];
+}
+
 $date = isset($_POST['date_creation']) && empty($errors)
 ?$_POST['date_creation']:date_convert_back(@$row['date_creation']);