List category posts - Version 0.83

Version Description

This is a big release since @zymeth25 and I have been doing lots of refactoring based on maintainability, code quality and testing. It means the code is much cleaner and easier to maintain. So fixing bugs or adding new features should be easier now. If you find any issues, please report them on GitHub (https://github.com/picandocodigo/List-Category-Posts/issues).

Development: We've refactored a lot of the code in include, updated the build, bumped versions, added tests, and more.
Bugfix: An issue where customfield_display_glue was shown even when the custom field values were empty - https://wordpress.org/support/topic/hide-the-glue-content-if-costum-fields-are-empty
Bugfix: Fixed excluded categories when using an and relationship.
New parameter: ol_offset, when you use an ordered list, you can set an offset so the posts will start from that number instead of 1.
Templates system refactor - The plugin now uses the template system by default. There should be no changes on how the plugin works, but please do let us know if you have any issues. Building templates should be easier now. You can use the included template as an example to start. It's in the plugin's template folder under the name default.php. Be warned, however, that this is the default template the plugin uses to create output so if you change it, you will change the plugin's default behavior. When you update the plugin this file will be overwritten so it's best not to edit it but copy it over to another file to create your custom template. More information on templates:
Pull Request: https://github.com/picandocodigo/List-Category-Posts/pull/411
Official docs: https://github.com/picandocodigo/List-Category-Posts/wiki/HTML-&-CSS-Customization#templates

Download this release

Release Info

Developer	fernandobt
Plugin	List category posts
Version	0.83
Comparing to
See all releases

Code changes from version 0.82 to 0.83

Files changed (11) hide show

include/lcp-category.php +198 -40
include/lcp-catlist.php +100 -51
include/lcp-catlistdisplayer.php +122 -362
include/lcp-date-query.php +62 -0
include/lcp-parameters.php +18 -127
include/lcp-templater.php +188 -0
include/lcp-widget-form.php +1 -1
include/lcp-wrapper.php +65 -0
list-category-posts.php +18 -11
readme.txt +21 -5
templates/default.php +20 -8

include/lcp-category.php CHANGED Viewed

@@ -15,49 +15,165 @@ class LcpCategory{
                 return self::$instance;
+              }
-            -
              /*
-            -
               * When the category is set using the `name` parameter.
                */
-            -
              public function with_name($name){
-            -
                $lcp_category_id = null;
-            -
                // AND relationship
-            -
                if ( preg_match('/\+/', $name) ){
-            -
                  $categories = array();
-            -
                  $cat_array = explode("+", $name);
-            -
-            -
                  foreach ($cat_array as $category){
-            -
                    $categories[] = $this->get_category_id_by_name($category);
-            -
                  }
-            -
                  $lcp_category_id = $categories;
-            -
                  // OR relationship
-            -
                } elseif (preg_match('/,/', $name )){
-            -
                  $categories = '';
-            -
                  $cat_array = explode(",", $name);
-            -
-            -
                  foreach ($cat_array as $category){
-            -
                    $id = $this->get_category_id_by_name($category);
-            -
                    $categories .= $id . ",";
+                  }
-            -
                  $lcp_category_id = $categories;
                 } else {
-            -
                  $lcp_category_id = $this->get_category_id_by_name($name);
+                }
-            -
                return $lcp_category_id;
+              }
-            -
              public function with_id($id){
-            -
                if (preg_match('/\+/', $id)){
-            -
                  if ( preg_match('/(-[0-9]+)+/', $id, $matches) ){
-            -
                    $this->exclude = implode(',', explode("-", ltrim($matches[0], '-') ));
+                  }
-            -
                  $lcp_category_id = array_map( 'intval', explode( "+", $id ) );
-            -
                } else {
-            -
                  $lcp_category_id = $id;
+                }
-            -
                return $lcp_category_id;
+              }
               public function current_category($mode){
                 // Only single post pages with assigned category and
                 // category archives have a 'current category',
@@ -93,18 +209,60 @@ class LcpCategory{
                 return $category->cat_ID;
+              }
               /**
-            -
               * Get the category id from its name
-            -
               * by Eric Celeste / http://eric.clst.org
                */
-            -
              private function get_category_id_by_name($cat_name){
-            -
                //TODO: Support multiple names (this used to work, but not anymore)
-            -
                //We check if the name gets the category id, if not, we check the slug.
-            -
                $term = get_term_by('slug', $cat_name, 'category');
-            -
                if (!$term){
-            -
                  $term = get_term_by('name', $cat_name, 'category');
+                }
                 return ($term) ? $term->term_id : 0;
+              }
+            }


15	return self::$instance;
16	}
17
18	+ /**
19	+ * Parses category related shortcode parameters and returns
20	+ * WP_Query compatible $args array. Also sets $lcp_category_id.
21	+ *
22	+ * This method is the main interface of the LcpCategory class. It
23	+ * is currently only used by the CatList class and servers as its helper.
24	+ * $params expects all category related shortcode parameters.
25	+ * $lcp_category_id is passed by reference so that it can be
26	+ * changed here. CatList::$lcp_category_id relies on this value heavily.
27	+ *
28	+ * @param array $params {
29	+ * Category related shortcode parameter values.
30	+ *
31	+ * @type string $id
32	+ * @type string $name
33	+ * @type string $categorypage
34	+ * @type string $child_categories
35	+ * }
36	+ * @param mixed &$lcp_category_id Optional. Updated by this method if necessary.
37	+ * @return array WP_Query $args array, @see lcp_categories.
38	*/
39	+ public function get_lcp_category($params, &$lcp_category_id=0) {
40	+ // Only used when excluded categories are combined with 'and' relationship.
41	+ $exclude = [];
42	+ // This will be the value of lcp_category_id which is passed by reference.
43	+ $categories = $lcp_category_id;
44	+
45	+ // In a category page:
46	+ if ($params['categorypage'] &&
47	+ in_array($params['categorypage'], ['yes', 'all', 'other']) \|\|
48	+ $params['id'] == -1) {
49	+ // Use current category
50	+ $categories = $this->current_category($params['categorypage']);
51	+ } elseif ($params['name']) {
52	+ // Using the category name:
53	+ $categories = $this->with_name($params['name']);
54	+ } elseif ($params['id']) {
55	+ // Using the id:
56	+ $categories = $this->with_id($params['id']);
57	+ // If the 'exclude' array was added, excract it.
58	+ if (is_array($categories) && array_key_exists('exclude', $categories)) {
59	+ $exclude = $categories['exclude'];
60	+ unset($categories['exclude']);
61	}
62	+ }
63	+
64	+ // This is where the lcp_category_id property of CatList is changed.
65	+ $lcp_category_id = $categories;
66	+
67	+ return $this->lcp_categories(
68	+ $categories, $params['child_categories'], $exclude);
69	+ }
70	+
71	+ /**
72	+ * Formats the $args array in compliance with WP_Query.
73	+ *
74	+ * This method assigns input category IDs to proper WP_Query $args array.
75	+ * $categories expects an int, string or an array following the logic:
76	+ * - int -> single category
77	+ * - array -> 'and' relationship
78	+ * - string -> 'or' relationship (or single cateogry as a string)
79	+ *
80	+ * $child_categories is the value of `child_categories` shortcode param.
81	+ * $exclude is only used when combining 'and' relationship with excluded IDs.
82	+ *
83	+ * @param int\|string\|array $categories Category IDs.
84	+ * @param string $child_categories 'no' or 'false' disables child cats.
85	+ * @param array $exclude Accepts an array of IDs.
86	+ * @return array WP_Query $args array.
87	+ */
88	+ private function lcp_categories($categories, $child_categories, $exclude) {
89	+ $args = array();
90
91	+ if (is_array($categories)) {
92	+ // Handle excluded categories for the 'and' relationship.
93	+ if ($exclude) {
94	+ $args['category__not_in'] = $exclude;
95	+ }
96	+ $args['category__and'] = $categories;
97	+ } else if (in_array($child_categories, ['no', 'false'])) {
98	+ $args['category__in']= $categories;
99	} else {
100	+ $args['cat'] = $categories;
101	}
102	+ return $args;
103	}
104
105	+ /**
106	+ * Used when the category is set using the `name` shortcode parameter.
107	+ *
108	+ * This method returns a category ID when a single category is specified,
109	+ * a string containing comma separated category IDs when using the 'or'
110	+ * relationship, an array of category IDs when using the 'and' relationship.
111	+ *
112	+ * If $name does not resolve to an existing name or slug, `0` will be returned.
113	+ * Similarly, the returned comma separated string or an array will have `0`
114	+ * for any name/slug that could not be found.
115	+ *
116	+ * @param string $name Accepts valid `name` shortcode parameter values.
117	+ * @return int\|string\|array Int for single category, string for 'or' relationsip,
118	+ * array for 'and' relationship.
119	+ */
120	+ public function with_name($name) {
121	+ if (false !== strpos($name, '+')) { // AND relationship
122	+ return $this->and_relationship($name);
123	+ } elseif (false !== strpos($name, ',')) { // OR relationship
124	+ return $this->or_relationship($name);
125	+ }
126	+ return $this->get_category_id_by_name($name);
127	+ }
128	+
129	+ /**
130	+ * Used when the category is set using the `id` shortcode parameter.
131	+ *
132	+ * Accepts all valid `id` parameter values. If $cat_id is a single category
133	+ * ID or comma separated IDs (for the 'or' relationship), this method does not
134	+ * perfom any parsing and returns the string as is. If the 'and' relationship
135	+ * is used (eg. `id=1+2+3`), returns an array of IDs. If the 'and' relationship is
136	+ * used together with excluded categories (`id=1+2-3-4`), returns an array of
137	+ * included IDs that also contains the 'exclude' key that is an array of excluded
138	+ * IDs.
139	+ *
140	+ * @param string $name Accepts valid `id` shortcode parameter values.
141	+ * @return string\|array Array of IDs for 'and' relationship, string otherwise.
142	+ */
143	+ public function with_id($cat_id) {
144	+ if (false !== strpos($cat_id, '+')) {
145	+ if (false !== strpos($cat_id, '-')) {
146	+ /*
147	+ * If the 'and' relationship is used together with excluded
148	+ * categories (eg. 1+2+3-4-5) we parse it with regex and append an
149	+ * array of excluded IDs to the returned array.
150	+ */
151	+ preg_match('/(?P<in>(\+?[0-9]+)+)(?P<ex>(-[0-9]+)+)/', $cat_id, $matches);
152	+
153	+ $cat_id = array_map('intval', explode("+", $matches['in']));
154	+ $cat_id['exclude'] = explode('-', ltrim($matches['ex'], '-'));
155	+ } else {
156	+ // Simple 'and' relationship, just convert input into an array.
157	+ $cat_id = array_map('intval', explode("+", $cat_id));
158	}



159	}
160	+ // In all other cases leave user input as is.
161	+ return $cat_id;
162	}
163
164	+ /**
165	+ * Handles the `categorypage` shortcode parameter with all its modes.
166	+ *
167	+ * This method accepts all valid `categorypage` shortcode parameters.
168	+ * Also accepts an empty string for compatibility with the widget.
169	+ * Returns a single category ID when used on category archive page,
170	+ * a comma separated string of IDs for the 'or' relationship,
171	+ * an array of IDs for the 'and' relationship. When no posts should be
172	+ * displayed it returns `[0]`.
173	+ *
174	+ * @param string $mode Accepts 'all', 'yes', 'other' and empty string.
175	+ * @return int\|string\|array Category ID(s).
176	+ */
177	public function current_category($mode){
178	// Only single post pages with assigned category and
179	// category archives have a 'current category',

209	return $category->cat_ID;
210	}
211
212	+
213	/**
214	+ * Gets the category id from its name.
215	+ *
216	+ * @author Eric Celeste / http://eric.clst.org
217	+ *
218	+ * @param string $category_name Accepts category name or slug.
219	+ * @return int Category ID or 0 if none found.
220	*/
221	+ private function get_category_id_by_name($category_name) {
222	+ //We check if the slug gets the category id, if not, we check the name.
223	+ $term = get_term_by('slug', $category_name, 'category');
224	+ if (!$term) {
225	+ $term = get_term_by('name', $category_name, 'category');

226	}
227	return ($term) ? $term->term_id : 0;
228	}
229
230	+ /**
231	+ * Handles 'and' relationship when categories are specified by name.
232	+ *
233	+ * Parses the input string and returns an array of corresponding
234	+ * category IDs.
235	+ *
236	+ * @param string $name Accepts category names or slugs separated by the '+' sign.
237	+ * @return array Category IDs.
238	+ */
239	+ private function and_relationship($name) {
240	+ $categories = array();
241	+ $cat_array = explode("+", $name);
242	+
243	+ foreach ($cat_array as $category) {
244	+ $categories[] = $this->get_category_id_by_name($category);
245	+ }
246	+ return $categories;
247	+ }
248	+
249	+ /**
250	+ * Handles 'or' relationship when categories are specified by name.
251	+ *
252	+ * Parses the input string and returns comma separated
253	+ * category IDs.
254	+ *
255	+ * @param string $name Accepts category names or slugs separated by the ',' sign.
256	+ * @return string Comma separated category IDs.
257	+ */
258	+ private function or_relationship($name) {
259	+ $categories = array();
260	+ $catArray = explode(",", $name);
261	+
262	+ foreach ($catArray as $category) {
263	+ $categories[] = $this->get_category_id_by_name($category);
264	+ }
265	+
266	+ return implode(',',$categories);
267	+ }
268	}

