Changeset 12818 for extensions/Icy_Picture_Modify/icy_picture_modify.php

Timestamp:

01/01/12 11:52:20 (18 months ago)

Author:

icy

Message:

Merge branch 'master' into svn

Files:

• extensions/Icy_Picture_Modify/icy_picture_modify.php (modified) (10 diffs)

extensions/Icy_Picture_Modify/icy_picture_modify.php

@@ -95 +95 @@
 
 // * Purpose: Find all categories that are reachable for the current user.
-// * FIXME:   This query will include all readable categories, those ones
-//            use can't write to them.
+// * FIXME:   This query will include all readable categories, included
+//            the ones user can't write to them.
 
 $my_categories = array();
 $my_permissions = null;
+$has_plugin_community = false;
 
 // <community support>
@@ -105 +106 @@
 {
   include_once(PHPWG_PLUGINS_PATH.'community/include/functions_community.inc.php');
+  $has_plugin_community = true;
+
   $user_permissions = community_get_user_permissions($user['id']);
   $my_categories = $user_permissions['upload_categories'];
@@ -110 +113 @@
 // </community support>
 
-// FIXME: what happens if both of the following conditions are true
-// FIXME:    * true == $user_permissions['create_whole_gallery']
-// FIXME:    * 0    <  count($my_categories)
-if (empty($user_permissions) or $user_permissions['create_whole_gallery'])
+if (($has_plugin_community == false) or $user_permissions['create_whole_gallery'])
 {
   $query = '
@@ -120 +120 @@
   ;';
 
-  // list of categories to which the user can access
+  // list of categories to which the user can read
   $my_categories = array_diff(
     array_from_query($query, 'category_id'),
@@ -270 +270 @@
 //
 if (isset($_POST['associate'])
+    and ($has_plugin_community == true)
     and isset($_POST['cat_dissociated'])
     and count($_POST['cat_dissociated']) > 0
@@ -283 +284 @@
 // dissociate the element from categories (but not from its storage category)
 if (isset($_POST['dissociate'])
+    and ($has_plugin_community == true)
     and isset($_POST['cat_associated'])
     and count($_POST['cat_associated']) > 0
@@ -297 +299 @@
   update_category($arr_dissociate);
 }
+
+// +-----------------------------------------------------------------------+
+// |                              representation                           |
+// +-----------------------------------------------------------------------+
+
 // select the element to represent the given categories
 if (isset($_POST['elect'])
+    and ($has_plugin_community == true)
     and isset($_POST['cat_dismissed'])
     and count($_POST['cat_dismissed']) > 0
@@ -318 +326 @@
   }
 }
+
 // dismiss the element as representant of the given categories
 if (isset($_POST['dismiss'])
+    and ($has_plugin_community == true)
     and isset($_POST['cat_elected'])
     and count($_POST['cat_elected']) > 0
@@ -331 +341 @@
 }
 
-// tags
+// +-----------------------------------------------------------------------+
+// |                             tagging support                           |
+// +-----------------------------------------------------------------------+
+
 if (version_compare(PHPWG_VERSION, '2.2.5', '<')) {
   $q_tag_selection = "tag_id, name AS tag_name";
@@ -594 +607 @@
 display_select_cat_wrapper($query, array(), 'dissociated_options');
 
-// representing
+// display list of categories for representing
 $query = '
 SELECT id,name,uppercats,global_rank