From 71c853cd028a4c4d073436f8e17a05ba8bf26048 Mon Sep 17 00:00:00 2001
From: "Philip M. Hofer (Frumph)" <frumph_dragon@yahoo.com>
Date: Sun, 3 Jan 2010 00:13:41 -0800
Subject: [PATCH] buystrip fixes and use of comicpress_display_comic_image

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
---
 buystrip.php | 65 ++++++++++++++++++++++------------------------------
 1 file changed, 27 insertions(+), 38 deletions(-)

diff --git a/buystrip.php b/buystrip.php
index beb1c0e..4f7f079 100644
--- a/buystrip.php
+++ b/buystrip.php
@@ -13,47 +13,38 @@ Template Version: 2.14
 
 <?php 
 	if (!empty($comicnum)):
-	$temppost = $post;
-	$post = & get_post( $comicnum ); 
+	$this_post = & get_post( $comicnum ); 
 ?>
 	<div <?php post_class(); ?>>
 		<?php comicpress_display_post_thumbnail(); ?>
 		<div class="post-head"></div>
 		<div class="post-content">
 			<?php if (!$comicpress_options['disable_page_titles']) { ?>
-				<h2 class="pagetitle"><?php the_title() ?></h2>
+				<h2 class="pagetitle"><?php the_title(); ?></h2>
 			<?php } ?>
 			<?php _e('Comic ID','comicpress'); ?> - #<?php echo $comicnum; ?><br />
-			<?php _e('Title:','comicpress'); ?>	<?php echo the_title(); ?><br />
+			<?php _e('Title:','comicpress'); ?>	<?php echo get_the_title($this_post); ?><br />
 			<br />
-			<?php $post = & get_post( $comicnum ); ?>
-				<?php
-				foreach (array("archive", "rss", "comic", "mini") as $type) {
-					if (($requested_image = get_comic_url($type, $post)) !== false) {
-						$image = $requested_image; break;
-					}
-				}
+			<?php 
+				echo comicpress_display_comic_image("archive,comic", false, $this_post, get_the_title($this_post));
 			?>
-			<center>
-			<img src="<?php echo $image; ?>" alt="<?php the_title(); ?>" title="<?php the_title(); ?>" /><br />
-			<br />
 			<table>
 			<tr>
-				<td align="left" valign="center">
+				<td align="left">
 						<form target="paypal" action="https://www.paypal.com/cgi-bin/webscr" method="post">
-						<input type="hidden" name="add" value="1">
-						<input type="hidden" name="cmd" value="_cart">
-						<input type="hidden" name="item_name" value="<?php _e('Print','comicpress'); ?>">
-						<input type="hidden" name="return" value="<?php echo bloginfo('wpurl'); ?>">
-						<input type="hidden" name="amount" value="<?php echo $comicpress_options['buy_print_us_amount']; ?>">
-						<input type="hidden" name="item_number" value="<?php _e('Comic ID','comicpress'); ?> (<?php echo $comicnum; ?>) - <?php echo the_title(); ?>">
-						<input type="hidden" name="business" value="<?php echo $comicpress_options['buy_print_email']; ?>">
+						<input type="hidden" name="add" value="1" />
+						<input type="hidden" name="cmd" value="_cart" />
+						<input type="hidden" name="item_name" value="<?php _e('Print','comicpress'); ?>" />
+						<input type="hidden" name="return" value="<?php echo bloginfo('wpurl'); ?>" />
+						<input type="hidden" name="amount" value="<?php echo $comicpress_options['buy_print_us_amount']; ?>" />
+						<input type="hidden" name="item_number" value="<?php _e('Comic ID','comicpress'); ?> (<?php echo $comicnum; ?>) - <?php echo get_the_title($this_post); ?>" />
+						<input type="hidden" name="business" value="<?php echo $comicpress_options['buy_print_email']; ?>" />
 					<?php if ($comicpress_options['buy_print_add_shipping']) { ?>
-						<input type="hidden" name="shipping" value="<?php echo $comicpress_options['buy_print_us_ship']; ?>">
-						US/Canada<br>
+						<input type="hidden" name="shipping" value="<?php echo $comicpress_options['buy_print_us_ship']; ?>" />
+						US/Canada<br />
 						$<?php echo $comicpress_options['buy_print_us_amount']; ?> + $<?php echo $comicpress_options['buy_print_us_ship']; ?> <?php _e('shipping','comicpress'); ?><br />
 					<?php } else { ?>
-						US/Canada<br>
+						US/Canada<br />
 						$<?php echo $comicpress_options['buy_print_us_amount']; ?><br />
 					<?php } ?>					
 						<input type="image" src="<?php echo get_template_directory_uri(); ?>/images/buynow_paypal.png" name="submit32" alt="<?php _e('Make payments with PayPal - it is fast, free and secure!','comicpress'); ?>" /> 
