better checks on who can tag for group albums

diff --git a/views/default/object/image.php b/views/default/object/image.php
index 93c79e174db0ef8418f4f15e4c445e95d8642451..e5ccd22762e90184a8742642acbc8063cdffd4f1 100644 (file)
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -212,7 +212,8 @@ if ($photo_tags) {
                        echo elgg_view('tidypics/image_menu', array('file_guid' => $file_guid, 
                                                                                                                'viewer' => $viewer,
                                                                                                                'owner' => $owner,
-                                                                                                               'anytags' => $photo_tags != '',) );
+                                                                                                               'anytags' => $photo_tags != '',
+                                                                                                               'album' => $album, ) );
                        echo '</ul></div>'; 
                        
                        // tagging code

diff --git a/views/default/tidypics/image_menu.php b/views/default/tidypics/image_menu.php
index b4597a99fbb327dd64a22398fbb8085f716966ca..d6568360c9367fd9e62fb67750855031c0dc391b 100644 (file)
--- a/views/default/tidypics/image_menu.php
+++ b/views/default/tidypics/image_menu.php
@@ -10,14 +10,25 @@
         *\r
         **************************************************************************/\r
 \r
-       $file_guid = $vars['file_guid'];\r
+       $image_guid = $vars['file_guid'];\r
        $viewer = $vars['viewer'];\r
        $owner = $vars['owner'];\r
        $anytags = $vars['anytags'];\r
+       $album = $vars['album'];\r
 \r
        if (get_plugin_setting('tagging', 'tidypics') != "disabled") {\r
+               \r
+               $can_tag = false;\r
+               \r
+               $container = get_entity($album->container_guid);\r
+               if ($container instanceof ElggGroup) {\r
+                       $can_tag = $viewer && $container->isMember($viewer);\r
+               } else {\r
+                       $can_tag = $viewer && $viewer->guid == $owner->guid || user_is_friend($owner->guid, $viewer->guid);\r
+               }\r
+               \r
                // only owner and friends of owner can tag\r
-               if ($viewer && $viewer->guid == $owner->guid || user_is_friend($owner->guid, $viewer->guid)) {\r
+               if ($can_tag) {\r
 ?>\r
 <li id="start_tagging"><a id="tidypics_tag_control" href="javascript:void(0)" onclick="startTagging()"><?= elgg_echo('tidypics:tagthisphoto') ?></a></li>\r
 <?php\r
@@ -33,7 +44,7 @@
        \r
        if (get_plugin_setting('download_link', 'tidypics') != "disabled") { \r
 ?>\r
-<li id="download_image"><a href="<?php echo $vars['url']; ?>action/tidypics/download?file_guid=<?php echo $file_guid; ?>"><?php echo elgg_echo("image:download"); ?></a></li>\r
+<li id="download_image"><a href="<?php echo $vars['url']; ?>action/tidypics/download?file_guid=<?php echo $image_guid; ?>"><?php echo elgg_echo("image:download"); ?></a></li>\r
 <?php\r
        } \r
 ?>
\ No newline at end of file