WP RSS Aggregator - Version 4.6.4

Version Description

(2014-11-10) = * Enhanced: Added filters to the custom feed. * Enhanced: Updated some styles to improve the user interface. * Fixed bug: The "Remove selected from Blacklist" button had no nonce associated with it. * Fixed bug: The Blacklist menu entry was not always being shown.

Download this release

Release Info

Developer Mekku
Plugin Icon 128x128 WP RSS Aggregator
Version 4.6.4
Comparing to
See all releases

Code changes from version 4.6.3 to 4.6.4

Files changed (8) hide show
  1. changelog.txt +6 -0
  2. css/admin-styles.css +4 -0
  3. includes/custom-feed.php +3 -3
  4. includes/feed-blacklist.php +11 -3
  5. includes/scripts.php +6 -0
  6. js/admin-custom.js +2 -1
  7. readme.txt +7 -1
  8. wp-rss-aggregator.php +3 -3
changelog.txt CHANGED
@@ -1,3 +1,9 @@
 
 
 
 
 
 
1
  4.6.3 (2014-11-3)
2
  Enhanced: Re-added the "Add New" link in the plugin's menu.
3
  Enhanced: Improved error logging.
1
+ 4.6.4 (2014-11-10)
2
+ Enhanced: Added filters to the custom feed.
3
+ Enhanced: Updated some styles to improve the user interface.
4
+ Fixed bug: The "Remove selected from Blacklist" button had no nonce associated with it.
5
+ Fixed bug: The Blacklist menu entry was not always being shown.
6
+
7
  4.6.3 (2014-11-3)
8
  Enhanced: Re-added the "Add New" link in the plugin's menu.
9
  Enhanced: Improved error logging.
css/admin-styles.css CHANGED
@@ -61,6 +61,10 @@ body.post-type-wprss_feed #titlediv div.inside { display: none !important; }
61
  .wprss-form-table th {
62
  width: 120px;
63
  max-width: 120px;
 
 
 
 
64
  }
