@@ -396,6 +396,9 @@ public function feedzy_import_feed_options() {
396
396
$ mark_duplicate_tag = get_post_meta ( $ post ->ID , 'mark_duplicate_tag ' , true );
397
397
$ import_post_author = get_post_meta ( $ post ->ID , 'import_post_author ' , true );
398
398
$ filter_conditions = get_post_meta ( $ post ->ID , 'filter_conditions ' , true );
399
+ $ import_remove_html = get_post_meta ( $ post ->ID , 'import_remove_html ' , true );
400
+ $ import_remove_html = 'yes ' === $ import_remove_html ? 'checked ' : '' ;
401
+ $ import_order = get_post_meta ( $ post ->ID , 'import_order ' , true );
399
402
400
403
if ( empty ( $ filter_conditions ) ) {
401
404
$ filter_conditions = apply_filters (
@@ -457,16 +460,6 @@ public function feedzy_import_feed_options() {
457
460
if ( empty ( $ import_feed_limit ) ) {
458
461
$ import_feed_limit = 10 ;
459
462
}
460
- $ import_feed_delete_days = intval ( get_post_meta ( $ post ->ID , 'import_feed_delete_days ' , true ) );
461
- if ( empty ( $ import_feed_delete_days ) ) {
462
- $ import_feed_delete_days = ! empty ( $ this ->free_settings ['general ' ]['feedzy-delete-days ' ] ) ? (int ) $ this ->free_settings ['general ' ]['feedzy-delete-days ' ] : 0 ;
463
- }
464
-
465
- $ import_feed_delete_media = get_post_meta ( $ post ->ID , 'import_feed_delete_media ' , true );
466
- if ( empty ( $ import_feed_delete_media ) ) {
467
- $ import_feed_delete_media = ! empty ( $ this ->free_settings ['general ' ]['feedzy-delete-media ' ] ) ? 'yes ' : 'no ' ;
468
- }
469
- $ import_feed_delete_media = 'yes ' === $ import_feed_delete_media ? 'checked ' : '' ;
470
463
471
464
$ default_thumbnail_id = 0 ;
472
465
if ( feedzy_is_pro () ) {
@@ -607,15 +600,14 @@ public function save_feedzy_import_feed_meta( $post_id, $post ) {
607
600
$ data_meta ['import_auto_translation ' ] = isset ( $ data_meta ['import_auto_translation ' ] ) ? $ data_meta ['import_auto_translation ' ] : 'no ' ;
608
601
// Check feeds external image URL checkbox checked OR not.
609
602
$ data_meta ['import_use_external_image ' ] = isset ( $ data_meta ['import_use_external_image ' ] ) ? $ data_meta ['import_use_external_image ' ] : 'no ' ;
603
+ // Check feeds remove html checkbox checked OR not.
604
+ $ data_meta ['import_remove_html ' ] = isset ( $ data_meta ['import_remove_html ' ] ) ? $ data_meta ['import_remove_html ' ] : 'no ' ;
610
605
611
606
// If it is filter_conditions we want to escape it.
612
607
if ( isset ( $ data_meta ['filter_conditions ' ] ) ) {
613
608
$ data_meta ['filter_conditions ' ] = wp_slash ( $ data_meta ['filter_conditions ' ] );
614
609
}
615
610
616
- // Check feeds remove attached media checkbox checked OR not.
617
- $ data_meta ['import_feed_delete_media ' ] = isset ( $ data_meta ['import_feed_delete_media ' ] ) ? $ data_meta ['import_feed_delete_media ' ] : 'no ' ;
618
-
619
611
// $data_meta['feedzy_post_author'] should be the author username. We convert it to the author ID.
620
612
if ( ! empty ( $ data_meta ['import_post_author ' ] ) ) {
621
613
$ author = get_user_by ( 'login ' , $ data_meta ['import_post_author ' ] );
@@ -1491,6 +1483,8 @@ private function run_job( $job, $max ) {
1491
1483
$ mark_duplicate_tag = get_post_meta ( $ job ->ID , 'mark_duplicate_tag ' , true );
1492
1484
$ mark_duplicate_tag = feedzy_is_pro () && ! empty ( $ mark_duplicate_tag ) ? preg_replace ( '/[\[\]#]/ ' , '' , $ mark_duplicate_tag ) : '' ;
1493
1485
$ max = $ import_feed_limit ;
1486
+ $ import_remove_html = get_post_meta ( $ job ->ID , 'import_remove_html ' , true );
1487
+ $ import_order = get_post_meta ( $ job ->ID , 'import_order ' , true );
1494
1488
1495
1489
if ( empty ( $ filter_conditions ) ) {
1496
1490
$ filter_conditions = apply_filters (
@@ -1565,6 +1559,7 @@ private function run_job( $job, $max ) {
1565
1559
'multiple_meta ' => 'no ' ,
1566
1560
'refresh ' => '55_mins ' ,
1567
1561
'filters ' => $ filter_conditions ,
1562
+ 'sort ' => $ import_order ,
1568
1563
),
1569
1564
$ job
1570
1565
);
@@ -1964,6 +1959,11 @@ function ( $attr, $key ) {
1964
1959
1965
1960
$ post_author = ! empty ( $ import_post_author ) ? $ import_post_author : $ job ->post_author ;
1966
1961
1962
+ // strip all HTML tag when remove html option is enabled.
1963
+ if ( 'yes ' === $ import_remove_html ) {
1964
+ $ post_content = wp_strip_all_tags ( $ post_content );
1965
+ }
1966
+
1967
1967
$ new_post = apply_filters (
1968
1968
'feedzy_insert_post_args ' ,
1969
1969
array (
@@ -2324,7 +2324,7 @@ public function get_job_feed( $options, $import_content = null, $raw_feed_also =
2324
2324
$ feed = $ admin ->fetch_feed ( $ feed_url , isset ( $ options ['refresh ' ] ) ? $ options ['refresh ' ] : '12_hours ' , $ options );
2325
2325
2326
2326
$ feed ->force_feed ( true );
2327
- $ feed ->enable_order_by_date ( false );
2327
+ $ feed ->enable_order_by_date ( isset ( $ options [ ' sort ' ] ) && ! empty ( $ options [ ' sort ' ] ) );
2328
2328
2329
2329
if ( is_string ( $ feed ) ) {
2330
2330
return array ();
0 commit comments