From 9f0e0efbcb22ca9b6a1559e8b057fb491033cca3 Mon Sep 17 00:00:00 2001
From: gjr-osweb <oswebcreations@gmail.com>
Date: Thu, 12 Feb 2015 13:56:36 -0600
Subject: [PATCH] 1.4.7 fixes along with thumb crop bug

---
 changelog.txt                |  7 +++++-
 zpbase/album-grid.php        | 26 +++++++++++++++++----
 zpbase/album-masonry.php     | 18 ++++++++++++---
 zpbase/inc/index-grid.php    |  6 ++++-
 zpbase/inc/index-masonry.php |  6 ++++-
 zpbase/search.php            | 44 ++++++++++++++++++++++++++++++------
 6 files changed, 90 insertions(+), 17 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index c698155..9f3de14 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,6 +1,11 @@
 Changelog
 --------------------
-Currently for use with Zenphoto version 1.4.6
+Currently for use with Zenphoto version 1.4.7
+
+1.0		2/11/15
+	- Fixed album menu for 1.4.7 (Thanks Acrylian!).
+	- Fixed bug when crop thumbnails is enabled, setting incorrect ch and cw, not sure why. Changed image function when cropping.
+	- Version updates.
 
 1.0		8/19/14
 	- Added mobile menu. (header.php and style.css)
diff --git a/zpbase/album-grid.php b/zpbase/album-grid.php
index 351d2e6..e7c6190 100644
--- a/zpbase/album-grid.php
+++ b/zpbase/album-grid.php
@@ -50,7 +50,11 @@
 					<?php while (next_album()): ?>
 					<div class="image-unit">
 						<a class="album-thumb" href="<?php echo html_encode(getAlbumURL());?>" title="<?php printBareAlbumTitle();?>">
-							<?php printAlbumThumbImage(getBareAlbumTitle(),'remove-attributes'); ?>
+							<?php if (getOption('thumb_crop')) {
+							printCustomAlbumThumbImage(getAnnotatedAlbumTitle(),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),null,null,'remove-attributes');
+							} else {
+							printAlbumThumbImage(getAnnotatedAlbumTitle(),'remove-attributes');
+							} ?>
 						</a>
 						<h3><?php printBareAlbumTitle();?></h3>
 						<p class="album-desc"><?php echo strip_tags(truncate_string(getAlbumDesc(),120,'...')); ?></p>
@@ -63,15 +67,29 @@
 					<div class="image-unit">
 						<?php if ( (getOption('zpbase_magnific_grid')) || (getOption('zpbase_nodetailpage'))) {
 							if (getOption('zpbase_magnific_target') == 'imagepage') { ?>
-							<a class="image-thumb popup-page" href="<?php echo html_encode(getImageURL()); ?>?show=imagepage" title="<?php printBareImageTitle();?>"><?php printImageThumb(getBareImageTitle(),'remove-attributes'); ?></a>
+							<a class="image-thumb popup-page" href="<?php echo html_encode(getImageURL()); ?>?show=imagepage" title="<?php printBareImageTitle();?>">
+								<?php if (getOption('thumb_crop')) {
+								printCustomSizedImage(getAnnotatedImageTitle(),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),null,null,'remove-attributes',null,true);
+								} else { 
+								printImageThumb(getBareImageTitle(),'remove-attributes'); 
+								} ?>
+							</a>
 							<?php } elseif (isImagePhoto($_zp_current_image)) { ?>
 							<a title="<?php echo getBareImageTitle(); ?>" class="image-popup" <?php if (!(getOption('zpbase_nodetailpage'))) { ?>data-source="<?php echo html_encode(getImageURL()); ?>" <?php } ?>href="<?php echo htmlspecialchars(getDefaultSizedImage()); ?>"><?php printImageThumb(getBareImageTitle(),'remove-attributes'); ?></a>
 							<?php } else { ?>
-							<?php printImageThumb(getBareImageTitle(),'remove-attributes'); ?>
+								<?php if (getOption('thumb_crop')) {
+								printCustomSizedImage(getAnnotatedImageTitle(),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),null,null,'remove-attributes',null,true);
+								} else { 
+								printImageThumb(getBareImageTitle(),'remove-attributes'); 
+								} ?>
 							<?php } ?>
 						<?php } else { ?>
 							<a class="image-thumb" href="<?php echo html_encode(getImageURL()); ?>" title="<?php printBareImageTitle();?>">
-								<?php printImageThumb(getBareImageTitle(),'remove-attributes'); ?>
+								<?php if (getOption('thumb_crop')) {
+								printCustomSizedImage(getAnnotatedImageTitle(),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),null,null,'remove-attributes',null,true);
+								} else { 
+								printImageThumb(getBareImageTitle(),'remove-attributes'); 
+								} ?>
 							</a>
 						<?php } ?>
 					</div>
