Changeset 12818

Timestamp:

Jan 1, 2012, 11:52:20 AM (12 years ago)

Author:

icy

Message:

Merge branch 'master' into svn

Location:

extensions/Icy_Picture_Modify

Files:

• README (modified) (3 diffs)
• icy_picture_modify.php (modified) (10 diffs)

extensions/Icy_Picture_Modify/README

@@ -13 +13 @@
 USAGE
 
-  1. Install and enable the plugin "community" which allows users to upload pictures
-  2. Install and enable this extension
+  1. Install and enable the plugin "community" which allows users to
+     upload pictures to some albums. Please configure the plugin before
+     you install "icy_picture_modify".
+
+  2. Install and enable this plugin
+
   3. When users view a picture they uploaded, they will be provided a link
      to modify that picture's information.
@@ -20 +24 @@
 FEATURES
 
-  Users can modify the following information of a picture
-    * Author
-    * Description
-    * Picture's date
-    * Tags
-    * ACL
-    * Synchronize meta data
-    * Delete picture
-    * Associcate/Dissociated image to/from uploadable category
-    * Use image to represent for uploadable category
+  Users can delete image or modify image's properties (author, date, tags,
+  description, metada, associcate/aissociated/represented categories).
 
 KNOWN PROBLEMS
 
+  * If an image is replaced by other version (using plugin 'Photo update')
+    the author of (new) image will be owned by administrator, not the
+    current user. Hence the image won't be editable anymore
   * This plugin doesn't support all known templates
-  * This plugin may not work smoothly without plugin 'community'
+  * This plugin may not work smoothly without the plugin 'community'
   * User can delete an image which is associated to some albums to which
-    the user doesn't have permission to write/access. When the plugin
-    'community' isn't installed, user can create image's link and/or
-    represents for any visible albums in the gallery.
+    the user doesn't have permission to write/access. This is true as the
+    plugin only checks owner of the image.
 
 AUTHOR
@@ -51 +49 @@
 
   At Github.com:  https://github.com/icy/icy_picture_modify
-  At Piwigo.com:   http://piwigo.org/ext/extension_view.php?eid=563
-  SVN repository:  http://piwigo.org/svn/extensions/Icy_Picture_Modify/
+  At Piwigo.com:  http://piwigo.org/ext/extension_view.php?eid=563
+  SVN repository: http://piwigo.org/svn/extensions/Icy_Picture_Modify/

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