-
\ No newline at end of file
+ - -
-
-
-
-+ +
+
+
+
+
diff --git a/admin/partials/nginx-helper-general-options.php b/admin/partials/nginx-helper-general-options.php
index 84ff30c1..ae1ebfd8 100644
--- a/admin/partials/nginx-helper-general-options.php
+++ b/admin/partials/nginx-helper-general-options.php
@@ -4,588 +4,590 @@
*
* This file is used to markup the admin-facing aspects of the plugin.
*
- * @link http://example.com
* @since 2.0.0
*
* @package nginx-helper
* @subpackage nginx-helper/admin/partials
*/
+
global $nginx_helper_admin;
$error_log_filesize = false;
-if( isset( $_POST['smart_http_expire_save'] ) ) {
- unset( $_POST['smart_http_expire_save'] );
- unset( $_POST['is_submit'] );
+if ( isset( $_POST['smart_http_expire_save'] ) ) {
+ unset( $_POST['smart_http_expire_save'] );
+ unset( $_POST['is_submit'] );
- $nginx_settings = wp_parse_args(
- $_POST,
- $nginx_helper_admin->nginx_helper_default_settings()
- );
+ $nginx_settings = wp_parse_args(
+ $_POST,
+ $nginx_helper_admin->nginx_helper_default_settings()
+ );
- 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'] );
- }
+ 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'] );
+ }
- if ( $nginx_settings['enable_map'] ) {
- $nginx_helper_admin->update_map();
- }
+ if ( $nginx_settings['enable_map'] ) {
+ $nginx_helper_admin->update_map();
+ }
- update_site_option( 'rt_wp_nginx_helper_options', $nginx_settings );
+ update_site_option( 'rt_wp_nginx_helper_options', $nginx_settings );
- echo '' . __( 'Settings saved.', 'nginx-helper' ) . '
' . esc_html__( 'Settings saved.', 'nginx-helper' ) . '
-
- -
-
-
+ - free support forum.', - 'nginx-helper'), - 'http://rtcamp.com/support/forum/wordpress-nginx/' - ); - ?> -
-+ +
+
+
+ free support forum.', + 'nginx-helper' + ), + 'http://rtcamp.com/support/forum/wordpress-nginx/' + ); + ?> +
+
-
- ; ?>/images/wpspin_light.gif)
-
\ No newline at end of file
+ -
+
 ); ?>/images/wpspin_light.gif)
