From fd36c38f04f775f34734f88ece2d23466d7715bb Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Wed, 1 Jul 2009 01:00:52 +0000
Subject: If everything works out, this should be Tidypics 1.6.0 Beta 1 - note
 I pulled back support for ImageMagick command line and watermarks. It would
 lead to too many support questions from the general public and I already
 expect to be inundated.

---
 contributions.txt                      | 16 +++++++++++++---
 manifest.xml                           |  2 +-
 views/default/object/image.php         |  4 +++-
 views/default/tidypics/forms/admin.php | 12 ++++++------
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/contributions.txt b/contributions.txt
index f7aee9ba5..f88e09832 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -2,15 +2,25 @@ See individual change logs for contributors to those builds
 
 
 ------------------------------------------------------------------------
-Version 1.6.0 Change List
-Release Date: 06/24/2009
+Version 1.6.0 Beta 1 Change List
+Release Date: 06/30/2009
 Contributors:
   * Cash Costello
-  * Greg
+  * Greg Froese
+  * tagging based on code by Predo Prez
 ------------------------------------------------------------------------
 BEGIN VERSION 1.6.0 CHANGES
 ------------------------------------------------------------------------
  * Photo tagging
+ * View counter
+ * EXIF view
+ * ImageMagick support
+ * Extensive admin settings
+ * Improved CSS
+ * Image ratings
+ * Upload quotas
+ * Better album RSS feed
+ * better almost everything
 ------------------------------------------------------------------------
 END VERSION 1.6.0 CHANGES
 ------------------------------------------------------------------------
diff --git a/manifest.xml b/manifest.xml
index b29aeea6f..31d66e2f0 100644
--- 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 e38576abf..ba3bb0272 100644
--- 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 6094a776c..79f652e4f 100644
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -23,18 +23,18 @@
 					'options_values' => array(
 						'GD' => 'GD',
 						'ImageMagickPHP' => 'ImageMagick',
-						'ImageMagick' => 'ImageMagick Cmdline',
+/*						'ImageMagick' => 'ImageMagick Cmdline', */
 					),
 					'value' => $image_lib
 	));
 	$form_body .= '</p>';
-
+/*
 	// Image Magick Path
 	$im_path = $plugin->im_path;
 	if(!$im_path) $im_path = "/usr/bin/";
 	$form_body .= "<p>" . elgg_echo('tidypics:settings:im_path') . "<br />";
 	$form_body .= elgg_view("input/text",array('internalname' => 'params[im_path]', 'value' => $im_path)) . "</p>";
-
+*/
 	// Tagging
 	$tagging = $plugin->tagging;
 	if(!$tagging) $tagging = "enabled";
@@ -55,15 +55,15 @@
 	if(!$exif) $exif = "disabled";
 	$form_body .= '<p class="admin_debug">' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:exif') => 'enabled'), 'internalname' => 'exif', 'value' => $exif )) . "</p>";
 
-	// Show EXIF
+	// Show View count
 	$view_count = $plugin->view_count;
 	if(!$view_count) $view_count = "enabled";
 	$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>";
-
+/*
 	// Watermark Text
 	$form_body .= "<p>" . elgg_echo('tidypics:settings:watermark') . "<br />";
 	$form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->watermark_text)) . "</p>";
-
+*/
 	// Max Image Size
 	$maxfilesize = $plugin->maxfilesize;
 	if (!$maxfilesize) $maxfilesize = (int)5; // 5 MB
-- 
cgit v1.2.3