Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GH-281: New filter for $feed [Develop] #294

Merged
merged 10 commits into from
Apr 5, 2024
Merged

GH-281: New filter for $feed [Develop] #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
af2253b
feat: adds checkbox for skipping feeds
Pathan-Amaankhan Feb 7, 2023
d894f3e
Merge pull request #318 from rtCamp/develop
vishalkakadiya Jan 18, 2024
21815e8
Merge branches 'master' and 'feature/skip-feeds-option' of github.com…
Pathan-Amaankhan Mar 25, 2024
ccbbd93
fix: fixes spacing
Pathan-Amaankhan Mar 25, 2024
eba37e5
fix: fixes spacing
Pathan-Amaankhan Mar 25, 2024
85db7e2
fix: fixes spacing
Pathan-Amaankhan Mar 25, 2024
1c2eafc
fix: fixes spacing
Pathan-Amaankhan Mar 25, 2024
1bcedea
fix: fixes spacing
Pathan-Amaankhan Mar 25, 2024
01424b0
refactor: makes 'purge_feeds' disable by default
Pathan-Amaankhan Mar 25, 2024
5d779c4
refactor: updates default options handling logic
Pathan-Amaankhan Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions admin/class-fastcgi-purger.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function purge_url( $url, $feed = true ) {

$this->delete_cache_file_for( $_url_purge );

if ( $feed ) {
if ( $feed && ! empty( $nginx_helper_admin->options['purge_feeds'] ) ) {

$feed_url = rtrim( $_url_purge_base, '/' ) . '/feed/';
$this->delete_cache_file_for( $feed_url );
Expand All @@ -79,7 +79,7 @@ public function purge_url( $url, $feed = true ) {

$this->do_remote_get( $_url_purge );

if ( $feed ) {
if ( $feed && ! empty( $nginx_helper_admin->options['purge_feeds'] ) ) {

$feed_url = rtrim( $_url_purge_base, '/' ) . '/feed/';
$this->do_remote_get( $feed_url );
Expand Down
1 change: 1 addition & 0 deletions admin/class-nginx-helper-admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ public function nginx_helper_default_settings() {
'purge_page_on_mod' => 1,
'purge_page_on_new_comment' => 1,
'purge_page_on_deleted_comment' => 1,
'purge_feeds' => 1,
'redis_hostname' => '127.0.0.1',
'redis_port' => '6379',
'redis_prefix' => 'nginx-cache:',
Expand Down
45 changes: 45 additions & 0 deletions admin/partials/nginx-helper-general-options.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
'purge_page_on_mod',
'purge_page_on_new_comment',
'purge_page_on_deleted_comment',
'purge_feeds',
'smart_http_expire_form_nonce',
);

Expand All @@ -58,6 +59,18 @@
$nginx_helper_admin->nginx_helper_default_settings()
);

$site_options = get_site_option( 'rt_wp_nginx_helper_options', array() );

// Uncheck checkbox fields whose default value is `1` but user has unchecked.
foreach ( $nginx_helper_admin->nginx_helper_default_settings() as $default_setting_field => $default_setting_value ) {

if ( 1 === $default_setting_value && isset( $site_options[ $default_setting_field ] ) && empty( $all_inputs[ $default_setting_field ] ) ) {

$nginx_settings[ $default_setting_field ] = 0;

}
}

if ( ( ! is_numeric( $nginx_settings['log_filesize'] ) ) || ( empty( $nginx_settings['log_filesize'] ) ) ) {
$error_log_filesize = __( 'Log file size must be a number.', 'nginx-helper' );
unset( $nginx_settings['log_filesize'] );
Expand Down Expand Up @@ -496,6 +509,38 @@
</td>
</tr>
</table>
<table class="form-table rtnginx-table">
<tr valign="top">
<th scope="row">
<h4>
<?php esc_html_e( 'Purge Feeds:', 'nginx-helper' ); ?>
</h4>
</th>
<td>
<fieldset>
<legend class="screen-reader-text">
<span>
&nbsp;
<?php
esc_html_e( 'purge feeds', 'nginx-helper' );
?>
</span>
</legend>
<label for="purge_feeds">
<input type="checkbox" value="1" id="purge_feeds" name="purge_feeds" <?php checked( $nginx_helper_settings['purge_feeds'], 1 ); ?> />
&nbsp;
<?php
echo wp_kses(
__( 'purge <strong>feeds</strong> along with <strong>posts</strong> & <strong>pages</strong>.', 'nginx-helper' ),
array( 'strong' => array() )
);
?>
</label>
<br />
</fieldset>
</td>
</tr>
</table>
<table class="form-table rtnginx-table">
<tr valign="top">
<th scope="row">
Expand Down
Loading