From 6ea2b4751abcae4d2b3b6aef1d1c3c4ce129d0a2 Mon Sep 17 00:00:00 2001
From: Frumph <philip@frumph.net>
Date: Tue, 14 Oct 2014 15:07:40 -0700
Subject: [PATCH] * Added dropdown box to choose which thumbnail goes into the
 og:image for facebook to recognize * adjusted the alternate color for the
 config and moved some alternates around in the css

---
 comiceasel.php           | 12 +++++++++---
 css/config.css           |  2 +-
 functions/injections.php |  2 +-
 options/general.php      | 19 ++++++++++++++++++-
 options/navigation.php   |  2 +-
 readme.txt               |  6 +++++-
 6 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/comiceasel.php b/comiceasel.php
index 3f6af39..501f4e6 100644
--- a/comiceasel.php
+++ b/comiceasel.php
@@ -3,7 +3,7 @@
 Plugin Name: Comic Easel
 Plugin URI: http://comiceasel.com
 Description: Comic Easel allows you to incorporate a WebComic using the WordPress Media Library functionality with Navigation into almost all WordPress themes. With just a few modifications of adding injection do_action locations into a theme, you can have the theme of your choice display and manage a webcomic.
-Version: 1.7.6
+Version: 1.7.7
 Author: Philip M. Hofer (Frumph)
 Author URI: http://frumph.net/
 