include/lcp-catlist.php CHANGED Viewed

@@ -14,7 +14,6 @@ require_once ( LCP_PATH . 'lcp-paginator.php' );
             class CatList{
               private $params = array();
               private $lcp_category_id = 0;
-            -
              private $exclude;
               private $page = 1;
               private $posts_count = 0;
               private $instance = 0;
@@ -42,7 +41,6 @@ class CatList{
                * Determine the categories of posts and execute the WP_query
                */
               public function get_posts() {
-            -
                $this->get_lcp_category();
                 $this->set_lcp_parameters();
+              }
@@ -74,7 +72,12 @@ class CatList{
                * Order the parameters and query the DB for posts
                */
               private function set_lcp_parameters(){
-            -
                $args = $this->lcp_categories();
                 $processed_params = LcpParameters::get_instance()->get_query_params($this->params);
                 $args = array_merge($args, $processed_params);
                 $args = $this->check_pagination($args);
@@ -114,43 +117,6 @@ class CatList{
                 return $args;
+              }
-            -
              /**
-            -
               * Check if there's one or more categories.
-            -
               * Used in the beginning when setting up the parameters.
-            -
               */
-            -
              private function lcp_categories(){
-            -
                if ( is_array($this->lcp_category_id) ){
-            -
                  return array('category__and' => $this->lcp_category_id);
-            -
                } else {
-            -
                  if($this->utils->lcp_not_empty('child_categories') &&
-            -
                     (($this->params['child_categories'] === 'no' ) ||
-            -
                      ($this->params['child_categories'] === 'false') )){
-            -
                    return array('category__in'=> $this->lcp_category_id);
-            -
                  }
-            -
                  return array('cat'=> $this->lcp_category_id);
-            -
                }
-            -
              }
-            -
-            -
              private function get_lcp_category(){
-            -
                // In a category page:
-            -
                if ( $this->utils->lcp_not_empty('categorypage') &&
-            -
                     in_array($this->params['categorypage'], ['yes', 'all', 'other']) ||
-            -
                     $this->params['id'] == -1){
-            -
                  // Use current category
-            -
                  $this->lcp_category_id = LcpCategory::get_instance()->current_category(
-            -
                    $this->params['categorypage']
-            -
                  );
-            -
                } elseif ( $this->utils->lcp_not_empty('name') ){
-            -
                  // Using the category name:
-            -
                  $this->lcp_category_id = LcpCategory::get_instance()->with_name( $this->params['name'] );
-            -
                  $this->params['name'] = null;
-            -
                } elseif ( isset($this->params['id']) && $this->params['id'] != '0' ){
-            -
                  // Using the id:
-            -
                  $this->lcp_category_id = LcpCategory::get_instance()->with_id( $this->params['id'] );
-            -
                }
-            -
-            -
              }
-            -
               public function get_category_id(){
                 return $this->lcp_category_id;
+              }
@@ -218,7 +184,17 @@ class CatList{
                 endif;
+              }
-            -
               public function get_category_count(){
                 if($this->utils->lcp_not_empty('category_count') && $this->params['category_count'] == 'yes'):
@@ -257,17 +233,26 @@ class CatList{
                   $custom_fields = get_post_custom( $post_id );
                   //Loop on custom fields and if there's a value, add it:
-            -
                  foreach ( $custom_array as $user_customfield ) :
                     // Check that the custom field is wanted:
-            -
                    if ( isset( $custom_fields[$user_customfield] ) ) :
                       //Browse through the custom field values:
-            -
                      foreach ( $custom_fields[$user_customfield] as $key => $value ) :
-            -
                        if ( $this->params['customfield_display_name'] != 'no' )
                           $value = $user_customfield . $this->params['customfield_display_name_glue'] . $value;
-            -
                        $lcp_customs[] = $value;
-            -
                      endforeach;
-            -
                    endif;
-            -
                  endforeach;
                   return $lcp_customs;
                 else:
@@ -307,6 +292,11 @@ class CatList{
                 return $this->page;
+              }
               public function get_posts_count(){
                 return $this->posts_count;
+              }
@@ -322,7 +312,7 @@ class CatList{
               public function get_date_to_show($single){
                 if ($this->params['date'] == 'yes'):
                   //by Verex, great idea!
-            -
                  return get_the_time($this->params['dateformat'], $single);
                 else:
                   return null;
                 endif;
@@ -330,12 +320,25 @@ class CatList{
               public function get_modified_date_to_show($single){
                 if ($this->params['date_modified'] == 'yes'):
-            -
                  return get_the_modified_time($this->params['dateformat'], $single);
                 else:
                   return null;
                 endif;
+              }
               public function get_content($single){
                 if (isset($this->params['content']) &&
                   ($this->params['content'] =='yes' || $this->params['content'] == 'full') &&
@@ -428,6 +431,52 @@ class CatList{
                   $lcp_thumb_class);
+              }
               public function get_pagination(){
                 $paginator_params = array(
                       'bookmarks'   => $this->params['pagination_bookmarks'],


14	class CatList{
15	private $params = array();
16	private $lcp_category_id = 0;

17	private $page = 1;
18	private $posts_count = 0;
19	private $instance = 0;

41	* Determine the categories of posts and execute the WP_query
42	*/
43	public function get_posts() {

44	$this->set_lcp_parameters();
45	}
46

72	* Order the parameters and query the DB for posts
73	*/
74	private function set_lcp_parameters(){
75	+ $args = LcpCategory::get_instance()->get_lcp_category([
76	+ 'id' => $this->params['id'],
77	+ 'name' => $this->params['name'],
78	+ 'categorypage' => $this->params['categorypage'],
79	+ 'child_categories' => $this->params['child_categories'],
80	+ ], $this->lcp_category_id);
81	$processed_params = LcpParameters::get_instance()->get_query_params($this->params);
82	$args = array_merge($args, $processed_params);
83	$args = $this->check_pagination($args);

117	return $args;
118	}
119





































120	public function get_category_id(){
121	return $this->lcp_category_id;
122	}

184	endif;
185	}
186
187	+ public function get_posts_morelink($single, $css_class) {
188	+ if(!empty($this->params['posts_morelink'])){
189	+ $href = 'href="' . get_permalink($single->ID) . '"';
190	+ $class = $css_class ?: "";
191	+ if ( $class ):
192	+ $class = 'class="' . $class . '" ';
193	+ endif;
194	+ $readmore = $this->params['posts_morelink'];
195	+ return ' <a ' . $href . ' ' . $class . ' >' . $readmore . '</a>';
196	+ }
197	+ }
198
199	public function get_category_count(){
200	if($this->utils->lcp_not_empty('category_count') && $this->params['category_count'] == 'yes'):

233	$custom_fields = get_post_custom( $post_id );
234
235	//Loop on custom fields and if there's a value, add it:
236	+ foreach ( $custom_array as $user_customfield ) {
237	// Check that the custom field is wanted:
238	+ if ( isset( $custom_fields[$user_customfield] )) {
239	//Browse through the custom field values:
240	+ foreach ( $custom_fields[$user_customfield] as $key => $value ) {
241	+ if ( $this->params['customfield_display_name'] != 'no' && $value !== '' ){
242	$value = $user_customfield . $this->params['customfield_display_name_glue'] . $value;
243	+ }
244	+ if($value != ''){
245	+ $lcp_customs[] = $value;
246	+ }
247	+ }
248	+ }
249	+ }
250	+
251	+ // Return a string instead of array if custom fields
252	+ // are not displayed separately.
253	+ if ($this->params['customfield_display_separately'] === 'no') {
254	+ $lcp_customs = implode($this->params['customfield_display_glue'], $lcp_customs);
255	+ }
256
257	return $lcp_customs;
258	else:

292	return $this->page;
293	}
294
295	+ // Helper method for tests.
296	+ public function update_page($page) {
297	+ $this->page = $page;
298	+ }
299	+
300	public function get_posts_count(){
301	return $this->posts_count;
302	}

312	public function get_date_to_show($single){
313	if ($this->params['date'] == 'yes'):
314	//by Verex, great idea!
315	+ return ' ' . get_the_time($this->params['dateformat'], $single);
316	else:
317	return null;
318	endif;

320
321	public function get_modified_date_to_show($single){
322	if ($this->params['date_modified'] == 'yes'):
323	+ return " " . get_the_modified_time($this->params['dateformat'], $single);
324	else:
325	return null;
326	endif;
327	}
328
329	+ public function get_display_id($single) {
330	+ if (!empty($this->params['display_id']) && $this->params['display_id'] == 'yes'){
331	+ $lcp_display_output .= $single->ID;
332	+ }
333	+ }
334	+
335	+ public function get_no_posts_text() {
336	+ if ( ($this->get_posts_count() == 0) &&
337	+ ($this->params["no_posts_text"] != '') ) {
338	+ return $this->params["no_posts_text"];
339	+ }
340	+ }
341	+
342	public function get_content($single){
343	if (isset($this->params['content']) &&
344	($this->params['content'] =='yes' \|\| $this->params['content'] == 'full') &&

431	$lcp_thumb_class);
432	}
433
434	+ public function get_outer_tag($tag, $css_class) {
435	+ $css_class = $this->params['class'] ?: $css_class;
436	+
437	+ $tag_string = '<' . $tag;
438	+ if ($tag == 'ol' && !empty($this->params['ol_offset'])) {
439	+ $tag_string .= ' start="' . $this->params['ol_offset'] . '"';
440	+ }
441	+
442	+ // Follow the number of posts in an ordered list with pagination.
443	+ if( 'ol' === $tag && $this->page > 1 ) {
444	+ $start = $this->get_number_posts() * ( $this->page - 1 ) + 1;
445	+ $tag_string .= ' start="' . $start . '"';
446	+ }
447	+ //Give a class to wrapper tag
448	+ $tag_string .= ' class="' . $css_class . '"';
449	+
450	+ //Give id to wrapper tag
451	+ $tag_string .= ' id="lcp_instance_' . $this->instance . '"';
452	+
453	+ $tag_string .= '>';
454	+
455	+ return $tag_string;
456	+ }
457	+
458	+ public function get_inner_tag( $single, $parent, $tag, $css_class='' ) {
459	+ $class = $css_class;
460	+ $tag_css = '';
461	+ if ( is_object( $parent ) && is_object( $single ) &&
462	+ $parent->ID === $single->ID ) {
463	+ $class .= 'current';
464	+ }
465	+
466	+ if ( $this->params['tags_as_class'] === 'yes' ) {
467	+ $post_tags = wp_get_post_Tags( $single->ID );
468	+ if ( !empty( $post_tags ) ) {
469	+ foreach ( $post_tags as $post_tag ) {
470	+ $class .= " $post_tag->slug ";
471	+ }
472	+ }
473	+ }
474	+ if ( !empty($class) ) {
475	+ $tag_css = 'class="' . $class . '"';
476	+ }
477	+ return '<'. $tag . ' ' . $tag_css . '>';
478	+ }
479	+
480	public function get_pagination(){
481	$paginator_params = array(
482	'bookmarks' => $this->params['pagination_bookmarks'],

include/lcp-catlistdisplayer.php CHANGED Viewed

@@ -5,279 +5,97 @@
              * @author fernando@picandocodigo.net
              */
             require_once 'lcp-catlist.php';
             class CatListDisplayer {
               public $catlist;
               private $params = array();
               private $lcp_output;
-            -
              public static function getTemplatePaths(){
-            -
                $template_path = TEMPLATEPATH . "/list-category-posts/";
-            -
                $stylesheet_path = STYLESHEETPATH . "/list-category-posts/";
-            -
                return array($template_path, $stylesheet_path);
-            -
              }
-            -
               public function __construct($atts) {
                 $this->params = $atts;
                 $this->catlist = new CatList($atts);
                 global $post;
                 $this->parent = $post;
+              }
               public function display(){
                 $this->catlist->save_wp_query();
                 $this->catlist->get_posts();
-            -
                $this->select_template();
                 $this->catlist->restore_wp_query();
                 wp_reset_query();
                 return $this->lcp_output;
+              }
-            -
              private function select_template(){
-            -
                // Check if we got a template param:
-            -
                if (isset($this->params['template']) &&
-            -
                  !empty($this->params['template'])){
-            -
                  // The default values for ul, ol and div:
-            -
                  if (preg_match('/^ul$|^div$|^ol$/i', $this->params['template'], $matches)){
-            -
                    $this->build_output($matches[0]);
-            -
                  } else {
-            -
                    // Else try an actual template from the params
-            -
                    $this->template();
-            -
                  }
-            -
                } else {
-            -
                  // Default:
-            -
                  $this->build_output('ul');
-            -
                }
+              }
               /**
-            -
               * Template code
                */
-            -
              private function template(){
-            -
                $tplFileName = null;
-            -
                $template_param = $this->params['template'];
-            -
                $templates = array();
-            -
-            -
                // Get templates paths and add the incoming parameter to search
-            -
                // for the php file:
-            -
                if($template_param){
-            -
                  $paths = self::getTemplatePaths();
-            -
                  foreach($paths as $path){
-            -
                    $templates[] = $path . $template_param . '.php';
-            -
                  }
-            -
                }
-            -
                // Check if we can read the template file:
-            -
                foreach ($templates as $file) :
-            -
                  if ( is_file($file) && is_readable($file) ) :
-            -
                    $tplFileName = $file;
-            -
                  endif;
-            -
                endforeach;
-            -
                if($tplFileName){
-            -
                  require($tplFileName);
-            -
                } else {
-            -
                  $this->build_output('ul');
-            -
                }
+              }
-            -
              public static function get_templates($param = null){
-            -
                $templates = array();
-            -
                $paths = self::getTemplatePaths();
-            -
                foreach ($paths as $templatePath){
-            -
                  if (is_dir($templatePath) && scandir($templatePath)){
-            -
                    foreach (scandir($templatePath) as $file){
-            -
                      // Check that the files found are well formed
-            -
                      if ( ($file[0] != '.') && (substr($file, -4) == '.php') &&
-            -
                      is_file($templatePath.$file) && is_readable($templatePath.$file) ){
-            -
                        $templateName = substr($file, 0, strlen($file)-4);
-            -
                        // Add the template only if necessary
-            -
                        if (!in_array($templateName, $templates)){
-            -
                          $templates[] = $templateName;
-            -
                        }
-            -
                      }
-            -
                    }
-            -
                  }
-            -
                }
-            -
                return $templates;
+              }
-            -
              private function build_output($tag){
-            -
                $this->category_title();
-            -
-            -
                $this->get_category_description();
-            -
-            -
                $this->lcp_output .= $this->get_conditional_title();
-            -
-            -
                $this->lcp_output .= '<' . $tag;
-            -
-            -
                // Follow the numner of posts in an ordered list with pagination
-            -
                if( $tag == 'ol' && $this->catlist->get_page() > 1 ){
-            -
                  $start = $this->catlist->get_number_posts() * ($this->catlist->get_page() - 1) + 1;
-            -
                  $this->lcp_output .= ' start="' .  $start . '" ';
-            -
                }
-            -
                //Give a class to wrapper tag
-            -
                if (isset($this->params['class'])):
-            -
                  $this->lcp_output .= ' class="' . $this->params['class'] . '"';
-            -
                endif;
-            -
-            -
                //Give id to wrapper tag
-            -
                if (isset($this->params['instance'])){
-            -
                  $this->lcp_output .= ' id="lcp_instance_' . $this->params['instance'] . '"';
-            -
                }
-            -
-            -
                $this->lcp_output .= '>';
-            -
                $inner_tag = ( ($tag == 'ul') || ($tag == 'ol') ) ? 'li' : 'p';
-            -
-            -
                //Posts loop
-            -
                global $post;
-            -
                while ( have_posts() ) : the_post();
-            -
                  if ( !post_password_required($post) ||
-            -
                       ( post_password_required($post) && (
-            -
                                                             isset($this->params['show_protected']) &&
-            -
                                                             $this->params['show_protected'] == 'yes' ) )):
-            -
                    $this->lcp_output .= $this->lcp_build_post($post, $inner_tag);
-            -
                  endif;
-            -
                endwhile;
-            -
-            -
                if ( ($this->catlist->get_posts_count() == 0) &&
-            -
                     ($this->params["no_posts_text"] != '') ) {
-            -
                  $this->lcp_output .= $this->params["no_posts_text"];
-            -
                }
-            -
-            -
                //Close wrapper tag
-            -
                $this->lcp_output .= '</' . $tag . '>';
-            -
-            -
                // More link
-            -
                $this->lcp_output .= $this->get_morelink();
-            -
-            -
                $this->lcp_output .= $this->catlist->get_pagination();
+              }
-            -
              /**
-            -
               * This function should be overriden for template system.
-            -
               * @param post $single
-            -
               * @param HTML tag to display $tag
-            -
               * @return string
-            -
               */
-            -
              private function lcp_build_post($single, $tag){
-            -
                $class ='';
-            -
                $tag_css = '';
-            -
                if ( is_object($this->parent) && is_object($single) && $this->parent->ID == $single->ID ){
-            -
                  $class = 'current';
-            -
                }
-            -
-            -
                if ( array_key_exists('tags_as_class', $this->params) && $this->params['tags_as_class'] == 'yes' ) {
-            -
                  $post_tags = wp_get_post_Tags($single->ID);
-            -
                  if ( !empty($post_tags) ){
-            -
                    foreach ($post_tags as $post_tag) {
-            -
                      $class .= " $post_tag->slug ";
-            -
                    }
-            -
                  }
-            -
                }
-            -
                if ( !empty($class) ){
-            -
                  $tag_css = 'class="' . $class . '"';
-            -
                }
-            -
                $lcp_display_output = '<'. $tag . ' ' . $tag_css . '>';
-            -
-            -
                if ( empty($this->params['no_post_titles']) || !empty($this->params['no_post_titles']) && $this->params['no_post_titles'] !== 'yes' ) {
-            -
                  $lcp_display_output .= $this->get_post_title($single);
-            -
                }
-            -
-            -
                // Comments count
-            -
                $lcp_display_output .= $this->get_stuff_with_tags_and_classes('comments', $single);
-            -
-            -
                // Date
-            -
                if (!empty($this->params['date_tag']) || !empty($this->params['date_class'])):
-            -
                  $lcp_display_output .= $this->get_date($single,
-            -
                                                         $this->params['date_tag'],
-            -
                                                         $this->params['date_class']);
-            -
                else:
-            -
                  $lcp_display_output .= $this->get_date($single);
-            -
                endif;
-            -
-            -
                // Date Modified
-            -
                if (!empty($this->params['date_modified_tag']) || !empty($this->params['date_modified_class'])):
-            -
                  $lcp_display_output .= $this->get_modified_date($single,
-            -
                                                         $this->params['date_modified_tag'],
-            -
                                                         $this->params['date_modified_class']);
-            -
                else:
-            -
                  $lcp_display_output .= $this->get_modified_date($single);
-            -
                endif;
-            -
-            -
                // Author
-            -
                $lcp_display_output .= $this->get_stuff_with_tags_and_classes('author', $single);
-            -
-            -
                // Display ID
-            -
                if (!empty($this->params['display_id']) && $this->params['display_id'] == 'yes'){
-            -
                    $lcp_display_output .= $single->ID;
-            -
                }
-            -
-            -
                // Custom field display
-            -
                $lcp_display_output .= $this->get_custom_fields($single);
-            -
-            -
                $lcp_display_output .= $this->get_thumbnail($single);
-            -
                $lcp_display_output .= $this->get_stuff_with_tags_and_classes('content', $single);
-            -
                $lcp_display_output .= $this->get_stuff_with_tags_and_classes('excerpt', $single);
-            -
                $lcp_display_output .= $this->get_posts_morelink($single);
-            -
                $lcp_display_output .= '</' . $tag . '>';
-            -
                return $lcp_display_output;
+              }
-            -
              /**
-            -
               * Several checks going on here:
-            -
               * - Tag provided, no class - wrap content with tag
-            -
               * - Tag and class provided - wrap content with tag and class
-            -
               * - Class provided, no tag - wrap content with span and class
-            -
              */
-            -
              private function get_stuff_with_tags_and_classes($entity, $single){
-            -
                $result = '';
-            -
                $stuffFunction = 'get_' . $entity;
-            -
                if (!empty($this->params[$entity . '_class'])){
-            -
                  if (empty($this->params[$entity . '_tag'])){
-            -
                    $result = $this->$stuffFunction($single, 'span', $this->params[$entity . '_class']);
-            -
                  } else {
-            -
                    $result = $this->$stuffFunction($single, $this->params[$entity . '_tag'], $this->params[$entity . '_class']);
-            -
                  }
-            -
                } else {
-            -
                  if (!empty($this->params[$entity . '_tag'])){
-            -
                    $result = $this->$stuffFunction($single, $this->params[$entity . '_tag']);
-            -
                  } else {
-            -
                    $result = $this->$stuffFunction($single);
-            -
                  }
-            -
                }
-            -
                return $result;
+              }
-            -
              private function category_title(){
-            -
                // More link
-            -
                if (!empty($this->params['catlink_tag'])):
-            -
                  if (!empty($this->params['catlink_class'])):
-            -
                    $this->lcp_output .= $this->get_category_link(
-            -
                      $this->params['catlink_tag'],
-            -
                      $this->params['catlink_class']
-            -
                    );
-            -
                  else:
-            -
                    $this->lcp_output .= $this->get_category_link($this->params['catlink_tag']);
-            -
                  endif;
-            -
                else:
-            -
                  $this->lcp_output .= $this->get_category_link("strong");
-            -
                endif;
+              }
-            -
              public function get_category_description(){
-            -
                if(!empty($this->params['category_description']) && $this->params['category_description'] == 'yes'){
-            -
                  $this->lcp_output .= $this->catlist->get_category_description();
-            -
                }
+              }
-            -
              /**
-            -
               * Auxiliary functions for templates
-            -
               */
               private function get_comments($single, $tag = null, $css_class = null){
                 return $this->content_getter('comments', $single, $tag, $css_class);
+              }
@@ -294,8 +112,28 @@ class CatListDisplayer {
                 return $this->content_getter('excerpt', $single, $tag, $css_class);
+              }
-            -
              private function get_pagination(){
-            -
                return $this->catlist->get_pagination();
+              }
               /*
@@ -303,6 +141,11 @@ class CatListDisplayer {
               * in the same function for less repetition.
               */
               private function content_getter($type, $post, $tag = null, $css_class = null) {
                 $info = '';
                 switch( $type ){
                 case 'comments':
@@ -317,79 +160,42 @@ class CatListDisplayer {
                 case 'excerpt':
                   $info = $this->catlist->get_excerpt($post);
                   $info = preg_replace('/\[.*\]/', '', $info);
+                }
-            -
                return $this->assign_style($info, $tag, $css_class);
-            -
              }
-            -
-            -
              private function get_conditional_title(){
-            -
                if(!empty($this->params['conditional_title_tag']))
-            -
                  $tag = $this->params['conditional_title_tag'];
-            -
                else
-            -
                  $tag = 'h3';
-            -
                if(!empty($this->params['conditional_title_class']))
-            -
                  $class = $this->params['conditional_title_class'];
-            -
                else
-            -
                  $class = '';
-            -
-            -
                return $this->assign_style($this->catlist->get_conditional_title(), $tag, $class);
-            -
              }
-            -
-            -
              private function get_custom_fields($single){
-            -
                if(!empty($this->params['customfield_display'])){
-            -
                  $info = $this->catlist->get_custom_fields($this->params['customfield_display'], $single->ID);
-            -
                  if(empty($this->params['customfield_tag']) || $this->params['customfield_tag'] == null){
-            -
                    $tag = 'div';
-            -
                  } else {
-            -
                    $tag = $this->params['customfield_tag'];
-            -
                  }
-            -
-            -
                  if(empty($this->params['customfield_class']) || $this->params['customfield_class'] == null){
-            -
                    $css_class = 'lcp_customfield';
-            -
                  } else {
-            -
                    $css_class = $this->params['customfield_class'];
-            -
                  }
-            -
-            -
                  $final_info = '';
-            -
                  if(!is_array($info)){
-            -
                    $final_info = $this->assign_style($info, $tag, $css_class);
-            -
                  }else{
-            -
                    if($this->params['customfield_display_separately'] != 'no'){
-            -
                      foreach($info as $i)
-            -
                        $final_info .= $this->assign_style($i, $tag, $css_class);
-            -
                    }else{
-            -
                      $one_info = implode($this->params['customfield_display_glue'], $info);
-            -
                      $final_info = $this->assign_style($one_info, $tag, $css_class);
-            -
                    }
-            -
                  }
-            -
                  return $final_info;
-            -
                }
-            -
              }
-            -
-            -
              private function get_date($single, $tag = null, $css_class = null){
-            -
                $info = $this->catlist->get_date_to_show($single);
-            -
-            -
                if ( !empty($this->params['link_dates']) && ( 'yes' === $this->params['link_dates'] || 'true' === $this->params['link_dates'] ) ):
-            -
                  $info = $this->get_post_link($single, $info);
-            -
                endif;
-            -
-            -
                $info = ' ' . $info;
-            -
                return $this->assign_style($info, $tag, $css_class);
-            -
              }
-            -
-            -
              private function get_modified_date($single, $tag = null, $css_class = null){
-            -
                $info = " " . $this->catlist->get_modified_date_to_show($single);
-            -
                return $this->assign_style($info, $tag, $css_class);
-            -
              }
-            -
-            -
              private function get_thumbnail($single, $tag = null){
-            -
                if ( !empty($this->params['thumbnail_class']) ) :
-            -
                  $lcp_thumb_class = $this->params['thumbnail_class'];
-            -
                  $info = $this->catlist->get_thumbnail($single, $lcp_thumb_class);
-            -
                else:
-            -
                  $info = $this->catlist->get_thumbnail($single);
-            -
                endif;
-            -
-            -
                return $this->assign_style($info, $tag);
+              }
               private function get_post_link($single, $text, $class = null){
@@ -414,6 +220,11 @@ class CatListDisplayer {
               // Link is a parameter here in case you want to use it on a template
               // and not show the links for all the shortcodes using this template:
               private function get_post_title($single, $tag = null, $css_class = null, $link = true){
                 $lcp_post_title = apply_filters('the_title', $single->post_title, $single->ID);
                 $lcp_post_title = $this->lcp_title_limit( $lcp_post_title );
@@ -443,7 +254,7 @@ class CatListDisplayer {
                 $info = $pre . $info . $post;
                 if( $tag !== null || $css_class !== null){
-            -
                  $info = $this->assign_style($info, $tag, $css_class);
+                }
                 return $info;
@@ -464,66 +275,15 @@ class CatListDisplayer {
                 return $lcp_post_title;
+              }
-            -
              private function get_posts_morelink($single){
-            -
                if(!empty($this->params['posts_morelink'])){
-            -
                  $href = 'href="' . get_permalink($single->ID) . '"';
-            -
                  $class = "";
-            -
                  if ( !empty($this->params['posts_morelink_class']) ):
-            -
                    $class = 'class="' . $this->params['posts_morelink_class'] . '" ';
-            -
                  endif;
-            -
                  $readmore = $this->params['posts_morelink'];
-            -
                  return ' <a ' . $href . ' ' . $class . ' >' . $readmore . '</a>';
-            -
                }
-            -
              }
-            -
-            -
              private function get_category_link($tag = null, $css_class = null){
-            -
                $info = $this->catlist->get_category_link();
-            -
                return $this->assign_style($info, $tag, $css_class);
-            -
              }
-            -
-            -
              private function get_morelink(){
-            -
                $info = $this->catlist->get_morelink();
-            -
                if ( !empty($this->params['morelink_tag'])){
-            -
                  if( !empty($this->params['morelink_class']) ){
-            -
                    return "<" . $this->params['morelink_tag'] . " class='" .
-            -
                      $this->params['morelink_class'] . "'>" . $info .
-            -
                      "</" . $this->params["morelink_tag"] . ">";
-            -
                  } else {
-            -
                    return "<" . $this->params['morelink_tag'] . ">" .
-            -
                      $info . "</" . $this->params["morelink_tag"] . ">";
-            -
                  }
-            -
                } else{
-            -
                  if ( !empty($this->params['morelink_class']) ){
-            -
                    return str_replace("<a", "<a class='" . $this->params['morelink_class'] . "' ", $info);
-            -
                  }
-            -
                }
-            -
                return $info;
-            -
              }
-            -
-            -
              public function get_category_count(){
-            -
                return $this->catlist->get_category_count();
-            -
              }
-            -
               /**
-            -
               * Assign style to the info delivered by CatList. Tag is an HTML tag
-            -
               * which is passed and will sorround the info. Css_class is the css
-            -
               * class we want to assign to this tag.
-            -
               * @param string $info
-            -
               * @param string $tag
-            -
               * @param string $css_class
-            -
               * @return string
                */
-            -
              private function assign_style($info, $tag = null, $css_class = null){
-            -
                 if (!empty($info)):
-            -
                  if (empty($tag) && !empty($css_class)):
-            -
                    $tag = "span";
-            -
                  elseif (empty($tag)):
-            -
                    return $info;
-            -
                  elseif (!empty($tag) && empty($css_class)) :
-            -
                    return '<' . $tag . '>' . $info . '</' . $tag . '>';
-            -
                  endif;
-            -
                  $css_class = sanitize_html_class($css_class);
-            -
                  return '<' . $tag . ' class="' . $css_class . '">' . $info . '</' . $tag . '>';
-            -
                endif;
+              }
+            }


5	* @author fernando@picandocodigo.net
6	*/
7	require_once 'lcp-catlist.php';
8	+ require_once 'lcp-wrapper.php';
9	+ require_once 'lcp-templater.php';
10
11	class CatListDisplayer {
12	public $catlist;
13	+ private $wrapper;
14	+ private $templater;
15	private $params = array();
16	private $lcp_output;
17






18	public function __construct($atts) {
19	$this->params = $atts;
20	$this->catlist = new CatList($atts);
21	+ $this->wrapper = LcpWrapper::get_instance();
22	global $post;
23	$this->parent = $post;
24	+ $this->templater = new LcpTemplater($atts['template']);
25	}
26
27	public function display(){
28	$this->catlist->save_wp_query();
29	$this->catlist->get_posts();
30	+ $this->create_output();
31	$this->catlist->restore_wp_query();
32	wp_reset_query();
33	return $this->lcp_output;
34	}
35
36	+ private function create_output() {
37	+ require $this->templater->get_template();













38	}
39
40	/**
41	+ * Auxiliary functions for templates
42	*/













43
44	+ /* Use outside The Loop */





45
46	+ private function open_outer_tag($tag='ul', $css_class='lcp_catlist') {
47	+ $this->templater->update_outer_tag($tag);
48	+ return $this->catlist->get_outer_tag($this->templater->outer_tag, $css_class);


49	}
50
51	+ private function close_outer_tag() {
52	+ return '</' . $this->templater->outer_tag . '>';

















53	}
54
55	+ private function get_morelink($tag = null, $css_class = null){
56	+ return $info = $this->content_getter('morelink', null, $tag, $css_class);
















































57	}
58
59	+ private function get_category_link($tag = 'strong', $css_class = null){
60	+ return $this->content_getter('catlink', null, $tag, $css_class);
61	+ }




























































62
63	+ private function get_conditional_title($tag = 'h3', $css_class = null){
64	+ return $this->content_getter('conditional_title', null, $tag, $css_class);
65	+ }
66
67	+ private function get_pagination(){
68	+ return $this->catlist->get_pagination();
69	+ }
70
71	+ public function get_category_count(){
72	+ return $this->catlist->get_category_count();
73	+ }
74
75	+ public function get_category_description(){
76	+ return $this->catlist->get_category_description();
77	}
78
79	+ private function get_no_posts_text() {
80	+ return $this->catlist->get_no_posts_text();





















81	}
82
83	+ /* Use within The Loop */
84	+
85	+ private function open_inner_tag($single, $tag, $css_class='') {
86	+ $this->templater->update_inner_tag( $tag );
87	+ return $this->catlist->get_inner_tag(
88	+ $single,
89	+ $this->parent,
90	+ $this->templater->inner_tag,
91	+ $css_class
92	+ );




93	}
94
95	+ private function close_inner_tag() {
96	+ return '</' . $this->templater->inner_tag . '>';


97	}
98



99	private function get_comments($single, $tag = null, $css_class = null){
100	return $this->content_getter('comments', $single, $tag, $css_class);
101	}

112	return $this->content_getter('excerpt', $single, $tag, $css_class);
113	}
114
115	+ private function get_modified_date($single, $tag = null, $css_class = null){
116	+ return $info = $this->content_getter('date_modified', $single, $tag, $css_class);
117	+ }
118	+
119	+ private function get_custom_fields($single, $tag='div', $css_class='lcp-customfield'){
120	+ return $this->content_getter('customfield', $single, $tag, $css_class);
121	+ }
122	+
123	+ private function get_date($single, $tag=null, $css_class=null) {
124	+ return $this->content_getter('date', $single, $tag, $css_class);
125	+ }
126	+
127	+ private function get_thumbnail($single, $tag=null, $css_class=null) {
128	+ return $this->content_getter('thumbnail', $single, $tag, $css_class);
129	+ }
130	+
131	+ private function get_posts_morelink($single, $css_class=null) {
132	+ return $this->content_getter('posts_morelink', $single, null, $css_class);
133	+ }
134	+
135	+ private function get_display_id($single) {
136	+ return $this->catlist->get_display_id($single);
137	}
138
139	/*

141	* in the same function for less repetition.
142	*/
143	private function content_getter($type, $post, $tag = null, $css_class = null) {
144	+ // Shortcode parameters take precedence over function arguments
145	+ // for tags and classes. 'posts_morelink_tag' param doesn't exist
146	+ if ($type !== 'posts_morelink') $tag = $this->params[$type . '_tag'] ?: $tag;
147	+ $css_class = $this->params[$type . '_class'] ?: $css_class;
148	+
149	$info = '';
150	switch( $type ){
151	case 'comments':

160	case 'excerpt':
161	$info = $this->catlist->get_excerpt($post);
162	$info = preg_replace('/\[.*\]/', '', $info);
163	+ break;
164	+ case 'date_modified':
165	+ $info = $this->catlist->get_modified_date_to_show($post);
166	+ break;
167	+ case 'morelink':
168	+ $info = $this->catlist->get_morelink();
169	+ break;
170	+ case 'catlink':
171	+ $info = $this->catlist->get_category_link();
172	+ break;
173	+ case 'conditional_title':
174	+ $info = $this->catlist->get_conditional_title();
175	+ break;
176	+ case 'customfield':
177	+ $info = $this->catlist->get_custom_fields($this->params['customfield_display'], $post->ID);
178	+ break;
179	+ case 'date':
180	+ $info = $this->catlist->get_date_to_show($post);
181	+ if ( !empty($this->params['link_dates']) && ( 'yes' === $this->params['link_dates'] \|\| 'true' === $this->params['link_dates'] ) ):
182	+ $info = $this->get_post_link($post, $info);
183	+ endif;
184	+ ($info) ? ($info = ' ' . $info) : null;
185	+ break;
186	+ case 'thumbnail':
187	+ $info = $this->catlist->get_thumbnail($post, $css_class);
188	+ // Default wrapper behavior not supported here,
189	+ // class is only used inside the <img> element.
190	+ $css_class = null;
191	+ break;
192	+ case 'posts_morelink':
193	+ $info = $this->catlist->get_posts_morelink($post, $css_class);
194	+ // Default wrapper behavior not supported here,
195	+ // class is only used inside the <a> element.
196	+ $css_class = null;
197	}
198	+ return $this->wrapper->wrap($info, $tag, $css_class);







































































199	}
200
201	private function get_post_link($single, $text, $class = null){

220	// Link is a parameter here in case you want to use it on a template
221	// and not show the links for all the shortcodes using this template:
222	private function get_post_title($single, $tag = null, $css_class = null, $link = true){
223	+ // Don't do anything if no_post_titles is specified.
224	+ if ( 'yes' === $this->params['no_post_titles'] ) {
225	+ return;
226	+ }
227	+
228	$lcp_post_title = apply_filters('the_title', $single->post_title, $single->ID);
229
230	$lcp_post_title = $this->lcp_title_limit( $lcp_post_title );

254	$info = $pre . $info . $post;
255
256	if( $tag !== null \|\| $css_class !== null){
257	+ $info = $this->wrapper->wrap($info, $tag, $css_class);
258	}
259
260	return $info;

275	return $lcp_post_title;
276	}
277








































278	/**
279	+ * Checks if a protected post should be included in the LCP output.
280	+ *
281	+ *
282	+ * @param object $post A post to be checked.
283	+ * @return bool Whether a post should be included in the LCP output.


284	*/
285	+ private function check_show_protected($post) {
286	+ return ! post_password_required($post) \|\|
287	+ post_password_required($post) && 'yes' === $this->params['show_protected'];









288	}
289	}

include/lcp-date-query.php ADDED Viewed

	@@ -0,0 +1,62 @@


1	+ <?php
2	+
3	+ trait LcpDateQuery{
4	+ // Parameters that are set to build the argument array
5	+ function params_set(){
6	+ return array(
7	+ 'after' => false,
8	+ 'after_year' => false,
9	+ 'after_month' => false,
10	+ 'after_day' => false,
11	+ 'before' => false,
12	+ 'before_year' => false,
13	+ 'before_month' => false,
14	+ 'before_day' => false,
15	+ );
16	+ }
17	+
18	+ /*
19	+ * Create date_query args according to https://codex.wordpress.org/Class_Reference/WP_Query#Date_Parameters
20	+ */
21	+ public function create_date_query_args($args, $params) {
22	+ $date_query = array();
23	+ // Booleans to track which subarrays should be created.
24	+ $after = false;
25	+ $before = false;
26	+ $time_periods = array('before', 'after');
27	+ $params_set = $this->set_params_values($params);
28	+
29	+ /*
30	+ * Build the subarrays.
31	+ * The after parameter takes priority over after_* parameters.
32	+ * Similarly, the before parameter takes priority over before_* parameters.
33	+ */
34	+ foreach ($time_periods as $period){
35	+ if ($params_set[$period]) {
36	+ $date_query[$period] = $params[$period];
37	+ } else {
38	+ if ( $params_set[$period . '_year'] ) $date_query[$period]['year'] = $params_set[$period . '_year'];
39	+ if ( $params_set[$period . '_month'] ) $date_query[$period]['month'] = $params_set[$period . '_month'];
40	+ if ( $params_set[$period . '_day'] ) $date_query[$period]['day'] = $params_set[$period . '_day'];
41	+ }
42	+ }
43	+
44	+ if(!empty($date_query)){
45	+ $args = array_merge($args, array('date_query' => $date_query));
46	+ }
47	+ return $args;
48	+ }
49	+
50	+ /*
51	+ * Check which paramaters are set save the values
52	+ */
53	+ private function set_params_values($params){
54	+ $params_set = $this->params_set();
55	+ foreach ($params_set as $key => $value){
56	+ if ( array_key_exists($key, $params) && $params[$key] != false){
57	+ $params_set[$key] = $params[$key];
58	+ }
59	+ }
60	+ return $params_set;
61	+ }
62	+ }

include/lcp-parameters.php CHANGED Viewed

@@ -1,15 +1,17 @@
             <?php
             require_once ( LCP_PATH . 'lcp-utils.php' );
             class LcpParameters{
               // Singleton implementation
               private static $instance = null;
               private $starting_with = null;
-            -
              // $date_query tells us if we need to generate date_query args
-            -
              private $date_query = false;
               private $utils;
               private $params;
               public static function get_instance(){
                 if( !isset( self::$instance ) ){
                   self::$instance = new self;
@@ -23,21 +25,11 @@ class LcpParameters{
                 # Essential parameters:
                 $args = array(
                   'numberposts' => $params['numberposts'],
-            -
                  'orderby' => $params['orderby'],
-            -
                  'order' => $params['order'],
                   'offset' => $params['offset']
                 );
-            -
                if( get_option('lcp_orderby') && $params['orderby'] === ''){
-            -
                  $orderby = array('orderby' => get_option('lcp_orderby'));
-            -
                  $args = array_merge($args, $orderby);
-            -
                }
-            -
-            -
                if( get_option('lcp_order') && $params['order'] === ''){
-            -
                  $order = array('order' => get_option('lcp_order'));
-            -
                  $args = array_merge($args, $order);
-            -
                }
-            -
                 $this->utils = new LcpUtils($params);
                 // Check posts to exclude
@@ -46,9 +38,9 @@ class LcpParameters{
                 // Check type, status, parent params
                 $args = $this->lcp_types_and_statuses($args);
-            -
                if($this->utils->lcp_not_empty('search')):
                   $args['s'] = $params['search'];
-            -
                endif;
                 if($this->utils->lcp_not_empty('author_posts')):
                   $authors = $params['author_posts'];
@@ -67,67 +59,8 @@ class LcpParameters{
                 // final return array ($args)
                 $args = $this->lcp_check_basic_params($args);
-            -
                // Posts within given date range:
-            -
                if ( $this->utils->lcp_not_empty('after') ) {
-            -
                  $this->after = $params['after'];
-            -
                  $date_query = true;
-            -
                }
-            -
-            -
                if ( $this->utils->lcp_not_empty('after_year') ) {
-            -
                  $this->after_year = $params['after_year'];
-            -
                  $date_query = true;
-            -
                }
-            -
-            -
                if ( $this->utils->lcp_not_empty('after_month') ) {
-            -
                  // after_month should be in the range [1, 12]
-            -
                  if ($params['after_month'] >= 1 && $params['after_month'] <= 12) {
-            -
                    $this->after_month = $params['after_month'];
-            -
                    $date_query = true;
-            -
                  }
-            -
                }
-            -
-            -
                if ( $this->utils->lcp_not_empty('after_day') ) {
-            -
                  // after_day should be in the range [1, 31]
-            -
                  if ($params['after_day'] >= 1 && $params['after_day'] <= 31) {
-            -
                    $this->after_day = $params['after_day'];
-            -
                    $date_query = true;
-            -
                  }
-            -
                }
-            -
-            -
                if ( $this->utils->lcp_not_empty('before') ) {
-            -
                  if('today' === strtolower($params['before'])) {
-            -
                      $this->before = date("Y/m/d");
-            -
                  } else {
-            -
                      $this->before = $params['before'];
-            -
                  }
-            -
                  $date_query = true;
-            -
                }
-            -
-            -
                if ( $this->utils->lcp_not_empty('before_year') ) {
-            -
                  $this->before_year = $params['before_year'];
-            -
                  $date_query = true;
-            -
                }
-            -
-            -
                if ( $this->utils->lcp_not_empty('before_month') ) {
-            -
                  // before_month should be in the range [1, 12]
-            -
                  if ($params['before_month'] >= 1 && $params['before_month'] <= 12) {
-            -
                    $this->before_month = $params['before_month'];
-            -
                    $date_query = true;
-            -
                  }
-            -
                }
-            -
-            -
                if ( $this->utils->lcp_not_empty('before_day') ) {
-            -
                  // before_day should be in the range [1, 31]
-            -
                  if ($params['before_day'] >= 1 && $params['before_day'] <= 31) {
-            -
                    $this->before_day = $params['before_day'];
-            -
                    $date_query = true;
-            -
                  }
-            -
                }
-            -
                 // Only generate date_query args if a before/after paramater was found
-            -
                if (isset($date_query) ){
-            -
                  $args['date_query'] = $this->create_date_query_args();
-            -
                }
                 /*
                  * Custom fields 'customfield_name' & 'customfield_value'
@@ -345,61 +278,19 @@ class LcpParameters{
                 return $post->ID;
+              }
-            -
              /*
-            -
               * Create date_query args according to https://codex.wordpress.org/Class_Reference/WP_Query#Date_Parameters
-            -
               * There's probably a better way to check if values exist.
-            -
               * Code should be cleaned up (this is first attempt at a solution).
-            -
               */
-            -
              private function create_date_query_args() {
-            -
                $date_query = array();
-            -
-            -
                // Keep track of parameters that are set to build the argument array.
-            -
                $params_set = array(
-            -
                  'after' => false,
-            -
                  'after_year' => false,
-            -
                  'after_month' => false,
-            -
                  'after_day' => false,
-            -
                  'before' => false,
-            -
                  'before_year' => false,
-            -
                  'before_month' => false,
-            -
                  'before_day' => false,
-            -
                );
-            -
                // Booleans to track which subarrays should be created.
-            -
                $after = false;
-            -
                $before = false;
-            -
                /*
-            -
                 *  Check which paramaters are set and find out which subarrays
-            -
                 *  should be created.
-            -
                 */
-            -
                foreach ($params_set as $key=>$value){
-            -
                  if ( property_exists($this, $key) ){
-            -
                    $params_set[$key] = true;
-            -
                    $trutify = explode('_', $key);
-            -
                    $trutify = $trutify[0];
-            -
                    ${$trutify} = true;
-            -
                  }
+                }
-            -
                /*
-            -
                 * Build the subarrays.
-            -
                 * The after parameter takes priority over after_* parameters.
-            -
                 * Similarly, the before parameter takes priority over before_* parameters.
-            -
                 */
-            -
                $time_periods = array('before', 'after');
-            -
                foreach ($time_periods as $period){
-            -
                  if (${$period}){
-            -
                    if ($params_set[$period]) {
-            -
                      $date_query[$period] = $this->$period;
-            -
                    } else {
-            -
                      if ( $params_set[$period . '_year'] )  $date_query[$period]['year']  = $this->{$period . '_year'};
-            -
                      if ( $params_set[$period . '_month'] ) $date_query[$period]['month'] = $this->{$period . '_month'};
-            -
                      if ( $params_set[$period . '_day'] )   $date_query[$period]['day']   = $this->{$period . '_day'};
-            -
                    }
-            -
                  }
+                }
-            -
-            -
                return $date_query;
+              }
+            }

             <?php
             require_once ( LCP_PATH . 'lcp-utils.php' );
+            +
            require_once ( LCP_PATH . 'lcp-date-query.php' );
             class LcpParameters{
               // Singleton implementation
               private static $instance = null;
               private $starting_with = null;
               private $utils;
               private $params;
+            +
              // Use Trait for before/after date queries:
+            +
              use LcpDateQuery;
+            +
               public static function get_instance(){
                 if( !isset( self::$instance ) ){
                   self::$instance = new self;
                 # Essential parameters:
                 $args = array(
                   'numberposts' => $params['numberposts'],
+            +
                  'orderby' => $this->lcp_order_by($params['orderby']),
+            +
                  'order' => $this->lcp_order($params['order']),
                   'offset' => $params['offset']
                 );
                 $this->utils = new LcpUtils($params);
                 // Check posts to exclude
                 // Check type, status, parent params
                 $args = $this->lcp_types_and_statuses($args);
+            +
                if($this->utils->lcp_not_empty('search')){
                   $args['s'] = $params['search'];
+            +
                }
                 if($this->utils->lcp_not_empty('author_posts')):
                   $authors = $params['author_posts'];
                 // final return array ($args)
                 $args = $this->lcp_check_basic_params($args);
                 // Only generate date_query args if a before/after paramater was found
+            +
                $args = $this->create_date_query_args($args, $params);
                 /*
                  * Custom fields 'customfield_name' & 'customfield_value'
                 return $post->ID;
+              }
+            +
              private function lcp_order_by($orderby) {
+            +
                if( get_option('lcp_orderby') && $orderby === ''){
+            +
                  return get_option('lcp_orderby');
+                }
+            +
                return $orderby;
+            +
              }
+            +
              private function lcp_order($order) {
+            +
                if( get_option('lcp_order') && $params['order'] === ''){
+            +
                  return get_option('lcp_order');
+                }
+            +
                return $order;
+              }
+            }

include/lcp-templater.php ADDED Viewed

	@@ -0,0 +1,188 @@


1	+ <?php
2	+ /**
3	+ * Defines the LcpTemplater class
4	+ */
5	+
6	+ /**
7	+ * Contains and manages all template-related logic.
8	+ *
9	+ * This class is used to choose the correct template file,
10	+ * either the default one or one that corresponds to the `template` parameter
11	+ * supplied by the user.
12	+ *
13	+ * It also stores and manages:
14	+ *
15	+ * - the list's outer tag
16	+ * - the list's inner tags
17	+ */
18	+ class LcpTemplater {
19	+
20	+ /**
21	+ * Paths to template directory.
22	+ *
23	+ * @var array
24	+ */
25	+ private static $paths = null;
26	+
27	+ /**
28	+ * Path to the template file being used.
29	+ *
30	+ * @var string
31	+ */
32	+ private $template_file;
33	+
34	+ /**
35	+ * List's outer tag.
36	+ *
37	+ * @var string
38	+ */
39	+ public $outer_tag = null;
40	+
41	+ /**
42	+ * List's inner tag.
43	+ *
44	+ * @var null
45	+ */
46	+ public $inner_tag = null;
47	+
48	+ /**
49	+ * Instance constructor.
50	+ *
51	+ * Sets the proper template to be used. Either the default one or one
52	+ * specified by the user, if set. If $param is ul, div, or ul this method
53	+ * will also set proper outer and inner tags.
54	+ *
55	+ * @param string $param 'template' shortcode parameter.
56	+ */
57	+ public function __construct($param) {
58	+ // Default plugin template.
59	+ $this->template_file = plugin_dir_path(__DIR__) . 'templates/default.php';
60	+
61	+ if (empty($param)) {
62	+ // Use default plugin template.
63	+ ;
64	+ } else if ( preg_match('/^ul$\|^div$\|^ol$/i', $param, $matches)) {
65	+ // Use default plugin template, set outer and inner tags.
66	+ $this->outer_tag = ($matches[0]);
67	+ if ('div' === $this->outer_tag) {
68	+ $this->inner_tag = 'p';
69	+ }
70	+ } else {
71	+ // Try user's template.
72	+ $this->select_template($param);
73	+ }
74	+ }
75	+
76	+ /**
77	+ * Gets the possible template direcotry paths.
78	+ *
79	+ * The paths are stored in the $paths variable and returned.
80	+ *
81	+ * @return array Paths to template directory.
82	+ */
83	+ private static function get_template_paths() {
84	+ if (null === self::$paths) {
85	+ self::$paths = array_unique(
86	+ [
87	+ get_stylesheet_directory() . '/list-category-posts/',
88	+ get_template_directory() . '/list-category-posts/',
89	+ ]
90	+ );
91	+ }
92	+ return self::$paths;
93	+ }
94	+
95	+ /**
96	+ * Gets and returns all available template names.
97	+ *
98	+ * THis method scans the template directory and outputs all available
99	+ * template names in an array. This is currently only used by the widget.
100	+ *
101	+ * @return array All available template names (without .php extension).
102	+ */
103	+ public static function get_templates() {
104	+ $templates = [];
105	+ $paths = self::get_template_paths();
106	+
107	+ foreach ($paths as $path) {
108	+ foreach (scandir($path) as $file) {
109	+ if (! self::validate_template($path, $file)) {
110	+ continue;
111	+ }
112	+
113	+ $template_name = substr($file, 0, strlen($file) - 4);
114	+
115	+ // Add the template only if necessary
116	+ if (! in_array( $template_name, $templates)) {
117	+ $templates[] = $template_name;
118	+ }
119	+ }
120	+ }
121	+ return $templates;
122	+ }
123	+
124	+ /**
125	+ * Checks whether specified template files are formatted properly.
126	+ *
127	+ * @param string $path Path to the template directory.
128	+ * @param string $file Template file name.
129	+ * @return bool Is the template a proper php file.
130	+ */
131	+ private static function validate_template($path, $file) {
132	+ return (substr($file, -4) == '.php' ) && is_file($path . $file) &&
133	+ is_readable($path . $file);
134	+ }
135	+
136	+ /**
137	+ * Determine template path.
138	+ *
139	+ * Checks if the user specified template file exists and if so,
140	+ * sets the $template_file member variable to the template file's path.
141	+ *
142	+ * @param string $param 'template' shortcode paramter.
143	+ */
144	+ private function select_template($param) {
145	+ // Path to a proper template file.
146	+ $template = null;
147	+
148	+ // Get templates paths and search for the php file.
149	+ $paths = self::get_template_paths();
150	+ foreach($paths as $path) {
151	+ if (self::validate_template($path, $param . '.php')) {
152	+ $template = $path . $param . '.php';
153	+ break;
154	+ }
155	+ }
156	+
157	+ if ($template) {
158	+ $this->template_file = $template;
159	+ }
160	+ }
161	+
162	+ /**
163	+ * Updates the list's outer tag.
164	+ *
165	+ * @param string $tag Outer tag, ex. ul.
166	+ */
167	+ public function update_outer_tag($tag) {
168	+ $this->outer_tag = $this->outer_tag ?: $tag;
169	+ }
170	+
171	+ /**
172	+ * Updates the list's inner tag.
173	+ *
174	+ * @param string $tag Inner tag, ex. li.
175	+ */
176	+ public function update_inner_tag($tag) {
177	+ $this->inner_tag = $this->inner_tag ?: $tag;
178	+ }
179	+
180	+ /**
181	+ * Getter method for the template path.
182	+ *
183	+ * @return string $template_file value.
184	+ */
185	+ public function get_template() {
186	+ return $this->template_file;
187	+ }
188	+ }

include/lcp-widget-form.php CHANGED Viewed

	@@ -259,7 +259,7 @@
259	<br/>
260	<select id="<?php echo $this->get_field_id('template'); ?>" name="<?php echo $this->get_field_name('template'); ?>">
261	<?php
262	- $templates = ~~CatListDisplayer~~::get_templates();
263	$templates[] = 'default';
264	foreach ($templates as $tmp) :
265	$option = '<option value="' . $tmp . '" ';


259	<br/>
260	<select id="<?php echo $this->get_field_id('template'); ?>" name="<?php echo $this->get_field_name('template'); ?>">
261	<?php
262	+ $templates = LcpTemplater::get_templates();
263	$templates[] = 'default';
264	foreach ($templates as $tmp) :
265	$option = '<option value="' . $tmp . '" ';

include/lcp-wrapper.php ADDED Viewed

	@@ -0,0 +1,65 @@


1	+ <?php
2	+ /**
3	+ * This class handles HTML customizations
4	+ * defined by the user, both in shortcode parameters (e.g. comments_tag)
5	+ * and in template method calls.
6	+ */
7	+ class LcpWrapper {
8	+
9	+ // Singleton implementation
10	+ private static $instance = null;
11	+ public static function get_instance(){
12	+ if( !isset( self::$instance ) ){
13	+ self::$instance = new self;
14	+ }
15	+ return self::$instance;
16	+ }
17	+
18	+ /**
19	+ * Several checks going on here:
20	+ * - Tag provided, no class - wrap content with tag
21	+ * - Tag and class provided - wrap content with tag and class
22	+ * - Class provided, no tag - wrap content with span and class
23	+ * @param string $info
24	+ * @param string $tag
25	+ * @param string $css_class
26	+ * @return string
27	+ */
28	+ private function assign_style($info, $tag = null, $css_class = null){
29	+ if (!empty($info)):
30	+ if (empty($tag) && !empty($css_class)):
31	+ $tag = "span";
32	+ elseif (empty($tag)):
33	+ return $info;
34	+ elseif (!empty($tag) && empty($css_class)) :
35	+ return '<' . $tag . '>' . $info . '</' . $tag . '>';
36	+ endif;
37	+ $css_class = sanitize_html_class($css_class);
38	+ return '<' . $tag . ' class="' . $css_class . '">' . $info . '</' . $tag . '>';
39	+ endif;
40	+ }
41	+
42	+ /**
43	+ * Assign style to the info delivered by CatList. Tag is an HTML tag
44	+ * which is passed and will sorround the info. Css_class is the css
45	+ * class we want to assign to this tag. If an array is passed to $info
46	+ * each element will be wrapped separately and added to the returned string.
47	+ * @param string\|array $info
48	+ * @param string $tag
49	+ * @param string $css_class
50	+ * @return string
51	+ */
52	+ public function wrap($info, $tag=null, $css_class=null) {
53	+
54	+ $wrapped = '';
55	+
56	+ if (is_array($info)) {
57	+ foreach ($info as $i) {
58	+ $wrapped .= $this->assign_style($i, $tag, $css_class);
59	+ }
60	+ } else {
61	+ $wrapped = $this->assign_style($info, $tag, $css_class);
62	+ }
63	+ return $wrapped;
64	+ }
65	+ }

list-category-posts.php CHANGED Viewed

	@@ -3,14 +3,14 @@
3	Plugin Name: List category posts
4	Plugin URI: https://github.com/picandocodigo/List-Category-Posts
5	Description: List Category Posts allows you to list posts by category in a post/page using the [catlist] shortcode. This shortcode accepts a category name or id, the order in which you want the posts to display, the number of posts to display and many more parameters. You can use [catlist] as many times as needed with different arguments. Usage: [catlist argument1=value1 argument2=value2].
6	- Version: 0.82
7	Author: Fernando Briano
8	Author URI: http://fernandobriano.com
9
10	Text Domain: list-category-posts
11	Domain Path: /languages/
12
13	- Copyright 2008-~~2016~~ Fernando Briano (email : fernando@picandocodigo.net)
14
15	This program is free software; you can redistribute it and/or modify
16	it under the terms of the GNU General Public License as published by
	@@ -34,6 +34,7 @@ require_once 'include/lcp-catlistdisplayer.php';
34
35	class ListCategoryPosts{
36	private static $default_params = null;

37	public static function default_params(){
38	if (self::$default_params === null) {
39	self::$default_params = array(
	@@ -83,6 +84,7 @@ class ListCategoryPosts{
83	'starting_with' => '',
84	'thumbnail' => 'no',
85	'thumbnail_size' => 'thumbnail',

86	'thumbnail_class' => '',
87	'force_thumbnail' => '',
88	'title_tag' => '',
	@@ -93,7 +95,7 @@ class ListCategoryPosts{
93	'post_parent' => '0',
94	'post_suffix' => '',
95	'show_protected' => 'no',
96	- 'class' => '~~lcp_catlist~~',
97	'conditional_title' => '',
98	'conditional_title_tag' => '',
99	'conditional_title_class' => '',
	@@ -142,6 +144,7 @@ class ListCategoryPosts{
142	'before_day' => '',
143	'tags_as_class' => 'no',
144	'pagination_bookmarks' => '',

145	);
146	}
147	return self::$default_params;
	@@ -152,7 +155,7 @@ class ListCategoryPosts{
152	* @param $atts
153	* @param $content
154	*/
155	- static function catlist_func($atts~~, $content = null~~) {
156	$atts = shortcode_atts(self::default_params(), $atts);
157
158	if($atts['numberposts'] == ''){
	@@ -173,14 +176,14 @@ add_shortcode( 'catlist', array('ListCategoryPosts', 'catlist_func') );
173	function lpc_meta($links, $file) {
174	$plugin = plugin_basename(__FILE__);
175
176	- if ($file == $plugin):
177	return array_merge(
178	$links,
179	array( sprintf('<a href="http://wordpress.org/extend/plugins/list-category-posts/other_notes/">%s</a>', __('How to use','list-category-posts')) ),
180	array( sprintf('<a href="http://picandocodigo.net/programacion/wordpress/list-category-posts-wordpress-plugin-english/#support">%s</a>', __('Donate','list-category-posts')) ),
181	array( sprintf('<a href="https://github.com/picandocodigo/List-Category-Posts">%s</a>', __('Fork on Github','list-category-posts')) )
182	);
183	- ~~endif;~~
184
185	return $links;
186	}
	@@ -194,18 +197,22 @@ function set_default_numberposts() {
194	register_activation_hook( __FILE__, 'set_default_numberposts' );
195
196	function load_i18n(){
197	- load_plugin_textdomain( ~~'list-category-posts', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' );~~




198	}
199	add_action( 'plugins_loaded', 'load_i18n' );
200
201	function lcp_pagination_css(){
202	- if ( @file_exists( get_stylesheet_directory() . '/lcp_paginator.css' ) ):
203	$css_file = get_stylesheet_directory_uri() . '/lcp_paginator.css';
204	- elseif ( @file_exists( get_template_directory() . '/lcp_paginator.css' ) ):
205	$css_file = get_template_directory_uri() . '/lcp_paginator.css';
206	- else:
207	$css_file = plugin_dir_url(__FILE__) . '/lcp_paginator.css';
208	- ~~endif;~~
209
210	wp_enqueue_style( 'lcp_paginator', $css_file);
211	}


3	Plugin Name: List category posts
4	Plugin URI: https://github.com/picandocodigo/List-Category-Posts
5	Description: List Category Posts allows you to list posts by category in a post/page using the [catlist] shortcode. This shortcode accepts a category name or id, the order in which you want the posts to display, the number of posts to display and many more parameters. You can use [catlist] as many times as needed with different arguments. Usage: [catlist argument1=value1 argument2=value2].
6	+ Version: 0.83
7	Author: Fernando Briano
8	Author URI: http://fernandobriano.com
9
10	Text Domain: list-category-posts
11	Domain Path: /languages/
12
13	+ Copyright 2008-2020 Fernando Briano (email : fernando@picandocodigo.net)
14
15	This program is free software; you can redistribute it and/or modify
16	it under the terms of the GNU General Public License as published by

34
35	class ListCategoryPosts{
36	private static $default_params = null;
37	+
38	public static function default_params(){
39	if (self::$default_params === null) {
40	self::$default_params = array(

84	'starting_with' => '',
85	'thumbnail' => 'no',
86	'thumbnail_size' => 'thumbnail',
87	+ 'thumbnail_tag' => '',
88	'thumbnail_class' => '',
89	'force_thumbnail' => '',
90	'title_tag' => '',

95	'post_parent' => '0',
96	'post_suffix' => '',
97	'show_protected' => 'no',
98	+ 'class' => '',
99	'conditional_title' => '',
100	'conditional_title_tag' => '',
101	'conditional_title_class' => '',

144	'before_day' => '',
145	'tags_as_class' => 'no',
146	'pagination_bookmarks' => '',
147	+ 'ol_offset' => ''
148	);
149	}
150	return self::$default_params;

155	* @param $atts
156	* @param $content
157	*/
158	+ static function catlist_func($atts) {
159	$atts = shortcode_atts(self::default_params(), $atts);
160
161	if($atts['numberposts'] == ''){

176	function lpc_meta($links, $file) {
177	$plugin = plugin_basename(__FILE__);
178
179	+ if ($file == $plugin) {
180	return array_merge(
181	$links,
182	array( sprintf('<a href="http://wordpress.org/extend/plugins/list-category-posts/other_notes/">%s</a>', __('How to use','list-category-posts')) ),
183	array( sprintf('<a href="http://picandocodigo.net/programacion/wordpress/list-category-posts-wordpress-plugin-english/#support">%s</a>', __('Donate','list-category-posts')) ),
184	array( sprintf('<a href="https://github.com/picandocodigo/List-Category-Posts">%s</a>', __('Fork on Github','list-category-posts')) )
185	);
186	+ }
187
188	return $links;
189	}

197	register_activation_hook( __FILE__, 'set_default_numberposts' );
198
199	function load_i18n(){
200	+ load_plugin_textdomain(
201	+ 'list-category-posts',
202	+ false,
203	+ dirname( plugin_basename( __FILE__ ) ) . '/languages/'
204	+ );
205	}
206	add_action( 'plugins_loaded', 'load_i18n' );
207
208	function lcp_pagination_css(){
209	+ if ( @file_exists( get_stylesheet_directory() . '/lcp_paginator.css' ) ) {
210	$css_file = get_stylesheet_directory_uri() . '/lcp_paginator.css';
211	+ } elseif ( @file_exists( get_template_directory() . '/lcp_paginator.css' ) ) {
212	$css_file = get_template_directory_uri() . '/lcp_paginator.css';
213	+ } else {
214	$css_file = plugin_dir_url(__FILE__) . '/lcp_paginator.css';
215	+ }
216
217	wp_enqueue_style( 'lcp_paginator', $css_file);
218	}

readme.txt CHANGED Viewed

	@@ -1,11 +1,11 @@
1	=== List category posts ===
2	- Contributors: fernandobt
3	Donate Link: http://picandocodigo.net/programacion/wordpress/list-category-posts-wordpress-plugin-english/#support
4	Tags: list, categories, posts, cms
5	Requires at least: 3.3
6	- Tested up to: 5.4.1
7	Requires PHP: 5.4
8	- Stable tag: 0.82
9	License: GPLv2 or later
10	License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
	@@ -60,7 +60,10 @@ Some users have made videos on how to use the plugin (thank you, you are awesome
60
61	Support the plugin
62
63	- If you've found ~~the~~ ~~plugin~~ ~~useful~~, consider ~~making~~ a ~~[donation~~ ~~via~~ ~~PayPal](http~~://~~picandocodigo~~.~~net~~/~~programacion~~/~~wordpress/list-category-posts-wordpress-plugin-english/#support "Donate via PayPal").~~



64
65	Development
66
	@@ -179,7 +182,7 @@ Then just add a new text widget to your blog and use the shortcode there as the
179
180	TEMPLATE SYSTEM
181
182	- How to customize the way the posts are shown: [Template System](https://github.com/picandocodigo/List-Category-Posts/wiki/Template-System). ~~I am aware the Template System is not the friendliest right now, I'll work on improving this if I ever get the time to work on it.~~
183
184	NEW FEATURE REQUESTS, BUG FIXES, ENHANCEMENTS
185
	@@ -229,6 +232,19 @@ Template system has changed. Custom templates should be stored in WordPress them
229
230	== Changelog ==
231













232	= 0.82 =
233
234	* Adds support for several authors. To select posts from one author, you can use the author_posts parameter and use 'user_nicename' (NOT name). Example: `[catlist author_posts="fernando"]`. If you want to select posts from several authors, you need to use the author id instead. You can find the id for each author in `wp-admin/users.php`. It needs to be a comma separated value, example: `[catlist author_posts="1,2"]`


1	=== List category posts ===
2	+ Contributors: fernandobt, zymeth25
3	Donate Link: http://picandocodigo.net/programacion/wordpress/list-category-posts-wordpress-plugin-english/#support
4	Tags: list, categories, posts, cms
5	Requires at least: 3.3
6	+ Tested up to: 5.4.2
7	Requires PHP: 5.4
8	+ Stable tag: 0.83
9	License: GPLv2 or later
10	License URI: http://www.gnu.org/licenses/gpl-2.0.html
11

60
61	Support the plugin
62
63	+ Klemens Starybrat has been writing lots of amazing code for this plugin, so if you've found it useful and want to pay it forward, consider sponsoring him on GitHub: https://github.com/sponsors/zymeth25
64	+
65	+ I have a [PayPal account](http://picandocodigo.net/programacion/wordpress/list-category-posts-wordpress-plugin-english/#support "Donate via PayPal") where you can donate too.
66	+
67
68	Development
69

182
183	TEMPLATE SYSTEM
184
185	+ How to customize the way the posts are shown: [Template System](https://github.com/picandocodigo/List-Category-Posts/wiki/Template-System).
186
187	NEW FEATURE REQUESTS, BUG FIXES, ENHANCEMENTS
188

232
233	== Changelog ==
234
235	+ = 0.83 =
236	+
237	+ This is a big release since @zymeth25 and I have been doing lots of refactoring based on maintainability, code quality and testing. It means the code is much cleaner and easier to maintain. So fixing bugs or adding new features should be easier now. If you find any issues, please report them on GitHub (https://github.com/picandocodigo/List-Category-Posts/issues).
238	+
239	+ * Development: We've refactored a lot of the code in `include`, updated the build, bumped versions, added tests, and more.
240	+ * Bugfix: An issue where `customfield_display_glue` was shown even when the custom field values were empty - https://wordpress.org/support/topic/hide-the-glue-content-if-costum-fields-are-empty
241	+ * Bugfix: Fixed excluded categories when using an `and` relationship.
242	+ * New parameter: `ol_offset`, when you use an ordered list, you can set an offset so the posts will start from that number instead of 1.
243	+ * Templates system refactor - The plugin now uses the template system by default. There should be no changes on how the plugin works, but please do let us know if you have any issues. Building templates should be easier now. You can use the included template as an example to start. It's in the plugin's template folder under the name default.php. Be warned, however, that this is the default template the plugin uses to create output so if you change it, you will change the plugin's default behavior. When you update the plugin this file will be overwritten so it's best not to edit it but copy it over to another file to create your custom template.
244	+ More information on templates:
245	+ - Pull Request: https://github.com/picandocodigo/List-Category-Posts/pull/411
246	+ - Official docs: https://github.com/picandocodigo/List-Category-Posts/wiki/HTML-&-CSS-Customization#templates
247	+
248	= 0.82 =
249
250	* Adds support for several authors. To select posts from one author, you can use the author_posts parameter and use 'user_nicename' (NOT name). Example: `[catlist author_posts="fernando"]`. If you want to select posts from several authors, you need to use the author id instead. You can find the id for each author in `wp-admin/users.php`. It needs to be a comma separated value, example: `[catlist author_posts="1,2"]`

templates/default.php CHANGED Viewed

	@@ -40,11 +40,14 @@ $lcp_display_output = '';
40	// Show category link:
41	$lcp_display_output .= $this->get_category_link('strong');
42



43	// Show the conditional title:
44	$lcp_display_output .= $this->get_conditional_title();
45
46	//Add 'starting' tag. Here, I'm using an unordered list (ul) as an example:
47	- $lcp_display_output .= '<ul ~~class="~~lcp_catlist">';
48
49	/* Posts Loop
50	*
	@@ -61,24 +64,30 @@ global $post;
61	while ( have_posts() ):
62	the_post();
63



64	//Start a List Item for each post:
65	- $lcp_display_output .= "<li>";
66
67	//Show the title and link to the post:
68	- $lcp_display_output .= $this->get_post_title($post~~, 'h3', 'lcp_post'~~);
69
70	//Show comments:
71	$lcp_display_output .= $this->get_comments($post);
72
73	//Show date:
74	- $lcp_display_output .= ~~' ' .~~ $this->get_date($post);
75
76	//Show date modified:
77	- $lcp_display_output .= ~~' ' .~~ $this->get_modified_date($post);
78
79	//Show author
80	$lcp_display_output .= $this->get_author($post);
81



82	//Custom fields:
83	$lcp_display_output .= $this->get_custom_fields($post);
84
	@@ -101,11 +110,14 @@ while ( have_posts() ):
101	$lcp_display_output .= $this->get_posts_morelink($post);
102
103	//Close li tag
104	- $lcp_display_output .= ~~'</li>'~~;
105	endwhile;
106



107	// Close the wrapper I opened at the beginning:
108	- $lcp_display_output .= ~~'</ul>'~~;
109
110	// If there's a "more link", show it:
111	$lcp_display_output .= $this->get_morelink();
	@@ -116,4 +128,4 @@ $lcp_display_output .= $this->get_category_count();
116	//Pagination
117	$lcp_display_output .= $this->get_pagination();
118
119	- $this->lcp_output = $lcp_display_output;


40	// Show category link:
41	$lcp_display_output .= $this->get_category_link('strong');
42
43	+ // Show category description:
44	+ $lcp_display_output .= $this->get_category_description();
45	+
46	// Show the conditional title:
47	$lcp_display_output .= $this->get_conditional_title();
48
49	//Add 'starting' tag. Here, I'm using an unordered list (ul) as an example:
50	+ $lcp_display_output .= $this->open_outer_tag('ul', 'lcp_catlist');
51
52	/* Posts Loop
53	*

64	while ( have_posts() ):
65	the_post();
66
67	+ // Check if protected post should be displayed
68	+ if (!$this->check_show_protected($post)) continue;
69	+
70	//Start a List Item for each post:
71	+ $lcp_display_output .= $this->open_inner_tag($post, 'li');
72
73	//Show the title and link to the post:
74	+ $lcp_display_output .= $this->get_post_title($post);
75
76	//Show comments:
77	$lcp_display_output .= $this->get_comments($post);
78
79	//Show date:
80	+ $lcp_display_output .= $this->get_date($post);
81
82	//Show date modified:
83	+ $lcp_display_output .= $this->get_modified_date($post);
84
85	//Show author
86	$lcp_display_output .= $this->get_author($post);
87
88	+ // Show post ID
89	+ $lcp_display_output .= $this->get_display_id($post);
90	+
91	//Custom fields:
92	$lcp_display_output .= $this->get_custom_fields($post);
93

110	$lcp_display_output .= $this->get_posts_morelink($post);
111
112	//Close li tag
113	+ $lcp_display_output .= $this->close_inner_tag();
114	endwhile;
115
116	+ // Show no posts text if there are no posts
117	+ $lcp_display_output .= $this->get_no_posts_text();
118	+
119	// Close the wrapper I opened at the beginning:
120	+ $lcp_display_output .= $this->close_outer_tag();
121
122	// If there's a "more link", show it:
123	$lcp_display_output .= $this->get_morelink();

128	//Pagination
129	$lcp_display_output .= $this->get_pagination();
130
131	+ $this->lcp_output = $lcp_display_output;