diff --git a/zpbase/album-masonry.php b/zpbase/album-masonry.php
index 34bfe94..c61cddf 100644
--- a/zpbase/album-masonry.php
+++ b/zpbase/album-masonry.php
@@ -53,7 +53,11 @@
 						<div class="masonry-style-padding">
 							<h3><?php printAlbumTitle(); ?></h3>
 							<a class="album-thumb" href="<?php echo html_encode(getAlbumURL()); ?>" title="<?php printBareAlbumTitle(); ?>">
-								<?php printAlbumThumbImage(getBareAlbumTitle(),'remove-attributes'); ?>
+								<?php if (getOption('thumb_crop')) {
+								printCustomAlbumThumbImage(getAnnotatedAlbumTitle(),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),null,null,'remove-attributes');
+								} else {
+								printAlbumThumbImage(getAnnotatedAlbumTitle(),'remove-attributes');
+								} ?>
 							</a>
 							<p class="album-desc"><?php echo strip_tags(truncate_string(getAlbumDesc(),140,'...')); ?></p>
 							<div class="album-stats">
@@ -70,10 +74,18 @@
 					<div class="masonry-style-item">
 						<div class="masonry-style-padding">
 							<?php if (getOption('zpbase_nodetailpage')) { 
-							printImageThumb(getBareImageTitle(),'remove-attributes');
+								if (getOption('thumb_crop')) {
+								printCustomSizedImage(getAnnotatedImageTitle(),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),null,null,'remove-attributes',null,true);
+								} else { 
+								printImageThumb(getBareImageTitle(),'remove-attributes'); 
+								}
 							} else { ?>
 							<a href="<?php echo html_encode(getImageURL()); ?>" title="<?php printBareImageTitle(); ?>">
-								<?php printImageThumb(getBareImageTitle(),'remove-attributes'); ?>
+								<?php if (getOption('thumb_crop')) {
+								printCustomSizedImage(getAnnotatedImageTitle(),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),null,null,'remove-attributes',null,true);
+								} else { 
+								printImageThumb(getBareImageTitle(),'remove-attributes'); 
+								} ?>
 							</a>
 							<?php } ?>
 							<?php if ((getOption('zpbase_magnific_masonry')) || (getOption('zpbase_nodetailpage'))) { 
diff --git a/zpbase/inc/index-grid.php b/zpbase/inc/index-grid.php
index 4b64ef1..e54f4f8 100644
--- a/zpbase/inc/index-grid.php
+++ b/zpbase/inc/index-grid.php
@@ -23,7 +23,11 @@
 					<?php while (next_album()): ?>
 					<div class="image-unit">
 						<a class="album-thumb" href="<?php echo html_encode(getAlbumURL());?>" title="<?php printBareAlbumTitle();?>">
-							<?php printAlbumThumbImage(getBareAlbumTitle(),'remove-attributes'); ?>
+							<?php if (getOption('thumb_crop')) {
+							printCustomAlbumThumbImage(getAnnotatedAlbumTitle(),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),null,null,'remove-attributes');
+							} else {
+							printAlbumThumbImage(getAnnotatedAlbumTitle(),'remove-attributes');
+							} ?>
 						</a>
 						<h3><?php printBareAlbumTitle();?></h3>
 						<p class="album-desc"><?php echo truncate_string(strip_tags(getAlbumDesc()),120,'...'); ?></p>
diff --git a/zpbase/inc/index-masonry.php b/zpbase/inc/index-masonry.php
index 9e8aee9..1716529 100644
--- a/zpbase/inc/index-masonry.php
+++ b/zpbase/inc/index-masonry.php
@@ -24,7 +24,11 @@
 						<div class="masonry-style-padding">
 							<h3><?php printAlbumTitle(); ?></h3>
 							<a class="album-thumb" href="<?php echo html_encode(getAlbumURL()); ?>" title="<?php printBareAlbumTitle(); ?>">
-								<?php printAlbumThumbImage(getBareAlbumTitle(),'remove-attributes'); ?>
+								<?php if (getOption('thumb_crop')) {
+								printCustomAlbumThumbImage(getAnnotatedAlbumTitle(),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),null,null,'remove-attributes');
+								} else {
+								printAlbumThumbImage(getAnnotatedAlbumTitle(),'remove-attributes');
+								} ?>
 							</a>
 							<p class="album-desc"><?php echo truncate_string(strip_tags(getAlbumDesc()),140,'...'); ?></p>
 							<div class="album-stats">
diff --git a/zpbase/search.php b/zpbase/search.php
index 3d94e71..51b1940 100644
--- a/zpbase/search.php
+++ b/zpbase/search.php
@@ -85,7 +85,11 @@
 						<div class="masonry-style-padding">
 							<h3><?php printAlbumTitle(); ?></h3>
 							<a class="album-thumb" href="<?php echo html_encode(getAlbumURL()); ?>" title="<?php printBareAlbumTitle(); ?>">
