can now turn off group permissions override - menus are still available though

diff --git a/actions/settings.php b/actions/settings.php
index 79839ceefc91534ea0376d5863b53623f8e41fd2..23fade8d97dc5e51f4fdb3948c7ca24f3526f2aa 100644 (file)
--- a/actions/settings.php
+++ b/actions/settings.php
@@ -36,6 +36,11 @@
        else\r
                set_plugin_setting('exif', 'disabled', 'tidypics');\r
 \r
+       if (is_array(get_input('grp_perm_override')))\r
+               set_plugin_setting('grp_perm_override', 'enabled', 'tidypics');\r
+       else\r
+               set_plugin_setting('grp_perm_override', 'disabled', 'tidypics');\r
+\r
 \r
        // image sizes\r
        $image_sizes = array();\r

diff --git a/languages/en.php b/languages/en.php
index 863fe554ec6df0ac8644c06d5409a13fce55ff4b..1b760e7a782122ed92f1a1bbc1d5b3d52a1a0ca3 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -45,6 +45,7 @@
                        'tidypics:settings:download_link' => "Show download link",\r
                        'tidypics:settings:tagging' => "Enable photo tagging",\r
                        'tidypics:settings:exif' => "Show EXIF data",\r
+                       'tidypics:settings:grp_perm_override' => "Allow group members full access to group albums",\r
                        'tidypics:settings:maxfilesize' => "Maximum image size in megabytes (MB):",\r
                        'tidypics:settings:watermark' => "Enter text to appear in the watermark - ImageMagick must be selected for the image library",\r
                        'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands",\r

diff --git a/start.php b/start.php
index 3a78700c65908b113fc201d2f21cccfd159228a7..2d4d407825baad6176f43287f5593c4e2821e5d5 100644 (file)
--- a/start.php
+++ b/start.php
@@ -49,7 +49,8 @@
                if (function_exists('add_group_tool_option'))\r
                        add_group_tool_option('photos',elgg_echo('tidypics:enablephotos'),true);\r
                \r
-               register_plugin_hook('permissions_check', 'object', 'tidypics_permission_override');\r
+               if (get_plugin_setting('grp_perm_override', 'tidypics') != "disabled")\r
+                       register_plugin_hook('permissions_check', 'object', 'tidypics_permission_override');\r
                \r
                // Register for notifications \r
                if (is_callable('register_notification_object')) {\r

diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index af84def00ce2c386ba03ab91133503104549d6fe..64e1ed3d1f1d7fac64095dcded28370d7a1fe3f2 100644 (file)
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -96,6 +96,11 @@
        $form_body .= 'height: <input style="width: 20%;" type="text" name="thumb_height" value=' . "\"{$image_sizes['thumb_image_height']}\"" . ' class="input-text" /></p>';\r
 \r
 \r
+       // Group permission override\r
+       $grp_perm_override = $plugin->grp_perm_override;\r
+       if(!$grp_perm_override) $grp_perm_override = "enabled";\r
+       $form_body .= '<p class="admin_debug">' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:grp_perm_override') => 'enabled'), 'internalname' => 'grp_perm_override', 'value' => $grp_perm_override )) . "</p>";\r
+\r
        $form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));\r
        \r
        echo elgg_view('input/form', array('action' => $action, 'body' => $form_body));
\ No newline at end of file