@@ -61,21 +52,21 @@ Template Version: 2.14
 				</td>
 				<td width="40">
 				</td>
-				<td align="left" valign="center">
+				<td align="left">
 					<form target="paypal" action="https://www.paypal.com/cgi-bin/webscr" method="post">
-						<input type="hidden" name="add" value="1">
-						<input type="hidden" name="cmd" value="_cart">
-						<input type="hidden" name="item_name" value="<?php _e('Print','comicpress'); ?>">
-						<input type="hidden" name="return" value="<?php echo bloginfo('wpurl'); ?>">
-						<input type="hidden" name="amount" value="<?php echo $comicpress_options['buy_print_int_amount']; ?>">
-						<input type="hidden" name="item_number" value="<?php _e('Comic ID','comicpress'); ?> (<?php echo $comicnum; ?>) - <?php echo the_title(); ?>">
-						<input type="hidden" name="business" value="<?php echo $comicpress_options['buy_print_email']; ?>">
+						<input type="hidden" name="add" value="1" />
+						<input type="hidden" name="cmd" value="_cart" />
+						<input type="hidden" name="item_name" value="<?php _e('Print','comicpress'); ?>" />
+						<input type="hidden" name="return" value="<?php echo bloginfo('wpurl'); ?>" />
+						<input type="hidden" name="amount" value="<?php echo $comicpress_options['buy_print_int_amount']; ?>" />
+						<input type="hidden" name="item_number" value="<?php _e('Comic ID','comicpress'); ?> (<?php echo $comicnum; ?>) - <?php echo get_the_title($this_post); ?>" />
+						<input type="hidden" name="business" value="<?php echo $comicpress_options['buy_print_email']; ?>" />
 					<?php if ($comicpress_options['buy_print_add_shipping']) { ?>
-						<input type="hidden" name="shipping" value="<?php echo $buy_print_int_ship; ?>">
-						International<br>
+						<input type="hidden" name="shipping" value="<?php echo $buy_print_int_ship; ?>" />
+						International<br />
 						$<?php echo $comicpress_options['buy_print_int_amount']; ?> + $<?php echo $comicpress_options['buy_print_int_ship']; ?> <?php _e('shipping','comicpress'); ?><br />
 					<?php } else { ?>
-						International<br>
+						International<br />
 						$<?php echo $comicpress_options['buy_print_int_amount']; ?><br />
 					<?php } ?>
 						<input type="image" src="<?php echo get_template_directory_uri(); ?>/images/buynow_paypal.png" name="submit32" alt="<?php _e('Make payments with PayPal - it is fast, free and secure!','comicpress'); ?>" />
@@ -86,8 +77,6 @@ Template Version: 2.14
 			<br />
 			<?php _e('The purchase of this strip is based on availability.   A Print of this strip is what you are purchasing.','comicpress'); ?><br />
 			</center>
-			<br />
-			<?php $post = $temppost; ?>
 			<br class="clear-margins" />
 		</div>
 		<div class="post-foot"></div>