added another setting - now view counter can be turned on and off

diff --git a/actions/settings.php b/actions/settings.php
index 903802dd820d109383a99115dcf5d931eed65cc5..ae74b8945f9c54f28c8c7cb634b8ac689db905c3 100644 (file)
--- a/actions/settings.php
+++ b/actions/settings.php
@@ -36,11 +36,16 @@
        else\r
                set_plugin_setting('photo_ratings', 'disabled', 'tidypics');\r
 \r
-               if (is_array(get_input('exif')))\r
+       if (is_array(get_input('exif')))\r
                set_plugin_setting('exif', 'enabled', 'tidypics');\r
        else\r
                set_plugin_setting('exif', 'disabled', 'tidypics');\r
 \r
+       if (is_array(get_input('view_count')))\r
+               set_plugin_setting('view_count', 'enabled', 'tidypics');\r
+       else\r
+               set_plugin_setting('view_count', 'disabled', 'tidypics');\r
+\r
        if (is_array(get_input('grp_perm_override')))\r
                set_plugin_setting('grp_perm_override', 'enabled', 'tidypics');\r
        else\r

diff --git a/languages/en.php b/languages/en.php
index f71a1fb897a2d5430a90243ed07e13d6b7172dee..fca507407ab0fafdb13bb4b0839a20c83f058e6d 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -50,6 +50,7 @@
                        'tidypics:settings:tagging' => "Enable photo tagging",\r
                        'tidypics:settings:photo_ratings' => "Enable photo ratings (requires rate plugin of Miguel Montes or compatible)",\r
                        'tidypics:settings:exif' => "Show EXIF data",\r
+                       'tidypics:settings:view_count' => "View counter",\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:quota' => "User/Group Quota (MB) - 0 equals no quota",\r

diff --git a/start.php b/start.php
index 650c9ed2ee7a00d532536bebc2a8017c4b115f7d..9c59fd8e6788761be5638339ed906e8fb6b8ebd0 100644 (file)
--- a/start.php
+++ b/start.php
@@ -77,9 +77,11 @@
                                }\r
                        }\r
                }\r
