Merge branch 'ottadvantage-master'

Author: picandocodigo

include/lcp-catlist.php

@@ -407,10 +407,16 @@ private function lcp_trim_excerpt($text = ''){
   }
 
   public function get_thumbnail($single, $lcp_thumb_class = null){
+    if ($this->utils->lcp_not_empty('force_thumbnail')){
+      $force_thumbnail = $this->params['force_thumbnail'];
+    } else {
+      $force_thumbnail = 'no';
+    }
     return LcpThumbnail::get_instance()->get_thumbnail(
       $single,
       $this->params['thumbnail'],
       $this->params['thumbnail_size'],
+      $force_thumbnail,
       $lcp_thumb_class);
   }
 

include/lcp-thumbnail.php

@@ -1,6 +1,5 @@
 <?php
 class LcpThumbnail{
-
   // Singleton implementation
   private static $instance = null;
 
@@ -11,13 +10,13 @@ public static function get_instance(){
 		return self::$instance;
 	}
 
-      /**
+  /**
    * Get the post Thumbnail
    * @see http://codex.wordpress.org/Function_Reference/get_the_post_thumbnail
    * @param unknown_type $single
    *
    */
-  public function get_thumbnail($single, $thumbnail, $thumbnail_size, $lcp_thumb_class = null){
+  public function get_thumbnail($single, $thumbnail, $thumbnail_size, $force_thumbnail, $lcp_thumb_class = null){
     $lcp_thumbnail = null;
 
     if( $thumbnail == 'yes' ){
@@ -40,14 +39,29 @@ public function get_thumbnail($single, $thumbnail, $thumbnail_size, $lcp_thumb_c
         }
 
         $lcp_thumbnail = '<a href="' . esc_url(get_permalink($single->ID)) .
-          '" title="' . esc_attr($single->post_title) . '">';
+                       '" title="' . esc_attr($single->post_title) . '">';
 
         $lcp_thumbnail .= get_the_post_thumbnail(
           $single->ID,
           $lcp_thumb_size,
           ( $lcp_thumb_class != null ) ? array( 'class' => $lcp_thumb_class ) : null
         );
         $lcp_thumbnail .= '</a>';
+      } else {
+        // if thumbnail is requested but not found as featured image, grab first image in the content of the post
+        if ( ($force_thumbnail === 'yes'|| $force_thumbnail === 'true') && preg_match('~<img[^>]*src\s?=\s?[\'"]([^\'"]*)~i',get_the_content(), $imgMatches)) {
+          $lcp_thumbnail = '<a href="' . esc_url(get_permalink($single->ID)) .
+                         '" title="' . esc_attr($single->post_title) . '">';
+
+          $lcp_thumbnail .= '<img src="' . esc_url($imgMatches[1]) . '" ';
+          if ( $lcp_thumb_class != null ) {  // thumbnail class passed as parameter to shortcode
+            $lcp_thumbnail .= 'class="' . $lcp_thumb_class . '" ';
+          }
+          else { // Otherwise, use this class name
+            $lcp_thumbnail .= 'class="lcp_thumbnail" ';
+          }
+          $lcp_thumbnail .= ' /></a>';
+        }
       }
     } else {
       # Check for a YouTube video thumbnail
@@ -68,21 +82,20 @@ private function check_youtube_thumbnail($content){
       preg_match($yt_pattern, $content, $matches) ||
       preg_match($yt_vpattern, $content, $matches) ||
       preg_match($yt_epattern, $content, $matches)
-    ){
-        $youtubeurl = $matches[0];
+    ) {
+      $youtubeurl = $matches[0];
 
-        if ($youtubeurl):
-          $imageurl = "http://i.ytimg.com/vi/{$matches[3]}/1.jpg";
-        endif;
+      if ($youtubeurl){
+        $imageurl = "http://i.ytimg.com/vi/{$matches[3]}/1.jpg";
+      }
 
-        $lcp_ytimage = '<img src="' . $imageurl . '" alt="' . $single->post_title . '" />';
+      $lcp_ytimage = '<img src="' . $imageurl . '" alt="' . $single->post_title . '" />';
 
-        if ($lcp_thumb_class != null):
-          $thmbn_class = ' class="' . $lcp_thumb_class . '" />';
+      if ($lcp_thumb_class != null){
+        $thmbn_class = ' class="' . $lcp_thumb_class . '" />';
         $lcp_ytimage = preg_replace("/\>/", $thmbn_class, $lcp_ytimage);
-        endif;
-
-        $lcp_thumbnail .= '<a href="' . get_permalink($single->ID).'">' . $lcp_ytimage . '</a>';
+      }
+      $lcp_thumbnail .= '<a href="' . get_permalink($single->ID).'">' . $lcp_ytimage . '</a>';
     }
   }
 }

list-category-posts.php

@@ -87,6 +87,7 @@ static function catlist_func($atts, $content = null) {
                              'thumbnail' => 'no',
                              'thumbnail_size' => 'thumbnail',
                              'thumbnail_class' => '',
+                             'force_thumbnail' => '',
                              'title_tag' => '',
                              'title_class' => '',
                              'title_limit' => '0',

readme.txt

@@ -313,6 +313,8 @@ Show the full content of the post regardless of whether there is a <!--more--
 
 * **thumbnail** - Show post thumbnail (http://markjaquith.wordpress.com/2009/12/23/new-in-wordpress-2-9-post-thumbnail-images/). Default is 'no'. Ex: `[catlist thumbnail=yes]`.
 
+* **force_thumbnail** - If the previous parameter is set to 'yes', and there's no featured image, setting this to 'yes' or 'true' will make the plugin look for the first image in the post and use it as a thumbnail. Ex: `[catlist thumbnail=yes force_thumbnail=yes]`.
+
 * **thumbnail_size** - Either a string keyword (thumbnail, medium, large or full) or 2 values representing width and height in pixels. Ex: `[catlist thumbnail_size=32,32]` or `[catlist thumbnail_size=thumbnail]`
 
 * **thumbnail_class** - Set a CSS class for the thumbnail.
@@ -533,6 +535,7 @@ Template system has changed. Custom templates should be stored in WordPress them
 = 0.67 =
 * Adds custom css class to current page in pagination `lcp_currentpage`.
 * Adds child_categories parameter to being able to exclude child categories' posts from a list.
+* New feature to look for the first image in a post when requesting a thumbnail and the post has no featured image. Thanks Michael J. Gibbs for writing this code :)
 
 = 0.66 =
 * Full release notes: https://github.com/picandocodigo/List-Category-Posts/releases/tag/0.66