diff --git a/includes/output/class-displayfeaturedimagegenesis-output-cpt.php b/includes/output/class-displayfeaturedimagegenesis-output-cpt.php
new file mode 100644
index 0000000..d3b02a9
--- /dev/null
+++ b/includes/output/class-displayfeaturedimagegenesis-output-cpt.php
@@ -0,0 +1,266 @@
+instance = $instance;
+ $this->args = $this->update_args( $args );
+ $this->post_type = $post_type;
+ $this->id_base = $id_base ? $id_base : 'display-featured-image-genesis-cpt';
+ $this->init();
+ }
+
+ /**
+ * Output the featured author.
+ * @since 3.1.0
+ */
+ private function init() {
+ if ( ! empty( $this->instance['title'] ) ) {
+ echo wp_kses_post( $this->args['before_title'] . apply_filters( 'widget_title', $this->instance['title'], $this->instance, $this->id_base ) . $this->args['after_title'] );
+ }
+
+ $permalink = $this->get_permalink();
+ $title = $this->get_title();
+
+ $this->do_image( $title, $permalink );
+ $this->do_title( $permalink, $title );
+ $this->do_intro_text();
+ $this->do_archive_link( $permalink );
+ }
+
+ /**
+ *
+ * @return string
+ */
+ private function get_title() {
+ $title = $this->post_type->label;
+ if ( 'post' === $this->instance['post_type'] ) {
+ $frontpage = get_option( 'show_on_front' );
+ $postspage = get_option( 'page_for_posts' );
+ $title = get_post( $postspage )->post_title;
+
+ if ( 'posts' === $frontpage || ( 'page' === $frontpage && ! $postspage ) ) {
+ $title = get_bloginfo( 'name' );
+ }
+ } elseif ( post_type_supports( $this->instance['post_type'], 'genesis-cpt-archives-settings' ) ) {
+ $headline = genesis_get_cpt_option( 'headline', $this->instance['post_type'] );
+ if ( ! empty( $headline ) ) {
+ $title = $headline;
+ }
+ }
+
+ return $title;
+ }
+
+ /**
+ * Get the link for the post type archive.
+ *
+ * @return mixed|string
+ */
+ private function get_permalink() {
+ if ( 'post' === $this->instance['post_type'] ) {
+ $frontpage = get_option( 'show_on_front' );
+ $postspage = get_option( 'page_for_posts' );
+ $permalink = get_the_permalink( $postspage );
+
+ if ( 'posts' === $frontpage || ( 'page' === $frontpage && ! $postspage ) ) {
+ $permalink = home_url();
+ }
+ } else {
+ $permalink = get_post_type_archive_link( $this->instance['post_type'] );
+ }
+
+ return esc_url( $permalink );
+ }
+
+ /**
+ * Print out the image for the widget.
+ *
+ * @param $title
+ * @param $permalink
+ */
+ private function do_image( $title, $permalink ) {
+ if ( ! $this->instance['show_image'] ) {
+ return;
+ }
+ $image = $this->get_image( $title );
+ if ( $image ) {
+ $role = empty( $this->instance['show_title'] ) ? '' : 'aria-hidden="true"';
+ printf( '%s', esc_url( $permalink ), esc_html( $title ), esc_attr( $this->instance['image_alignment'] ), $role, $image );
+ }
+ }
+
+ /**
+ * Get the image.
+ *
+ * @param $title
+ *
+ * @return string
+ */
+ private function get_image( $title ) {
+ $image_id = $this->get_image_id();
+
+ return wp_get_attachment_image(
+ $image_id,
+ $this->instance['image_size'],
+ false,
+ array(
+ 'alt' => $title,
+ )
+ );
+ }
+
+ /**
+ * Get the image ID.
+ *
+ * @return int|string
+ */
+ private function get_image_id() {
+ $image_id = '';
+ $option = displayfeaturedimagegenesis_get_setting();
+ if ( 'post' === $this->instance['post_type'] ) {
+ $frontpage = get_option( 'show_on_front' );
+ $postspage = get_option( 'page_for_posts' );
+ $postspage_image = get_post_thumbnail_id( $postspage );
+
+ if ( 'posts' === $frontpage || ( 'page' === $frontpage && ! $postspage ) ) {
+ $postspage_image = display_featured_image_genesis_get_default_image_id();
+ }
+ $image_id = $postspage_image;
+ } elseif ( isset( $option['post_type'][ $this->post_type->name ] ) && $option['post_type'][ $this->post_type->name ] ) {
+ $image_id = $option['post_type'][ $this->post_type->name ];
+ }
+
+ return $image_id;
+ }
+
+ /**
+ * Print the title with markup.
+ *
+ * @param $permalink
+ * @param $title
+ */
+ private function do_title( $permalink, $title ) {
+ if ( ! $this->instance['show_title'] ) {
+ return;
+ }
+
+ $title_output = sprintf( '
', $permalink, esc_html( $title ) );
+ if ( ! genesis_html5() ) {
+ $title_output = sprintf( '', $permalink, esc_html( $title ) );
+ }
+ echo wp_kses_post( $title_output );
+ }
+
+ /**
+ * Print the intro text.
+ */
+ private function do_intro_text() {
+ $intro_text = $this->get_intro_text();
+ if ( ! $this->instance['show_content'] || ! $intro_text ) {
+ return;
+ }
+ echo genesis_html5() ? '' : '';
+ $intro_text = apply_filters( 'display_featured_image_genesis_cpt_description', $intro_text );
+ echo wp_kses_post( wpautop( $intro_text ) );
+ echo genesis_html5() ? '
' : '';
+ }
+
+ /**
+ * Get the intro text.
+ *
+ * @return string
+ */
+ private function get_intro_text() {
+ $intro_text = '';
+ if ( post_type_supports( $this->instance['post_type'], 'genesis-cpt-archives-settings' ) ) {
+ $intro_text = genesis_get_cpt_option( 'intro_text', $this->instance['post_type'] );
+ } elseif ( 'post' === $this->instance['post_type'] ) {
+ $frontpage = get_option( 'show_on_front' );
+ $postspage = get_option( 'page_for_posts' );
+ $intro_text = get_post( $postspage )->post_excerpt;
+ if ( 'posts' === $frontpage || ( 'page' === $frontpage && ! $postspage ) ) {
+ $intro_text = get_bloginfo( 'description' );
+ }
+ }
+
+ if ( 'custom' === $this->instance['show_content'] ) {
+ $intro_text = $this->instance['custom_content'];
+ }
+
+ return $intro_text;
+ }
+
+ /**
+ * Echo the CPT archive link.
+ *
+ * @param $permalink
+ */
+ private function do_archive_link( $permalink ) {
+ if ( ! $this->instance['archive_link'] || ! $this->instance['archive_link_text'] ) {
+ return;
+ }
+ printf(
+ '%s
',
+ esc_url( $permalink ),
+ esc_html( $this->instance['archive_link_text'] )
+ );
+ }
+
+ /**
+ * Update the "sidebar" args with some defaults (really only needed for the title).
+ *
+ * @param array $args
+ *
+ * @return array
+ * @since 1.7.0
+ *
+ */
+ private function update_args( $args ) {
+ $defaults = array(
+ 'before_title' => '',
+ 'after_title' => '
',
+ );
+
+ return wp_parse_args( $args, $defaults );
+ }
+}
diff --git a/includes/widgets/displayfeaturedimagegenesis-cpt-archive-widget.php b/includes/widgets/displayfeaturedimagegenesis-cpt-archive-widget.php
index 4f55abf..e69da59 100644
--- a/includes/widgets/displayfeaturedimagegenesis-cpt-archive-widget.php
+++ b/includes/widgets/displayfeaturedimagegenesis-cpt-archive-widget.php
@@ -81,211 +81,12 @@ class Display_Featured_Image_Genesis_Widget_CPT extends WP_Widget {
echo $args['before_widget'];
- if ( ! empty( $instance['title'] ) ) {
- echo $args['before_title'] . apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base ) . $args['after_title'];
- }
-
- $permalink = $this->get_permalink( $instance );
- $title = $this->get_title( $instance, $post_type );
-
- $this->do_image( $instance, $post_type, $title, $permalink );
- $this->do_title( $instance, $permalink, $title );
- $this->do_intro_text( $instance );
- $this->do_archive_link( $permalink, $instance );
+ include plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-cpt.php';
+ new DisplayFeaturedImageGenesisOutputCPT( $instance, $args, $post_type, $this->id_base );
echo $args['after_widget'];
}
- /**
- * @param $instance
- * @param $post_type
- *
- * @return string
- */
- protected function get_title( $instance, $post_type ) {
- $title = $post_type->label;
- if ( 'post' === $instance['post_type'] ) {
- $frontpage = get_option( 'show_on_front' ); // either 'posts' or 'page'
- $postspage = get_option( 'page_for_posts' );
- $title = get_post( $postspage )->post_title;
-
- if ( 'posts' === $frontpage || ( 'page' === $frontpage && ! $postspage ) ) {
- $title = get_bloginfo( 'name' );
- }
- } elseif ( post_type_supports( $instance['post_type'], 'genesis-cpt-archives-settings' ) ) {
- $headline = genesis_get_cpt_option( 'headline', $instance['post_type'] );
- if ( ! empty( $headline ) ) {
- $title = $headline;
- }
- }
-
- return $title;
- }
-
- /**
- * Get the link for the post type archive.
- *
- * @param $instance
- *
- * @return mixed|string
- */
- protected function get_permalink( $instance ) {
- if ( 'post' === $instance['post_type'] ) {
- $frontpage = get_option( 'show_on_front' ); // either 'posts' or 'page'
- $postspage = get_option( 'page_for_posts' );
- $permalink = get_the_permalink( $postspage );
-
- if ( 'posts' === $frontpage || ( 'page' === $frontpage && ! $postspage ) ) {
- $permalink = home_url();
- }
- } else {
- $permalink = get_post_type_archive_link( $instance['post_type'] );
- }
-
- return esc_url( $permalink );
- }
-
- /**
- * Print out the image for the widget.
- *
- * @param $instance
- * @param $post_type
- * @param $title
- * @param $permalink
- */
- protected function do_image( $instance, $post_type, $title, $permalink ) {
- if ( ! $instance['show_image'] ) {
- return;
- }
- $image = $this->get_image( $instance, $post_type, $title );
- if ( $image ) {
- $role = empty( $instance['show_title'] ) ? '' : 'aria-hidden="true"';
- printf( '%s', esc_url( $permalink ), esc_html( $title ), esc_attr( $instance['image_alignment'] ), $role, $image );
- }
- }
-
- /**
- * Get the image.
- *
- * @param $instance
- * @param $post_type
- * @param $title
- *
- * @return string
- */
- protected function get_image( $instance, $post_type, $title ) {
- $image_id = $this->get_image_id( $instance, $post_type );
-
- return wp_get_attachment_image( $image_id, $instance['image_size'], false, array(
- 'alt' => $title,
- ) );
- }
-
- /**
- * Get the image ID.
- *
- * @param $instance
- * @param $post_type
- *
- * @return int|string
- */
- protected function get_image_id( $instance, $post_type ) {
- $image_id = '';
- $option = displayfeaturedimagegenesis_get_setting();
- if ( 'post' === $instance['post_type'] ) {
- $frontpage = get_option( 'show_on_front' ); // either 'posts' or 'page'
- $postspage = get_option( 'page_for_posts' );
- $postspage_image = get_post_thumbnail_id( $postspage );
-
- if ( 'posts' === $frontpage || ( 'page' === $frontpage && ! $postspage ) ) {
- $postspage_image = display_featured_image_genesis_get_default_image_id();
- }
- $image_id = $postspage_image;
- } elseif ( isset( $option['post_type'][ $post_type->name ] ) && $option['post_type'][ $post_type->name ] ) {
- $image_id = $option['post_type'][ $post_type->name ];
- }
-
- return $image_id;
- }
-
- /**
- * Print the title with markup.
- *
- * @param $instance
- * @param $permalink
- * @param $title
- */
- protected function do_title( $instance, $permalink, $title ) {
- if ( ! $instance['show_title'] ) {
- return;
- }
-
- $title_output = sprintf( '', $permalink, esc_html( $title ) );
- if ( genesis_html5() ) {
- $title_output = sprintf( '', $permalink, esc_html( $title ) );
- }
- echo wp_kses_post( $title_output );
- }
-
- /**
- * Print the intro text.
- *
- * @param $instance
- */
- protected function do_intro_text( $instance ) {
- $intro_text = $this->get_intro_text( $instance );
- if ( ! $instance['show_content'] || ! $intro_text ) {
- return;
- }
- echo genesis_html5() ? '' : '';
- $intro_text = apply_filters( 'display_featured_image_genesis_cpt_description', $intro_text );
- echo wp_kses_post( wpautop( $intro_text ) );
- echo genesis_html5() ? '
' : '';
- }
-
- /**
- * Get the intro text.
- *
- * @param $instance
- *
- * @return string
- */
- protected function get_intro_text( $instance ) {
- $intro_text = '';
- if ( post_type_supports( $instance['post_type'], 'genesis-cpt-archives-settings' ) ) {
- $intro_text = genesis_get_cpt_option( 'intro_text', $instance['post_type'] );
- } elseif ( 'post' === $instance['post_type'] ) {
- $frontpage = get_option( 'show_on_front' ); // either 'posts' or 'page'
- $postspage = get_option( 'page_for_posts' );
- $intro_text = get_post( $postspage )->post_excerpt;
- if ( 'posts' === $frontpage || ( 'page' === $frontpage && ! $postspage ) ) {
- $intro_text = get_bloginfo( 'description' );
- }
- }
-
- if ( 'custom' === $instance['show_content'] ) {
- $intro_text = $instance['custom_content'];
- }
-
- return $intro_text;
- }
-
- /**
- * Echo the CPT archive link.
- *
- * @param $permalink
- * @param $instance
- */
- protected function do_archive_link( $permalink, $instance ) {
- if ( ! $instance['archive_link'] || ! $instance['archive_link_text'] ) {
- return;
- }
- printf( '%s
',
- esc_url( $permalink ),
- esc_html( $instance['archive_link_text'] )
- );
- }
-
/**
* Update a particular instance.
*