If everything works out, this should be Tidypics 1.6.0 Beta 1 - note I pulled back...

diff --git a/contributions.txt b/contributions.txt
index f7aee9ba534b4008fb7ce4adb0abe9719d9ad2b2..f88e098326be03b58849751933426f92ce3bbe75 100644 (file)
--- a/contributions.txt
+++ b/contributions.txt
@@ -2,15 +2,25 @@ See individual change logs for contributors to those builds
 \r
 \r
 ------------------------------------------------------------------------\r
-Version 1.6.0 Change List\r
-Release Date: 06/24/2009\r
+Version 1.6.0 Beta 1 Change List\r
+Release Date: 06/30/2009\r
 Contributors:\r
   * Cash Costello\r
-  * Greg\r
+  * Greg Froese\r
+  * tagging based on code by Predo Prez\r
 ------------------------------------------------------------------------\r
 BEGIN VERSION 1.6.0 CHANGES\r
 ------------------------------------------------------------------------\r
  * Photo tagging\r
+ * View counter\r
+ * EXIF view\r
+ * ImageMagick support\r
+ * Extensive admin settings\r
+ * Improved CSS\r
+ * Image ratings\r
+ * Upload quotas\r
+ * Better album RSS feed\r
+ * better almost everything\r
 ------------------------------------------------------------------------\r
 END VERSION 1.6.0 CHANGES\r
 ------------------------------------------------------------------------\r

diff --git a/manifest.xml b/manifest.xml
index b29aeea6f2eab1332f2e40e91c28bb91afe0e773..31d66e2f05d3b635423e16d397ede73db076a0e1 100644 (file)
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest>
         <field key="author" value="The TidyPics team." />
-        <field key="version" value="1.6.0" />
+        <field key="version" value="1.6.0 Beta 1" />
         <field key="description" value="Tidypics Photo Gallery Plugin" />
         <field key="website" value="http://code.google.com/p/tidypics/" />
         <field key="copyright" value="2008-2009 Jade Dominguez, Gabriel Monge-Franco, Cash Costello" />

diff --git a/views/default/object/image.php b/views/default/object/image.php
index e38576abf5a74432391d0102578ffaf5398ace7a..ba3bb0272f278e0ba6fc7757634e11520ac52e6d 100644 (file)
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -126,7 +126,9 @@ if ($photo_tags) {
                                        $the_viewer = 0;
                                }
                                
-                               create_annotation($file_guid, "tp_view", "1", "integer", $the_viewer, ACCESS_PUBLIC);
+                               // only non-owner views count
+                               if ($owner->guid != $view->owner_guid)
+                                       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);
                        

diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index 6094a776ce90c07f2cc396b66abe7231c1fab8af..79f652e4f741a265463d54bd68a7b5540c8ff10b 100644 (file)
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -23,18 +23,18 @@
                                        'options_values' => array(\r
                                                'GD' => 'GD',\r
                                                'ImageMagickPHP' => 'ImageMagick',\r
-                                               'ImageMagick' => 'ImageMagick Cmdline',\r
+/*                                             'ImageMagick' => 'ImageMagick Cmdline', */\r
                                        ),\r
                                        'value' => $image_lib\r
        ));\r
        $form_body .= '</p>';\r
-\r
+/*\r
        // Image Magick Path\r
        $im_path = $plugin->im_path;\r
        if(!$im_path) $im_path = "/usr/bin/";\r
        $form_body .= "<p>" . elgg_echo('tidypics:settings:im_path') . "<br />";\r
        $form_body .= elgg_view("input/text",array('internalname' => 'params[im_path]', 'value' => $im_path)) . "</p>";\r
-\r
+*/\r
        // Tagging\r
        $tagging = $plugin->tagging;\r
        if(!$tagging) $tagging = "enabled";\r
@@ -55,15 +55,15 @@
        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
+       // Show View count\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
+/*\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
-\r
+*/\r
        // Max Image Size\r
        $maxfilesize = $plugin->maxfilesize;\r
        if (!$maxfilesize) $maxfilesize = (int)5; // 5 MB\r