-								<?php printAlbumThumbImage(getBareAlbumTitle(),'remove-attributes'); ?>
+								<?php if (getOption('thumb_crop')) {
+								printCustomAlbumThumbImage(getAnnotatedAlbumTitle(),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),null,null,'remove-attributes');
+								} else {
+								printAlbumThumbImage(getAnnotatedAlbumTitle(),'remove-attributes');
+								} ?>
 							</a>
 							<p class="album-desc"><?php echo strip_tags(truncate_string(getAlbumDesc(),140,'...')); ?></p>
 							<div class="album-stats">
@@ -102,10 +106,18 @@
 					<div class="masonry-style-item">
 						<div class="masonry-style-padding">
 							<?php if (getOption('zpbase_nodetailpage')) { 
-							printImageThumb(getBareImageTitle(),'remove-attributes');
+								if (getOption('thumb_crop')) {
+								printCustomSizedImage(getAnnotatedImageTitle(),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),null,null,'remove-attributes',null,true);
+								} else { 
+								printImageThumb(getBareImageTitle(),'remove-attributes'); 
+								} 
 							} else { ?>
 							<a href="<?php echo html_encode(getImageURL()); ?>" title="<?php printBareImageTitle(); ?>">
-								<?php printImageThumb(getBareImageTitle(),'remove-attributes'); ?>
+								<?php if (getOption('thumb_crop')) {
+								printCustomSizedImage(getAnnotatedImageTitle(),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),null,null,'remove-attributes',null,true);
+								} else { 
+								printImageThumb(getBareImageTitle(),'remove-attributes'); 
+								} ?>
 							</a>
 							<?php } ?>
 							<?php if ((getOption('zpbase_magnific_masonry')) || (getOption('zpbase_nodetailpage'))) { 
@@ -159,7 +171,11 @@
 					<?php while (next_album()): ?>
 					<div class="image-unit">
 						<a class="album-thumb" href="<?php echo html_encode(getAlbumURL());?>" title="<?php printBareAlbumTitle();?>">
-							<?php printAlbumThumbImage(getBareAlbumTitle(),'remove-attributes'); ?>
+							<?php if (getOption('thumb_crop')) {
+							printCustomAlbumThumbImage(getAnnotatedAlbumTitle(),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),null,null,'remove-attributes');
+							} else {
+							printAlbumThumbImage(getAnnotatedAlbumTitle(),'remove-attributes');
+							} ?>
 						</a>
 						<h3><?php printBareAlbumTitle();?></h3>
 						<p class="album-desc"><?php echo strip_tags(truncate_string(getAlbumDesc(),120,'...')); ?></p>
@@ -174,13 +190,27 @@
 							if (getOption('zpbase_magnific_target') == 'imagepage') { ?>
 							<a class="image-thumb popup-page" href="<?php echo html_encode(getImageURL()); ?>?show=imagepage" title="<?php printBareImageTitle();?>"><?php printImageThumb(getBareImageTitle(),'remove-attributes'); ?></a>
 							<?php } elseif (isImagePhoto($_zp_current_image)) { ?>
-							<a title="<?php echo getBareImageTitle(); ?>" class="image-popup" <?php if (!(getOption('zpbase_nodetailpage'))) { ?>data-source="<?php echo html_encode(getImageURL()); ?>" <?php } ?>href="<?php echo htmlspecialchars(getDefaultSizedImage()); ?>"><?php printImageThumb(getBareImageTitle(),'remove-attributes'); ?></a>
+							<a title="<?php echo getBareImageTitle(); ?>" class="image-popup" <?php if (!(getOption('zpbase_nodetailpage'))) { ?>data-source="<?php echo html_encode(getImageURL()); ?>" <?php } ?>href="<?php echo htmlspecialchars(getDefaultSizedImage()); ?>">
+								<?php if (getOption('thumb_crop')) {
+								printCustomSizedImage(getAnnotatedImageTitle(),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),null,null,'remove-attributes',null,true);
+								} else { 
+								printImageThumb(getBareImageTitle(),'remove-attributes'); 
+								} ?>
+							</a>
 							<?php } else { ?>
-							<?php printImageThumb(getBareImageTitle(),'remove-attributes'); ?>
+								<?php if (getOption('thumb_crop')) {
+								printCustomSizedImage(getAnnotatedImageTitle(),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),null,null,'remove-attributes',null,true);
+								} else { 
+								printImageThumb(getBareImageTitle(),'remove-attributes'); 
+								} ?>
 							<?php } ?>
 						<?php } else { ?>
 							<a class="image-thumb" href="<?php echo html_encode(getImageURL()); ?>" title="<?php printBareImageTitle();?>">
-								<?php printImageThumb(getBareImageTitle(),'remove-attributes'); ?>
+								<?php if (getOption('thumb_crop')) {
+								printCustomSizedImage(getAnnotatedImageTitle(),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),getOption('thumb_size'),null,null,'remove-attributes',null,true);
+								} else { 
+								printImageThumb(getBareImageTitle(),'remove-attributes'); 
+								} ?>
 							</a>
 						<?php } ?>
 					</div>