65
  .wprss-form-table td label {
66
  line-height: 15px;
61
  .wprss-form-table th {
62
  width: 120px;
63
  max-width: 120px;
64
+ padding: 7px 10px 10px 0;
65
+ }
66
+ .wprss-form-table td {
67
+ padding: 7px 10px;
68
  }
69
  .wprss-form-table td label {
70
  line-height: 15px;
includes/custom-feed.php CHANGED
@@ -132,15 +132,15 @@
132
  while ( have_posts() ) : the_post();
133
  $source = get_post_meta( get_the_ID(), 'wprss_feed_id', TRUE );
134
  $permalink = get_post_meta( get_the_ID(), 'wprss_item_permalink', true );
135
-
136
  ?>
137
  <item>
138
  <title><![CDATA[<?php the_title_rss(); ?>]]></title>
139
  <link><?php echo $permalink; ?></link>
140
  <guid isPermaLink="true"><?php echo $permalink; ?></guid>
141
  <pubDate><?php echo get_post_time( DATE_RSS ); ?></pubDate>
142
- <description><![CDATA[<?php the_content(); ?>]]></description>
143
- <content:encoded><![CDATA[<?php the_content(); ?>]]></content:encoded>
144
  <source url="<?php echo get_post_meta( $source, 'wprss_url', TRUE ); ?>"><?php echo get_the_title( $source ); ?></source>
145
  <?php do_action( 'wprss_custom_feed_entry', get_the_ID() ); ?>
146
  </item>
132
  while ( have_posts() ) : the_post();
133
  $source = get_post_meta( get_the_ID(), 'wprss_feed_id', TRUE );
134
  $permalink = get_post_meta( get_the_ID(), 'wprss_item_permalink', true );
135
+ $content = apply_filters( 'wprss_custom_feed_item_content', get_the_content() );
136
  ?>
137
  <item>
138
  <title><![CDATA[<?php the_title_rss(); ?>]]></title>
139
  <link><?php echo $permalink; ?></link>
140
  <guid isPermaLink="true"><?php echo $permalink; ?></guid>
141
  <pubDate><?php echo get_post_time( DATE_RSS ); ?></pubDate>
142
+ <description><![CDATA[<?php echo $content; ?>]]></description>
143
+ <content:encoded><![CDATA[<?php echo $content; ?>]]></content:encoded>
144
  <source url="<?php echo get_post_meta( $source, 'wprss_url', TRUE ); ?>"><?php echo get_the_title( $source ); ?></source>
145
  <?php do_action( 'wprss_custom_feed_entry', get_the_ID() ); ?>
146
  </item>
includes/feed-blacklist.php CHANGED
@@ -139,6 +139,7 @@ function wprss_check_if_blacklist_item() {
139
  wp_die('The item you are trying to blacklist is not valid!');
140
  }
141
 
 
142
  wprss_blacklist_item( $ID );
143
 
144
  // Check the current page, and generate the URL query string for the page
@@ -165,7 +166,7 @@ function wprss_blacklist_cpt() {
165
  'exclude_from_search' => true,
166
  'show_ui' => true,
167
  'show_in_menu' => 'edit.php?post_type=wprss_feed',
168
- 'capability_type' => 'wprss_blacklist',
169
  'supports' => array('title'),
170
  'labels' => array(
171
  'name' => __( 'Blacklist', WPRSS_TEXT_DOMAIN ),
@@ -197,12 +198,16 @@ function wprss_blacklist_row_actions( $actions ) {
197
  // Get the Post ID
198
  $ID = get_the_ID();
199
 
 
 
200
  // Prepare the blacklist URL
201
- $url = apply_filters(
202
  'wprss_blacklist_row_action_url',
203
  admin_url( "edit.php?post_type=$post_type&wprss_blacklist=$ID" ),
204
  $ID
205
  ) . $paged;
 
 
206
 
207
  // Prepare the text
208
  $text = apply_filters( 'wprss_blacklist_row_action_text', 'Delete Permanently &amp; Blacklist' );
@@ -216,7 +221,7 @@ function wprss_blacklist_row_actions( $actions ) {
216
  $hint = esc_attr( __( $hint, WPRSS_TEXT_DOMAIN ) );
217
 
218
  // Add the blacklist action
219
- $actions['blacklist-item'] = "<span class='delete'><a title='$hint' href='$url'>$text</a></span>";
220
  }
221
 
222
  // For the blacklisted item
@@ -252,6 +257,7 @@ function wprss_check_if_blacklist_delete() {
252
  // check if deleting in bulk
253
  if ( isset( $_GET['wprss-bulk'] ) && $_GET['wprss-bulk'] == '1' ) {
254
  $to_delete = explode( ',', $ID );
 
255
  } else {
256
  $to_delete = array( $ID );
257
  // Get the ID from the GET param
@@ -261,6 +267,8 @@ function wprss_check_if_blacklist_delete() {
261
 
262
  // Delete the posts marked for delete
263
  foreach( $to_delete as $delete_id ) {
 
 
264
  wp_delete_post( $delete_id, TRUE );
265
  }
266
 
139
  wp_die('The item you are trying to blacklist is not valid!');
140
  }
141
 
142
+ check_admin_referer( 'blacklist-item-' . $ID, 'wprss_blacklist_item' );
143
  wprss_blacklist_item( $ID );
144
 
145
  // Check the current page, and generate the URL query string for the page
166
  'exclude_from_search' => true,
167
  'show_ui' => true,
168
  'show_in_menu' => 'edit.php?post_type=wprss_feed',
169
+ 'capability_type' => 'feed_source',
170
  'supports' => array('title'),
171
  'labels' => array(
172
  'name' => __( 'Blacklist', WPRSS_TEXT_DOMAIN ),
198
  // Get the Post ID
199
  $ID = get_the_ID();
200
 
201
+ $remove_url =
202
+
203
  // Prepare the blacklist URL
204
+ $plain_url = apply_filters(
205
  'wprss_blacklist_row_action_url',
206
  admin_url( "edit.php?post_type=$post_type&wprss_blacklist=$ID" ),
207
  $ID
208
  ) . $paged;
209
+ // Add a nonce to the URL
210
+ $nonced_url = wp_nonce_url( $plain_url, 'blacklist-item-' . $ID, 'wprss_blacklist_item' );
211
 
212
  // Prepare the text
213
  $text = apply_filters( 'wprss_blacklist_row_action_text', 'Delete Permanently &amp; Blacklist' );
221
  $hint = esc_attr( __( $hint, WPRSS_TEXT_DOMAIN ) );
222
 
223
  // Add the blacklist action
224
+ $actions['blacklist-item'] = "<span class='delete'><a title='$hint' href='$nonced_url'>$text</a></span>";
225
  }
226
 
227
  // For the blacklisted item
257
  // check if deleting in bulk
258
  if ( isset( $_GET['wprss-bulk'] ) && $_GET['wprss-bulk'] == '1' ) {
259
  $to_delete = explode( ',', $ID );
260
+ check_admin_referer( 'blacklist-remove-selected', 'wprss_blacklist_trash' );
261
  } else {
262
  $to_delete = array( $ID );
263
  // Get the ID from the GET param
267
 
268
  // Delete the posts marked for delete
269
  foreach( $to_delete as $delete_id ) {
270
+ $post = get_post( $delete_id );
271
+ if ( $post === NULL || get_post_type( $post ) !== 'wprss_blacklist' ) continue;
272
  wp_delete_post( $delete_id, TRUE );
273
  }
274
 
includes/scripts.php CHANGED
@@ -42,6 +42,11 @@
42
  wp_enqueue_style( 'wprss-admin-styles', WPRSS_CSS . 'admin-styles.css' );
43
  wp_enqueue_style( 'wprss-fa', WPRSS_CSS . 'font-awesome.min.css' );
44
 
 
 
 
 
 
45
  wp_enqueue_script( 'wprss-admin-custom', WPRSS_JS .'admin-custom.js', array('jquery','jquery-ui-datepicker','jquery-ui-slider') );
46
  wp_localize_script( 'wprss-admin-custom', 'wprss_admin_custom', array(
47
  'failed_to_import' => __( 'Failed to import', WPRSS_TEXT_DOMAIN ),
@@ -52,6 +57,7 @@
52
  'cancel' => __( 'Cancel', WPRSS_TEXT_DOMAIN ),
53
  'blacklist_desc' => __( 'The feed items listed here will be disregarded when importing new items from your feed sources.', WPRSS_TEXT_DOMAIN ),
54
  'blacklist_remove' => __( 'Remove selected from Blacklist', WPRSS_TEXT_DOMAIN ),
 
55
  ) );
56
 
57
  wp_enqueue_script( 'jquery-ui-timepicker-addon', WPRSS_JS .'jquery-ui-timepicker-addon.js', array('jquery','jquery-ui-datepicker') );
42
  wp_enqueue_style( 'wprss-admin-styles', WPRSS_CSS . 'admin-styles.css' );
43
  wp_enqueue_style( 'wprss-fa', WPRSS_CSS . 'font-awesome.min.css' );
44
 
45
+ // Prepare the URL for removing bulk from blacklist, with a nonce
46
+ $blacklist_remove_url = admin_url( 'edit.php?wprss-bulk=1' );
47
+ $blacklist_remove_url = wp_nonce_url( $blacklist_remove_url, 'blacklist-remove-selected', 'wprss_blacklist_trash' );
48
+ $blacklist_remove_url .= '&wprss-blacklist-remove=';
49
+
50
  wp_enqueue_script( 'wprss-admin-custom', WPRSS_JS .'admin-custom.js', array('jquery','jquery-ui-datepicker','jquery-ui-slider') );
51
  wp_localize_script( 'wprss-admin-custom', 'wprss_admin_custom', array(
52
  'failed_to_import' => __( 'Failed to import', WPRSS_TEXT_DOMAIN ),
57
  'cancel' => __( 'Cancel', WPRSS_TEXT_DOMAIN ),
58
  'blacklist_desc' => __( 'The feed items listed here will be disregarded when importing new items from your feed sources.', WPRSS_TEXT_DOMAIN ),
59
  'blacklist_remove' => __( 'Remove selected from Blacklist', WPRSS_TEXT_DOMAIN ),
60
+ 'blacklist_remove_url' => $blacklist_remove_url
61
  ) );
62
 
63
  wp_enqueue_script( 'jquery-ui-timepicker-addon', WPRSS_JS .'jquery-ui-timepicker-addon.js', array('jquery','jquery-ui-datepicker') );
js/admin-custom.js CHANGED
@@ -308,7 +308,8 @@ jQuery(window).load( function(){
308
  }
309
  });
310
  var id_str = ids.join();
311
- $(this).attr('href', 'edit.php?wprss-blacklist-remove=' + id_str + '&wprss-bulk=1');
 
312
  //e.preventDefault();
313
  });
314
 
308
  }
309
  });
310
  var id_str = ids.join();
311
+ var blacklist_selected_url = wprss_admin_custom.blacklist_remove_url + id_str;
312
+ $(this).attr('href', blacklist_selected_url);
313
  //e.preventDefault();
314
  });
