Skip to content

Commit 4b82559

Browse files
Soare-Robert-DanielSoare-Robert-Daniel
committed
refactor: move some options to misc
- User Agent - Delete the posts created from all feeds, after a number of days - Delete attached featured image - Deprecate Headers tabs Reference: Codeinwp/feedzy-rss-feeds-pro#852
1 parent 6ae9c69 commit 4b82559

File tree

4 files changed

+53
-72
lines changed

4 files changed

+53
-72
lines changed

‎includes/admin/feedzy-rss-feeds-admin.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1446,21 +1446,16 @@ function ( $item ) {
14461446
$auto_categories = array_values( $auto_categories );
14471447

14481448
$settings['general']['disable-default-style'] = isset( $_POST['disable-default-style'] ) ? absint( wp_unslash( $_POST['disable-default-style'] ) ) : '';
1449-
$settings['general']['feedzy-delete-days'] = isset( $_POST['feedzy-delete-days'] ) ? absint( wp_unslash( $_POST['feedzy-delete-days'] ) ) : '';
14501449
$settings['general']['default-thumbnail-id'] = isset( $_POST['default-thumbnail-id'] ) ? absint( wp_unslash( $_POST['default-thumbnail-id'] ) ) : 0;
14511450
$settings['general']['fz_cron_schedule'] = isset( $_POST['fz_cron_schedule'] ) ? sanitize_text_field( wp_unslash( $_POST['fz_cron_schedule'] ) ) : 'hourly';
14521451
$settings['general']['auto-categories'] = array_values( $auto_categories );
14531452
$settings['general']['feedzy-telemetry'] = isset( $_POST['feedzy-telemetry'] ) ? absint( wp_unslash( $_POST['feedzy-telemetry'] ) ) : '';
1454-
$settings['general']['feedzy-delete-media'] = isset( $_POST['feedzy-delete-media'] ) ? absint( wp_unslash( $_POST['feedzy-delete-media'] ) ) : '';
14551453

14561454
$settings['logs']['level'] = isset( $_POST['logs-logging-level'] ) ? sanitize_text_field( wp_unslash( $_POST['logs-logging-level'] ) ) : '';
14571455
$settings['logs']['email'] = isset( $_POST['feedzy-email-error-address'] ) ? sanitize_email( wp_unslash( $_POST['feedzy-email-error-address'] ) ) : '';
14581456
$settings['logs']['send_email_report'] = isset( $_POST['feedzy-email-error-enabled'] ) ? absint( wp_unslash( $_POST['feedzy-email-error-enabled'] ) ) : '';
14591457
$settings['logs']['email_frequency'] = isset( $_POST['logs-email-frequency'] ) ? sanitize_text_field( wp_unslash( $_POST['logs-email-frequency'] ) ) : '';
14601458
break;
1461-
case 'headers':
1462-
$settings['header']['user-agent'] = isset( $_POST['user-agent'] ) ? sanitize_text_field( wp_unslash( $_POST['user-agent'] ) ) : '';
1463-
break;
14641459
case 'proxy':
14651460
$settings['proxy'] = array(
14661461
'host' => isset( $_POST['proxy-host'] ) ? sanitize_text_field( wp_unslash( $_POST['proxy-host'] ) ) : '',

‎includes/admin/feedzy-rss-feeds-import.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3358,8 +3358,11 @@ public function save_tab_settings( $settings, $tab ) {
33583358
}
33593359

33603360
if ( 'misc' === $tab ) {
3361-
$settings['canonical'] = isset( $_POST['canonical'] ) ? absint( $_POST['canonical'] ) : 0;
3362-
$settings['general']['rss-feeds'] = isset( $_POST['rss-feeds'] ) ? absint( $_POST['rss-feeds'] ) : '';
3361+
$settings['canonical'] = isset( $_POST['canonical'] ) ? absint( $_POST['canonical'] ) : 0;
3362+
$settings['general']['rss-feeds'] = isset( $_POST['rss-feeds'] ) ? absint( $_POST['rss-feeds'] ) : '';
3363+
$settings['header']['user-agent'] = isset( $_POST['user-agent'] ) ? sanitize_text_field( wp_unslash( $_POST['user-agent'] ) ) : '';
3364+
$settings['general']['feedzy-delete-days'] = isset( $_POST['feedzy-delete-days'] ) ? absint( wp_unslash( $_POST['feedzy-delete-days'] ) ) : '';
3365+
$settings['general']['feedzy-delete-media'] = isset( $_POST['feedzy-delete-media'] ) ? absint( wp_unslash( $_POST['feedzy-delete-media'] ) ) : '';
33633366
}
33643367

33653368
return $settings;

‎includes/layouts/settings.php‎

Lines changed: 1 addition & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,6 @@ class="<?php echo 'general' === $active_tab ? esc_attr( 'active' ) : ''; ?>"
7575
<?php esc_html_e( 'General', 'feedzy-rss-feeds' ); ?>
7676
</a>
7777
</li>
78-
<li>
79-
<a
80-
href="<?php echo esc_url( admin_url( 'admin.php?page=feedzy-settings&tab=headers' ) ); ?>"
81-
class="<?php echo 'headers' === $active_tab ? esc_attr( 'active' ) : ''; ?>"
82-
>
83-
<?php esc_html_e( 'Headers', 'feedzy-rss-feeds' ); ?>
84-
</a>
85-
</li>
8678
<li>
8779
<a
8880
href="<?php echo esc_url( admin_url( 'admin.php?page=feedzy-settings&tab=proxy' ) ); ?>"
@@ -136,12 +128,7 @@ class="<?php echo $_tab === $active_tab ? esc_attr( 'active' ) : ''; ?>"
136128
if ( isset( $settings['general']['disable-default-style'] ) && 1 === intval( $settings['general']['disable-default-style'] ) ) {
137129
$disble_default_style = 1;
138130
}
139-
$delete_media = 0;
140-
if ( isset( $settings['general']['feedzy-delete-media'] ) && 1 === intval( $settings['general']['feedzy-delete-media'] ) ) {
141-
$delete_media = 1;
142-
}
143-
144-
$feedzy_delete_days = isset( $settings['general']['feedzy-delete-days'] ) ? $settings['general']['feedzy-delete-days'] : 0;
131+
145132
$default_thumbnail_id = isset( $settings['general']['default-thumbnail-id'] ) ? $settings['general']['default-thumbnail-id'] : 0;
146133
$mapped_categories = isset( $settings['general']['auto-categories'] ) && ! empty( $settings['general']['auto-categories'] ) ? $settings['general']['auto-categories'] : array(
147134
array(
@@ -238,23 +225,6 @@ class="btn btn-outline-primary<?php echo 0 === $index ? ' disabled' : ''; ?>" <?
238225
</div>
239226
</div>
240227
<?php if ( feedzy_is_pro() ) : ?>
241-
<div class="form-block">
242-
<div class="fz-form-group">
243-
<label class="form-label"><?php esc_html_e( 'Delete the posts created from all feeds, after a number of days', 'feedzy-rss-feeds' ); ?></label>
244-
<input type="number" min="0" max="9999" id="feedzy_delete_days" name="feedzy-delete-days" class="form-control" value="<?php echo esc_attr( $feedzy_delete_days ); ?>"/>
245-
<div class="help-text pt-8"><?php esc_html_e( 'Helpful if you want to remove stale or old items automatically. If you choose 0, it will be considered the individual import setting.', 'feedzy-rss-feeds' ); ?></div>
246-
</div>
247-
</div>
248-
<div class="form-block">
249-
<div class="fz-form-switch pb-0">
250-
<input type="checkbox" id="feedzy-delete-media" class="fz-switch-toggle" name="feedzy-delete-media"
251-
value="1" <?php checked( 1, $delete_media ); ?> />
252-
<label for="feedzy-delete-media" class="form-label"><?php esc_html_e( 'Delete attached featured image', 'feedzy-rss-feeds' ); ?></label>
253-
</div>
254-
<div class="fz-form-group">
255-
<div class="help-text pt-8"><?php esc_html_e( 'Helpful if you want to delete attached featured image when posts are automatically deleted.', 'feedzy-rss-feeds' ); ?></div>
256-
</div>
257-
</div>
258228
<div class="form-block">
259229
<div class="fz-form-row">
260230
<div class="fz-form-col-6">
@@ -446,40 +416,6 @@ class="fz-form-group fz-log-email-freq <?php echo esc_attr( ! $email_error_enabl
446416
</div>
447417
<?php
448418
break;
449-
case 'headers':
450-
?>
451-
<div class="fz-form-wrap">
452-
<div class="feedzy-helper-notice">
453-
<h5 class="feedzy-helper-notice__title">
454-
<?php esc_html_e( 'Headers Configuration', 'feedzy-rss-feeds' ); ?>
455-
</h5>
456-
<p>
457-
<?php
458-
esc_html_e(
459-
'Use this section to add custom HTTP headers (e.g., User-Agent). This can help bypass feed access restrictions, simulate browser requests, or resolve issues where feeds return incomplete or blocked content.',
460-
'feedzy-rss-feeds'
461-
);
462-
?>
463-
<a href="<?php echo esc_url( $help_btn_url ); ?>" target="_blank">
464-
<?php esc_html_e( 'Learn more about headers here.', 'feedzy-rss-feeds' ); ?>
465-
</a>
466-
</p>
467-
</div>
468-
<div class="form-block">
469-
<div class="fz-form-group">
470-
<label class="form-label"><?php esc_html_e( 'User Agent', 'feedzy-rss-feeds' ); ?></label>
471-
<input
472-
type="text"
473-
class="form-control"
474-
name="user-agent"
475-
placeholder="<?php esc_attr_e( 'Add the user agent string', 'feedzy-rss-feeds' ); ?>"
476-
value="<?php echo isset( $settings['header']['user-agent'] ) ? esc_attr( $settings['header']['user-agent'] ) : ''; ?>"
477-
>
478-
</div>
479-
</div>
480-
</div>
481-
<?php
482-
break;
483419
case 'proxy':
484420
?>
485421
<div class="fz-form-wrap">

‎includes/views/misc-view.php‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,51 @@
4646
<div class="help-text pb-8"><?php esc_html_e( 'This setting controls whether there are featured images available in the RSS XML Feed of your own website.', 'feedzy-rss-feeds' ); ?></div>
4747
</div>
4848
</div>
49+
<div class="form-block">
50+
<div class="fz-form-group">
51+
<label class="form-label">
52+
<?php esc_html_e( 'User Agent', 'feedzy-rss-feeds' ); ?>
53+
</label>
54+
<input
55+
type="text"
56+
class="form-control"
57+
name="user-agent"
58+
placeholder="<?php esc_attr_e( 'Add the user agent string', 'feedzy-rss-feeds' ); ?>"
59+
value="<?php echo isset( $this->free_settings['header']['user-agent'] ) ? esc_attr( $this->free_settings['header']['user-agent'] ) : ''; ?>"
60+
>
61+
</div>
62+
<div class="help-text pt-8">
63+
<?php esc_html_e( 'Specify a custom User-Agent string for feed requests. Some feed providers block automated requests. If you\'re experiencing issues accessing a feed, try setting this to a common browser string like "Mozilla/5.0". In most cases, you can leave this field empty.', 'feedzy-rss-feeds' ); ?>
64+
</div>
65+
</div>
66+
<?php if ( feedzy_is_pro() ) : ?>
67+
<?php
68+
$delete_media = 0;
69+
if (
70+
isset( $this->free_settings['general']['feedzy-delete-media'] ) &&
71+
1 === intval( $this->free_settings['general']['feedzy-delete-media'] )
72+
) {
73+
$delete_media = 1;
74+
}
75+
76+
$feedzy_delete_days = isset( $this->free_settings['general']['feedzy-delete-days'] ) ? $this->free_settings['general']['feedzy-delete-days'] : 0;
77+
?>
78+
<div class="form-block">
79+
<div class="fz-form-group">
80+
<label class="form-label"><?php esc_html_e( 'Delete the posts created from all feeds, after a number of days', 'feedzy-rss-feeds' ); ?></label>
81+
<input type="number" min="0" max="9999" id="feedzy_delete_days" name="feedzy-delete-days" class="form-control" value="<?php echo esc_attr( $feedzy_delete_days ); ?>"/>
82+
<div class="help-text pt-8"><?php esc_html_e( 'Helpful if you want to remove stale or old items automatically. If you choose 0, it will be considered the individual import setting.', 'feedzy-rss-feeds' ); ?></div>
83+
</div>
84+
</div>
85+
<div class="form-block">
86+
<div class="fz-form-switch pb-0">
87+
<input type="checkbox" id="feedzy-delete-media" class="fz-switch-toggle" name="feedzy-delete-media"
88+
value="1" <?php checked( 1, $delete_media ); ?> />
89+
<label for="feedzy-delete-media" class="form-label"><?php esc_html_e( 'Delete attached featured image', 'feedzy-rss-feeds' ); ?></label>
90+
</div>
91+
<div class="fz-form-group">
92+
<div class="help-text pt-8"><?php esc_html_e( 'Helpful if you want to delete attached featured image when posts are automatically deleted.', 'feedzy-rss-feeds' ); ?></div>
93+
</div>
94+
</div>
95+
<?php endif; ?>
4996
</div>

0 commit comments

Comments
 (0)