+ +
+ + diff --git a/admin/predis.php b/admin/predis.php index 48399dff..040065c6 100644 --- a/admin/predis.php +++ b/admin/predis.php @@ -15200,4 +15200,3 @@ protected function getReadOnlyOperations() } /* --------------------------------------------------------------------------- */ - diff --git a/composer.json b/composer.json new file mode 100644 index 00000000..f215446d --- /dev/null +++ b/composer.json @@ -0,0 +1,28 @@ +{ + "name": "rtcamp/nginx-helper", + "description": "Cleans nginx's fastcgi/proxy cache or redis-cache whenever a post is edited/published. Also does a few more things.", + "keywords": ["wordpress", "plugin", "nginx", "nginx-helper", "fastcgi", "redis-cache", "redis", "cache"], + "homepage": "https://rtcamp.com/nginx-helper/", + "license": "GPL-2.0+", + "authors": [{ + "name": "rtCamp", + "email": "support@rtcamp.com", + "homepage": "https://rtcamp.com" + }], + "minimum-stability": "dev", + "prefer-stable": true, + "type": "wordpress-plugin", + "support": { + "issues": "https://github.com/rtCamp/nginx-helper/issues", + "forum": "https://wordpress.org/support/plugin/nginx-helper", + "wiki": "https://github.com/rtCamp/nginx-helper/wiki", + "source": "https://github.com/rtCamp/nginx-helper/" + }, + "require": { + "php": ">=5.3.2", + "composer/installers": "^1.0" + }, + "require-dev": { + "wpreadme2markdown/wpreadme2markdown": "*" + } +} diff --git a/composer.lock b/composer.lock new file mode 100644 index 00000000..589b0711 --- /dev/null +++ b/composer.lock @@ -0,0 +1,200 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "This file is @generated automatically" + ], + "hash": "f8ee8d46fadaee8c9cc194ef126e7404", + "packages": [ + { + "name": "composer/installers", + "version": "v1.0.6", + "source": { + "type": "git", + "url": "https://github.com/composer/installers.git", + "reference": "b3bd071ea114a57212c75aa6a2eef5cfe0cc798f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/installers/zipball/b3bd071ea114a57212c75aa6a2eef5cfe0cc798f", + "reference": "b3bd071ea114a57212c75aa6a2eef5cfe0cc798f", + "shasum": "" + }, + "replace": { + "shama/baton": "*" + }, + "require-dev": { + "composer/composer": "1.0.*@dev", + "phpunit/phpunit": "3.7.*" + }, + "type": "composer-installer", + "extra": { + "class": "Composer\\Installers\\Installer", + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-0": { + "Composer\\Installers\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kyle Robinson Young", + "email": "kyle@dontkry.com", + "homepage": "https://github.com/shama", + "role": "Developer" + } + ], + "description": "A multi-framework Composer library installer", + "homepage": "http://composer.github.com/installers/", + "keywords": [ + "TYPO3 CMS", + "TYPO3 Flow", + "TYPO3 Neos", + "agl", + "cakephp", + "codeigniter", + "drupal", + "fuelphp", + "installer", + "joomla", + "kohana", + "laravel", + "li3", + "lithium", + "mako", + "modulework", + "phpbb", + "ppi", + "silverstripe", + "symfony", + "wordpress", + "zend" + ], + "time": "2013-08-20 04:37:09" + } + ], + "packages-dev": [ + { + "name": "symfony/console", + "version": "v2.7.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/Console.git", + "reference": "564398bc1f33faf92fc2ec86859983d30eb81806" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Console/zipball/564398bc1f33faf92fc2ec86859983d30eb81806", + "reference": "564398bc1f33faf92fc2ec86859983d30eb81806", + "shasum": "" + }, + "require": { + "php": ">=5.3.9" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/event-dispatcher": "~2.1", + "symfony/phpunit-bridge": "~2.7", + "symfony/process": "~2.1" + }, + "suggest": { + "psr/log": "For using the console logger", + "symfony/event-dispatcher": "", + "symfony/process": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Console\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Console Component", + "homepage": "https://symfony.com", + "time": "2015-06-10 15:30:22" + }, + { + "name": "wpreadme2markdown/wpreadme2markdown", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/benbalter/WP-Readme-to-Github-Markdown.git", + "reference": "dceae108111232949affc9107c98276c6fa6c98f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/benbalter/WP-Readme-to-Github-Markdown/zipball/dceae108111232949affc9107c98276c6fa6c98f", + "reference": "dceae108111232949affc9107c98276c6fa6c98f", + "shasum": "" + }, + "require": { + "php": ">= 5.3.3", + "symfony/console": "~2.4" + }, + "bin": [ + "bin/wp2md" + ], + "type": "library", + "autoload": { + "psr-4": { + "WPReadme2Markdown\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christian Archer", + "email": "chrstnarchr@aol.com" + }, + { + "name": "Benjamin J. Balter" + } + ], + "description": "Convert WordPress Plugin readme.txt to Markdown", + "keywords": [ + "converter", + "markdown", + "readme", + "wordpress" + ], + "time": "2014-05-28 21:28:31" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": { + "php": ">=5.3.2" + }, + "platform-dev": [] +} diff --git a/deploy.sh b/deploy.sh new file mode 100644 index 00000000..53cdbb05 --- /dev/null +++ b/deploy.sh @@ -0,0 +1,95 @@ +#! /bin/bash +# A modification of Dean Clatworthy's deploy script as found here: https://github.com/deanc/wordpress-plugin-git-svn +# The difference is that this script lives in the plugin's git repo & doesn't require an existing SVN repo. + +# main config +PLUGINSLUG="nginx-helper" +MAINFILE="nginx-helper.php" # this should be the name of your main php file in the wordpress plugin +#SVNUSER="rtcamp" # your svn username + + +##### YOU CAN STOP EDITING HERE ##### +CURRENTDIR=`pwd` + +# git config +GITPATH="$CURRENTDIR/" # this file should be in the base of your git repository + +# svn config +SVNPATH="/tmp/$PLUGINSLUG" # path to a temp SVN repo. No trailing slash required and don't add trunk. +SVNURL="https://plugins.svn.wordpress.org/$PLUGINSLUG/" # Remote SVN repo on wordpress.org, with no trailing slash + +# Detect svn username based on url +SVNUSER=$(cat ~/.subversion/auth/svn.simple/* | grep -A4 $(echo $SVNURL | awk -F// '{print $2}' | cut -d'/' -f1) | tail -n1) +if [ -z "$SVNUSER" ] +then + SVNUSER="chandrapatel" +fi + + +# Let's begin... +echo ".........................................." +echo +echo "Preparing to deploy WordPress plugin" +echo +echo ".........................................." +echo + +# Check version in readme.txt is the same as plugin file +NEWVERSION1=`grep "^Stable tag" $GITPATH/readme.txt | awk -F' ' '{print $3}'` +echo "readme version: $NEWVERSION1" +#NEWVERSION2=`grep "^Version" $GITPATH/$MAINFILE | awk -F' ' '{print $2}'` +NEWVERSION2=`grep -i "Version" $GITPATH/$MAINFILE | head -n1 | awk -F':' '{print $2}' | awk -F' ' '{print $1}'` +echo "$MAINFILE version: $NEWVERSION2" + +if [ "$NEWVERSION1" != "$NEWVERSION2" ]; then echo "Versions don't match. Exiting...."; exit 1; fi + +echo "Versions match in readme.txt and PHP file. Let's proceed..." + +cd $GITPATH +bash readme.sh $SVNURL +git add README.md +echo -e "Enter a commit message for this new version: \c" +read COMMITMSG +git commit -am "$COMMITMSG" + +echo "Tagging new version in git" +git tag -a "$NEWVERSION1" -m "Tagging version $NEWVERSION1" + +echo "Pushing latest commit to origin, with tags" +git push origin master +git push origin master --tags + +echo +echo "Creating local copy of SVN repo ..." +svn co $SVNURL $SVNPATH + +echo "Exporting the HEAD of master from git to the trunk of SVN" +git checkout-index -a -f --prefix=$SVNPATH/trunk/ + +echo "Ignoring github specific files and deployment script" +svn propset svn:ignore "deploy.sh +readme.sh +README.md +.git +.gitattributes +.gitignore +tests +map.conf +nginx.log" "$SVNPATH/trunk/" + +echo "Changing directory to SVN and committing to trunk" +cd $SVNPATH/trunk/ +# Add all new files that are not set to be ignored +svn status | grep -v "^.[ \t]*\..*" | grep "^?" | awk '{print $2}' | xargs svn add +svn commit --username=$SVNUSER -m "$COMMITMSG" + +echo "Creating new SVN tag & committing it" +cd $SVNPATH +svn copy trunk/ tags/$NEWVERSION1/ +cd $SVNPATH/tags/$NEWVERSION1 +svn commit --username=$SVNUSER -m "Tagging version $NEWVERSION1" + +echo "Removing temporary directory $SVNPATH" +rm -fr $SVNPATH/ + +echo "*** FIN ***" diff --git a/includes/class-nginx-helper-activator.php b/includes/class-nginx-helper-activator.php index f7186dab..c6e0ebd7 100644 --- a/includes/class-nginx-helper-activator.php +++ b/includes/class-nginx-helper-activator.php @@ -1,58 +1,50 @@ functional_asset_path(); - if ( !is_dir( $path ) ) { - mkdir( $path ); - } + $path = $nginx_helper_admin->functional_asset_path(); + if ( ! is_dir( $path ) ) { + mkdir( $path ); + } - if ( !current_user_can( 'activate_plugins' ) ) { - return; - } + if ( ! current_user_can( 'activate_plugins' ) ) { + return; + } $role = get_role( 'administrator' ); if ( empty( $role ) ) { update_site_option( - "rt_wp_nginx_helper_init_check", - __( 'Sorry, you need to be an administrator to use Nginx Helper', 'nginx-helper' ) - ); + 'rt_wp_nginx_helper_init_check', + __( 'Sorry, you need to be an administrator to use Nginx Helper', 'nginx-helper' ) + ); return; } $role->add_cap( 'Nginx Helper | Config' ); $role->add_cap( 'Nginx Helper | Purge cache' ); - wp_schedule_event( time(), 'daily', 'rt_wp_nginx_helper_check_log_file_size_daily' ); - } + wp_schedule_event( time(), 'daily', 'rt_wp_nginx_helper_check_log_file_size_daily' ); + } } diff --git a/includes/class-nginx-helper-deactivator.php b/includes/class-nginx-helper-deactivator.php index 0e1dadf9..c767f92f 100644 --- a/includes/class-nginx-helper-deactivator.php +++ b/includes/class-nginx-helper-deactivator.php @@ -1,13 +1,8 @@ remove_cap( 'Nginx Helper | Config' ); + + wp_clear_scheduled_hook( 'rt_wp_nginx_helper_check_log_file_size_daily' ); + + $role = get_role( 'administrator' ); + $role->remove_cap( 'Nginx Helper | Config' ); $role->remove_cap( 'Nginx Helper | Purge cache' ); } diff --git a/includes/class-nginx-helper.php b/includes/class-nginx-helper.php index ed5efe13..09061426 100644 --- a/includes/class-nginx-helper.php +++ b/includes/class-nginx-helper.php @@ -56,8 +56,8 @@ class Nginx_Helper { * @var string $version The current version of the plugin. */ protected $version; - - /** + + /** * Minimum WordPress Version Required. * * @since 2.0.0 @@ -78,21 +78,21 @@ class Nginx_Helper { public function __construct() { $this->plugin_name = 'nginx-helper'; - $this->version = '2.0.0'; - $this->minimum_WP = '3.0'; - - if ( !$this->required_wp_version() ) { - return; - } - - if ( !defined( 'RT_WP_NGINX_HELPER_CACHE_PATH' ) ) { - define( 'RT_WP_NGINX_HELPER_CACHE_PATH', '/var/run/nginx-cache' ); - } - + $this->version = '2.0.0'; + $this->minimum_WP = '3.0'; + + if ( ! $this->required_wp_version() ) { + return; + } + + if ( ! defined( 'RT_WP_NGINX_HELPER_CACHE_PATH' ) ) { + define( 'RT_WP_NGINX_HELPER_CACHE_PATH', '/var/run/nginx-cache' ); + } + $this->load_dependencies(); $this->set_locale(); $this->define_admin_hooks(); - //$this->define_public_hooks(); + // $this->define_public_hooks(); } /** @@ -124,12 +124,12 @@ private function load_dependencies() { * of the plugin. */ require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-nginx-helper-i18n.php'; - - /** + + /** * The class responsible for defining all actions that required for purging urls. */ require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-purger.php'; - + /** * The class responsible for defining all actions that occur in the admin area. */ @@ -139,8 +139,7 @@ private function load_dependencies() { * The class responsible for defining all actions that occur in the public-facing * side of the site. */ - //require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-nginx-helper-public.php'; - + // require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-nginx-helper-public.php'; $this->loader = new Nginx_Helper_Loader(); } @@ -171,57 +170,57 @@ private function set_locale() { * @access private */ private function define_admin_hooks() { - global $nginx_helper_admin, $nginx_purger; - + global $nginx_helper_admin, $nginx_purger; + $nginx_helper_admin = new Nginx_Helper_Admin( $this->get_plugin_name(), $this->get_version() ); - - if ( !empty( $nginx_helper_admin->options['cache_method'] ) && $nginx_helper_admin->options['cache_method'] == "enable_redis") { - if ( class_exists( 'Redis' ) ) { // Use PHP5-Redis extension if installed. - require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-phpredis-purger.php'; - $nginx_purger = new PhpRedis_Purger(); - } else { - require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-predis-purger.php'; - $nginx_purger = new Predis_Purger(); - } - } else { - require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-fastcgi-purger.php'; - $nginx_purger = new FastCGI_Purger(); - } - - $this->loader->add_action( 'admin_enqueue_scripts', $nginx_helper_admin, 'enqueue_styles' ); + + if ( ! empty( $nginx_helper_admin->options['cache_method'] ) && $nginx_helper_admin->options['cache_method'] == 'enable_redis' ) { + if ( class_exists( 'Redis' ) ) { // Use PHP5-Redis extension if installed. + require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-phpredis-purger.php'; + $nginx_purger = new PhpRedis_Purger(); + } else { + require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-predis-purger.php'; + $nginx_purger = new Predis_Purger(); + } + } else { + require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-fastcgi-purger.php'; + $nginx_purger = new FastCGI_Purger(); + } + + $this->loader->add_action( 'admin_enqueue_scripts', $nginx_helper_admin, 'enqueue_styles' ); $this->loader->add_action( 'admin_enqueue_scripts', $nginx_helper_admin, 'enqueue_scripts' ); - - if ( is_multisite() ) { - $this->loader->add_action( 'network_admin_menu', $nginx_helper_admin, 'nginx_helper_admin_menu' ); - $this->loader->add_filter( "network_admin_plugin_action_links_" . NGINX_HELPER_BASENAME, $nginx_helper_admin, 'nginx_helper_settings_link' ); - } else { - $this->loader->add_action( 'admin_menu', $nginx_helper_admin, 'nginx_helper_admin_menu' ); - $this->loader->add_filter( "plugin_action_links_" . NGINX_HELPER_BASENAME, $nginx_helper_admin, 'nginx_helper_settings_link' ); - } - - $this->loader->add_action( 'admin_bar_menu', $nginx_helper_admin, 'nginx_helper_toolbar_purge_link', 100 ); - $this->loader->add_action( 'wp_ajax_rt_get_feeds', $nginx_helper_admin, 'nginx_helper_get_feeds' ); - - $this->loader->add_action( 'shutdown', $nginx_helper_admin, 'add_timestamps', 99999 ); - $this->loader->add_action( 'add_init', $nginx_helper_admin, 'update_map' ); - - // Add actions to purge. - $this->loader->add_action( 'wp_insert_comment', $nginx_purger, 'purgePostOnComment', 200, 2 ); - $this->loader->add_action( 'transition_comment_status', $nginx_purger, 'purgePostOnCommentChange', 200, 3 ); - $this->loader->add_action( 'transition_post_status', $nginx_helper_admin, 'set_future_post_option_on_future_status', 20, 3 ); - $this->loader->add_action( 'delete_post', $nginx_helper_admin, 'unset_future_post_option_on_delete', 20, 1 ); - $this->loader->add_action( 'nm_check_log_file_size_daily', $nginx_purger, 'checkAndTruncateLogFile', 100, 1 ); - $this->loader->add_action( 'edit_attachment', $nginx_purger, 'purgeImageOnEdit', 100, 1 ); - $this->loader->add_action( 'wpmu_new_blog', $nginx_helper_admin, 'update_new_blog_options', 10, 1 ); - $this->loader->add_action( 'transition_post_status', $nginx_purger, 'purge_on_post_moved_to_trash', 20, 3 ); - $this->loader->add_action( 'edit_term', $nginx_purger, 'purge_on_term_taxonomy_edited', 20, 3 ); - $this->loader->add_action( 'delete_term', $nginx_purger, 'purge_on_term_taxonomy_edited', 20, 3 ); - $this->loader->add_action( 'check_ajax_referer', $nginx_purger, 'purge_on_check_ajax_referer', 20, 2 ); - $this->loader->add_action( 'admin_init', $nginx_helper_admin, 'purge_all' ); - - // expose action to allow other plugins to purge the cache - $this->loader->add_action( 'rt_nginx_helper_purge_all', $nginx_purger, 'purgeAll' ); - } + + if ( is_multisite() ) { + $this->loader->add_action( 'network_admin_menu', $nginx_helper_admin, 'nginx_helper_admin_menu' ); + $this->loader->add_filter( 'network_admin_plugin_action_links_' . NGINX_HELPER_BASENAME, $nginx_helper_admin, 'nginx_helper_settings_link' ); + } else { + $this->loader->add_action( 'admin_menu', $nginx_helper_admin, 'nginx_helper_admin_menu' ); + $this->loader->add_filter( 'plugin_action_links_' . NGINX_HELPER_BASENAME, $nginx_helper_admin, 'nginx_helper_settings_link' ); + } + + $this->loader->add_action( 'admin_bar_menu', $nginx_helper_admin, 'nginx_helper_toolbar_purge_link', 100 ); + $this->loader->add_action( 'wp_ajax_rt_get_feeds', $nginx_helper_admin, 'nginx_helper_get_feeds' ); + + $this->loader->add_action( 'shutdown', $nginx_helper_admin, 'add_timestamps', 99999 ); + $this->loader->add_action( 'add_init', $nginx_helper_admin, 'update_map' ); + + // Add actions to purge. + $this->loader->add_action( 'wp_insert_comment', $nginx_purger, 'purgePostOnComment', 200, 2 ); + $this->loader->add_action( 'transition_comment_status', $nginx_purger, 'purgePostOnCommentChange', 200, 3 ); + $this->loader->add_action( 'transition_post_status', $nginx_helper_admin, 'set_future_post_option_on_future_status', 20, 3 ); + $this->loader->add_action( 'delete_post', $nginx_helper_admin, 'unset_future_post_option_on_delete', 20, 1 ); + $this->loader->add_action( 'nm_check_log_file_size_daily', $nginx_purger, 'checkAndTruncateLogFile', 100, 1 ); + $this->loader->add_action( 'edit_attachment', $nginx_purger, 'purgeImageOnEdit', 100, 1 ); + $this->loader->add_action( 'wpmu_new_blog', $nginx_helper_admin, 'update_new_blog_options', 10, 1 ); + $this->loader->add_action( 'transition_post_status', $nginx_purger, 'purge_on_post_moved_to_trash', 20, 3 ); + $this->loader->add_action( 'edit_term', $nginx_purger, 'purge_on_term_taxonomy_edited', 20, 3 ); + $this->loader->add_action( 'delete_term', $nginx_purger, 'purge_on_term_taxonomy_edited', 20, 3 ); + $this->loader->add_action( 'check_ajax_referer', $nginx_purger, 'purge_on_check_ajax_referer', 20, 2 ); + $this->loader->add_action( 'admin_init', $nginx_helper_admin, 'purge_all' ); + + // expose action to allow other plugins to purge the cache + $this->loader->add_action( 'rt_nginx_helper_purge_all', $nginx_purger, 'purgeAll' ); + } /** * Register all of the hooks related to the public-facing functionality @@ -278,42 +277,42 @@ public function get_loader() { public function get_version() { return $this->version; } - - /** - * Check wp version. + + /** + * Check wp version. * - * @since 2.0.0 - * @global type $wp_version - * @return boolean - */ - public function required_wp_version() { - global $wp_version; - - $wp_ok = version_compare( $wp_version, $this->minimum_wp, '>=' ); - - if ( ( false == $wp_ok ) ) { - add_action( 'admin_notices', array( &$this, 'display_notices' ) ); - add_action( 'network_admin_notices', array( &$this, 'display_notices' ) ); - return false; - } - - return true; - } - - /** - * Dispay plugin notices. - */ - public function display_notices() { -?> -
-
-minimum_wp, '>=' );
+
+ if ( ( false == $wp_ok ) ) {
+ add_action( 'admin_notices', array( &$this, 'display_notices' ) );
+ add_action( 'network_admin_notices', array( &$this, 'display_notices' ) );
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Dispay plugin notices.
+ */
+ public function display_notices() {
+ ?>
+ - - minimum_WP . ' or higher', 'nginx-helper' ); - ?> - -
-
+
+ run();
+ // Load WP-CLI command.
+ if ( defined( 'WP_CLI' ) && WP_CLI ) {
+
+ require_once plugin_dir_path( __FILE__ ) . 'wp-cli.php';
+ \WP_CLI::add_command( 'nginx-helper', 'Nginx_Helper_WP_CLI_Command' );
+
+ }
+
}
run_nginx_helper();
diff --git a/readme.txt b/readme.txt
index 3a35980b..45544ea3 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,14 +1,14 @@
=== Nginx Helper ===
-Contributors: rtcamp, rahul286, saurabhshukla, manishsongirkar36, faishal, desaiuditd, darren-slatten, jk3us, daankortenbach, telofy, pjv, llonchj, jinnko, weskoop, bcole808, gungeekatx, rohanveer, chandrapatel, gagan0123
+Contributors: rtcamp, rahul286, saurabhshukla, manishsongirkar36, faishal, desaiuditd, darren-slatten, jk3us, daankortenbach, telofy, pjv, llonchj, jinnko, weskoop, bcole808, gungeekatx, rohanveer, chandrapatel, gagan0123, ravanh, michaelbeil, samedwards, niwreg, entr, nuvoPoint
+Donate Link: http://rtcamp.com/donate/
Tags: nginx, cache, purge, nginx map, nginx cache, maps, fastcgi, proxy, redis, redis-cache, rewrite, permalinks
-Requires at least: 3.0
-Tested up to: 4.2.2
-Stable tag: 1.9.4
License: GPLv2 or later (of-course)
License URI: http://www.gnu.org/licenses/gpl-2.0.html
-Donate Link: http://rtcamp.com/donate/
+Requires at least: 3.0
+Tested up to: 4.9.5
+Stable tag: 1.9.11
-Cleans nginx's fastcgi/proxy cache or redis-cache whenever a post is edited/published. Also does few more things.
+Cleans nginx's fastcgi/proxy cache or redis-cache whenever a post is edited/published. Also does a few more things.
== Description ==
@@ -21,11 +21,11 @@ Cleans nginx's fastcgi/proxy cache or redis-cache whenever a post is edited/publ
You will need to follow one or more tutorials below to get desired functionality:
-* [Nginx Map + WordPress-Multisite + Static Files Handling](http://rtcamp.com/tutorials/nginx-maps-wordpress-multisite-static-files-handling/)
-* [Nginx + WordPress + fastcgi_purge_cache](http://rtcamp.com/tutorials/wordpress-nginx-fastcgi-cache-purge-conditional/)
-* [Nginx + WordPress-Multisite (Subdirectories) + fastcgi_purge_cache](http://rtcamp.com/tutorials/wordpress-multisite-subdirectories-nginx-fastcgi-cache-purge/)
-* [Nginx + WordPress-Multisite (Subdomains/domain-mapping) + fastcgi_purge_cache](http://rtcamp.com/tutorials/wordpress-multisite-subdomains-domain-mapping-nginx-fastcgi-cache-purge/)
-* [Other WordPress-Nginx Tutorials](http://rtcamp.com/wordpress-nginx/tutorials/)
+* [Nginx Map + WordPress-Multisite + Static Files Handling](https://easyengine.io/wordpress-nginx/tutorials/multisite/static-files-handling/)
+* [Nginx + WordPress + fastcgi_purge_cache](https://easyengine.io/wordpress-nginx/tutorials/single-site/fastcgi-cache-with-purging/)
+* [Nginx + WordPress-Multisite (Subdirectories) + fastcgi_purge_cache](https://easyengine.io/wordpress-nginx/tutorials/multisite/subdirectories/fastcgi-cache-with-purging/)
+* [Nginx + WordPress-Multisite (Subdomains/domain-mapping) + fastcgi_purge_cache](https://easyengine.io/wordpress-nginx/tutorials/multisite/subdomains/fastcgi-cache-with-purging/)
+* [Other WordPress-Nginx Tutorials](https://easyengine.io/wordpress-nginx/tutorials/)
== Installation ==
@@ -45,13 +45,13 @@ For proper configuration, check out our **tutorial list** in the [Description ta
== Frequently Asked Questions ==
-**Important** - Please refer to [http://rtcamp.com/nginx-helper/faq](http://rtcamp.com/nginx-helper/faq) for up-to-date FAQs.
+**Important** - Please refer to [https://easyengine.io/nginx-helper/faq](https://easyengine.io/nginx-helper/faq) for up-to-date FAQs.
= FAQ - Installation/Comptability =
**Q. Will this work out of the box?**
-No. You need to make some changes at the Nginx end. Please check our [tutorial list](http://rtcamp.com/wordpress-nginx/tutorials).
+No. You need to make some changes at the Nginx end. Please check our [tutorial list](https://easyengine.io/wordpress-nginx/tutorials/).
= FAQ - Nginx Fastcgi Cache Purge =
@@ -114,6 +114,35 @@ Please post your problem in [our free support forum](http://community.rtcamp.com
== Changelog ==
+= 1.9.11 =
+* Fixed issue where permalinks without trailing slash does not purging [#124](https://github.com/rtCamp/nginx-helper/issues/124) - by Patrick
+* Check whether role exist or not before removing capability. [#134](https://github.com/rtCamp/nginx-helper/pull/134) - by [1gor](https://github.com/1gor)
+
+= 1.9.10 =
+* Fixed issue where Nginx cache folders deleted on purge. [#123](https://github.com/rtCamp/nginx-helper/pull/123) - by [johan-chassaing](https://github.com/johan-chassaing)
+* Fixed Redis purge all feature for installation where WordPress lives in a separate folder. [#130](https://github.com/rtCamp/nginx-helper/pull/130) - by [pySilver](https://github.com/pySilver)
+
+= 1.9.9 =
+* Fix wp_redirect issue. [#131](https://github.com/rtCamp/nginx-helper/pull/131) - by [matt-h](https://github.com/matt-h)
+
+= 1.9.8 =
+* Fixed homepage cache cleared when WPML plugin used [#116](https://github.com/rtCamp/nginx-helper/pull/116) - by [Niwreg](https://profiles.wordpress.org/niwreg/)
+* Fixed Purge Cache clears the whole Redis cache [#113](https://github.com/rtCamp/nginx-helper/issues/113) - by HansVanEijsden
+* One log file for all site in WPMU.
+* Single site Redis cache purge when click on Purge Cache button in WPMU [#122](https://github.com/rtCamp/nginx-helper/pull/122) - by Lars Støttrup Nielsen
+* Fixed notices and warnings.
+
+= 1.9.7 =
+* Remove timestamp if cron or wp-cli [#114](https://github.com/rtCamp/nginx-helper/pull/114) - by [samedwards](https://profiles.wordpress.org/samedwards/)
+* Fixed notices and warnings.
+
+= 1.9.6 =
+* Fixed cache purging on post publish.
+* Error fixed when redis server not installed.
+
+= 1.9.5 =
+Added custom purge URL option.
+
= 1.9.4 =
* Added redis server connection timeout.
* Added RedisException handling.
@@ -315,6 +344,6 @@ Fix url escaping [#82](https://github.com/rtCamp/nginx-helper/pull/82) - by
== Upgrade Notice ==
-= 1.9.4 =
-* Added redis server connection timeout.
-* Added RedisException handling.
+= 1.9.11 =
+* Fixed issue where permalinks without trailing slash does not purging [#124](https://github.com/rtCamp/nginx-helper/issues/124) - by Patrick
+* Check whether role exist or not before removing capability. [#134](https://github.com/rtCamp/nginx-helper/pull/134) - by [1gor](https://github.com/1gor)
diff --git a/wercker.yml b/wercker.yml
new file mode 100644
index 00000000..ff534cc2
--- /dev/null
+++ b/wercker.yml
@@ -0,0 +1,22 @@
+box: ubuntu
+
+build:
+ steps:
+
+ - script:
+ name: placehoder
+ code: echo "nothing to build"
+
+deploy:
+ steps:
+ # - install-packages:
+ # packages: subversion git wget
+
+ - rtcamp/wordpress-svn:
+ pluginslug: nginx-helper
+ mainfile: nginx-helper.php
+ svnuser: $SVNUSER
+ svnpass: $SVNPASS #wordpress.org password
+ gituser: $GITUSER
+ gitpass: $GITPASS #github.com password
+ gitemail: git@example.com #github.com password
diff --git a/wp-cli.php b/wp-cli.php
new file mode 100644
index 00000000..fe5e4b65
--- /dev/null
+++ b/wp-cli.php
@@ -0,0 +1,38 @@
+purgeAll();
+
+ $message = __( 'Purged Everything!' );
+ WP_CLI::success( $message );
+
+ }
+
+ }
+
+}
+ + minimum_WP . ' or higher', 'nginx-helper' ); + ?> + +
+
- - - -
-+ + + +
+