From 91b4c4622c7cf6cdb8d76707c6335dfc967dc6a5 Mon Sep 17 00:00:00 2001
From: Erick Hitter <ehitter@gmail.com>
Date: Fri, 1 Jun 2012 15:56:02 -0400
Subject: [PATCH] Commit trunk version from WP.org repository. Contains
 in-development modifications to address problems with add_rewrite_endpoint()
 when WP_Rewrite::use_verbose_page_rules is true.

---
 wp-print-friendly.php | 300 ++++++++++++++++++++++--------------------
 1 file changed, 155 insertions(+), 145 deletions(-)

diff --git a/wp-print-friendly.php b/wp-print-friendly.php
index 5532330..4ef7b79 100644
--- a/wp-print-friendly.php
+++ b/wp-print-friendly.php
@@ -4,15 +4,15 @@ Plugin Name: WP Print Friendly
 Plugin URI: http://www.thinkoomph.com/plugins-modules/wp-print-friendly/
 Description: Extends WordPress' template system to support printer-friendly templates. Works with permalink structures to support nice URLs.
 Author: Erick Hitter (Oomph, Inc.)
-Version: 0.4.4.1
+Version: 0.4.4.2
 Author URI: http://www.thinkoomph.com/
 */
 
 class wp_print_friendly {
 	var $query_var = 'print';
-	
+
 	var $ns = 'wp_print_friendly';
-	
+
 	var $settings_key = 'wpf';
 	var $settings_defaults = array(
 		'auto' => false,
@@ -25,9 +25,9 @@ class wp_print_friendly {
 		'endnotes' => true,
 		'endnotes_label' => 'Endnotes:'
 	);
-	
+
 	var $notice_key = 'wpf_admin_notice_dismissed';
-	
+
 	/*
 	 * Register deactivation hook and filter.
 	 * @uses register_deactivation_hook, add_filter
@@ -37,7 +37,7 @@ class wp_print_friendly {
 		register_deactivation_hook( __FILE__, array( $this, 'deactivation_hook' ) );
 		add_action( 'plugins_loaded', array( $this, 'action_plugins_loaded' ) );
 	}
-	
+
 	/*
 	 * Clean up after plugin deactivation.
 	 * @uses flush_rewrite_rules, delete_option
@@ -46,11 +46,11 @@ class wp_print_friendly {
 	 */
 	function deactivation_hook() {
 		flush_rewrite_rules();
-		
+
 		delete_option( $this->settings_key );
 		delete_option( $this->notice_key );
 	}
-		
+
 	/*
 	 * Register actions and filters.
 	 * @uses add_action, add_filter, get_option
@@ -68,11 +68,11 @@ class wp_print_friendly {
 		add_filter( 'the_content', array( $this, 'filter_the_content' ), 0 );
 		add_filter( 'the_content', array( $this, 'filter_the_content_auto' ) );
 		add_filter( 'the_content', array( $this, 'filter_the_content_late' ), 99 );
-		
+
 		if( !get_option( $this->notice_key ) )
 			add_action( 'admin_notices', array( $this, 'action_admin_notices_activation' ) );
 	}
-	
+
 	/*
 	 * Add print endpoint and rewrite rules for term taxonomy archives
 	 * @uses add_rewrite_endpoint, $wp_rewrite, get_taxonomies, add_rewrite_rule
@@ -81,26 +81,36 @@ class wp_print_friendly {
 	 */
 	function action_init() {
 		add_rewrite_endpoint( $this->query_var, EP_ALL );
-		
-		//Taxonomies, since they aren't covered by add_rewrite_endpoint
+
 		global $wp_rewrite;
+
+		//Taxonomies, since they aren't covered by add_rewrite_endpoint
 		if( $wp_rewrite->permalink_structure ) {
 			$taxonomies = get_taxonomies( array(), 'objects' );
 			foreach( $taxonomies as $taxonomy => $args ) {
 				if( $args->rewrite == false )
 					continue;
-				
+
 				$taxonomy_slug = '';
 				if( $args->rewrite[ 'with_front' ] && $wp_rewrite->front != '/' ) $taxonomy_slug .= $wp_rewrite->front;
 				$taxonomy_slug .= $args->rewrite[ 'slug' ];
-				
+
 				$query_var = $args->query_var ? $args->query_var : 'taxonomy=' . $taxonomy . '&term';
-				
-				add_rewrite_rule( $taxonomy_slug . '/([^/]+)?/' . $this->query_var . '(/(.*))?/?$', $wp_rewrite->index . '?' . $query_var . '=$matches[1]&' . $this->query_var . '=$matches[2]', 'top' );
+
+				add_rewrite_rule( $taxonomy_slug . '/(.+)/' . $this->query_var . '(/([0-9]*))?/?$', $wp_rewrite->index . '?' . $query_var . '=$matches[1]&' . $this->query_var . '=$matches[3]', 'top' );
 			}
 		}
+
+		//Extra rules needed if verbose page rules are requested
+		if ( $wp_rewrite->use_verbose_page_rules ) {
+			$regex = substr( str_replace( $wp_rewrite->rewritecode, $wp_rewrite->rewritereplace, $wp_rewrite->permalink_structure ), 1 );
+			$regex = trailingslashit( $regex );
+			$regex .= $this->query_var . '(/([0-9]*))?/?$';
+
+			add_rewrite_rule( $regex, $wp_rewrite->index . '?category_name=$matches[1]&name=$matches[2]&' . $this->query_var . '=$matches[4]', 'top' );
+		}
 	}
-	
+
 	/*
 	 * Register plugin option and disable rewrite rule flush warning.
 	 * @uses register_setting, update_option
@@ -109,11 +119,11 @@ class wp_print_friendly {
 	 */
 	function action_admin_init() {
 		register_setting( $this->settings_key, $this->settings_key, array( $this, 'admin_options_validate' ) );
-		
+
 		if( isset( $_GET[ $this->notice_key ] ) )
 			update_option( $this->notice_key, 1 );
 	}
-	
+
 	/*
 	 * Determine if print template is being requested.
 	 * @uses $wp_query
@@ -123,7 +133,7 @@ class wp_print_friendly {
 		global $wp_query;
 		return is_array( $wp_query->query ) && array_key_exists( $this->query_var, $wp_query->query );
 	}
-	
+
 	/*
 	 * Select appropriate template based on post type and available templates.
 	 * Returns an array with name and path keys for available template or false if no template is found.
@@ -133,10 +143,10 @@ class wp_print_friendly {
 	function template_chooser() {
 		//Get queried object to check post type
 		$queried_object = get_queried_object();
-		
+
 		//Get plugin path
 		$pluginpath = dirname( __FILE__ );
-		
+
 		if( ( is_home() || is_front_page() ) && ( '' !== ( $path = locate_template( 'wpf-home.php', false ) ) ) ) {
 			$template = array(
 				'name' => 'wpf-home',
@@ -147,7 +157,7 @@ class wp_print_friendly {
 			is_object( $queried_object ) &&
 			property_exists( $queried_object, 'taxonomy' ) &&
 			property_exists( $queried_object, 'slug' ) &&
-			( '' !== ( $path = locate_template( array( 'wpf-' . $queried_object->taxonomy . '-' . $queried_object->slug . '.php', 'wpf-' . $queried_object->taxonomy . '.php' ), false ) ) ) 
+			( '' !== ( $path = locate_template( array( 'wpf-' . $queried_object->taxonomy . '-' . $queried_object->slug . '.php', 'wpf-' . $queried_object->taxonomy . '.php' ), false ) ) )
 		)
 			$template = array(
 				'name' => 'wpf-' . $queried_object->taxonomy,
@@ -182,10 +192,10 @@ class wp_print_friendly {
 				'name' => 'wpf-plugin-default',
 				'path' => $pluginpath . '/default-template.php'
 			);
-			
+
 		return isset( $template ) ? $template : false;
 	}
-	
+
 	/*
 	 * Detect request for print stylesheet on the homepage and reset query variables
 	 * @param array $qv
@@ -198,13 +208,13 @@ class wp_print_friendly {
 			unset( $qv[ 'page' ] );
 			unset( $qv[ 'pagename' ] );
 		}
-		
+
 		if( array_key_exists( $this->query_var, $qv ) && is_numeric( $qv[ $this->query_var ] ) )
 			$qv[ 'page' ] = intval( $qv[ $this->query_var ] );
-		
+
 		return $qv;
 	}
-	
+
 	/*
 	 * Filter query when request to print specific page is made.
 	 * @param object $query
@@ -214,14 +224,14 @@ class wp_print_friendly {
 	function action_pre_get_posts( $query ) {
 		if( array_key_exists( $this->query_var, $query->query_vars ) && !empty( $query->query_vars[ $this->query_var ] ) ) {
 			$qv = explode( '/', $query->query_vars[ $this->query_var ] );
-			
+
 			if( array_key_exists( 1, $qv ) && is_numeric( $qv[ 1 ] ) )
 				$query->query_vars[ 'page' ] = (int)$qv[ 1 ];
 		}
-		
+
 		return $query;
 	}
-	
+
 	/*
 	 * Filter template include to return print template if requested.
 	 * @param string $template
@@ -231,10 +241,10 @@ class wp_print_friendly {
 	function filter_template_include( $template ) {
 		if( $this->is_print() && ( $print_template = $this->template_chooser() ) )
 			$template = $print_template[ 'path' ];
-		
+
 		return $template;
 	}
-	
+
 	/*
 	 * Filter body classes to include references to print template.
 	 * @param array $classes
@@ -248,10 +258,10 @@ class wp_print_friendly {
 			else
 				$classes[] = $print_template[ 'name' ];
 		}
-		
+
 		return $classes;
 	}
-	
+
 	/*
 	 * Filter post content to support printing entire post on one page.
 	 * @param string $content
@@ -262,10 +272,10 @@ class wp_print_friendly {
 	function filter_the_content( $content ) {
 		if( $this->is_print() ) {
 			$print = get_query_var( $this->query_var );
-			
+
 			if( $print == 'all' || $print == '/all' || empty( $print ) ) {
 				global $post;
-				
+
 				$content = $post->post_content;
 				$content = str_replace("\n<!--nextpage-->\n", "\n\n", $content);
 				$content = str_replace("\n<!--nextpage-->", "\n", $content);
@@ -273,10 +283,10 @@ class wp_print_friendly {
 				$content = str_replace("<!--nextpage-->", ' ', $content);
 			}
 		}
-		
+
 		return $content;
 	}
-	
+
 	/*
 	 * Filter the content if automatic inclusion is selected
 	 * @param string $content
@@ -286,33 +296,33 @@ class wp_print_friendly {
 	 */
 	function filter_the_content_auto( $content ) {
 		$options = $this->get_options();
-		
+
 		global $post;
-		
+
 		if( is_array( $options ) && array_key_exists( 'auto', $options ) && $options[ 'auto' ] == true && in_array( $post->post_type, $options[ 'post_types' ] ) && !$this->is_print() ) {
 			extract( $options );
-			
+
 			//Basic URL
 			$print_url = $this->print_url();
-			
+
 			//Page URL, if necessary
 			if( !empty( $print_text_page ) && strpos( $post->post_content, '<!--nextpage-->' ) !== false ) {
 				$page = get_query_var( 'page' );
 				$page = $page ? $page : 1;
-				
+
 				$print_url_page = $this->print_url( false, $page );
 			}
-			
+
 			//Build link(s)
 			$link = '<p class="wpf_wrapper"><a class="' . $css_class . '" href="' . $print_url . '"' . ( $link_target == 'new' ? ' target="_blank"' : '' ) . '>' . $print_text . '</a>';
-			
+
 			if( isset( $print_url_page ) ) {
 				$link .= ' | ';
 				$link .= '<a class="' . $css_class . ' ' . $css_class . '_cur" href="' . $print_url_page . '"' . ( $link_target == 'new' ? ' target="_blank"' : '' ) . '>' . $print_text_page . '</a>';
 			}
-			
+
 			$link .= '</p><!-- .wpf_wrapper -->';
-			
+
 			//Place link(s)
 			if( $placement == 'above' )
 				$content = $link . $content;
@@ -321,10 +331,10 @@ class wp_print_friendly {
 			elseif( $placement == 'both' )
 				$content = $link . $content . $link;
 		}
-		
+
 		return $content;
 	}
-	
+
 	/*
 	 * Convert links to endnotes if desired
 	 * @param string $content
@@ -335,17 +345,17 @@ class wp_print_friendly {
 	function filter_the_content_late( $content ) {
 		if( $this->is_print() ) {
 			global $post;
-			
+
 			$options = $this->get_options();
-			
+
 			//Endnotes
 			if( $options[ 'endnotes' ] ) {
 				$links = array();
 				$i = 1;
-				
+
 				//Build array of links
 				preg_match_all( '#<a href=(["\'{1}])([^"\']+)(["\'{1}])([^>]*)>(.*?)</a>#i', $content, $matches );
-				
+
 				if(
 					isset( $matches ) && is_array( $matches ) &&
 					array_key_exists( 0, $matches ) && !empty( $matches[ 0 ] ) &&
@@ -360,14 +370,14 @@ class wp_print_friendly {
 							'title' => $matches[ 5 ][ $key ]
 						);
 					}
-					
+
 					//Replace links with endnote markers
 					foreach( $replacements as $match => $args ) {
 						$content = str_replace( $match, $args[ 'title' ] . '[' . $i . ']', $content );
 						$links[ $i ] = $args;
 						$i++;
 					}
-					
+
 					//Output endnotes
 					$endnotes = '<div class="wpf-endnotes">';
 					$endnotes .= '<strong>' . $options[ 'endnotes_label' ] . '</strong>';
@@ -378,15 +388,15 @@ class wp_print_friendly {
 						$endnotes .= '</li>';
 					}
 					$endnotes .= '</ol></div><!-- .wpf-endnotes -->';
-					
+
 					$content .= $endnotes;
 				}
 			}
 		}
-		
+
 		return $content;
 	}
-	
+
 	/*
 	 * Generate URL for post's printer-friendly format
 	 * @param int $post_id
@@ -397,22 +407,22 @@ class wp_print_friendly {
 	function print_url( $post_id = false, $page = false ) {
 		if( $page === true )
 			return false;
-		
+
 		if( function_exists( 'is_view_all' ) && is_view_all() )
 			$page = false;
-		
+
 		$link = false;
-		
+
 		//Get link base specific to page type being viewed
 		if( is_singular() || in_the_loop() ) {
 			if( $post_id == false ) {
 				global $post;
 				$post_id = $post->ID;
 			}
-			
+
 			if( !$post_id )
 				return false;
-			
+
 			$link = get_permalink( $post_id );
 		}
 		elseif( is_home() || is_front_page() )
@@ -426,7 +436,7 @@ class wp_print_friendly {
 			$year = get_query_var( 'year' );
 			$monthnum = get_query_var( 'monthnum' );
 			$day = get_query_var( 'day' );
-			
+
 			if( $day )
 				$link = get_day_link( $year, $monthnum, $day );
 			elseif( $monthnum )
@@ -436,37 +446,37 @@ class wp_print_friendly {
 		}*/
 		elseif( is_tax() ) {
 			$queried_object = get_queried_object();
-			
+
 			if( is_object( $queried_object ) && property_exists( $queried_object, 'taxonomy' ) && property_exists( $queried_object, 'term_id' ) )
 				$link = get_term_link( (int)$queried_object->term_id, $queried_object->taxonomy );
 		}
-		
+
 		//If link base is set, build link
 		if( $link !== false ) {
 			global $wp_rewrite;
-			
+
 			$page = intval( $page );
-			
+
 			if( $wp_rewrite->using_permalinks() ) {
 				$link = path_join( $link, $this->query_var );
-				
+
 				if( $page )
 					$link = path_join( $link, intval( $page ) );
-				
+
 				if( $wp_rewrite->use_trailing_slashes )
 					$link = trailingslashit( $link );
 			}
 			else {
 				$link = add_query_arg( $this->query_var, is_numeric( $page ) ? intval( $page ) : 'all', $link );
-				
+
 				if( $page )
 					$link = add_query_arg( 'page', is_numeric( $page ) ? intval( $page ) : 'all', $link );
 			}
 		}
-		
+
 		return $link;
 	}
-	
+
 	/*
 	 * Add menu item for options page
 	 * @uses add_options_page
@@ -476,7 +486,7 @@ class wp_print_friendly {
 	function action_admin_menu() {
 		add_options_page( 'WP Print Friendly Options', 'WP Print Friendly', 'manage_options', $this->ns, array( $this, 'admin_options' ) );
 	}
-	
+
 	/*
 	 * Render options page
 	 * @uses settings_fields, $this::get_options, _e, checked, esc_attr
@@ -486,57 +496,57 @@ class wp_print_friendly {
 	?>
 		<div class="wrap">
 			<h2>WP Print Friendly</h2>
-			
+
 			<form action="options.php" method="post">
 				<?php
 					settings_fields( $this->settings_key );
 					$options = $this->get_options();
-					
+
 					$post_types = $this->post_types_array();
 				?>
-				
+
 				<h3>Display Options</h3>
-				
+
 				<table class="form-table">
 					<tr>
 						<th scope="row"><?php _e( 'Automatically add print links based on settings below?', $this->ns ); ?></th>
 						<td>
-							<input type="radio" name="<?php echo $this->settings_key; ?>[auto]" id="auto-true" value="1"<?php checked( $options[ 'auto' ], true, true ); ?> /> <label for="auto-true"><?php _e( 'Yes', $this->ns ); ?></label><br />
-							<input type="radio" name="<?php echo $this->settings_key; ?>[auto]" id="auto-false" value="0"<?php checked( $options[ 'auto' ], false, true ); ?> /> <label for="auto-false"><?php _e( 'No', $this->ns ); ?></label>
+							<input type="radio" name="<?php echo esc_attr( $this->settings_key ); ?>[auto]" id="auto-true" value="1"<?php checked( $options[ 'auto' ], true, true ); ?> /> <label for="auto-true"><?php _e( 'Yes', $this->ns ); ?></label><br />
+							<input type="radio" name="<?php echo esc_attr( $this->settings_key ); ?>[auto]" id="auto-false" value="0"<?php checked( $options[ 'auto' ], false, true ); ?> /> <label for="auto-false"><?php _e( 'No', $this->ns ); ?></label>
 						</td>
 					</tr>
 					<tr>
 						<th scope="row"><?php _e( 'Automatically place link:', $this->ns ); ?></th>
 						<td>
-							<input type="radio" name="<?php echo $this->settings_key; ?>[placement]" id="placement-above" value="above"<?php checked( $options[ 'placement' ], 'above', true ); ?> /> <label for="placement-above"><?php _e( 'Above content', $this->ns ); ?></label><br />
-							<input type="radio" name="<?php echo $this->settings_key; ?>[placement]" id="placement-below" value="below"<?php checked( $options[ 'placement' ], 'below', true ); ?> /> <label for="placement-below"><?php _e( 'Below content', $this->ns ); ?></label><br />
-							<input type="radio" name="<?php echo $this->settings_key; ?>[placement]" id="placement-both" value="both"<?php checked( $options[ 'placement' ], 'both', true ); ?> /> <label for="placement-both"><?php _e( 'Above and below content', $this->ns ); ?></label>
+							<input type="radio" name="<?php echo esc_attr( $this->settings_key ); ?>[placement]" id="placement-above" value="above"<?php checked( $options[ 'placement' ], 'above', true ); ?> /> <label for="placement-above"><?php _e( 'Above content', $this->ns ); ?></label><br />
+							<input type="radio" name="<?php echo esc_attr( $this->settings_key ); ?>[placement]" id="placement-below" value="below"<?php checked( $options[ 'placement' ], 'below', true ); ?> /> <label for="placement-below"><?php _e( 'Below content', $this->ns ); ?></label><br />
+							<input type="radio" name="<?php echo esc_attr( $this->settings_key ); ?>[placement]" id="placement-both" value="both"<?php checked( $options[ 'placement' ], 'both', true ); ?> /> <label for="placement-both"><?php _e( 'Above and below content', $this->ns ); ?></label>
 						</td>
 					</tr>
 					<tr>
 						<th scope="row"><?php _e( 'Display automatically on:', $this->ns ); ?></th>
 						<td>
 							<?php foreach( $post_types as $post_type ): ?>
-								<input type="checkbox" name="<?php echo $this->settings_key; ?>[post_types][]" id="pt-<?php echo $post_type->name; ?>" value="<?php echo $post_type->name; ?>"<?php if( in_array( $post_type->name, $options[ 'post_types' ] ) ) echo ' checked="checked"'; ?> /> <label for="pt-<?php echo $post_type->name; ?>"><?php echo $post_type->labels->name; ?></label><br />
+								<input type="checkbox" name="<?php echo esc_attr( $this->settings_key ); ?>[post_types][]" id="pt-<?php echo $post_type->name; ?>" value="<?php echo $post_type->name; ?>"<?php if( in_array( $post_type->name, $options[ 'post_types' ] ) ) echo ' checked="checked"'; ?> /> <label for="pt-<?php echo $post_type->name; ?>"><?php echo $post_type->labels->name; ?></label><br />
 							<?php endforeach; ?>
 						</td>
 					</tr>
 				</table>
-				
+
 				<h3>Link Options</h3>
-				
+
 				<table class="form-table">
 					<tr>
 						<th scope="row"><?php _e( 'Text for link to print entire item:', $this->ns ); ?></th>
 						<td>
-							<input type="text" name="<?php echo $this->settings_key; ?>[print_text]" id="print_text" value="<?php echo esc_attr( $options[ 'print_text' ] ); ?>" style="width: 40%;" />
+							<input type="text" name="<?php echo esc_attr( $this->settings_key ); ?>[print_text]" id="print_text" value="<?php echo esc_attr( $options[ 'print_text' ] ); ?>" style="width: 40%;" />
 						</td>
 					</tr>
 					<tr>
 						<th scope="row"><?php _e( 'Text for link to print current page:', $this->ns ); ?></th>
 						<td>
-							<input type="text" name="<?php echo $this->settings_key; ?>[print_text_page]" id="print_text_page" value="<?php echo esc_attr( $options[ 'print_text_page' ] ); ?>" style="width: 40%;" />
-							
+							<input type="text" name="<?php echo esc_attr( $this->settings_key ); ?>[print_text_page]" id="print_text_page" value="<?php echo esc_attr( $options[ 'print_text_page' ] ); ?>" style="width: 40%;" />
+
 							<p class="description"><?php _e( 'If viewing a multipage post (set by using the &lt;!--nextpage--&gt; tag), the text above is used for a link to print just the current page.', $this->ns ); ?></p>
 							<p class="description"><?php _e( '<strong>To hide this link,</strong> clear the field\'s contents.', $this->ns ); ?></p>
 						</td>
@@ -544,8 +554,8 @@ class wp_print_friendly {
 					<tr>
 						<th scope="row"><?php _e( 'CSS for print links:', $this->ns ); ?></th>
 						<td>
-							<input type="text" name="<?php echo $this->settings_key;?>[css_class]" id="css_class" value="<?php echo esc_attr( $options[ 'css_class' ] ); ?>" style="width: 40%;" />
-							
+							<input type="text" name="<?php echo esc_attr( $this->settings_key ); ?>[css_class]" id="css_class" value="<?php echo esc_attr( $options[ 'css_class' ] ); ?>" style="width: 40%;" />
+
 							<p class="description"><?php _e( 'For page-specific print links, a second class, created by appending <strong>_cur</strong> to the above text, is added to each link.', $this->ns ); ?></p>
 							<p class="description"><?php _e( 'Be aware that Internet Explorer will only interpret the first two CSS classes, so if multiple classes are entered above, the page-specific class may not be available in IE.', $this->ns ); ?></p>
 						</td>
@@ -553,42 +563,42 @@ class wp_print_friendly {
 					<tr>
 						<th scope="row"><?php _e( 'Open print-friendly views:', $this->ns ); ?></th>
 						<td>
-							<input type="radio" name="<?php echo $this->settings_key; ?>[link_target]" id="target-same" value="same"<?php checked( $options[ 'link_target' ], 'same', true ); ?> /> <label for="target-same"><?php _e( 'In the same window', $this->ns ); ?></label><br />
-							<input type="radio" name="<?php echo $this->settings_key; ?>[link_target]" id="target-new" value="new"<?php checked( $options[ 'link_target' ], 'new', true ); ?> /> <label for="target-new"><?php _e( 'In a new window', $this->ns ); ?></label>
+							<input type="radio" name="<?php echo esc_attr( $this->settings_key ); ?>[link_target]" id="target-same" value="same"<?php checked( $options[ 'link_target' ], 'same', true ); ?> /> <label for="target-same"><?php _e( 'In the same window', $this->ns ); ?></label><br />
+							<input type="radio" name="<?php echo esc_attr( $this->settings_key ); ?>[link_target]" id="target-new" value="new"<?php checked( $options[ 'link_target' ], 'new', true ); ?> /> <label for="target-new"><?php _e( 'In a new window', $this->ns ); ?></label>
 						</td>
 					</tr>
 				</table>
-				
+
 				<h3>Endnote Options</h3>
-				
+
 				<table class="form-table">
 					<tr>
 						<th scope="row"><?php _e( 'Include endnotes for links found in content?', $this->ns ); ?></th>
 						<td>
-							<input type="checkbox" name="<?php echo $this->settings_key; ?>[endnotes]" id="endnotes" value="1"<?php checked( $options[ 'endnotes' ], true, true ); ?> /> <label for="endnotes"><?php _e( 'Yes', $this->ns ); ?></label>
-							
+							<input type="checkbox" name="<?php echo esc_attr( $this->settings_key ); ?>[endnotes]" id="endnotes" value="1"<?php checked( $options[ 'endnotes' ], true, true ); ?> /> <label for="endnotes"><?php _e( 'Yes', $this->ns ); ?></label>
+
 							<p class="description"><?php _e( 'If enabled, content is automatically scanned for links and an endnote is added for each link found. This can be helpful for users if your content includes many links.', $this->ns ); ?></p>
 						</td>
 					</tr>
 					<tr>
 						<th scope="row"><label for="endnotes-label"><?php _e( 'Endnotes heading:', $this->ns ); ?></label></th>
 						<td>
-							<input type="text" name="<?php echo $this->settings_key; ?>[endnotes_label]" class="regular-text code" id="endnotes-label" value="<?php echo esc_attr( $options[ 'endnotes_label' ] ); ?>" />
-							
+							<input type="text" name="<?php echo esc_attr( $this->settings_key ); ?>[endnotes_label]" class="regular-text code" id="endnotes-label" value="<?php echo esc_attr( $options[ 'endnotes_label' ] ); ?>" />
+
 							<p class="description"><?php _e( 'If endnotes are enabled, the text entered above will be output above the list of links.', $this->ns ); ?></p>
 						</td>
 					</tr>
 				</table>
-				
+
 				<p class="submit">
 					<input type="submit" class="button-primary" value="Save Changes" />
 				</p>
 			</form>
-			
+
 		</div><!-- .wrap -->
 	<?php
 	}
-	
+
 	/*
 	 * Validate options
 	 * @param array $options
@@ -599,7 +609,7 @@ class wp_print_friendly {
 		$new_options = array(
 			'endnotes' => false
 		);
-		
+
 		if( is_array( $options ) ) {
 			foreach( $options as $key => $value ) {
 				switch( $key ) {
@@ -607,22 +617,22 @@ class wp_print_friendly {
 					case 'endnotes':
 						$new_options[ $key ] = (bool)$value;
 					break;
-					
+
 					case 'placement':
 						$placements = array(
 							'above',
 							'below',
 							'both'
 						);
-						
+
 						$new_options[ $key ] = in_array( $value, $placements ) ? $value : 'below';
 					break;
-					
+
 					case 'post_types':
 						$post_types = $this->post_types_array();
-						
+
 						$new_options[ $key ] = array();
-						
+
 						if( is_array( $value ) && is_array( $post_types ) ) {
 							foreach( $post_types as $post_type ) {
 								if( in_array( $post_type->name, $value ) )
@@ -630,33 +640,33 @@ class wp_print_friendly {
 							}
 						}
 					break;
-					
+
 					case 'print_text':
 					case 'print_text_page':
 					case 'css_class':
 					case 'endnotes_label':
 						$value = sanitize_text_field( $value );
-						
+
 						if( $key == 'print_text' && empty( $value ) )
 							$value = 'Print this entry';
-						
+
 						$new_options[ $key ] = $value;
 					break;
-					
+
 					case 'link_target':
 						$new_options[ $key ] = $value == 'new' ? 'new' : 'same';
 					break;
-					
+
 					default:
 						continue;
 					break;
 				}
 			}
 		}
-		
+
 		return $new_options;
 	}
-	
+
 	/*
 	 * Return plugin options array parsed with default options
 	 * @uses wp_parse_args, get_option
@@ -664,13 +674,13 @@ class wp_print_friendly {
 	 */
 	function get_options() {
 		$options = get_option( $this->settings_key, $this->settings_defaults );
-		
+
 		if( !array_key_exists( 'post_types', $options ) )
 			$options[ 'post_types' ] = array();
-		
+
 		return wp_parse_args( $options, $this->settings_defaults );
 	}
-	
+
 	/*
 	 * Build array of available post types, excluding all builtin ones except 'post' and 'page'
 	 * @uses get_post_types
@@ -682,10 +692,10 @@ class wp_print_friendly {
 			if( $post_type->_builtin == false || $post_type->name == 'post' || $post_type->name == 'page' )
 				$post_types[] = $post_type;
 		}
-		
+
 		return $post_types;
 	}
-	
+
 	/*
 	 * Display admin notice regarding rewrite rules flush.
 	 * @uses get_option, _e, __, admin_url, add_query_arg
@@ -695,19 +705,19 @@ class wp_print_friendly {
 	function action_admin_notices_activation() {
 		if( !get_option( $this->notice_key ) ):
 		?>
-		
+
 		<div id="wpf-rewrite-flush-warning" class="error fade">
 			<p><strong><?php _e( 'WP Print Friendly', $this->ns ); ?></strong></p>
-			
+
 			<p><?php printf( __( 'You must refresh your site\'s permalinks before WP Print Friendly is fully activated. To do so, go to <a href="%s">Permalinks</a> and click the <strong><em>Save Changes</em></strong> button at the bottom of the screen.', $this->ns ), admin_url( 'options-permalink.php' ) ); ?></p>
-			
+
 			<p><?php printf( __( 'When finished, click <a href="%s">here</a> to hide this message.', $this->ns ), admin_url( add_query_arg( $this->notice_key, 1, 'index.php' ) ) ); ?></p>
 		</div>
-		
+
 		<?php
 		endif;
 	}
-	
+
 	/*
 	 * Render page numbers, such as "Page 1 of 5."
 	 * @param int $post_id
@@ -720,44 +730,44 @@ class wp_print_friendly {
 	function page_numbers( $post_id = false, $before = 'Page ', $separator = ' of ', $after = '' ) {
 		if( !$this->is_print() )
 			return false;
-		
+
 		//Don't display on views that include all pages of a post
 		$print = get_query_var( $this->query_var );
 		if( $print == 'all' || $print == '/all' || empty( $print ) )
 			return false;
-		
+
 		//Get post ID and post content, or return false it either fails validation
 		$post_id = intval( $post_id );
-		
+
 		if( !$post_id ) {
 			global $post;
 			$post_id = $post->ID;
 			$post_content = $post->post_content;
 		}
-		
+
 		$post_id = intval( $post_id );
-		
+
 		if( !$post_id )
 			return false;
-		
+
 		if( !isset( $post_content ) || empty( $post_content ) )
 			$post_content = get_post_field( 'post_content', $post_id );
-		
+
 		if( !is_string( $post_content ) || empty( $post_content ) || strpos( $post_content, '<!--nextpage-->' ) === false )
 			return false;
-		
+
 		//Get current page
 		$page = get_query_var( $this->query_var );
 		$page = $page ? $page : 1;
-		
+
 		//Get total number of pages, or return false if total cannot be determined
 		$num_pages = substr_count( $post_content, '<!--nextpage-->' );
-		
+
 		if( is_int( $num_pages ) && $num_pages > 0 )
 			$num_pages = $num_pages + 1;
 		else
 			return false;
-		
+
 		//Having made it this far, return the specified string
 		return $before . $page . $separator . $num_pages . $after;
 	}
@@ -776,7 +786,7 @@ function wpf_get_print_url( $post_id = false, $page = false ) {
 	global $wpf;
 	if( !is_a( $wpf, 'wp_print_friendly' ) )
 		$wpf = new wp_print_friendly;
-	
+
 	return $wpf->print_url( intval( $post_id ), intval( $page ) );
 }
 
@@ -795,21 +805,21 @@ function wpf_get_print_url( $post_id = false, $page = false ) {
 function wpf_the_print_link( $page_link = false, $link_text = 'Print this post', $class = 'print_link', $page_link_separator = ' | ', $page_link_text = 'Print this page', $link_target = 'same' ) {
 	global $post;
 	$url = wpf_get_print_url( $post->ID );
-	
+
 	$page_link = (bool)$page_link;
-	
+
 	if( function_exists( 'is_view_all' ) && is_view_all() )
 		$page_link = false;
-	
+
 	if( $url ) {
 		$link = '<a ' . ( $class ? 'class="' . esc_attr( $class ) . '"' : '' ) . ' href="' . esc_url( $url ) . '"' . ( $link_target == 'new' ? ' target="_blank"' : '' ) . '>' . $link_text . '</a>';
-		
+
 		if( $page_link && strpos( $post->post_content, '<!--nextpage-->' ) !== false ) {
 			$page = get_query_var( 'page' );
 			$page = $page ? $page : 1;
 			$link .= $page_link_separator . '<a ' . ( $class ? 'class="' . esc_attr( $class ) . '_cur ' . esc_attr( $class ) . '"' : '' ) . ' href="' . esc_url( wpf_get_print_url( $post->ID, $page ) ) . '"' . ( $link_target == 'new' ? ' target="_blank"' : '' ) . '>' . $page_link_text . '</a>';
 		}
-		
+
 		echo $link;
 	}
 }
@@ -827,7 +837,7 @@ function wpf_the_page_numbers( $post_id = false, $before = 'Page ', $separator =
 	global $wpf;
 	if( !is_a( $wpf, 'wp_print_friendly' ) )
 		$wpf = new wp_print_friendly;
-	
+
 	echo $wpf->page_numbers( intval( $post_id ), $before, $separator, $after );
 }
 
@@ -841,7 +851,7 @@ if( !function_exists( 'is_print' ) ) {
 		global $wpf;
 		if( !is_a( $wpf, 'wp_print_friendly' ) )
 			$wpf = new wp_print_friendly;
-			
+
 		return $wpf->is_print();
 	}
 }
-- 
GitLab