added admin setting for exif

4 files changed, 14 insertions, 0 deletions

diff --git a/actions/settings.php b/actions/settings.php
index 29a77577f..79839ceef 100644
--- a/actions/settings.php
+++ b/actions/settings.php
@@ -31,6 +31,11 @@
 	else

 		set_plugin_setting('tagging', 'disabled', 'tidypics');

 

+	if (is_array(get_input('exif')))

+		set_plugin_setting('exif', 'enabled', 'tidypics');

+	else

+		set_plugin_setting('exif', 'disabled', 'tidypics');

+

 

 	// image sizes

 	$image_sizes = array();

diff --git a/languages/en.php b/languages/en.php
index 6b2281110..863fe554e 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -44,6 +44,7 @@
 			'tidypics:settings:image_lib' => "Image Library: ",

 			'tidypics:settings:download_link' => "Show download link",

 			'tidypics:settings:tagging' => "Enable photo tagging",

+			'tidypics:settings:exif' => "Show EXIF data",

 			'tidypics:settings:maxfilesize' => "Maximum image size in megabytes (MB):",

 			'tidypics:settings:watermark' => "Enter text to appear in the watermark - ImageMagick must be selected for the image library",

 			'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands",

diff --git a/views/default/object/image.php b/views/default/object/image.php
index 5787bb39f..21ee3ff1d 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -187,6 +187,8 @@ if ($photo_tags) {
 															'owner' => $owner, ) );
 			}
 			
+			
+			if (get_plugin_setting('exif', 'tidypics') != "disabled") {
 ?>
 			<div id="tidypics_breadcrumbs">
 				<?php
@@ -194,6 +196,7 @@ if ($photo_tags) {
 					if($exif) echo $exif;
 				?>
 			</div>
+<?php		} ?>
 		<div id="tidypics_info">
 <?php if (!is_null($tags)) { ?>
 			<div class="object_tag_string"><?php echo elgg_view('output/tags',array('value' => $tags));?></div>
diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index c5e7c68d0..d4c9e1b5b 100644
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -45,6 +45,11 @@
 	if(!$download_link) $download_link = "enabled";

 	$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>";

 

+	// Show EXIF

+	$exif = $plugin->exif;

+	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>";

+

 	// 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>";