diff options
| author | Cash Costello <cash.costello@gmail.com> | 2009-07-01 01:00:52 +0000 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2009-07-01 01:00:52 +0000 |
| commit | fd36c38f04f775f34734f88ece2d23466d7715bb (patch) | |
| tree | e8175c16f1a089f23e47f0da3995c1f80d86923c /views/default | |
| parent | d1e02e6aa2f75a311c46a465bc044211edb36ed9 (diff) | |
| download | elgg-fd36c38f04f775f34734f88ece2d23466d7715bb.tar.gz elgg-fd36c38f04f775f34734f88ece2d23466d7715bb.tar.bz2 | |
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.
Diffstat (limited to 'views/default')
| -rw-r--r-- | views/default/object/image.php | 4 | ||||
| -rw-r--r-- | views/default/tidypics/forms/admin.php | 12 |
2 files changed, 9 insertions, 7 deletions
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
|