@@ -373,10 +373,11 @@ function ceo_load_options($reset = false) {
 			'thumbnail_size_for_rss' => 'thumbnail',
 			'thumbnail_size_for_direct_rss' => 'full',
 			'thumbnail_size_for_archive' => 'large',
+			'thumbnail_size_for_facebook' => 'full',
 			'graphic_navigation_directory' => 'default',
 			'disable_mininav' => false,
 			'include_comics_in_blog_archive' => false,
-			'disable_related_comics' => false,
+			'disable_related_comics' => true,
 			'custom_post_type_slug_name' => __('comic','comiceasel'),
 			'display_first_comic_on_home_page' => false,
 			'disable_style_sheet' => false,
@@ -440,6 +441,11 @@ function ceo_pluginfo($whichinfo = null) {
 			$ceo_options['enable_nav_above_comic'] = false;
 			update_option('comiceasel-config', $ceo_options);
 		}
+		if (version_compare($ceo_options['db_version'], '1.6', '<')) {
+			$ceo_options['db_version'] = '1.6';
+			$ceo_options['thumbnail_size_for_facebook'] = 'large';
+			update_option('comiceasel-config', $ceo_options);
+		}		
 		$ceo_coreinfo = wp_upload_dir();
 		$ceo_addinfo = array(
 				// if wp_upload_dir reports an error, capture it
@@ -456,7 +462,7 @@ function ceo_pluginfo($whichinfo = null) {
 				// comic-easel plugin directory/url
 				'plugin_url' => plugin_dir_url(__FILE__),
 				'plugin_path' => plugin_dir_path(__FILE__),
-				'version' => '1.7.6'
+				'version' => '1.7.7'
 		);
 		// Combine em.
 		$ceo_pluginfo = array_merge($ceo_pluginfo, $ceo_addinfo);
diff --git a/css/config.css b/css/config.css
index 1bf8266..4c38d19 100644
--- a/css/config.css
+++ b/css/config.css
@@ -229,5 +229,5 @@ div.show .ceoadmin-footer img{
 }
 
 .alternate {
-    background: #fff;
+    background: #fcfcfc;
 }
\ No newline at end of file
diff --git a/functions/injections.php b/functions/injections.php
index 6d4026e..d7c88ec 100644
--- a/functions/injections.php
+++ b/functions/injections.php
@@ -348,7 +348,7 @@ function ceo_social_meta() {
 			echo '<meta name="twitter:title" content="" />'."\r\n";
 		}
 		$post_image_id = get_post_thumbnail_id($post->ID);
-		$thumbnail = wp_get_attachment_image_src( $post_image_id, 'full', false);
+		$thumbnail = wp_get_attachment_image_src( $post_image_id, ceo_pluginfo('thumbnail_size_for_facebook'), false);
 		if (is_array($thumbnail)) { 
 			$thumbnail = reset($thumbnail);
 			echo '<meta property="og:image" content="'.$thumbnail.'" />'."\r\n";
diff --git a/options/general.php b/options/general.php
index 76265b0..7a8b208 100644
--- a/options/general.php
+++ b/options/general.php
@@ -216,6 +216,23 @@ foreach ($thumbnail_sizes as $size) { ?>
 						<?php _e('The thumbnail shown inside posts when viewed in the archive and search functions of WordPress','comiceasel'); ?>
 					</td>
 				</tr>
+				<tr>
+					<th scope="row">
+						<label for="thumbnail_size_for_archive"><?php _e('Thumbnail size for Facebook images','comiceasel'); ?></label>
+						<select name="thumbnail_size_for_archive" id="thumbnail_size_for_archive">
+							<option class="level-0" value="none" <?php selected( $ceo_options['thumbnail_size_for_facebook'],'none'); ?>><?php _e('None', 'comiceasel'); ?></option>
+<?php 
+if (!in_array($ceo_options['thumbnail_size_for_facebook'], $thumbnail_sizes) && ($ceo_options['thumbnail_size_for_facebook'] != 'none') && ($ceo_options['thumbnail_size_for_facebook'] != 'full')) $ceo_options['thumbnail_size_for_facebook'] = 'large';
+foreach ($thumbnail_sizes as $size) { ?>
+							<option class="level-0" value="<?php echo $size; ?>" <?php selected( $ceo_options['thumbnail_size_for_facebook'], $size); ?>><?php echo ucfirst($size); ?></option>
+<?php } ?>
+							<option class="level-0" value="full" <?php selected( $ceo_options['thumbnail_size_for_facebook'],'full'); ?>><?php _e('Full', 'comiceasel'); ?></option>							
+						</select>
+					</th>
+					<td>
+						<?php _e('Comic Easel adds an og:image to the head section of the site.  This is the size of the image that is used for the image that facebook recognizes.  If you are having issues where the image is not the one you want, flip this.','comiceasel'); ?>
+					</td>
+				</tr>
 				<tr>
 					<td colspan="12">
 						<i><?php _e('NOTE: Edit a post, click update on it for the feeds to refresh with new copies; to see changes.','comiceasel'); ?></i>
@@ -250,7 +267,7 @@ if ($check_term) { ?>
 						<span style='color: #b00;'><?php _e('IMPORTANT - If you change this from the default remember to go to settings -> permalink and click SAVE so that the permalink structure can be recognized by WordPress','comiceasel'); ?></span>
 					</td>
 				</tr>
-				<tr class="alternate">
+				<tr>
 					<?php if (!isset($ceo_options['disable_cal_rewrite_rules'])) $ceo_options['disable_cal_rewrite_rules'] = false; ?>
 					<th scope="row"><label for="disable_cal_rewrite_rules"><?php _e('Disable the regeneration of the rewrite rules so numerical slugs get turned into dates?','comiceasel'); ?></label></th>
 					<td>
diff --git a/options/navigation.php b/options/navigation.php
index ec7975e..da73c4a 100644
--- a/options/navigation.php
+++ b/options/navigation.php
@@ -48,7 +48,7 @@
 						<?php _e('Make the random button only jump to the comics within the same chapter?','comiceasel'); ?>
 					</td>
 				</tr>
-				<tr>
+				<tr class="alternate">
 					<?php if (!isset($ceo_options['enable_prevnext_chapter_traversing'])) $ceo_options['enable_prevnext_chapter_traversing'] = false; ?>
 					<th scope="row"><label for="enable_prevnext_chapter_traversing"><?php _e('Traverse comic chapters with the previous/next?','comiceasel'); ?></label></th>
 					<td>
diff --git a/readme.txt b/readme.txt
index bd5bff9..27b6a2b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: Frumph
 Tags: comiceasel, easel, webcomic, comic, webcomic
 Requires at least: 3.2
 Tested up to: 4.0
-Stable tag: 1.7.6
+Stable tag: 1.7.7
 Donate link: http://frumph.net
 License: GPLv3 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -125,6 +125,10 @@ The comic navigation widget is only seen if you have the comic sidebar's enabled
 
 
 == Changelog ==
+= 1.7.7 =
+* Added dropdown box to choose which thumbnail goes into the og:image for facebook to recognize
+* adjusted the alternate color for the config and moved some alternates around in the css
+
 = 1.7.6 =
 * Fixed the dropdown-archive widget to allow you to recheckmark certain options
 * https://core.trac.wordpress.org/ticket/16863 bug problem still exists with the exclude in the dropdown-archive