Skip to content

Fix PHP 8.1 compatibility issues and phpcs #302

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

Merged
merged 1 commit into from
May 15, 2023
Merged

Fix PHP 8.1 compatibility issues and phpcs #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 17 additions & 9 deletions admin/class-nginx-helper-admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,12 +679,20 @@ public function purge_all() {

global $nginx_purger, $wp;

$method = filter_input( INPUT_SERVER, 'REQUEST_METHOD', FILTER_SANITIZE_STRING );
$method = null;
if ( isset( $_SERVER['REQUEST_METHOD'] ) ) {
$method = wp_strip_all_tags( $_SERVER['REQUEST_METHOD'] );
}

$action = '';
if ( 'POST' === $method ) {
$action = filter_input( INPUT_POST, 'nginx_helper_action', FILTER_SANITIZE_STRING );
if ( isset( $_POST['nginx_helper_action'] ) ) {
$action = wp_strip_all_tags( $_POST['nginx_helper_action'] );
}
} else {
$action = filter_input( INPUT_GET, 'nginx_helper_action', FILTER_SANITIZE_STRING );
if ( isset( $_GET['nginx_helper_action'] ) ) {
$action = wp_strip_all_tags( $_GET['nginx_helper_action'] );
}
}

if ( empty( $action ) ) {
Expand Down Expand Up @@ -725,12 +733,12 @@ public function purge_all() {

if ( 'purge' === $action ) {

/**
* Fire an action after the entire cache has been purged whatever caching type is used.
*
* @since 2.2.2
*/
do_action( 'rt_nginx_helper_after_purge_all' );
/**
* Fire an action after the entire cache has been purged whatever caching type is used.
*
* @since 2.2.2
*/
do_action( 'rt_nginx_helper_after_purge_all' );

}

Expand Down
2 changes: 1 addition & 1 deletion admin/partials/nginx-helper-admin-display.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<div id="post-body-content">
<?php
/* Show settinhs tabs */
$current_tab = filter_input( INPUT_GET, 'tab', FILTER_SANITIZE_STRING );
$current_tab = ( isset( $_GET['tab'] ) ? wp_strip_all_tags( $_GET['tab'] ) : '' );
$current_setting_tab = ( ! empty( $current_tab ) ) ? $current_tab : 'general';

echo '<h2 class="nav-tab-wrapper">';
Expand Down
58 changes: 32 additions & 26 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 @@ -15,33 +15,39 @@
$error_log_filesize = false;

$args = array(
'enable_purge' => FILTER_SANITIZE_STRING,
'enable_stamp' => FILTER_SANITIZE_STRING,
'purge_method' => FILTER_SANITIZE_STRING,
'is_submit' => FILTER_SANITIZE_STRING,
'redis_hostname' => FILTER_SANITIZE_STRING,
'redis_port' => FILTER_SANITIZE_STRING,
'redis_prefix' => FILTER_SANITIZE_STRING,
'purge_homepage_on_edit' => FILTER_SANITIZE_STRING,
'purge_homepage_on_del' => FILTER_SANITIZE_STRING,
'purge_url' => FILTER_SANITIZE_STRING,
'log_level' => FILTER_SANITIZE_STRING,
'log_filesize' => FILTER_SANITIZE_STRING,
'smart_http_expire_save' => FILTER_SANITIZE_STRING,
'cache_method' => FILTER_SANITIZE_STRING,
'enable_map' => FILTER_SANITIZE_STRING,
'enable_log' => FILTER_SANITIZE_STRING,
'purge_archive_on_edit' => FILTER_SANITIZE_STRING,
'purge_archive_on_del' => FILTER_SANITIZE_STRING,
'purge_archive_on_new_comment' => FILTER_SANITIZE_STRING,
'purge_archive_on_deleted_comment' => FILTER_SANITIZE_STRING,
'purge_page_on_mod' => FILTER_SANITIZE_STRING,
'purge_page_on_new_comment' => FILTER_SANITIZE_STRING,
'purge_page_on_deleted_comment' => FILTER_SANITIZE_STRING,
'smart_http_expire_form_nonce' => FILTER_SANITIZE_STRING,
'enable_purge',
'enable_stamp',
'purge_method',
'is_submit',
'redis_hostname',
'redis_port',
'redis_prefix',
'purge_homepage_on_edit',
'purge_homepage_on_del',
'purge_url',
'log_level',
'log_filesize',
'smart_http_expire_save',
'cache_method',
'enable_map',
'enable_log',
'purge_archive_on_edit',
'purge_archive_on_del',
'purge_archive_on_new_comment',
'purge_archive_on_deleted_comment',
'purge_page_on_mod',
'purge_page_on_new_comment',
'purge_page_on_deleted_comment',
'smart_http_expire_form_nonce',
);

$all_inputs = filter_input_array( INPUT_POST, $args );
$all_inputs = array();

foreach ( $args as $val ) {
if ( isset( $_POST[ $val ] ) ) {
$all_inputs[ $val ] = wp_strip_all_tags( $_POST[ $val ] );
}
}

if ( isset( $all_inputs['smart_http_expire_save'] ) && wp_verify_nonce( $all_inputs['smart_http_expire_form_nonce'], 'smart-http-expire-form-nonce' ) ) {
unset( $all_inputs['smart_http_expire_save'] );
Expand Down Expand Up @@ -720,7 +726,7 @@
</table>
</div> <!-- End of .inside -->
</div>
<input type="hidden" name="smart_http_expire_form_nonce" value="<?php echo wp_create_nonce('smart-http-expire-form-nonce'); ?>"/>
<input type="hidden" name="smart_http_expire_form_nonce" value="<?php echo esc_attr( wp_create_nonce( 'smart-http-expire-form-nonce' ) ); ?>" />
<?php
submit_button( __( 'Save All Changes', 'nginx-helper' ), 'primary large', 'smart_http_expire_save', true );
?>
Expand Down