added option for turning off ratings

diff --git a/actions/settings.php b/actions/settings.php
index 23fade8d97dc5e51f4fdb3948c7ca24f3526f2aa..903802dd820d109383a99115dcf5d931eed65cc5 100644 (file)
--- a/actions/settings.php
+++ b/actions/settings.php
@@ -25,13 +25,18 @@
                set_plugin_setting('download_link', 'enabled', 'tidypics');\r
        else\r
                set_plugin_setting('download_link', 'disabled', 'tidypics');\r
-       \r
+\r
        if (is_array(get_input('tagging')))\r
                set_plugin_setting('tagging', 'enabled', 'tidypics');\r
        else\r
                set_plugin_setting('tagging', 'disabled', 'tidypics');\r
 \r
-       if (is_array(get_input('exif')))\r
+       if (is_array(get_input('photo_ratings')))\r
+               set_plugin_setting('photo_ratings', 'enabled', 'tidypics');\r
+       else\r
+               set_plugin_setting('photo_ratings', 'disabled', 'tidypics');\r
+\r
+               if (is_array(get_input('exif')))\r
                set_plugin_setting('exif', 'enabled', 'tidypics');\r
        else\r
                set_plugin_setting('exif', 'disabled', 'tidypics');\r

diff --git a/languages/en.php b/languages/en.php
index 8adcd75776e97046af164db37504f09691049144..b85ca205bd8b7fe601d0baf0ae49c27c1bf7d3d6 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -44,6 +44,7 @@
                        'tidypics:settings:image_lib' => "Image Library: ",\r
                        'tidypics:settings:download_link' => "Show download link",\r
                        'tidypics:settings:tagging' => "Enable photo tagging",\r
+                       'tidypics:settings:photo_ratings' => "Enable photo ratings (requires rate plugin of Miguel Montes or comptabile)",\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

diff --git a/views/default/object/image.php b/views/default/object/image.php
index 21ee3ff1dbce6140a6f851e29237fb5fc3b7c945..ebac9c775ce4b5384065424af7e12befcd35e5d3 100644 (file)
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -200,12 +200,15 @@ if ($photo_tags) {
                <div id="tidypics_info">
 <?php if (!is_null($tags)) { ?>
                        <div class="object_tag_string"><?php echo elgg_view('output/tags',array('value' => $tags));?></div>
-<?php } ?>
-<div id="rate_container">
+<?php } 
+                       if (get_plugin_setting('photo_ratings', 'tidypics') != "disabled") {
+?>
+                       <div id="rate_container">
        <?php echo elgg_view('rate/rate', array('entity'=> $vars['entity'])); ?>
 </div>
 <?
-
+                       }
+                       
                        echo elgg_echo('image:by');?> <b><a href="<?php echo $vars['url']; ?>pg/profile/<?php echo $owner->username; ?>"><?php echo $owner->name; ?></a></b>  <?php echo $friendlytime;
 ?>
                </div>

diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index 64e1ed3d1f1d7fac64095dcded28370d7a1fe3f2..c5d71409c61e7d4d1626a1648fd854b7aa9802c0 100644 (file)
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -45,6 +45,11 @@
        if(!$download_link) $download_link = "enabled";\r
        $form_body .= '<p class="admin_debug">' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:download_link') => 'enabled'), 'internalname' => 'download_link', 'value' => $download_link )) . "</p>";\r
 \r
+       // Download Link\r
+       $photo_ratings = $plugin->photo_ratings;\r
+       if(!$photo_ratings) $photo_ratings = "disabled";\r
+       $form_body .= '<p class="admin_debug">' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:photo_ratings') => 'enabled'), 'internalname' => 'photo_ratings', 'value' => $photo_ratings )) . "</p>";\r
+\r
        // Show EXIF\r
        $exif = $plugin->exif;\r
        if(!$exif) $exif = "disabled";\r