From 83f6a0be7761323ca8326b45aa857cc99a38fe28 Mon Sep 17 00:00:00 2001 From: Vaishali Agola Date: Thu, 11 Oct 2018 11:58:21 +0530 Subject: [PATCH 1/8] phpcs basic errors resolved and spacing issues resolved --- admin/class-fastcgi-purger.php | 54 ++++++- admin/class-nginx-helper-admin.php | 21 ++- admin/class-phpredis-purger.php | 51 ++++++- admin/class-predis-purger.php | 57 ++++++- admin/class-purger.php | 141 ++++++++++++++---- admin/partials/nginx-helper-admin-display.php | 11 +- .../partials/nginx-helper-general-options.php | 96 ++++++++---- .../partials/nginx-helper-sidebar-display.php | 9 +- includes/class-nginx-helper.php | 9 +- phpcs.xml | 38 +++++ 10 files changed, 387 insertions(+), 100 deletions(-) create mode 100644 phpcs.xml diff --git a/admin/class-fastcgi-purger.php b/admin/class-fastcgi-purger.php index d93cdf16..5b315325 100644 --- a/admin/class-fastcgi-purger.php +++ b/admin/class-fastcgi-purger.php @@ -1,5 +1,4 @@ log( '- Purging URL | ' . $url ); - $parse = parse_url( $url ); + $parse = wp_parse_url( $url ); if ( ! isset( $parse['path'] ) ) { $parse['path'] = ''; } switch ( $nginx_helper_admin->options['purge_method'] ) { + case 'unlink_files': $_url_purge_base = $parse['scheme'] . '://' . $parse['host'] . $parse['path']; $_url_purge = $_url_purge_base; - if ( isset( $parse['query'] ) && $parse['query'] != '' ) { + if ( isset( $parse['query'] ) && $parse['query'] !== '' ) { $_url_purge .= '?' . $parse['query']; } @@ -48,32 +55,42 @@ public function purgeUrl( $url, $feed = true ) { $this->_delete_cache_file_for( $feed_url . 'rdf/' ); } break; + case 'get_request': // Go to default case + default: $_url_purge_base = $parse['scheme'] . '://' . $parse['host'] . '/purge' . $parse['path']; $_url_purge = $_url_purge_base; - if ( isset( $parse['query'] ) && '' != $parse['query'] ) { + if ( isset( $parse['query'] ) && '' !== $parse['query'] ) { $_url_purge .= '?' . $parse['query']; } $this->_do_remote_get( $_url_purge ); if ( $feed ) { + $feed_url = rtrim( $_url_purge_base, '/' ) . '/feed/'; $this->_do_remote_get( $feed_url ); $this->_do_remote_get( $feed_url . 'atom/' ); $this->_do_remote_get( $feed_url . 'rdf/' ); + } break; + } + } + /** + * Function to custom purge urls. + */ public function customPurgeUrls() { + global $nginx_helper_admin; - $parse = parse_url( site_url() ); + $parse = wp_parse_url( site_url() ); $purge_urls = isset( $nginx_helper_admin->options['purge_url'] ) && ! empty( $nginx_helper_admin->options['purge_url'] ) ? explode( "\r\n", $nginx_helper_admin->options['purge_url'] ) : array(); @@ -82,45 +99,68 @@ public function customPurgeUrls() { $purge_urls = apply_filters( 'rt_nginx_helper_purge_urls', $purge_urls, false ); switch ( $nginx_helper_admin->options['purge_method'] ) { + case 'unlink_files': $_url_purge_base = $parse['scheme'] . '://' . $parse['host']; if ( is_array( $purge_urls ) && ! empty( $purge_urls ) ) { + foreach ( $purge_urls as $purge_url ) { + $purge_url = trim( $purge_url ); if ( strpos( $purge_url, '*' ) === false ) { + $purge_url = $_url_purge_base . $purge_url; - $this->log( '- Purging URL | ' . $url ); + $this->log( '- Purging URL | ' . $purge_url ); $this->_delete_cache_file_for( $purge_url ); + } + } + } break; + case 'get_request': // Go to default case + default: $_url_purge_base = $parse['scheme'] . '://' . $parse['host'] . '/purge'; if ( is_array( $purge_urls ) && ! empty( $purge_urls ) ) { + foreach ( $purge_urls as $purge_url ) { + $purge_url = trim( $purge_url ); if ( strpos( $purge_url, '*' ) === false ) { + $purge_url = $_url_purge_base . $purge_url; - $this->log( '- Purging URL | ' . $url ); + $this->log( '- Purging URL | ' . $purge_url ); $this->_do_remote_get( $purge_url ); + } + } + } break; + } + } + /** + * Purge everything. + */ public function purgeAll() { + $this->unlinkRecursive( RT_WP_NGINX_HELPER_CACHE_PATH, false ); $this->log( '* * * * *' ); $this->log( '* Purged Everything!' ); $this->log( '* * * * *' ); + } + } diff --git a/admin/class-nginx-helper-admin.php b/admin/class-nginx-helper-admin.php index 5e06365f..f240dfb0 100644 --- a/admin/class-nginx-helper-admin.php +++ b/admin/class-nginx-helper-admin.php @@ -1,5 +1,4 @@