315
 
readme.txt CHANGED
@@ -5,7 +5,7 @@ Plugin URI: http://www.wprssaggregator.com
5
  Tags: rss, feeds, aggregation, rss to post, autoblog aggregator, rss import, feed aggregator, rss aggregator, multiple rss feeds, multi rss feeds, rss multi importer, feed import, feed import, multiple feed import, feed aggregation, rss feader, feed reader, feed to post, multiple feeds, multi feed importer, multi feed import, multi import, autoblogging, autoblogger
6
  Requires at least: 3.3
7
  Tested up to: 4.0
8
- Stable tag: 4.6.3
9
  License: GPLv2 or later
10
  The no.1 RSS feed importer for WordPress. Premium add-ons available for more functionality.
11
 
@@ -167,6 +167,12 @@ The full documentation section can be found on the [WP RSS Aggregator website](w
167
 
168
  == Changelog ==
169
 
 
 
 
 
 
 
170
  = 4.6.3 (2014-11-3) =
171
  Enhanced: Re-added the "Add New" link in the plugin's menu.
172
  Enhanced: Improved error logging.
5
  Tags: rss, feeds, aggregation, rss to post, autoblog aggregator, rss import, feed aggregator, rss aggregator, multiple rss feeds, multi rss feeds, rss multi importer, feed import, feed import, multiple feed import, feed aggregation, rss feader, feed reader, feed to post, multiple feeds, multi feed importer, multi feed import, multi import, autoblogging, autoblogger
6
  Requires at least: 3.3
7
  Tested up to: 4.0
8
+ Stable tag: 4.6.4
9
  License: GPLv2 or later
10
  The no.1 RSS feed importer for WordPress. Premium add-ons available for more functionality.
11
 
167
 
168
  == Changelog ==
169
 
170
+ = 4.6.4 (2014-11-10) =
171
+ * Enhanced: Added filters to the custom feed.
172
+ * Enhanced: Updated some styles to improve the user interface.
173
+ * Fixed bug: The "Remove selected from Blacklist" button had no nonce associated with it.
174
+ * Fixed bug: The Blacklist menu entry was not always being shown.
175
+
176
  = 4.6.3 (2014-11-3) =
177
  Enhanced: Re-added the "Add New" link in the plugin's menu.
178
  Enhanced: Improved error logging.
wp-rss-aggregator.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: WP RSS Aggregator
4
  Plugin URI: http://www.wprssaggregator.com
5
  Description: Imports and aggregates multiple RSS Feeds using SimplePie
6
- Version: 4.6.3
7
  Author: Jean Galea
8
  Author URI: http://www.wprssaggregator.com
9
  License: GPLv2
@@ -29,7 +29,7 @@
29
 
30
  /**
31
  * @package WPRSSAggregator
32
- * @version 4.6.3
33
  * @since 1.0
34
  * @author Jean Galea <info@wprssaggregator.com>
35
  * @copyright Copyright (c) 2012-2014, Jean Galea
@@ -43,7 +43,7 @@
43
 
44
  // Set the version number of the plugin.
45
  if( !defined( 'WPRSS_VERSION' ) )
46
- define( 'WPRSS_VERSION', '4.6.2', true );
47
 
48
  // Set the database version number of the plugin.
49
  if( !defined( 'WPRSS_DB_VERSION' ) )
3
  Plugin Name: WP RSS Aggregator
4
  Plugin URI: http://www.wprssaggregator.com
5
  Description: Imports and aggregates multiple RSS Feeds using SimplePie
6
+ Version: 4.6.4
7
  Author: Jean Galea
8
  Author URI: http://www.wprssaggregator.com
9
  License: GPLv2
29
 
30
  /**
31
  * @package WPRSSAggregator
32
+ * @version 4.6.4
33
  * @since 1.0
34
  * @author Jean Galea <info@wprssaggregator.com>
35
  * @copyright Copyright (c) 2012-2014, Jean Galea
43
 
44
  // Set the version number of the plugin.
45
  if( !defined( 'WPRSS_VERSION' ) )
46
+ define( 'WPRSS_VERSION', '4.6.4', true );
47
 
48
  // Set the database version number of the plugin.
49
  if( !defined( 'WPRSS_DB_VERSION' ) )