From 6108b73aadbfbf6d39ab4f9dd7a56e5fc53b9ae1 Mon Sep 17 00:00:00 2001
From: "Philip M. Hofer (Frumph)" <frumph_dragon@yahoo.com>
Date: Wed, 16 Sep 2009 08:55:29 -0700
Subject: [PATCH] hgrn'

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
---
 archive.php                   |  7 ++++++-
 comicpress-options-config.php | 12 +++++++++++-
 comicpress-options.php        | 24 ++++++++++++++++++++++++
 functions.php                 |  4 +++-
 functions/moods.php           | 12 +++++++-----
 search.php                    |  7 ++++++-
 sidebar-belowfooter.php       |  7 +++++++
 7 files changed, 64 insertions(+), 9 deletions(-)
 create mode 100644 sidebar-belowfooter.php

diff --git a/archive.php b/archive.php
index 5008cba..679baa8 100644
--- a/archive.php
+++ b/archive.php
@@ -113,7 +113,12 @@
 					</div>
 					<div class="clear"></div>
 				</div>
-					<?php the_excerpt() ?>
+					<?php global $excerpt_or_content_archive; 
+					if ($excerpt_or_content_archive != 'excerpt') {
+						the_content('&darr; Read the rest of this entry...');
+					} else { 
+						the_excerpt();
+					} ?>
 					<br class="clear-margins" />
 					<div class="post-extras">
 						<div class="tags">
diff --git a/comicpress-options-config.php b/comicpress-options-config.php
index 33c6b35..24abd04 100644
--- a/comicpress-options-config.php
+++ b/comicpress-options-config.php
@@ -227,7 +227,17 @@ $options = array (
 		array(
 			"id" => "comicpress-disable_comment_note",
 			"default" => "no",
-			"type" => "comicpress-disable_comment_note"),	
+			"type" => "comicpress-disable_comment_note"),
+			
+		array(
+			"id" => "comicpress-excerpt_or_content_archive",
+			"default" => "excerpt",
+			"type" => "comicpress-excerpt_or_content_archive"),
+			
+		array(
+			"id" => "comicpress-excerpt_or_content_search",
+			"default" => "excerpt",
+			"type" => "comicpress-excerpt_or_content_search"),
 
 		array("type" => "close")
 		);
diff --git a/comicpress-options.php b/comicpress-options.php
index 92baf89..d52760d 100644
--- a/comicpress-options.php
+++ b/comicpress-options.php
@@ -421,6 +421,30 @@ function comicpress_admin() {
 				</td>
 				</tr>
 				<?php break;
+			case "comicpress-excerpt_or_content_archive": ?>
+				<tr>
+				<th scope="row"><strong>Would you like to have users see the entire content or just an excerpt when viewing the archives?</strong><br /><br /></th>
+				<td valign="top">
+				<label><input name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>-excerpt" type="radio" value="excerpt"<?php if ( get_option( $value['id'] ) == "excerpt") { echo " checked"; } ?> />Excerpt</label>
+				&nbsp;&nbsp;
+				<label><input  name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>-content" type="radio" value="content"<?php if ( get_option( $value['id'] ) == "content") { echo " checked"; } ?> />Content</label>
+				</td>
+				<td valign="top">
+				</td>
+				</tr>
+				<?php break;
+			case "comicpress-excerpt_or_content_search": ?>
+				<tr>
+				<th scope="row"><strong>Would you like to have users see the entire content or just an excerpt when searching?</strong><br /><br /></th>
+				<td valign="top">
+				<label><input name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>-excerpt" type="radio" value="excerpt"<?php if ( get_option( $value['id'] ) == "excerpt") { echo " checked"; } ?> />Excerpt</label>
+				&nbsp;&nbsp;
+				<label><input  name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>-content" type="radio" value="content"<?php if ( get_option( $value['id'] ) == "content") { echo " checked"; } ?> />Content</label>
+				</td>
+				<td valign="top">
+				</td>
+				</tr>
+				<?php break;
 		}
 	}
 	?>
diff --git a/functions.php b/functions.php
index b576c38..7047884 100644
--- a/functions.php
+++ b/functions.php
@@ -87,7 +87,9 @@ if (get_option('upload_path') !== false) {
 				'themepack_directory'			=> 'themepack_directory',
 				'avatar_directory'				=> 'avatar_directory',
 				'archive_display_order'			=> 'archive_display_order',
-				'disable_comment_note'			=> 'disable_comment_note' ) as $options => $variable_name) {
+				'disable_comment_note'			=> 'disable_comment_note',
+				'excerpt_or_content_archive'	=> 'excerpt_or_content_archive',
+				'excerpt_or_content_search'		=> 'excerpt_or_content_search' ) as $options => $variable_name) {
 		$variables_to_extract[$variable_name] = get_option("comicpress-${options}");
 	}
 	
diff --git a/functions/moods.php b/functions/moods.php
index 2310e2d..1286398 100644
--- a/functions/moods.php
+++ b/functions/moods.php
@@ -20,11 +20,13 @@ function comicpress_show_mood_in_post() {
 	$moods_directory = get_option('comicpress-moods_directory');
 	if (!empty($moods_directory) && $moods_directory != 'none') {
 		$mood_file = get_post_meta( get_the_ID(), "mood", true );
-		$mood = explode(".", $mood);
-		$mood = reset($mood);
-		if ( !empty($mood_file) && file_exists(get_template_directory() . '/images/moods/'.$moods_directory.'/'.$mood_file) ) { ?>
-			<div class="post-mood post-<?php echo $mood; ?>"><img src="<?php bloginfo('stylesheet_directory'); ?>/images/moods/<?php echo $moods_directory; ?>/<?php echo $mood_file; ?>" alt="<?php echo $mood; ?>" title="<?php echo $mood; ?>" /></div>
-		<?php }
+		if (!empty($mood_file) && $mood_file != '') {
+			$mood = explode(".", $mood);
+			$mood = reset($mood);
+			if ( !empty($mood_file) && file_exists(get_template_directory() . '/images/moods/'.$moods_directory.'/'.$mood_file) ) { ?>
+				<div class="post-mood post-<?php echo $mood; ?>"><img src="<?php bloginfo('stylesheet_directory'); ?>/images/moods/<?php echo $moods_directory; ?>/<?php echo $mood_file; ?>" alt="<?php echo $mood; ?>" title="<?php echo $mood; ?>" /></div>
+			<?php } 
+		}
 	}
 }
 
diff --git a/search.php b/search.php
index b6168b8..a603ed4 100644
--- a/search.php
+++ b/search.php
@@ -93,7 +93,12 @@ $count = $tmp_search->post_count;
 					</div>
 					<div class="clear"></div>
 				</div>
-				<?php the_excerpt() ?>
+					<?php global $excerpt_or_content_search; 
+					if ($excerpt_or_content_search != 'excerpt') {
+						the_content('&darr; Read the rest of this entry...');
+					} else { 
+						the_excerpt();
+					} ?>
 				<br class="clear-margins" />
 				<div class="post-extras">
 					<div class="tags">
diff --git a/sidebar-belowfooter.php b/sidebar-belowfooter.php
new file mode 100644
index 0000000..3dd524d
--- /dev/null
+++ b/sidebar-belowfooter.php
@@ -0,0 +1,7 @@
+<?php if (commpress_is_active_sidebar('Below Footer')) { ?>
+<div id="sidebar-aboveheader">
+	<div class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>">
+		<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Below Footer') ) : ?><?php endif; ?>
+	</div>
+</div>
+<?php } ?>