-               // context is only set to photos on individual pages, not on group pages                \r
+               // context is only set to photos on individual pages, not on group pages\r
                else if (get_context() == "photos") {\r
                        \r
+                       $view_count = get_plugin_setting('view_count', 'tidypics');\r
+                       \r
                        // owner gets "your albumn", "your friends albums", "your most viewed", "your most recent"\r
                        if (get_loggedin_userid() == $page_owner->guid && get_loggedin_userid()) {\r
                                add_submenu_item(       elgg_echo('album:create'), \r
@@ -93,10 +95,12 @@
                                add_submenu_item(       elgg_echo('album:yours:friends'), \r
                                                                        $CONFIG->wwwroot . "pg/photos/friends/". $page_owner->username, \r
                                                                        'tidypics-a');\r
-                                                                       \r
-                               add_submenu_item(       elgg_echo('tidypics:yourmostviewed'),\r
-                                                                       $CONFIG->wwwroot . 'pg/photos/yourmostviewed',\r
-                                                                       'tidypics-a');\r
+                               \r
+                               if ($view_count != 'disabled') {\r
+                                       add_submenu_item(       elgg_echo('tidypics:yourmostviewed'),\r
+                                                                               $CONFIG->wwwroot . 'pg/photos/yourmostviewed',\r
+                                                                               'tidypics-a');\r
+                               }\r
                                \r
                                add_submenu_item(       elgg_echo('tidypics:yourmostrecent'),\r
                                                                        $CONFIG->wwwroot . 'pg/photos/yourmostrecent',\r
@@ -106,9 +110,12 @@
                                add_submenu_item(       elgg_echo("album:yours"), \r
                                                                        $CONFIG->wwwroot . "pg/photos/owned/" . $_SESSION['user']->username, \r
                                                                        'tidypics-b' );\r
-                               add_submenu_item(       elgg_echo('tidypics:yourmostviewed'),\r
-                                                                       $CONFIG->wwwroot . 'pg/photos/yourmostviewed',\r
-                                                                       'tidypics-b');\r
+                               \r
+                               if ($view_count != 'disabled') {\r
+                                       add_submenu_item(       elgg_echo('tidypics:yourmostviewed'),\r
+                                                                               $CONFIG->wwwroot . 'pg/photos/yourmostviewed',\r
+                                                                               'tidypics-b');\r
+                               }\r
                                \r
                                add_submenu_item(       elgg_echo('tidypics:yourmostrecent'),\r
                                                                        $CONFIG->wwwroot . 'pg/photos/yourmostrecent',\r
@@ -121,9 +128,13 @@
                                        add_submenu_item(       sprintf(elgg_echo('album:friends'),$page_owner->name), \r
                                                                                $CONFIG->wwwroot . "pg/photos/friends/". $page_owner->username, \r
                                                                                'tidypics-a');\r
-                                       add_submenu_item(       sprintf(elgg_echo('tidypics:friendmostviewed'),$page_owner->name), \r
-                                                                               $CONFIG->wwwroot . "pg/photos/friendmostviewed/". $page_owner->username, \r
-                                                                               'tidypics-a');\r
+                                       \r
+                                       if ($view_count != 'disabled') {\r
+                                               add_submenu_item(       sprintf(elgg_echo('tidypics:friendmostviewed'),$page_owner->name), \r
+                                                                                       $CONFIG->wwwroot . "pg/photos/friendmostviewed/". $page_owner->username, \r
+                                                                                       'tidypics-a');\r
+                                       }\r
+                                       \r
                                        add_submenu_item(       sprintf(elgg_echo('tidypics:friendmostrecent'),$page_owner->name), \r
                                                                                $CONFIG->wwwroot . "pg/photos/friendmostrecent/". $page_owner->username, \r
                                                                                'tidypics-a');\r
@@ -141,15 +152,18 @@
                        add_submenu_item(       sprintf(elgg_echo('album:all'),$page_owner->name), \r
                                                                $CONFIG->wwwroot . "pg/photos/world/", \r
                                                                'tidypics-z');\r
-                       add_submenu_item(       elgg_echo('tidypics:mostviewed'),\r
-                                                               $CONFIG->wwwroot . 'pg/photos/mostviewed',\r
-                                                               'tidypics-z');                  \r
                        add_submenu_item(       elgg_echo('tidypics:mostrecent'),\r
                                                                $CONFIG->wwwroot . 'pg/photos/mostrecent',\r
                                                                'tidypics-z');\r
-                       add_submenu_item(       elgg_echo('tidypics:recentlyviewed'),\r
-                                                               $CONFIG->wwwroot . 'pg/photos/recentlyviewed',\r
-                                                               'tidypics-z');\r
+                       \r
+                       if ($view_count != 'disabled') {\r
+                               add_submenu_item(       elgg_echo('tidypics:mostviewed'),\r
+                                                                       $CONFIG->wwwroot . 'pg/photos/mostviewed',\r
+                                                                       'tidypics-z');\r
+                               add_submenu_item(       elgg_echo('tidypics:recentlyviewed'),\r
+                                                                       $CONFIG->wwwroot . 'pg/photos/recentlyviewed',\r
+                                                                       'tidypics-z');\r
+                       }\r
 \r
                }\r
                \r

diff --git a/views/default/object/image.php b/views/default/object/image.php
index 1ab2e921a76ef5744b326845a10844268e59a488..bd81e238e0124c819738acd3f054448adebb4cb6 100644 (file)
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -101,33 +101,37 @@ if ($photo_tags) {
 //
 ////////////////////////////////////////////////////////
 
-                       // Get view information
+                       $view_count = get_plugin_setting('view_count', 'tidypics');
                        
                        $viewer = get_loggedin_user();
-               
-                       //who is viewing?
-                       if($viewer->guid) {
-                               $the_viewer = $viewer->guid;
-                       } else {
-                               $the_viewer = 0;
-                       }
+
+                       if ($view_count != 'disabled') {
+                               // Get view information
+                               
+                               //who is viewing?
+                               if($viewer->guid) {
+                                       $the_viewer = $viewer->guid;
+                               } else {
+                                       $the_viewer = 0;
+                               }
+                               
+                               create_annotation($file_guid, "tp_view", "1", "integer", $the_viewer, ACCESS_PUBLIC);
+                               $views_a = get_annotations($file_guid, "object", "image", "tp_view", "", 0, 9999);
+                               $views = count($views_a);
                        
-                       create_annotation($file_guid, "tp_view", "1", "integer", $the_viewer, 2);
-                       $views_a = get_annotations($file_guid, "object", "image", "tp_view", "", 0, 9999);
-                       $views = count($views_a);
-               
-                       $my_views = 0;
-                       $owner_views = 0;
-                       $diff_viewers = array();
-//                     echo "<pre>"; var_dump($owner); echo "</pre>";
-                       foreach($views_a as $view) {
-                               if($view->owner_guid == $the_viewer && $the_viewer != 0) $my_views++;
-                               if($owner->guid == $view->owner_guid) $owner_views++;
-                               //count how many different people have viewed it
-                               if($owner->guid != $view->owner_guid) $diff_viewers[$view->owner_guid] = 1;
+                               $my_views = 0;
+                               $owner_views = 0;
+                               $diff_viewers = array();
+       //                      echo "<pre>"; var_dump($owner); echo "</pre>";
+                               foreach($views_a as $view) {
+                                       if($view->owner_guid == $the_viewer && $the_viewer != 0) $my_views++;
+                                       if($owner->guid == $view->owner_guid) $owner_views++;
+                                       //count how many different people have viewed it
+                                       if($owner->guid != $view->owner_guid) $diff_viewers[$view->owner_guid] = 1;
+                               }
+                               //remove the owner's views from the total count (prevents artificially inflated view counts)
+                               $views = $views - $owner_views;
                        }
-                       //remove the owner's views from the total count (prevents artificially inflated view counts)
-                       $views = $views - $owner_views;
                        
                        // Build back and next links
                        $back = '';
@@ -163,11 +167,13 @@ if ($photo_tags) {
 
                <div id="tidypics_breadcrumbs">
                        <?php echo elgg_view('tidypics/breadcrumbs', array('album' => $album,) ); ?> <br />
-                       <?
-                               if($owner->guid == $the_viewer) {
-                                       echo sprintf(elgg_echo("tidypics:viewsbyowner"), $views, count($diff_viewers));
-                               } else {
-                                       echo sprintf(elgg_echo("tidypics:viewsbyothers"), $views, $my_views);
+                       <?php
+                               if ($view_count != 'disabled') {
+                                       if ($owner->guid == $the_viewer) {
+                                               echo sprintf(elgg_echo("tidypics:viewsbyowner"), $views, count($diff_viewers));
+                                       } else {
+                                               echo sprintf(elgg_echo("tidypics:viewsbyothers"), $views, $my_views);
+                                       }
                                }
                        ?>
                </div>

diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index 564b89987028185905f28aa0528d3167c241eae1..6094a776ce90c07f2cc396b66abe7231c1fab8af 100644 (file)
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -55,6 +55,11 @@
        if(!$exif) $exif = "disabled";\r
        $form_body .= '<p class="admin_debug">' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:exif') => 'enabled'), 'internalname' => 'exif', 'value' => $exif )) . "</p>";\r
 \r
+       // Show EXIF\r
+       $view_count = $plugin->view_count;\r
+       if(!$view_count) $view_count = "enabled";\r
+       $form_body .= '<p class="admin_debug">' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:view_count') => 'enabled'), 'internalname' => 'view_count', 'value' => $view_count )) . "</p>";\r
+\r
        // Watermark Text\r
        $form_body .= "<p>" . elgg_echo('tidypics:settings:watermark') . "<br />";\r
        $form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->watermark_text)) . "</p>";\r