Changeset 1871614

Timestamp:

05/09/2018 04:11:42 PM (8 years ago)

Author:

pressshack

Message:

Releasing 1.12.1

Location:

publishpress/trunk

Files:

• includes.php (modified) (1 diff)
• libraries/Notifications/Traits/Dependency_Injector.php (modified) (2 diffs)
• modules/async-notifications/async-notifications.php (modified) (1 diff)
• modules/content-overview/content-overview.php (modified) (3 diffs)
• modules/notifications/notifications.php (modified) (4 diffs)
• modules/roles/roles.php (modified) (1 diff)
• publishpress.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• vendor/twig/twig/.gitignore (deleted)
• vendor/twig/twig/ext/twig/.gitignore (deleted)

publishpress/trunk/includes.php

@@ -41 +41 @@
 
     // Define contants
-    define('PUBLISHPRESS_VERSION', '1.12.0');
+    define('PUBLISHPRESS_VERSION', '1.12.1');
     define('PUBLISHPRESS_BASE_PATH', __DIR__);
     define('PUBLISHPRESS_FILE_PATH', PUBLISHPRESS_BASE_PATH . '/' . basename(__FILE__));

publishpress/trunk/libraries/Notifications/Traits/Dependency_Injector.php

@@ -17 +17 @@
      * Instance of the Pimple container
      */
-    protected $pimple_container;
+    protected $container;
 
     /**
@@ -31 +31 @@
     public function get_service($service_name)
     {
-        if (empty($this->pimple_container))
+        if (empty($this->container))
         {
             $this->init_pimple();
         }
 
-        if (!isset($this->pimple_container[$service_name]))
+        if (!isset($this->container[$service_name]))
         {
             throw new \Exception("Service \"{$service_name}\" not found in the container");
         }
 
-        return $this->pimple_container[$service_name];
+        return $this->container[$service_name];
     }
 
     protected function init_pimple()
     {
-        $this->pimple_container = Pimple_Container::get_instance();
+        $this->container = Pimple_Container::get_instance();
     }
 }

publishpress/trunk/modules/async-notifications/async-notifications.php

@@ -33 +33 @@
 use PublishPress\Notifications\Traits\PublishPress_Module;
 
-if (!class_exists('PP_Async_Notifications'))
-{
-    /**
-     * class PP_Async_Notifications. Depends on the Improved Notifications module.
-     */
-    class PP_Async_Notifications extends PP_Module
-    {
-        use Dependency_Injector, PublishPress_Module;
-
-        const SETTINGS_SLUG = 'pp-async-notifications-settings';
-
-        const POST_STATUS_QUEUED = 'queued';
-
-        const POST_STATUS_SENT = 'sent';
-
-        const POST_STATUS_FAILED = 'failed';
-
-        public $module_name = 'async-notifications';
-
-        public $module_url;
-
-        /**
-         * Instace for the module
-         *
-         * @var stdClass
-         */
-        public $module;
-
-        /**
-         * Construct the Notifications class
-         */
-        public function __construct()
-        {
-            global $publishpress;
-
-            $this->twigPath = dirname(dirname(dirname(__FILE__))) . '/twig';
-
-            $this->module_url = $this->get_module_url(__FILE__);
-
-            // Register the module with PublishPress
-            $args = [
-                'title'                => __('Async Notifications', 'publishpress'),
-                'short_description'    => false,
-                'extended_description' => false,
-                'module_url'           => $this->module_url,
-                'icon_class'           => 'dashicons dashicons-feedback',
-                'slug'                 => 'async-notifications',
-                'default_options'      => [
-                    'enabled' => 'on',
-                ],
-                'options_page'         => false,
-            ];
-
-            // Apply a filter to the default options
-            $args['default_options'] = apply_filters('publishpress_async_notif_default_options', $args['default_options']);
-            $this->module            = $publishpress->register_module(
-                PublishPress\Legacy\Util::sanitize_module_name($this->module_name),
-                $args
-            );
-
-            Auto_loader::register('\\PublishPress\\AsyncNotifications\\', __DIR__ . '/library');
-
-            parent::__construct();
-        }
-
-        /**
-         * Initialize the module. Conditionally loads if the module is enabled
-         *
-         * @throws Exception
-         */
-        public function init()
-        {
-            add_filter('publishpress_notif_workflow_run_action', [$this, 'filter_workflow_run_action'], 10, 3);
-
-            add_action('publishpress_notif_queue', [$this, 'action_notif_queue'], 10, 5);
-
-            add_action('publishpress_cron_notify', [$this, 'action_cron_notify'], 10, 8);
-        }
-
-        /**
-         * Load default editorial metadata the first time the module is loaded
-         *
-         * @since 0.7
-         */
-        public function install()
-        {
-        }
-
-        /**
-         * Upgrade our data in case we need to
-         *
-         * @since 0.7
-         */
-        public function upgrade($previous_version)
-        {
-        }
-
-        /**
-         * @param string                               $action
-         * @param PublishPress\Notifications\Workflow\ $workflow
-         * @param string                               $channel
-         *
-         * @return string
-         */
-        public function filter_workflow_run_action($action, $workflow, $channel)
-        {
-            // Change the action to send the notification to the queue, instead sending to receiver, directly.
-            $action = 'publishpress_notif_queue';
-
-            return $action;
-        }
-
-        /**
-         * Enqueue the notification inse
-         *
-         * @param $workflow_post
-         * @param $action_args
-         * @param $receiver
-         * @param $content
-         * @param $channel
-         *
-         * @throws Exception;
-         */
-        public function action_notif_queue($workflow_post, $action_args, $receiver, $content, $channel)
-        {
-            $queue = $this->get_service('notification_queue');
-
-            $queue->enqueueNotification($workflow_post, $action_args, $receiver, $content, $channel);
-        }
-
-        /**
-         * @param $workflowPostId
-         * @param $action
-         * @param $postId
-         * @param $content
-         * @param $oldStatus
-         * @param $newStatus
-         * @param $channel
-         * @param $receiver
-         */
-        public function action_cron_notify($workflowPostId, $action, $postId, $content, $oldStatus, $newStatus, $channel, $receiver)
-        {
-            $workflowPost = get_post($workflowPostId);
-            $actionArgs   = [
-                'action'     => $action,
-                'post'       => get_post($postId),
-                'new_status' => $newStatus,
-                'old_status' => $oldStatus,
-            ];
-            $receivers    = [$receiver];
-
-            // Decode the content
-            $content = base64_decode(maybe_unserialize($content));
-
-            /**
-             * Triggers the notification. This can be caught by notification channels.
-             *
-             * @param WP_Post $workflow_post
-             * @param array   $action_args
-             * @param array   $receivers
-             * @param array   $content
-             * @param array   $channel
-             */
-            do_action('publishpress_notif_send_notification_' . $channel, $workflowPost, $actionArgs, $receivers, $content, $channel);
-        }
-    }
+if ( ! class_exists( 'PP_Async_Notifications' ) ) {
+    /**
+     * class PP_Async_Notifications. Depends on the Improved Notifications module.
+     */
+    class PP_Async_Notifications extends PP_Module {
+        use Dependency_Injector, PublishPress_Module;
+
+        const SETTINGS_SLUG = 'pp-async-notifications-settings';
+
+        const POST_STATUS_QUEUED = 'queued';
+
+        const POST_STATUS_SENT = 'sent';
+
+        const POST_STATUS_FAILED = 'failed';
+
+        const DEFAULT_DUPLICATED_NOTIFICATION_TIMEOUT = 60;
+
+        public $module_name = 'async-notifications';
+
+        public $module_url;
+
+        /**
+         * Instace for the module
+         *
+         * @var stdClass
+         */
+        public $module;
+
+        /**
+         * Construct the Notifications class
+         */
+        public function __construct() {
+            global $publishpress;
+
+            $this->twigPath = dirname( dirname( dirname( __FILE__ ) ) ) . '/twig';
+
+            $this->module_url = $this->get_module_url( __FILE__ );
+
+            // Register the module with PublishPress
+            $args = [
+                'title'                => __( 'Async Notifications', 'publishpress' ),
+                'short_description'    => false,
+                'extended_description' => false,
+                'module_url'           => $this->module_url,
+                'icon_class'           => 'dashicons dashicons-feedback',
+                'slug'                 => 'async-notifications',
+                'default_options'      => [
+                    'enabled' => 'on',
+                ],
+                'options_page'         => false,
+            ];
+
+            // Apply a filter to the default options
+            $args['default_options'] = apply_filters( 'publishpress_async_notif_default_options',
+                $args['default_options'] );
+            $this->module            = $publishpress->register_module(
+                PublishPress\Legacy\Util::sanitize_module_name( $this->module_name ),
+                $args
+            );
+
+            Auto_loader::register( '\\PublishPress\\AsyncNotifications\\', __DIR__ . '/library' );
+
+            parent::__construct();
+        }
+
+        /**
+         * Initialize the module. Conditionally loads if the module is enabled
+         *
+         * @throws Exception
+         */
+        public function init() {
+            add_filter( 'publishpress_notif_workflow_run_action', [ $this, 'filter_workflow_run_action' ], 10, 3 );
+
+            add_action( 'publishpress_notif_queue', [ $this, 'action_notif_queue' ], 10, 5 );
+
+            add_action( 'publishpress_cron_notify', [ $this, 'action_cron_notify' ], 10, 8 );
+        }
+
+        /**
+         * Load default editorial metadata the first time the module is loaded
+         *
+         * @since 0.7
+         */
+        public function install() {
+        }
+
+        /**
+         * Upgrade our data in case we need to
+         *
+         * @since 0.7
+         */
+        public function upgrade( $previous_version ) {
+        }
+
+        /**
+         * @param string                               $action
+         * @param PublishPress\Notifications\Workflow\ $workflow
+         * @param string                               $channel
+         *
+         * @return string
+         */
+        public function filter_workflow_run_action( $action, $workflow, $channel ) {
+            // Change the action to send the notification to the queue, instead sending to receiver, directly.
+            $action = 'publishpress_notif_queue';
+
+            return $action;
+        }
+
+        /**
+         * Enqueue the notification inse
+         *
+         * @param $workflow_post
+         * @param $action_args
+         * @param $receiver
+         * @param $content
+         * @param $channel
+         *
+         * @throws Exception;
+         */
+        public function action_notif_queue( $workflow_post, $action_args, $receiver, $content, $channel ) {
+            $queue = $this->get_service( 'notification_queue' );
+
+            $queue->enqueueNotification( $workflow_post, $action_args, $receiver, $content, $channel );
+        }
+
+        /**
+         * Check if the notification was just sent, to avoid duplicated notifications when
+         * multiple requests try to run the same job.
+         *
+         * @param $args
+         *
+         * @return bool
+         */
+        protected function is_duplicated_notification( $args ) {
+            // Calculate unique ID to avoid repeated notifications.
+            $uid = md5( maybe_serialize( func_get_args() ) );
+
+            $transientName = 'ppnotif_' . $uid;
+
+            // Check if we already have the transient.
+            if ( get_transient( $transientName ) ) {
+                // Yes, duplicated notification.
+                return true;
+            }
+
+            // No, set the flag and return as non-duplicated.
+            set_transient( $transientName, 1, self::DEFAULT_DUPLICATED_NOTIFICATION_TIMEOUT );
+
+            return false;
+        }
+
+        /**
+         * @param $workflowPostId
+         * @param $action
+         * @param $postId
+         * @param $content
+         * @param $oldStatus
+         * @param $newStatus
+         * @param $channel
+         * @param $receiver
+         */
+        public function action_cron_notify(
+            $workflowPostId,
+            $action,
+            $postId,
+            $content,
+            $oldStatus,
+            $newStatus,
+            $channel,
+            $receiver
+        ) {
+            // Check if this is a duplicated notification and skip it.
+            // I hope this is a temporary fix. When scheduled, some notifications seems to be triggered multiple times
+            // by the same cron task.
+            if ( $this->is_duplicated_notification( func_get_args() ) ) {
+                return;
+            }
+
+            // Work the notification
+            $workflowPost = get_post( $workflowPostId );
+            $actionArgs   = [
+                'action'     => $action,
+                'post'       => get_post( $postId ),
+                'new_status' => $newStatus,
+                'old_status' => $oldStatus,
+            ];
+            $receivers    = [ $receiver ];
+
+            // Decode the content
+            $content = base64_decode( maybe_unserialize( $content ) );
+
+            /**
+             * Triggers the notification. This can be caught by notification channels.
+             *
+             * @param WP_Post $workflow_post
+             * @param array   $action_args
+             * @param array   $receivers
+             * @param array   $content
+             * @param array   $channel
+             */
+            do_action( 'publishpress_notif_send_notification_' . $channel, $workflowPost, $actionArgs, $receivers,
+                $content, $channel );
+        }
+    }
 }

publishpress/trunk/modules/content-overview/content-overview.php

@@ -147 +147 @@
         add_action('admin_init', array($this, 'handle_form_date_range_change'));
 
-        include_once PUBLISHPRESS_BASE_PATH . '/common/php/' . 'screen-options.php';
-
-        if (function_exists('add_screen_options_panel'))
-        {
-            add_screen_options_panel(
-                self::USERMETA_KEY_PREFIX . 'screen_columns',
-                __('Screen Layout', 'publishpress'),
-                array($this, 'print_column_prefs'),
-                self::SCREEN_ID,
-                array($this, 'save_column_prefs'),
-                true
-            );
-        }
+        add_action('admin_init', array($this, 'handle_screen_options'));
 
         // Register the columns of data appearing on every term. This is hooked into admin_init
@@ -171 +159 @@
         add_action('admin_enqueue_scripts', array($this, 'action_enqueue_admin_styles'));
     }
+
+    public function handle_screen_options() {
+        include_once PUBLISHPRESS_BASE_PATH . '/common/php/' . 'screen-options.php';
+
+        if (function_exists('add_screen_options_panel'))
+        {
+            add_screen_options_panel(
+                self::USERMETA_KEY_PREFIX . 'screen_columns',
+                __('Screen Layout', 'publishpress'),
+                array($this, 'print_column_prefs'),
+                self::SCREEN_ID,
+                array($this, 'save_column_prefs'),
+                true
+            );
+        }
+    }
+
 
     /**
@@ -860 +865 @@
                 $post_author = get_userdata($post->post_author);
 
-                return $post_author->display_name;
+                $author_name = is_object( $post_author ) ? $post_author->display_name : '';
+
+                // @todo: Make this compatible with Multiple Authors
+                $author_name = apply_filters( 'the_author', $author_name );
+
+                return $author_name;
                 break;
             case 'post_date':

publishpress/trunk/modules/notifications/notifications.php

@@ -29 +29 @@
  */
 
-if (!defined('PP_NOTIFICATION_USE_CRON'))
-{
-    define('PP_NOTIFICATION_USE_CRON', false);
+if ( ! defined( 'PP_NOTIFICATION_USE_CRON' ) ) {
+    define( 'PP_NOTIFICATION_USE_CRON', false );
 }
 
-if (!class_exists('PP_Notifications'))
-{
-    /**
-     * Class PP_Notifications
-     * Notifications for PublishPress and more
-     */
-    class PP_Notifications extends PP_Module
-    {
-
-        // Taxonomy name used to store users which will be notified for changes in the posts.
-        public $notify_user_taxonomy = 'pp_notify_user';
-
-        // Taxonomy name used to store roles which will be notified for changes in the posts.
-        public $notify_role_taxonomy = 'pp_notify_role';
-
-        public $module;
-
-        public $edit_post_subscriptions_cap = 'edit_post_subscriptions';
-
-        /**
-         * Register the module with PublishPress but don't do anything else
-         */
-        public function __construct()
-        {
-
-            // Register the module with PublishPress
-            $this->module_url = $this->get_module_url(__FILE__);
-            $args             = array(
-                'title'                 => __('Default Notifications', 'publishpress'),
-                'short_description'     => false,
-                'extended_description'  => false,
-                'module_url'            => $this->module_url,
-                'icon_class'            => 'dashicons dashicons-email',
-                'slug'                  => 'notifications',
-                'default_options'       => array(
-                    'enabled'                   => 'on',
-                    'post_types'                => array(
-                        'post' => 'on',
-                        'page' => 'on',
-                    ),
-                    'notify_author_by_default'  => '1',
-                    'notify_current_user_by_default' => '1',
-                ),
-                'configure_page_cb'     => 'print_configure_view',
-                'post_type_support'     => 'pp_notification',
-                'autoload'              => false,
-                'settings_help_tab'     => array(
-                    'id'      => 'pp-notifications-overview',
-                    'title'   => __('Overview', 'publishpress'),
-                    'content' => __('<p>Notifications ensure you keep up to date with progress your most important content. Users can be subscribed to notifications on a post one by one or by selecting roles.</p><p>When enabled, notifications can be sent when a post changes status or an editorial comment is left by a writer or an editor.</p>', 'publishpress'),
-                ),
-                'settings_help_sidebar' => __('<p><strong>For more information:</strong></p><p><a href="https://publishpress.com/features/notifications/">Notifications Documentation</a></p><p><a href="https://github.com/ostraining/PublishPress">PublishPress on Github</a></p>', 'publishpress'),
-                'general_options'       => true,
-            );
-            $this->module     = PublishPress()->register_module('notifications', $args);
-        }
-
-        /**
-         * Initialize the notifications class if the plugin is enabled
-         */
-        public function init()
-        {
-
-            // Register our taxonomies for managing relationships
-            $this->register_taxonomies();
-
-            // Allow users to use a different user capability for editing post subscriptions
-            $this->edit_post_subscriptions_cap = apply_filters('pp_edit_post_subscriptions_cap', $this->edit_post_subscriptions_cap);
-
-            // Set up metabox and related actions
-            add_action('add_meta_boxes', array($this, 'add_post_meta_box'));
-
-            // Saving post actions
-            // self::save_post_subscriptions() is hooked into transition_post_status so we can ensure role data
-            // is properly saved before sending notifs
-            add_action('transition_post_status', array($this, 'notification_status_change'), PP_NOTIFICATION_PRIORITY_STATUS_CHANGE, 3);
-            add_action('pp_post_insert_editorial_comment', array($this, 'notification_comment'));
-            add_action('delete_user', array($this, 'delete_user_action'));
-            add_action('pp_send_scheduled_notification', array($this, 'send_single_email'), 10, 4);
-
-            add_action('admin_init', array($this, 'register_settings'));
-
-            // Javascript and CSS if we need it
-            add_action('admin_enqueue_scripts', array($this, 'enqueue_admin_scripts'));
-            add_action('admin_enqueue_scripts', array($this, 'enqueue_admin_styles'));
-
-            // Add a "Notify" link to posts
-            if (apply_filters('pp_notifications_show_notify_link', true))
-            {
-                // A little extra JS for the Notify button
-                add_action('admin_head', array($this, 'action_admin_head_notify_js'));
-                // Manage Posts
-                add_filter('post_row_actions', array($this, 'filter_post_row_actions'), 10, 2);
-                add_filter('page_row_actions', array($this, 'filter_post_row_actions'), 10, 2);
-                // Calendar and Content Overview
-                add_filter('pp_calendar_item_actions', array($this, 'filter_post_row_actions'), 10, 2);
-                add_filter('pp_story_budget_item_actions', array($this, 'filter_post_row_actions'), 10, 2);
-            }
-
-            add_filter('pp_notification_auto_subscribe_post_author', array($this, 'filter_pp_notification_auto_subscribe_post_author'), 10, 2);
-            add_filter('pp_notification_auto_subscribe_current_user', array($this, 'filter_pp_notification_auto_subscribe_current_user'), 10, 2);
-
-            add_action('save_post', array($this, 'action_save_post'), 10);
-
-            // Ajax for saving notification updates
-            add_action('wp_ajax_pp_notifications_user_post_subscription', array($this, 'handle_user_post_subscription'));
-
-            add_action('pp_send_notification_status_update', array($this, 'send_notification_status_update'));
-            add_action('pp_send_notification_comment', array($this, 'send_notification_comment'));
-        }
-
-        /**
-         * Load the capabilities onto users the first time the module is run
-         *
-         * @since 0.7
-         */
-        public function install()
-        {
-            // Considering we could be moving from Edit Flow, we need to migrate the following users.
-            $this->migrateLegacyFollowingTerms();
-        }
-
-        /**
-         * Upgrade our data in case we need to
-         *
-         * @since 0.7
-         */
-        public function upgrade($previous_version)
-        {
-            global $publishpress;
-
-            // Upgrade path to v0.7
-            if (version_compare($previous_version, '0.7', '<'))
-            {
-                // Migrate whether notifications were enabled or not
-                if ($enabled = get_option('publishpress_notifications_enabled'))
-                {
-                    $enabled = 'on';
-                } else
-                {
-                    $enabled = 'off';
-                }
-                $publishpress->update_module_option($this->module->name, 'enabled', $enabled);
-                delete_option('publishpress_notifications_enabled');
-                // Migrate whether to always notify the admin
-                // @todo: Remove after sometime. The setting always notify admin was removed.
-                if ($always_notify_admin = get_option('publishpress_always_notify_admin'))
-                {
-                    $always_notify_admin = 'on';
-                } else
-                {
-                    $always_notify_admin = 'off';
-                }
-                $publishpress->update_module_option($this->module->name, 'always_notify_admin', $always_notify_admin);
-                delete_option('publishpress_always_notify_admin');
-
-                // Technically we've run this code before so we don't want to auto-install new data
-                $publishpress->update_module_option($this->module->name, 'loaded_once', true);
-            }
-
-            if (version_compare($previous_version, '1.10', '<=')) {
-                $this->migrateLegacyFollowingTerms();
-            }
-        }
-
-
-        protected function migrateLegacyFollowingTerms()
-        {
-            global $wpdb;
-
-            // Migrate Following Users
-            $query = "UPDATE {$wpdb->prefix}term_taxonomy SET taxonomy = '{$this->notify_user_taxonomy}' WHERE taxonomy = 'following_users'";
-            $wpdb->query($query);
-        }
-
-        /**
-         * Register the taxonomies we use to manage relationships
-         *
-         * @since 0.7
-         *
-         * @uses  register_taxonomy()
-         */
-        public function register_taxonomies()
-        {
-            // Load the currently supported post types so we only register against those
-            $supported_post_types = $this->get_post_types_for_module($this->module);
-
-            $args = array(
-                'hierarchical'          => false,
-                'update_count_callback' => '_update_post_term_count',
-                'label'                 => false,
-                'query_var'             => false,
-                'rewrite'               => false,
-                'public'                => false,
-                'show_ui'               => false,
-            );
-
-            register_taxonomy($this->notify_user_taxonomy, $supported_post_types, $args);
-            register_taxonomy($this->notify_role_taxonomy, $supported_post_types, $args);
-        }
-
-        /**
-         * Enqueue necessary admin scripts
-         *
-         * @since 0.7
-         *
-         * @uses  wp_enqueue_script()
-         */
-        public function enqueue_admin_scripts()
-        {
-            if ($this->is_whitelisted_functional_view())
-            {
-                wp_enqueue_script(
-                    'publishpress-notifications-js',
-                    $this->module_url . 'assets/notifications.js',
-                    array(
-                        'jquery',
-                    ),
-                    PUBLISHPRESS_VERSION,
-                    true
-                );
-
-                wp_enqueue_script('publishpress-chosen-js', PUBLISHPRESS_URL . '/common/libs/chosen/chosen.jquery.js',
-                    ['jquery'], PUBLISHPRESS_VERSION);
-            }
-        }
-
-        /**
-         * Enqueue necessary admin styles, but only on the proper pages
-         *
-         * @since 0.7
-         *
-         * @uses  wp_enqueue_style()
-         */
-        public function enqueue_admin_styles()
-        {
-            if ($this->is_whitelisted_functional_view() || $this->is_whitelisted_settings_view())
-            {
-                wp_enqueue_style('jquery-listfilterizer');
-                wp_enqueue_style(
-                    'publishpress-notifications-css',
-                    $this->module->module_url . 'assets/notifications.css',
-                    false,
-                    PUBLISHPRESS_VERSION
-                );
-
-                wp_enqueue_style('publishpress-chosen-css', PUBLISHPRESS_URL . '/common/libs/chosen/chosen.css', false,
-                    PUBLISHPRESS_VERSION);
-            }
-        }
-
-        /**
-         * JS required for the Notify link to work
-         *
-         * @since 0.8
-         */
-        public function action_admin_head_notify_js()
-        {
-            ?>
+if ( ! class_exists( 'PP_Notifications' ) ) {
+    /**
+     * Class PP_Notifications
+     * Notifications for PublishPress and more
+     */
+    class PP_Notifications extends PP_Module {
+
+        // Taxonomy name used to store users which will be notified for changes in the posts.
+        public $notify_user_taxonomy = 'pp_notify_user';
+
+        // Taxonomy name used to store roles which will be notified for changes in the posts.
+        public $notify_role_taxonomy = 'pp_notify_role';
+
+        public $module;
+
+        public $edit_post_subscriptions_cap = 'edit_post_subscriptions';
+
+        /**
+         * Register the module with PublishPress but don't do anything else
+         */
+        public function __construct() {
+
+            // Register the module with PublishPress
+            $this->module_url = $this->get_module_url( __FILE__ );
+            $args             = [
+                'title'                 => __( 'Default Notifications', 'publishpress' ),
+                'short_description'     => false,
+                'extended_description'  => false,
+                'module_url'            => $this->module_url,
+                'icon_class'            => 'dashicons dashicons-email',
+                'slug'                  => 'notifications',
+                'default_options'       => [
+                    'enabled'                        => 'on',
+                    'post_types'                     => [
+                        'post' => 'on',
+                        'page' => 'on',
+                    ],
+                    'notify_author_by_default'       => '1',
+                    'notify_current_user_by_default' => '1',
+                ],
+                'configure_page_cb'     => 'print_configure_view',
+                'post_type_support'     => 'pp_notification',
+                'autoload'              => false,
+                'settings_help_tab'     => [
+                    'id'      => 'pp-notifications-overview',
+                    'title'   => __( 'Overview', 'publishpress' ),
+                    'content' => __( '<p>Notifications ensure you keep up to date with progress your most important content. Users can be subscribed to notifications on a post one by one or by selecting roles.</p><p>When enabled, notifications can be sent when a post changes status or an editorial comment is left by a writer or an editor.</p>',
+                        'publishpress' ),
+                ],
+                'settings_help_sidebar' => __( '<p><strong>For more information:</strong></p><p><a href="https://publishpress.com/features/notifications/">Notifications Documentation</a></p><p><a href="https://github.com/ostraining/PublishPress">PublishPress on Github</a></p>',
+                    'publishpress' ),
+                'general_options'       => true,
+            ];
+            $this->module     = PublishPress()->register_module( 'notifications', $args );
+        }
+
+        /**
+         * Initialize the notifications class if the plugin is enabled
+         */
+        public function init() {
+
+            // Register our taxonomies for managing relationships
+            $this->register_taxonomies();
+
+            // Allow users to use a different user capability for editing post subscriptions
+            $this->edit_post_subscriptions_cap = apply_filters( 'pp_edit_post_subscriptions_cap',
+                $this->edit_post_subscriptions_cap );
+
+            // Set up metabox and related actions
+            add_action( 'add_meta_boxes', [ $this, 'add_post_meta_box' ] );
+
+            // Saving post actions
+            // self::save_post_subscriptions() is hooked into transition_post_status so we can ensure role data
+            // is properly saved before sending notifs
+            add_action( 'transition_post_status', [ $this, 'notification_status_change' ],
+                PP_NOTIFICATION_PRIORITY_STATUS_CHANGE, 3 );
+            add_action( 'pp_post_insert_editorial_comment', [ $this, 'notification_comment' ] );
+            add_action( 'delete_user', [ $this, 'delete_user_action' ] );
+            add_action( 'pp_send_scheduled_notification', [ $this, 'send_single_email' ], 10, 4 );
+
+            add_action( 'admin_init', [ $this, 'register_settings' ] );
+
+            // Javascript and CSS if we need it
+            add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_admin_scripts' ] );
+            add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_admin_styles' ] );
+
+            // Add a "Notify" link to posts
+            if ( apply_filters( 'pp_notifications_show_notify_link', true ) ) {
+                // A little extra JS for the Notify button
+                add_action( 'admin_head', [ $this, 'action_admin_head_notify_js' ] );
+                // Manage Posts
+                add_filter( 'post_row_actions', [ $this, 'filter_post_row_actions' ], 10, 2 );
+                add_filter( 'page_row_actions', [ $this, 'filter_post_row_actions' ], 10, 2 );
+                // Calendar and Content Overview
+                add_filter( 'pp_calendar_item_actions', [ $this, 'filter_post_row_actions' ], 10, 2 );
+                add_filter( 'pp_story_budget_item_actions', [ $this, 'filter_post_row_actions' ], 10, 2 );
+            }
+
+            add_filter( 'pp_notification_auto_subscribe_post_author',
+                [ $this, 'filter_pp_notification_auto_subscribe_post_author' ], 10, 2 );
+            add_filter( 'pp_notification_auto_subscribe_current_user',
+                [ $this, 'filter_pp_notification_auto_subscribe_current_user' ], 10, 2 );
+
+            add_action( 'save_post', [ $this, 'action_save_post' ], 10 );
+
+            // Ajax for saving notification updates
+            add_action( 'wp_ajax_pp_notifications_user_post_subscription', [ $this, 'handle_user_post_subscription' ] );
+
+            add_action( 'pp_send_notification_status_update', [ $this, 'send_notification_status_update' ] );
+            add_action( 'pp_send_notification_comment', [ $this, 'send_notification_comment' ] );
+        }
+
+        /**
+         * Load the capabilities onto users the first time the module is run
+         *
+         * @since 0.7
+         */
+        public function install() {
+            // Considering we could be moving from Edit Flow, we need to migrate the following users.
+            $this->migrateLegacyFollowingTerms();
+        }
+
+        /**
+         * Upgrade our data in case we need to
+         *
+         * @since 0.7
+         */
+        public function upgrade( $previous_version ) {
+            global $publishpress;
+
+            // Upgrade path to v0.7
+            if ( version_compare( $previous_version, '0.7', '<' ) ) {
+                // Migrate whether notifications were enabled or not
+                if ( $enabled = get_option( 'publishpress_notifications_enabled' ) ) {
+                    $enabled = 'on';
+                } else {
+                    $enabled = 'off';
+                }
+                $publishpress->update_module_option( $this->module->name, 'enabled', $enabled );
+                delete_option( 'publishpress_notifications_enabled' );
+                // Migrate whether to always notify the admin
+                // @todo: Remove after sometime. The setting always notify admin was removed.
+                if ( $always_notify_admin = get_option( 'publishpress_always_notify_admin' ) ) {
+                    $always_notify_admin = 'on';
+                } else {
+                    $always_notify_admin = 'off';
+                }
+                $publishpress->update_module_option( $this->module->name, 'always_notify_admin', $always_notify_admin );
+                delete_option( 'publishpress_always_notify_admin' );
+
+                // Technically we've run this code before so we don't want to auto-install new data
+                $publishpress->update_module_option( $this->module->name, 'loaded_once', true );
+            }
+
+            if ( version_compare( $previous_version, '1.10', '<=' ) ) {
+                $this->migrateLegacyFollowingTerms();
+            }
+        }
+
+
+        protected function migrateLegacyFollowingTerms() {
+            global $wpdb;
+
+            // Migrate Following Users
+            $query = "UPDATE {$wpdb->prefix}term_taxonomy SET taxonomy = '{$this->notify_user_taxonomy}' WHERE taxonomy = 'following_users'";
+            $wpdb->query( $query );
+        }
+
+        /**
+         * Register the taxonomies we use to manage relationships
+         *
+         * @since 0.7
+         *
+         * @uses  register_taxonomy()
+         */
+        public function register_taxonomies() {
+            // Load the currently supported post types so we only register against those
+            $supported_post_types = $this->get_post_types_for_module( $this->module );
+
+            $args = [
+                'hierarchical'          => false,
+                'update_count_callback' => '_update_post_term_count',
+                'label'                 => false,
+                'query_var'             => false,
+                'rewrite'               => false,
+                'public'                => false,
+                'show_ui'               => false,
+            ];
+
+            register_taxonomy( $this->notify_user_taxonomy, $supported_post_types, $args );
+            register_taxonomy( $this->notify_role_taxonomy, $supported_post_types, $args );
+        }
+
+        /**
+         * Enqueue necessary admin scripts
+         *
+         * @since 0.7
+         *
+         * @uses  wp_enqueue_script()
+         */
+        public function enqueue_admin_scripts() {
+            if ( $this->is_whitelisted_functional_view() ) {
+                wp_enqueue_script(
+                    'publishpress-notifications-js',
+                    $this->module_url . 'assets/notifications.js',
+                    [
+                        'jquery',
+                    ],
+                    PUBLISHPRESS_VERSION,
+                    true
+                );
+
+                wp_enqueue_script( 'publishpress-chosen-js', PUBLISHPRESS_URL . '/common/libs/chosen/chosen.jquery.js',
+                    [ 'jquery' ], PUBLISHPRESS_VERSION );
+            }
+        }
+
+        /**
+         * Enqueue necessary admin styles, but only on the proper pages
+         *
+         * @since 0.7
+         *
+         * @uses  wp_enqueue_style()
+         */
+        public function enqueue_admin_styles() {
+            if ( $this->is_whitelisted_functional_view() || $this->is_whitelisted_settings_view() ) {
+                wp_enqueue_style( 'jquery-listfilterizer' );
+                wp_enqueue_style(
+                    'publishpress-notifications-css',
+                    $this->module->module_url . 'assets/notifications.css',
+                    false,
+                    PUBLISHPRESS_VERSION
+                );
+
+                wp_enqueue_style( 'publishpress-chosen-css', PUBLISHPRESS_URL . '/common/libs/chosen/chosen.css', false,
+                    PUBLISHPRESS_VERSION );
+            }
+        }
+
+        /**
+         * JS required for the Notify link to work
+         *
+         * @since 0.8
+         */
+        public function action_admin_head_notify_js() {
+            ?>
             <script type='text/javascript'>
-                (function ($) {
-                    $(document).ready(function ($) {
-                        /**
-                         * Action to Notify / Stop Notifying posts on the manage posts screen
-                         */
-                        $('.wp-list-table, #pp-calendar-view, #pp-story-budget-wrap').on('click', '.pp_notify_link a', function (e) {
-
-                            e.preventDefault();
-
-                            var link = $(this);
-
-                            $.ajax({
-                                type: 'GET',
-                                url: link.attr('href'),
-                                success: function (data) {
-                                    if ('success' === data.status) {
-                                        link.attr('href', data.message.link);
-                                        link.attr('title', data.message.title);
-                                        link.text(data.message.text);
-                                    }
-                                    // @todo expose the error somehow
-                                }
-                            });
-
-                            return false;
-                        });
-                    });
-                })(jQuery);
+              (function ($) {
+                $(document).ready(function ($) {
+                  /**
+                   * Action to Notify / Stop Notifying posts on the manage posts screen
+                   */
+                  $('.wp-list-table, #pp-calendar-view, #pp-story-budget-wrap').on('click', '.pp_notify_link a', function (e) {
+
+                    e.preventDefault()
+
+                    var link = $(this)
+
+                    $.ajax({
+                      type: 'GET',
+                      url: link.attr('href'),
+                      success: function (data) {
+                        if ('success' === data.status) {
+                          link.attr('href', data.message.link)
+                          link.attr('title', data.message.title)
+                          link.text(data.message.text)
+                        }
+                        // @todo expose the error somehow
+                      }
+                    })
+
+                    return false
+                  })
+                })
+              })(jQuery)
             </script>
-            <?php
-        }
-
-        /**
-         * Add a "Notify" link to supported post types Manage Posts view
-         *
-         * @since 0.8
-         *
-         * @param array      $actions Any existing item actions
-         * @param int|object $post    Post id or object
-         * @return array     $actions   The follow link has been appended
-         */
-        public function filter_post_row_actions($actions, $post)
-        {
-            $post = get_post($post);
-
-            if (!in_array($post->post_type, $this->get_post_types_for_module($this->module)))
-            {
-                return $actions;
-            }
-
-            if (!current_user_can($this->edit_post_subscriptions_cap) || !current_user_can('edit_post', $post->ID))
-            {
-                return $actions;
-            }
-
-            $parts                     = $this->get_notify_action_parts($post);
-            $actions['pp_notify_link'] = '<a title="' . esc_attr($parts['title']) . '" href="' . esc_url($parts['link']) . '">' . $parts['text'] . '</a>';
-
-            return $actions;
-        }
-
-        /**
-         * Get an action parts for a user to set Notify or Stop Notify for a post
-         *
-         * @since 0.8
-         */
-        private function get_notify_action_parts($post)
-        {
-            $args = array(
-                'action'  => 'pp_notifications_user_post_subscription',
-                'post_id' => $post->ID,
-            );
-
-            $user_to_notify = $this->get_users_to_notify($post->ID);
-
-            if (in_array(wp_get_current_user()->user_login, $user_to_notify))
-            {
-                $args['method'] = 'stop_notifying';
-                $title_text     = __('Click to stop being notified on updates for this post', 'publishpress');
-                $link_text      = __('Stop notifying me', 'publishpress');
-            } else
-            {
-                $args['method'] = 'start_notifying';
-                $title_text     = __('Click to start being notified on updates for this post', 'publishpress');
-                $link_text      = __('Notify me', 'publishpress');
-            }
-
-            // wp_nonce_url() has encoding issues: http://core.trac.wordpress.org/ticket/20771
-            $args['_wpnonce'] = wp_create_nonce('pp_notifications_user_post_subscription');
-
-            return array(
-                'title' => $title_text,
-                'text'  => $link_text,
-                'link'  => add_query_arg($args, admin_url('admin-ajax.php')),
-            );
-        }
-
-        /**
-         * Add the subscriptions meta box to relevant post types
-         */
-        public function add_post_meta_box()
-        {
-            if (!current_user_can($this->edit_post_subscriptions_cap))
-            {
-                return;
-            }
-
-            $role_post_types = $this->get_post_types_for_module($this->module);
-            foreach ($role_post_types as $post_type)
-            {
-                add_meta_box(
-                    'publishpress-notifications',
-                    __('Notify', 'publishpress'),
-                    array($this, 'notifications_meta_box'),
-                    $post_type,
-                    'side',
-                    'high'
-                );
-            }
-        }
-
-        /**
-         * Outputs box used to subscribe users and roles to Posts
-         *
-         * @todo add_cap to set subscribers for posts; default to Admin and editors
-         */
-        public function notifications_meta_box()
-        {
-            global $post, $post_ID, $publishpress;
-
-            ?>
+            <?php
+        }
+
+        /**
+         * Add a "Notify" link to supported post types Manage Posts view
+         *
+         * @since 0.8
+         *
+         * @param array      $actions Any existing item actions
+         * @param int|object $post    Post id or object
+         *
+         * @return array     $actions   The follow link has been appended
+         */
+        public function filter_post_row_actions( $actions, $post ) {
+            $post = get_post( $post );
+
+            if ( ! in_array( $post->post_type, $this->get_post_types_for_module( $this->module ) ) ) {
+                return $actions;
+            }
+
+            if ( ! current_user_can( $this->edit_post_subscriptions_cap ) || ! current_user_can( 'edit_post',
+                    $post->ID ) ) {
+                return $actions;
+            }
+
+            $parts                     = $this->get_notify_action_parts( $post );
+            $actions['pp_notify_link'] = '<a title="' . esc_attr( $parts['title'] ) . '" href="' . esc_url( $parts['link'] ) . '">' . $parts['text'] . '</a>';
+
+            return $actions;
+        }
+
+        /**
+         * Get an action parts for a user to set Notify or Stop Notify for a post
+         *
+         * @since 0.8
+         */
+        private function get_notify_action_parts( $post ) {
+            $args = [
+                'action'  => 'pp_notifications_user_post_subscription',
+                'post_id' => $post->ID,
+            ];
+
+            $user_to_notify = $this->get_users_to_notify( $post->ID );
+
+            if ( in_array( wp_get_current_user()->user_login, $user_to_notify ) ) {
+                $args['method'] = 'stop_notifying';
+                $title_text     = __( 'Click to stop being notified on updates for this post', 'publishpress' );
+                $link_text      = __( 'Stop notifying me', 'publishpress' );
+            } else {
+                $args['method'] = 'start_notifying';
+                $title_text     = __( 'Click to start being notified on updates for this post', 'publishpress' );
+                $link_text      = __( 'Notify me', 'publishpress' );
+            }
+
+            // wp_nonce_url() has encoding issues: http://core.trac.wordpress.org/ticket/20771
+            $args['_wpnonce'] = wp_create_nonce( 'pp_notifications_user_post_subscription' );
+
+            return [
+                'title' => $title_text,
+                'text'  => $link_text,
+                'link'  => add_query_arg( $args, admin_url( 'admin-ajax.php' ) ),
+            ];
+        }
+
+        /**
+         * Add the subscriptions meta box to relevant post types
+         */
+        public function add_post_meta_box() {
+            if ( ! current_user_can( $this->edit_post_subscriptions_cap ) ) {
+                return;
+            }
+
+            $role_post_types = $this->get_post_types_for_module( $this->module );
+            foreach ( $role_post_types as $post_type ) {
+                add_meta_box(
+                    'publishpress-notifications',
+                    __( 'Notify', 'publishpress' ),
+                    [ $this, 'notifications_meta_box' ],
+                    $post_type,
+                    'side',
+                    'high'
+                );
+            }
+        }
+
+        /**
+         * Outputs box used to subscribe users and roles to Posts
+         *
+         * @todo add_cap to set subscribers for posts; default to Admin and editors
+         */
+        public function notifications_meta_box() {
+            global $post, $post_ID, $publishpress;
+
+            ?>
             <div id="pp_post_notify_box">
                 <a name="subscriptions"></a>
 
                 <p>
-                    <?php _e('Select the users and roles that should receive notifications from workflows.', 'publishpress'); ?>
+                    <?php _e( 'Select the users and roles that should receive notifications from workflows.',
+                        'publishpress' ); ?>
                 </p>
 
@@ -439 +418 @@
                     $selected = array_merge($users_to_notify, $roles_to_notify);
 
-                    $select_form_args = array(
+                    $select_form_args = [
                         'list_class' => 'pp_post_notify_list',
-                    );
+                    ];
                     $this->users_select_form($selected , $select_form_args);
                     ?>
@@ -449 +428 @@
 
                 <p>
-                    <a href="https://publishpress.com/docs/notifications/"><?php _e('Click to read more about notifications', 'publishpress'); ?></a>
+                    <a href="https://publishpress.com/docs/notifications/"><?php _e( 'Click to read more about notifications',
+                            'publishpress' ); ?></a>
                 </p>
 
@@ -455 +435 @@
 
                 <input type="hidden" name="pp_save_notify" value="1"/> <?php // Extra protection against autosaves
-                ?>
-
-                <?php wp_nonce_field('save_roles', 'pp_notifications_nonce', false); ?>
+                ?>
+
+                <?php wp_nonce_field( 'save_roles', 'pp_notifications_nonce', false ); ?>
             </div>
 
-            <?php
-        }
-
-        public function action_save_post($postId)
-        {
-            if (!isset($_POST['pp_notifications_nonce']) || !wp_verify_nonce($_POST['pp_notifications_nonce'], 'save_roles')) {
-                return;
-            }
-
-            if (isset($_POST['to_notify'])) {
-                // Remove current users
-                $terms = get_the_terms($postId, $this->notify_user_taxonomy);
-                $users = array();
-                if (!empty($terms)) {
-                    foreach ($terms as $term) {
-                        $users[] = $term->term_id;
-                    }
-                }
-                wp_remove_object_terms($postId, $users, $this->notify_user_taxonomy);
-
-                // Remove current roles
-                $terms = get_the_terms($postId, $this->notify_role_taxonomy);
-                $roles = array();
-                if (!empty($terms)) {
-                    foreach ($terms as $term) {
-                        $roles[] = $term->term_id;
-                    }
-                }
-                wp_remove_object_terms($postId, $roles, $this->notify_role_taxonomy);
-
-                foreach ($_POST['to_notify'] as $id) {
-                    if (is_numeric($id)) {
-                        // User id
-                        $this->post_set_users_to_notify($postId, (int)$id, true);
-                    } else {
-                        // Role name
-                        $this->post_set_roles_to_notify($postId, $id, true);
-                    }
-                }
-            }
-        }
-
-        /**
-         * Handle a request to update a user's post subscription
-         *
-         * @since 0.8
-         */
-        public function handle_user_post_subscription()
-        {
-            if (!wp_verify_nonce($_GET['_wpnonce'], 'pp_notifications_user_post_subscription'))
-            {
-                $this->print_ajax_response('error', $this->module->messages['nonce-failed']);
-            }
-
-            if (!current_user_can($this->edit_post_subscriptions_cap))
-            {
-                $this->print_ajax_response('error', $this->module->messages['invalid-permissions']);
-            }
-
-            $post = get_post(($post_id = $_GET['post_id']));
-
-            if (!$post)
-            {
-                $this->print_ajax_response('error', $this->module->messages['missing-post']);
-            }
-
-            if ('start_notifying' === $_GET['method'])
-            {
-                $retval = $this->post_set_users_to_notify($post, get_current_user_id());
-            } else
-            {
-                $retval = $this->post_set_users_stop_notify($post, get_current_user_id());
-            }
-
-            if (is_wp_error($retval))
-            {
-                $this->print_ajax_response('error', $retval->get_error_message());
-            }
-
-            $this->print_ajax_response('success', (object )$this->get_notify_action_parts($post));
-        }
-
-        /**
-         * @param $default
-         * @param $context
-         * @return bool
-         */
-        public function filter_pp_notification_auto_subscribe_post_author($default, $context)
-        {
-            if (!isset($this->module->options->notify_author_by_default))
-            {
-                return $default;
-            }
-
-            return (booL)$this->module->options->notify_author_by_default;
-        }
-
-        /**
-         * @param $default
-         * @param $context
-         * @return bool
-         */
-        public function filter_pp_notification_auto_subscribe_current_user($default, $context)
-        {
-            if (!isset($this->module->options->notify_current_user_by_default))
-            {
-                return $default;
-            }
-
-            return (booL)$this->module->options->notify_current_user_by_default;
-        }
-
-        /**
-         * Sets users to be notified for the specified post
-         *
-         * @param int $post ID of the post
-         */
-        public function save_post_notify_users($post, $users = null)
-        {
-            if (!is_array($users))
-            {
-                $users = array();
-            }
-
-            // Add current user to notify list
-            $user = wp_get_current_user();
-            if ($user && apply_filters('pp_notification_auto_subscribe_current_user', true, 'subscription_action'))
-            {
-                $users[] = $user->ID;
-            }
-
-            // Add post author to notify list
-            if (apply_filters('pp_notification_auto_subscribe_post_author', true, 'subscription_action'))
-            {
-                $users[] = $post->post_author;
-            }
-
-            $users = array_unique(array_map('intval', $users));
-
-            $this->post_set_users_to_notify($post, $users, false);
-        }
-
-        /**
-         * Sets roles to be notified for the specified post
-         *
-         * @param int   $post       ID of the post
-         * @param array $roles   Roles to be notified for posts
-         */
-        public function save_post_notify_roles($post, $roles = null)
-        {
-            if (!is_array($roles))
-            {
-                $roles = array();
-            }
-            $roles = array_map('intval', $roles);
-
-            $this->add_role_to_notify($post, $roles, false);
-        }
-
-        /**
-         * Set up and send post status change a notification
-         */
-        public function notification_status_change($new_status, $old_status, $post)
-        {
-            global $publishpress;
-
-
-            // Kill switch for notification
-            if (!apply_filters('pp_notification_status_change', $new_status, $old_status, $post) || !apply_filters("pp_notification_{$post->post_type}_status_change", $new_status, $old_status, $post))
-            {
-                return false;
-            }
-
-            $supported_post_types = $this->get_post_types_for_module($this->module);
-            if (!in_array($post->post_type, $supported_post_types))
-            {
-                return;
-            }
-
-            // No need to notify if it's a revision, auto-draft, or if post status wasn't changed
-            $ignored_statuses = apply_filters('pp_notification_ignored_statuses', array($old_status, 'inherit', 'auto-draft'), $post->post_type);
-
-            if (!in_array($new_status, $ignored_statuses))
-            {
-                $args = array(
-                    'new_status' => $new_status,
-                    'old_status' => $old_status,
-                    'post'       => $post,
-                );
-
-                do_action('pp_send_notification_status_update', $args);
-            }
-        }
-
-        /**
-         * Set up and set editorial comment notification email
-         */
-        public function notification_comment($comment)
-        {
-            $post = get_post($comment->comment_post_ID);
-
-            $supported_post_types = $this->get_post_types_for_module($this->module);
-            if (!in_array($post->post_type, $supported_post_types))
-            {
-                return;
-            }
-
-            // Kill switch for notification
-            if (!apply_filters('pp_notification_editorial_comment', $comment, $post))
-            {
-                return false;
-            }
-
-            $user         = get_userdata($post->post_author);
-            $current_user = wp_get_current_user();
-
-            $post_id    = $post->ID;
-            $post_type  = get_post_type_object($post->post_type)->labels->singular_name;
-            $post_title = pp_draft_or_post_title($post_id);
-
-            // Check if this a reply
-            //$parent_ID = isset( $comment->comment_parent_ID ) ? $comment->comment_parent_ID : 0;
-            //if( $parent_ID ) $parent = get_comment( $parent_ID );
-
-            // Set user to be notified for a post, but make it filterable
-            if (apply_filters('pp_notification_auto_subscribe_current_user', true, 'comment'))
-            {
-                $this->post_set_users_to_notify($post, (int )$current_user->ID);
-            }
-
-            // Set the post author to be notified for the post but make it filterable
-            if (apply_filters('pp_notification_auto_subscribe_post_author', true, 'comment'))
-            {
-                $this->post_set_users_to_notify($post, (int )$post->post_author);
-            }
-
-            $blogname = get_option('blogname');
-
-            // Send the notification
-            $args = array(
-                'blogname'     => $blogname,
-                'post'         => $post,
-                'post_title'   => $post_title,
-                'post_id'      => $post_id,
-                'post_type'    => $post_type,
-                'current_user' => $current_user,
-                'comment'      => $comment,
-            );
-
-            do_action('pp_send_notification_comment', $args);
-        }
-
-        public function get_notification_footer($post)
-        {
-            $body = "";
-            $body .= "\r\n--------------------\r\n";
-            $body .= sprintf(__('You are receiving this email because you are subscribed to "%s".', 'publishpress'), pp_draft_or_post_title($post->ID));
-            $body .= "\r\n";
-            $body .= sprintf(__('This email was sent %s.', 'publishpress'), date('r'));
-            $body .= "\r\n \r\n";
-            $body .= get_option('blogname') . " | " . get_bloginfo('url') . " | " . admin_url('/') . "\r\n";
-
-            return $body;
-        }
-
-        /**
-         * send_email()
-         */
-        public function send_email($action, $post, $subject, $message, $message_headers = '', $recipients = null)
-        {
-            if (is_null($recipients))
-            {
-                // Get list of email recipients -- set them CC
-                $recipients = $this->_get_notification_recipients($post, true);
-            }
-
-            if ($recipients && !is_array($recipients))
-            {
-                $recipients = explode(',', $recipients);
-            }
-
-            $subject         = apply_filters('pp_notification_send_email_subject', $subject, $action, $post);
-            $message         = apply_filters('pp_notification_send_email_message', $message, $action, $post);
-            $message_headers = apply_filters('pp_notification_send_email_message_headers', $message_headers, $action, $post);
-
-            if (PP_NOTIFICATION_USE_CRON)
-            {
-                $this->schedule_emails($recipients, $subject, $message, $message_headers);
-            } else if (!empty($recipients))
-            {
-                foreach ($recipients as $recipient)
-                {
-                    $this->send_single_email($recipient, $subject, $message, $message_headers);
-                }
-            }
-        }
-
-        /**
-         * Schedules emails to be sent in succession
-         *
-         * @param mixed  $recipients      Individual email or array of emails
-         * @param string $subject         Subject of the email
-         * @param string $message         Body of the email
-         * @param string $message_headers . (optional ) Message headers
-         * @param int    $time_offset     (optional ) Delay in seconds per email
-         */
-        public function schedule_emails($recipients, $subject, $message, $message_headers = '', $time_offset = 1)
-        {
-            $recipients = (array)$recipients;
-
-            $send_time = time();
-
-            foreach ($recipients as $recipient)
-            {
-                wp_schedule_single_event($send_time, 'pp_send_scheduled_notification', array($recipient, $subject, $message, $message_headers));
-                $send_time += $time_offset;
-            }
-        }
-
-        /**
-         * Sends an individual email
-         *
-         * @param mixed  $to              Email to send to
-         * @param string $subject         Subject of the email
-         * @param string $message         Body of the email
-         * @param string $message_headers . (optional ) Message headers
-         */
-        public function send_single_email($to, $subject, $message, $message_headers = '')
-        {
-            wp_mail($to, $subject, $message, $message_headers);
-        }
-
-        /**
-         * Returns a list of recipients for a given post
-         *
-         * @param $post   object
-         * @param $string bool Whether to return recipients as comma-delimited string or array
-         * @return string or array of recipients to receive notification
-         */
-        private function _get_notification_recipients($post, $string = false)
-        {
-            global $publishpress;
-
-            $post_id = $post->ID;
-            if (!$post_id)
-            {
-                return;
-            }
-
-            $authors    = array();
-            $admins     = array();
-            $recipients = array();
-
-            $role_users = array();
-
-            // Get users and roles to notify
-            $roles = $this->get_roles_to_notify($post_id, 'slugs');
-            foreach ((array )$roles as $role_id)
-            {
-                $users = get_users(
-                    [
-                        'role' => $role_id,
-                    ]
-                );
-
-                if (!empty($users)) {
-                    foreach ($users as $user)
-                    {
-                        if (is_user_member_of_blog($user->ID))
-                        {
-                            $role_users[] = $user->user_email;
-                        }
-                    }
-                }
-            }
-
-            $users = $this->get_users_to_notify($post_id, 'user_email');
-
-            // Merge arrays and filter any duplicates
-            $recipients = array_merge($authors, $admins, $users, $role_users);
-            $recipients = array_unique($recipients);
-
-            // Process the recipients for this email to be sent
-            foreach ($recipients as $key => $user_email)
-            {
-                // Get rid of empty email entries
-                if (empty($recipients[$key]))
-                {
-                    unset($recipients[$key]);
-                }
-                // Don't send the email to the current user unless we've explicitly indicated they should receive it
-                if (false === apply_filters('publishpress_notify_current_user', false) && wp_get_current_user()->user_email == $user_email)
-                {
-                    unset($recipients[$key]);
-                }
-            }
-
-            // Filter to allow further modification of recipients
-            $recipients = apply_filters('pp_notification_recipients', $recipients, $post, $string);
-
-            // If string set to true, return comma-delimited
-            if ($string && is_array($recipients))
-            {
-                return implode(',', $recipients);
-            } else
-            {
-                return $recipients;
-            }
-        }
-
-        /**
-         * Set a user or users to be notified for a post
-         *
-         * @param int|object   $post   Post object or ID
-         * @param string|array $users  User or users to subscribe to post updates
-         * @param bool         $append Whether users should be added to pp_notify_user list or replace existing list
-         *
-         * @return true|WP_Error     $response  True on success, WP_Error on failure
-         */
-        public function post_set_users_to_notify($post, $users, $append = true)
-        {
-            $post = get_post($post);
-            if (!$post)
-            {
-                return new WP_Error('missing-post', $this->module->messages['missing-post']);
-            }
-
-            if (!is_array($users))
-            {
-                $users = array($users);
-            }
-
-            $user_terms = array();
-
-            foreach ($users as $user)
-            {
-                if (is_int($user))
-                {
-                    $user = get_user_by('id', $user);
-                } else if (is_string($user))
-                {
-                    $user = get_user_by('login', $user);
-                }
-
-                if (!is_object($user))
-                {
-                    continue;
-                }
-
-                $name = $user->user_login;
-
-                // Add user as a term if they don't exist
-                $term = $this->add_term_if_not_exists($name, $this->notify_user_taxonomy);
-
-                if (!is_wp_error($term))
-                {
-                    $user_terms[] = $name;
-                }
-            }
-
-            $set = wp_set_object_terms($post->ID, $user_terms, $this->notify_user_taxonomy, $append);
-
-            if (is_wp_error($set))
-            {
-                return $set;
-            } else
-            {
-                return true;
-            }
-        }
-
-        /**
-         * Set a role or roles to be notified for a post
-         *
-         * @param int|object   $post   Post object or ID
-         * @param string|array $roles  Role or roles to subscribe to post updates
-         * @param bool         $append Whether roles should be added to pp_notify_role list or replace existing list
-         *
-         * @return true|WP_Error     $response  True on success, WP_Error on failure
-         */
-        public function post_set_roles_to_notify($post, $roles, $append = true)
-        {
-            $post = get_post($post);
-            if (!$post)
-            {
-                return new WP_Error('missing-post', $this->module->messages['missing-post']);
-            }
-
-            if (!is_array($roles))
-            {
-                $roles = array($roles);
-            }
-
-            $role_terms = array();
-
-            foreach ($roles as $role)
-            {
-                $role = get_role($role);
-
-                if (!is_object($role))
-                {
-                    continue;
-                }
-
-                // Add user as a term if they don't exist
-                $term = $this->add_term_if_not_exists($role->name, $this->notify_role_taxonomy);
-
-                if (!is_wp_error($term))
-                {
-                    $role_terms[] = $role->name;
-                }
-            }
-
-            $set = wp_set_object_terms($post->ID, $role_terms, $this->notify_role_taxonomy, $append);
-
-            if (is_wp_error($set))
-            {
-                return $set;
-            } else
-            {
-                return true;
-            }
-        }
-
-        /**
-         * Removes user from pp_notify_user taxonomy for the given Post,
-         * so they no longer receive future notifications.
-         *
-         * @param object           $post  Post object or ID
-         * @param int|string|array $users One or more users to stop being notified for the post
-         * @return true|WP_Error     $response  True on success, WP_Error on failure
-         */
-        public function post_set_users_stop_notify($post, $users)
-        {
-            $post = get_post($post);
-            if (!$post)
-            {
-                return new WP_Error('missing-post', $this->module->messages['missing-post']);
-            }
-
-            if (!is_array($users))
-            {
-                $users = array($users);
-            }
-
-            $terms = get_the_terms($post->ID, $this->notify_user_taxonomy);
-            if (is_wp_error($terms))
-            {
-                return $terms;
-            }
-
-            $user_terms = wp_list_pluck($terms, 'slug');
-            foreach ($users as $user)
-            {
-                if (is_int($user))
-                {
-                    $user = get_user_by('id', $user);
-                } else if (is_string($user))
-                {
-                    $user = get_user_by('login', $user);
-                }
-
-                if (!is_object($user))
-                {
-                    continue;
-                }
-
-                $key = array_search($user->user_login, $user_terms);
-                if (false !== $key)
-                {
-                    unset($user_terms[$key]);
-                }
-            }
-            $set = wp_set_object_terms($post->ID, $user_terms, $this->notify_user_taxonomy, false);
-
-            if (is_wp_error($set))
-            {
-                return $set;
-            } else
-            {
-                return true;
-            }
-        }
-
-        /**
-         * add_role_to_notify()
-         *
-         */
-        public function add_role_to_notify($post, $roles = 0, $append = true)
-        {
-            $post_id = (is_int($post)) ? $post : $post->ID;
-            if (!is_array($roles))
-            {
-                $roles = array($roles);
-            }
-
-            // make sure each role id is an integer and not a number stored as a string
-            foreach ($roles as $key => $role)
-            {
-                $roles[$key] = intval($role);
-            }
-
-            wp_set_object_terms($post_id, $roles, $this->notify_role_taxonomy, $append);
-
-            return;
-        }
-
-        /**
-         * Removes users that are deleted from receiving future notifications (i.e. makes them out of notify list for posts FOREVER! )
-         *
-         * @param $id int ID of the user
-         */
-        public function delete_user_action($id)
-        {
-            if (!$id)
-            {
-                return;
-            }
-
-            // get user data
-            $user = get_userdata($id);
-
-            if ($user)
-            {
-                // Delete term from the pp_notify_user taxonomy
-                $notify_user_term = get_term_by('name', $user->user_login, $this->notify_user_taxonomy);
-                if ($notify_user_term)
-                {
-                    wp_delete_term($notify_user_term->term_id, $this->notify_user_taxonomy);
-                }
-            }
-
-            return;
-        }
-
-        /**
-         * Add user as a term if they aren't already
-         *
-         * @param $term     string term to be added
-         * @param $taxonomy string taxonomy to add term to
-         * @return WP_error if insert fails, true otherwise
-         */
-        public function add_term_if_not_exists($term, $taxonomy)
-        {
-            if (!term_exists($term, $taxonomy))
-            {
-                $args = array('slug' => sanitize_title($term));
-
-                return wp_insert_term($term, $taxonomy, $args);
-            }
-
-            return true;
-        }
-
-        /**
-         * Gets a list of the users to be notified for the specified post
-         *
-         * @param int    $post_id The ID of the post
-         * @param string $return  The field to return
-         * @return array $users Users to notify for the specified posts
-         */
-        public function get_users_to_notify($post_id, $return = 'user_login')
-        {
-            // Get pp_notify_user terms for the post
-            $users = wp_get_object_terms($post_id, $this->notify_user_taxonomy, array('fields' => 'names'));
-
-            // Don't have any users to notify
-            if (!$users || is_wp_error($users))
-            {
-                return array();
-            }
-
-            // if just want user_login, return as is
-            if ($return == 'user_login')
-            {
-                return $users;
-            }
-
-            foreach ((array )$users as $key => $user)
-            {
-                switch ($user)
-                {
-                    case is_int($user):
-                        $search = 'id';
-                        break;
-                    case is_email($user):
-                        $search = 'email';
-                        break;
-                    default:
-                        $search = 'login';
-                        break;
-                }
-                $new_user = get_user_by($search, $user);
-                if (!$new_user || !is_user_member_of_blog($new_user->ID))
-                {
-                    unset($users[$key]);
-                    continue;
-                }
-                switch ($return)
-                {
-                    case 'user_login':
-                        $users[$key] = $new_user->user_login;
-                        break;
-                    case 'id':
-                        $users[$key] = $new_user->ID;
-                        break;
-                    case 'user_email':
-                        $users[$key] = $new_user->user_email;
-                        break;
-                    case 'object':
-                        $users[$key] = $new_user;
-                        break;
-                }
-            }
-            if (!$users || is_wp_error($users))
-            {
-                $users = array();
-            }
-
-            return $users;
-        }
-
-        /**
-         * Gets a list of the roles that should be notified for the specified post
-         *
-         * @param int $post_id
-         * @return array $roles All of the role slugs
-         */
-        public function get_roles_to_notify($post_id, $return = 'all')
-        {
-            global $publishpress;
-
-            // Workaround for the fact that get_object_terms doesn't return just slugs
-            if ($return == 'slugs')
-            {
-                $fields = 'all';
-            } else
-            {
-                $fields = $return;
-            }
-
-            $roles = wp_get_object_terms($post_id, $this->notify_role_taxonomy, array('fields' => $fields));
-
-            if ($return == 'slugs')
-            {
-                $slugs = array();
-                foreach ($roles as $role)
-                {
-                    $slugs[] = $role->slug;
-                }
-                $roles = $slugs;
-            }
-
-            return $roles;
-        }
-
-        /**
-         * Gets a list of posts that a user is selected to be notified
-         *
-         * @param string|int $user user_login or id of user
-         * @param array      $args
-         * @return array $posts Posts a user is selected to be notified
-         */
-        public function get_user_to_notify_posts($user = 0, $args = null)
-        {
-            if (!$user)
-            {
-                $user = (int )wp_get_current_user()->ID;
-            }
-
-            if (is_int($user))
-            {
-                $user = get_userdata($user)->user_login;
-            }
-
-            $post_args = array(
-                'tax_query'      => array(
-                    array(
-                        'taxonomy' => $this->notify_user_taxonomy,
-                        'field'    => 'slug',
-                        'terms'    => $user,
-                    ),
-                ),
-                'posts_per_page' => '10',
-                'orderby'        => 'modified',
-                'order'          => 'DESC',
-                'post_status'    => 'any',
-            );
-            $post_args = apply_filters('pp_user_to_notify_posts_query_args', $post_args);
-            $posts     = get_posts($post_args);
-
-            return $posts;
-        }
-
-        /**
-         * Register settings for notifications so we can partially use the Settings API
-         * (We use the Settings API for form generation, but not saving )
-         *
-         * @since 0.7
-         */
-        public function register_settings()
-        {
-            add_settings_section($this->module->options_group_name . '_general', false, '__return_false', $this->module->options_group_name);
-            add_settings_field(
-                'post_types',
-                __('Show the "Notify me" and "Stop notifying me" links for these post types:', 'publishpress'),
-                array($this, 'settings_post_types_option'),
-                $this->module->options_group_name,
-                $this->module->options_group_name . '_general'
-            );
-
-            add_settings_field(
-                'email_from',
-                __('Email from:', 'publishpress'),
-                array($this, 'settings_email_from_option'),
-                $this->module->options_group_name,
-                $this->module->options_group_name . '_general'
-            );
-
-            add_settings_field(
-                'notify_author_by_default',
-                __('Always notify the author of the content:', 'publishpress'),
-                array($this, 'settings_notify_author_by_default_option'),
-                $this->module->options_group_name,
-                $this->module->options_group_name . '_general'
-            );
-
-            add_settings_field(
-                'notify_current_user_by_default',
-                __('Always notify users who have edited the content:', 'publishpress'),
-                array($this, 'settings_notify_current_user_by_default_option'),
-                $this->module->options_group_name,
-                $this->module->options_group_name . '_general'
-            );
-        }
-
-        /**
-         * Chose the post types for notifications
-         *
-         * @since 0.7
-         */
-        public function settings_post_types_option()
-        {
-            global $publishpress;
-            $publishpress->settings->helper_option_custom_post_type($this->module);
-        }
-
-        public function get_email_from()
-        {
-            if (!isset($this->module->options->email_from_name))
-            {
-                $name = get_bloginfo('name');
-            } else
-            {
-                $name = $this->module->options->email_from_name;
-            }
-
-            if (!isset($this->module->options->email_from))
-            {
-                $email = get_bloginfo('admin_email');
-            } else
-            {
-                $email = $this->module->options->email_from;
-            }
-
-            return array(
-                'name'  => $name,
-                'email' => $email,
-            );
-        }
-
-        /**
-         * Field to customize the email for the "email from".
-         */
-        public function settings_email_from_option()
-        {
-            $email_from = $this->get_email_from();
-
-            echo '<input
+            <?php
+        }
+
+        public function action_save_post( $postId ) {
+            if ( ! isset( $_POST['pp_notifications_nonce'] ) || ! wp_verify_nonce( $_POST['pp_notifications_nonce'],
+                    'save_roles' ) ) {
+                return;
+            }
+
+            if ( isset( $_POST['to_notify'] ) ) {
+                // Remove current users
+                $terms = get_the_terms( $postId, $this->notify_user_taxonomy );
+                $users = [];
+                if ( ! empty( $terms ) ) {
+                    foreach ( $terms as $term ) {
+                        $users[] = $term->term_id;
+                    }
+                }
+                wp_remove_object_terms( $postId, $users, $this->notify_user_taxonomy );
+
+                // Remove current roles
+                $terms = get_the_terms( $postId, $this->notify_role_taxonomy );
+                $roles = [];
+                if ( ! empty( $terms ) ) {
+                    foreach ( $terms as $term ) {
+                        $roles[] = $term->term_id;
+                    }
+                }
+                wp_remove_object_terms( $postId, $roles, $this->notify_role_taxonomy );
+
+                foreach ( $_POST['to_notify'] as $id ) {
+                    if ( is_numeric( $id ) ) {
+                        // User id
+                        $this->post_set_users_to_notify( $postId, (int) $id, true );
+                    } else {
+                        // Role name
+                        $this->post_set_roles_to_notify( $postId, $id, true );
+                    }
+                }
+            }
+        }
+
+        /**
+         * Handle a request to update a user's post subscription
+         *
+         * @since 0.8
+         */
+        public function handle_user_post_subscription() {
+            if ( ! wp_verify_nonce( $_GET['_wpnonce'], 'pp_notifications_user_post_subscription' ) ) {
+                $this->print_ajax_response( 'error', $this->module->messages['nonce-failed'] );
+            }
+
+            if ( ! current_user_can( $this->edit_post_subscriptions_cap ) ) {
+                $this->print_ajax_response( 'error', $this->module->messages['invalid-permissions'] );
+            }
+
+            $post = get_post( ( $post_id = $_GET['post_id'] ) );
+
+            if ( ! $post ) {
+                $this->print_ajax_response( 'error', $this->module->messages['missing-post'] );
+            }
+
+            if ( 'start_notifying' === $_GET['method'] ) {
+                $retval = $this->post_set_users_to_notify( $post, get_current_user_id() );
+            } else {
+                $retval = $this->post_set_users_stop_notify( $post, get_current_user_id() );
+            }
+
+            if ( is_wp_error( $retval ) ) {
+                $this->print_ajax_response( 'error', $retval->get_error_message() );
+            }
+
+            $this->print_ajax_response( 'success', (object ) $this->get_notify_action_parts( $post ) );
+        }
+
+        /**
+         * @param $default
+         * @param $context
+         *
+         * @return bool
+         */
+        public function filter_pp_notification_auto_subscribe_post_author( $default, $context ) {
+            if ( ! isset( $this->module->options->notify_author_by_default ) ) {
+                return $default;
+            }
+
+            return (booL) $this->module->options->notify_author_by_default;
+        }
+
+        /**
+         * @param $default
+         * @param $context
+         *
+         * @return bool
+         */
+        public function filter_pp_notification_auto_subscribe_current_user( $default, $context ) {
+            if ( ! isset( $this->module->options->notify_current_user_by_default ) ) {
+                return $default;
+            }
+
+            return (booL) $this->module->options->notify_current_user_by_default;
+        }
+
+        /**
+         * Sets users to be notified for the specified post
+         *
+         * @param int $post ID of the post
+         */
+        public function save_post_notify_users( $post, $users = null ) {
+            if ( ! is_array( $users ) ) {
+                $users = [];
+            }
+
+            // Add current user to notify list
+            $user = wp_get_current_user();
+            if ( $user && apply_filters( 'pp_notification_auto_subscribe_current_user', true,
+                    'subscription_action' ) ) {
+                $users[] = $user->ID;
+            }
+
+            // Add post author to notify list
+            if ( apply_filters( 'pp_notification_auto_subscribe_post_author', true, 'subscription_action' ) ) {
+                $users[] = $post->post_author;
+            }
+
+            $users = array_unique( array_map( 'intval', $users ) );
+
+            $this->post_set_users_to_notify( $post, $users, false );
+        }
+
+        /**
+         * Sets roles to be notified for the specified post
+         *
+         * @param int   $post  ID of the post
+         * @param array $roles Roles to be notified for posts
+         */
+        public function save_post_notify_roles( $post, $roles = null ) {
+            if ( ! is_array( $roles ) ) {
+                $roles = [];
+            }
+            $roles = array_map( 'intval', $roles );
+
+            $this->add_role_to_notify( $post, $roles, false );
+        }
+
+        /**
+         * Set up and send post status change a notification
+         */
+        public function notification_status_change( $new_status, $old_status, $post ) {
+            global $publishpress;
+
+
+            // Kill switch for notification
+            if ( ! apply_filters( 'pp_notification_status_change', $new_status, $old_status,
+                    $post ) || ! apply_filters( "pp_notification_{$post->post_type}_status_change", $new_status,
+                    $old_status, $post ) ) {
+                return false;
+            }
+
+            $supported_post_types = $this->get_post_types_for_module( $this->module );
+            if ( ! in_array( $post->post_type, $supported_post_types ) ) {
+                return;
+            }
+
+            // No need to notify if it's a revision, auto-draft, or if post status wasn't changed
+            $ignored_statuses = apply_filters( 'pp_notification_ignored_statuses',
+                [ $old_status, 'inherit', 'auto-draft' ], $post->post_type );
+
+            if ( ! in_array( $new_status, $ignored_statuses ) ) {
+                $args = [
+                    'new_status' => $new_status,
+                    'old_status' => $old_status,
+                    'post'       => $post,
+                ];
+
+                do_action( 'pp_send_notification_status_update', $args );
+            }
+        }
+
+        /**
+         * Set up and set editorial comment notification email
+         */
+        public function notification_comment( $comment ) {
+            $post = get_post( $comment->comment_post_ID );
+
+            $supported_post_types = $this->get_post_types_for_module( $this->module );
+            if ( ! in_array( $post->post_type, $supported_post_types ) ) {
+                return;
+            }
+
+            // Kill switch for notification
+            if ( ! apply_filters( 'pp_notification_editorial_comment', $comment, $post ) ) {
+                return false;
+            }
+
+            $user         = get_userdata( $post->post_author );
+            $current_user = wp_get_current_user();
+
+            $post_id    = $post->ID;
+            $post_type  = get_post_type_object( $post->post_type )->labels->singular_name;
+            $post_title = pp_draft_or_post_title( $post_id );
+
+            // Check if this a reply
+            //$parent_ID = isset( $comment->comment_parent_ID ) ? $comment->comment_parent_ID : 0;
+            //if( $parent_ID ) $parent = get_comment( $parent_ID );
+
+            // Set user to be notified for a post, but make it filterable
+            if ( apply_filters( 'pp_notification_auto_subscribe_current_user', true, 'comment' ) ) {
+                $this->post_set_users_to_notify( $post, (int ) $current_user->ID );
+            }
+
+            // Set the post author to be notified for the post but make it filterable
+            if ( apply_filters( 'pp_notification_auto_subscribe_post_author', true, 'comment' ) ) {
+                $this->post_set_users_to_notify( $post, (int ) $post->post_author );
+            }
+
+            $blogname = get_option( 'blogname' );
+
+            // Send the notification
+            $args = [
+                'blogname'     => $blogname,
+                'post'         => $post,
+                'post_title'   => $post_title,
+                'post_id'      => $post_id,
+                'post_type'    => $post_type,
+                'current_user' => $current_user,
+                'comment'      => $comment,
+            ];
+
+            do_action( 'pp_send_notification_comment', $args );
+        }
+
+        public function get_notification_footer( $post ) {
+            $body = "";
+            $body .= "\r\n--------------------\r\n";
+            $body .= sprintf( __( 'You are receiving this email because you are subscribed to "%s".', 'publishpress' ),
+                pp_draft_or_post_title( $post->ID ) );
+            $body .= "\r\n";
+            $body .= sprintf( __( 'This email was sent %s.', 'publishpress' ), date( 'r' ) );
+            $body .= "\r\n \r\n";
+            $body .= get_option( 'blogname' ) . " | " . get_bloginfo( 'url' ) . " | " . admin_url( '/' ) . "\r\n";
+
+            return $body;
+        }
+
+        /**
+         * send_email()
+         */
+        public function send_email( $action, $post, $subject, $message, $message_headers = '', $recipients = null ) {
+            if ( is_null( $recipients ) ) {
+                // Get list of email recipients -- set them CC
+                $recipients = $this->_get_notification_recipients( $post, true );
+            }
+
+            if ( $recipients && ! is_array( $recipients ) ) {
+                $recipients = explode( ',', $recipients );
+            }
+
+            $subject         = apply_filters( 'pp_notification_send_email_subject', $subject, $action, $post );
+            $message         = apply_filters( 'pp_notification_send_email_message', $message, $action, $post );
+            $message_headers = apply_filters( 'pp_notification_send_email_message_headers', $message_headers, $action,
+                $post );
+
+            if ( PP_NOTIFICATION_USE_CRON ) {
+                $this->schedule_emails( $recipients, $subject, $message, $message_headers );
+            } elseif ( ! empty( $recipients ) ) {
+                foreach ( $recipients as $recipient ) {
+                    $this->send_single_email( $recipient, $subject, $message, $message_headers );
+                }
+            }
+        }
+
+        /**
+         * Schedules emails to be sent in succession
+         *
+         * @param mixed  $recipients      Individual email or array of emails
+         * @param string $subject         Subject of the email
+         * @param string $message         Body of the email
+         * @param string $message_headers . (optional ) Message headers
+         * @param int    $time_offset     (optional ) Delay in seconds per email
+         */
+        public function schedule_emails( $recipients, $subject, $message, $message_headers = '', $time_offset = 1 ) {
+            $recipients = (array) $recipients;
+
+            $send_time = time();
+
+            foreach ( $recipients as $recipient ) {
+                wp_schedule_single_event( $send_time, 'pp_send_scheduled_notification',
+                    [ $recipient, $subject, $message, $message_headers ] );
+                $send_time += $time_offset;
+            }
+        }
+
+        /**
+         * Sends an individual email
+         *
+         * @param mixed  $to              Email to send to
+         * @param string $subject         Subject of the email
+         * @param string $message         Body of the email
+         * @param string $message_headers . (optional ) Message headers
+         */
+        public function send_single_email( $to, $subject, $message, $message_headers = '' ) {
+            wp_mail( $to, $subject, $message, $message_headers );
+        }
+
+        /**
+         * Returns a list of recipients for a given post
+         *
+         * @param $post   object
+         * @param $string bool Whether to return recipients as comma-delimited string or array
+         *
+         * @return string|array
+         */
+        private function _get_notification_recipients( $post, $string = false ) {
+            $post_id = $post->ID;
+            if ( ! $post_id ) {
+                return [];
+            }
+
+            $authors    = [];
+            $admins     = [];
+            $role_users = [];
+
+            // Get users and roles to notify
+            $roles = $this->get_roles_to_notify( $post_id, 'slugs' );
+            foreach ( (array ) $roles as $role_id ) {
+                $users = get_users(
+                    [
+                        'role' => $role_id,
+                    ]
+                );
+
+                if ( ! empty( $users ) ) {
+                    foreach ( $users as $user ) {
+                        if ( is_user_member_of_blog( $user->ID ) ) {
+                            $role_users[] = $user->user_email;
+                        }
+                    }
+                }
+            }
+
+            $users = $this->get_users_to_notify( $post_id, 'user_email' );
+
+            // Merge arrays and filter any duplicates
+            $recipients = array_merge( $authors, $admins, $users, $role_users );
+            $recipients = array_unique( $recipients );
+
+            // Process the recipients for this email to be sent
+            foreach ( $recipients as $key => $user_email ) {
+                // Get rid of empty email entries
+                if ( empty( $recipients[ $key ] ) ) {
+                    unset( $recipients[ $key ] );
+                }
+                // Don't send the email to the current user unless we've explicitly indicated they should receive it
+                if ( false === apply_filters( 'publishpress_notify_current_user',
+                        false ) && wp_get_current_user()->user_email == $user_email ) {
+                    unset( $recipients[ $key ] );
+                }
+            }
+
+            // Filter to allow further modification of recipients
+            $recipients = apply_filters( 'pp_notification_recipients', $recipients, $post, $string );
+
+            // If string set to true, return comma-delimited
+            if ( $string && is_array( $recipients ) ) {
+                return implode( ',', $recipients );
+            } else {
+                return $recipients;
+            }
+        }
+
+        /**
+         * Set a user or users to be notified for a post
+         *
+         * @param int|object   $post   Post object or ID
+         * @param string|array $users  User or users to subscribe to post updates
+         * @param bool         $append Whether users should be added to pp_notify_user list or replace existing list
+         *
+         * @return true|WP_Error     $response  True on success, WP_Error on failure
+         */
+        public function post_set_users_to_notify( $post, $users, $append = true ) {
+            $post = get_post( $post );
+            if ( ! $post ) {
+                return new WP_Error( 'missing-post', $this->module->messages['missing-post'] );
+            }
+
+            if ( ! is_array( $users ) ) {
+                $users = [ $users ];
+            }
+
+            $user_terms = [];
+
+            foreach ( $users as $user ) {
+                if ( is_int( $user ) ) {
+                    $user = get_user_by( 'id', $user );
+                } elseif ( is_string( $user ) ) {
+                    $user = get_user_by( 'login', $user );
+                }
+
+                if ( ! is_object( $user ) ) {
+                    continue;
+                }
+
+                $name = $user->user_login;
+
+                // Add user as a term if they don't exist
+                $term = $this->add_term_if_not_exists( $name, $this->notify_user_taxonomy );
+
+                if ( ! is_wp_error( $term ) ) {
+                    $user_terms[] = $name;
+                }
+            }
+
+            $set = wp_set_object_terms( $post->ID, $user_terms, $this->notify_user_taxonomy, $append );
+
+            if ( is_wp_error( $set ) ) {
+                return $set;
+            } else {
+                return true;
+            }
+        }
+
+        /**
+         * Set a role or roles to be notified for a post
+         *
+         * @param int|object   $post   Post object or ID
+         * @param string|array $roles  Role or roles to subscribe to post updates
+         * @param bool         $append Whether roles should be added to pp_notify_role list or replace existing list
+         *
+         * @return true|WP_Error     $response  True on success, WP_Error on failure
+         */
+        public function post_set_roles_to_notify( $post, $roles, $append = true ) {
+            $post = get_post( $post );
+            if ( ! $post ) {
+                return new WP_Error( 'missing-post', $this->module->messages['missing-post'] );
+            }
+
+            if ( ! is_array( $roles ) ) {
+                $roles = [ $roles ];
+            }
+
+            $role_terms = [];
+
+            foreach ( $roles as $role ) {
+                $role = get_role( $role );
+
+                if ( ! is_object( $role ) ) {
+                    continue;
+                }
+
+                // Add user as a term if they don't exist
+                $term = $this->add_term_if_not_exists( $role->name, $this->notify_role_taxonomy );
+
+                if ( ! is_wp_error( $term ) ) {
+                    $role_terms[] = $role->name;
+                }
+            }
+
+            $set = wp_set_object_terms( $post->ID, $role_terms, $this->notify_role_taxonomy, $append );
+
+            if ( is_wp_error( $set ) ) {
+                return $set;
+            } else {
+                return true;
+            }
+        }
+
+        /**
+         * Removes user from pp_notify_user taxonomy for the given Post,
+         * so they no longer receive future notifications.
+         *
+         * @param object           $post  Post object or ID
+         * @param int|string|array $users One or more users to stop being notified for the post
+         *
+         * @return true|WP_Error     $response  True on success, WP_Error on failure
+         */
+        public function post_set_users_stop_notify( $post, $users ) {
+            $post = get_post( $post );
+            if ( ! $post ) {
+                return new WP_Error( 'missing-post', $this->module->messages['missing-post'] );
+            }
+
+            if ( ! is_array( $users ) ) {
+                $users = [ $users ];
+            }
+
+            $terms = get_the_terms( $post->ID, $this->notify_user_taxonomy );
+            if ( is_wp_error( $terms ) ) {
+                return $terms;
+            }
+
+            $user_terms = wp_list_pluck( $terms, 'slug' );
+            foreach ( $users as $user ) {
+                if ( is_int( $user ) ) {
+                    $user = get_user_by( 'id', $user );
+                } elseif ( is_string( $user ) ) {
+                    $user = get_user_by( 'login', $user );
+                }
+
+                if ( ! is_object( $user ) ) {
+                    continue;
+                }
+
+                $key = array_search( $user->user_login, $user_terms );
+                if ( false !== $key ) {
+                    unset( $user_terms[ $key ] );
+                }
+            }
+            $set = wp_set_object_terms( $post->ID, $user_terms, $this->notify_user_taxonomy, false );
+
+            if ( is_wp_error( $set ) ) {
+                return $set;
+            } else {
+                return true;
+            }
+        }
+
+        /**
+         * add_role_to_notify()
+         *
+         */
+        public function add_role_to_notify( $post, $roles = 0, $append = true ) {
+            $post_id = ( is_int( $post ) ) ? $post : $post->ID;
+            if ( ! is_array( $roles ) ) {
+                $roles = [ $roles ];
+            }
+
+            // make sure each role id is an integer and not a number stored as a string
+            foreach ( $roles as $key => $role ) {
+                $roles[ $key ] = intval( $role );
+            }
+
+            wp_set_object_terms( $post_id, $roles, $this->notify_role_taxonomy, $append );
+
+            return;
+        }
+
+        /**
+         * Removes users that are deleted from receiving future notifications (i.e. makes them out of notify list for posts FOREVER! )
+         *
+         * @param $id int ID of the user
+         */
+        public function delete_user_action( $id ) {
+            if ( ! $id ) {
+                return;
+            }
+
+            // get user data
+            $user = get_userdata( $id );
+
+            if ( $user ) {
+                // Delete term from the pp_notify_user taxonomy
+                $notify_user_term = get_term_by( 'name', $user->user_login, $this->notify_user_taxonomy );
+                if ( $notify_user_term ) {
+                    wp_delete_term( $notify_user_term->term_id, $this->notify_user_taxonomy );
+                }
+            }
+
+            return;
+        }
+
+        /**
+         * Add user as a term if they aren't already
+         *
+         * @param $term     string term to be added
+         * @param $taxonomy string taxonomy to add term to
+         *
+         * @return WP_error if insert fails, true otherwise
+         */
+        public function add_term_if_not_exists( $term, $taxonomy ) {
+            if ( ! term_exists( $term, $taxonomy ) ) {
+                $args = [ 'slug' => sanitize_title( $term ) ];
+
+                return wp_insert_term( $term, $taxonomy, $args );
+            }
+
+            return true;
+        }
+
+        /**
+         * Gets a list of the users to be notified for the specified post
+         *
+         * @param int    $post_id The ID of the post
+         * @param string $return  The field to return
+         *
+         * @return array $users Users to notify for the specified posts
+         */
+        public function get_users_to_notify( $post_id, $return = 'user_login' ) {
+            // Get pp_notify_user terms for the post
+            $users = wp_get_object_terms( $post_id, $this->notify_user_taxonomy, [ 'fields' => 'names' ] );
+
+            // Don't have any users to notify
+            if ( ! $users || is_wp_error( $users ) ) {
+                return [];
+            }
+
+            // if just want user_login, return as is
+            if ( $return == 'user_login' ) {
+                return $users;
+            }
+
+            foreach ( (array ) $users as $key => $user ) {
+                switch ( $user ) {
+                    case is_int( $user ):
+                        $search = 'id';
+                        break;
+                    case is_email( $user ):
+                        $search = 'email';
+                        break;
+                    default:
+                        $search = 'login';
+                        break;
+                }
+                $new_user = get_user_by( $search, $user );
+                if ( ! $new_user || ! is_user_member_of_blog( $new_user->ID ) ) {
+                    unset( $users[ $key ] );
+                    continue;
+                }
+                switch ( $return ) {
+                    case 'user_login':
+                        $users[ $key ] = $new_user->user_login;
+                        break;
+                    case 'id':
+                        $users[ $key ] = $new_user->ID;
+                        break;
+                    case 'user_email':
+                        $users[ $key ] = $new_user->user_email;
+                        break;
+                    case 'object':
+                        $users[ $key ] = $new_user;
+                        break;
+                }
+            }
+            if ( ! $users || is_wp_error( $users ) ) {
+                $users = [];
+            }
+
+            return $users;
+        }
+
+        /**
+         * Gets a list of the roles that should be notified for the specified post
+         *
+         * @param int $post_id
+         *
+         * @return array $roles All of the role slugs
+         */
+        public function get_roles_to_notify( $post_id, $return = 'all' ) {
+            global $publishpress;
+
+            // Workaround for the fact that get_object_terms doesn't return just slugs
+            if ( $return == 'slugs' ) {
+                $fields = 'all';
+            } else {
+                $fields = $return;
+            }
+
+            $roles = wp_get_object_terms( $post_id, $this->notify_role_taxonomy, [ 'fields' => $fields ] );
+
+            if ( $return == 'slugs' ) {
+                $slugs = [];
+                foreach ( $roles as $role ) {
+                    $slugs[] = $role->slug;
+                }
+                $roles = $slugs;
+            }
+
+            return $roles;
+        }
+
+        /**
+         * Gets a list of posts that a user is selected to be notified
+         *
+         * @param string|int $user user_login or id of user
+         * @param array      $args
+         *
+         * @return array $posts Posts a user is selected to be notified
+         */
+        public function get_user_to_notify_posts( $user = 0, $args = null ) {
+            if ( ! $user ) {
+                $user = (int ) wp_get_current_user()->ID;
+            }
+
+            if ( is_int( $user ) ) {
+                $user = get_userdata( $user )->user_login;
+            }
+
+            $post_args = [
+                'tax_query'      => [
+                    [
+                        'taxonomy' => $this->notify_user_taxonomy,
+                        'field'    => 'slug',
+                        'terms'    => $user,
+                    ],
+                ],
+                'posts_per_page' => '10',
+                'orderby'        => 'modified',
+                'order'          => 'DESC',
+                'post_status'    => 'any',
+            ];
+            $post_args = apply_filters( 'pp_user_to_notify_posts_query_args', $post_args );
+            $posts     = get_posts( $post_args );
+
+            return $posts;
+        }
+
+        /**
+         * Register settings for notifications so we can partially use the Settings API
+         * (We use the Settings API for form generation, but not saving )
+         *
+         * @since 0.7
+         */
+        public function register_settings() {
+            add_settings_section( $this->module->options_group_name . '_general', false, '__return_false',
+                $this->module->options_group_name );
+            add_settings_field(
+                'post_types',
+                __( 'Show the "Notify me" and "Stop notifying me" links for these post types:', 'publishpress' ),
+                [ $this, 'settings_post_types_option' ],
+                $this->module->options_group_name,
+                $this->module->options_group_name . '_general'
+            );
+
+            add_settings_field(
+                'email_from',
+                __( 'Email from:', 'publishpress' ),
+                [ $this, 'settings_email_from_option' ],
+                $this->module->options_group_name,
+                $this->module->options_group_name . '_general'
+            );
+
+            add_settings_field(
+                'notify_author_by_default',
+                __( 'Always notify the author of the content:', 'publishpress' ),
+                [ $this, 'settings_notify_author_by_default_option' ],
+                $this->module->options_group_name,
+                $this->module->options_group_name . '_general'
+            );
+
+            add_settings_field(
+                'notify_current_user_by_default',
+                __( 'Always notify users who have edited the content:', 'publishpress' ),
+                [ $this, 'settings_notify_current_user_by_default_option' ],
+                $this->module->options_group_name,
+                $this->module->options_group_name . '_general'
+            );
+        }
+
+        /**
+         * Chose the post types for notifications
+         *
+         * @since 0.7
+         */
+        public function settings_post_types_option() {
+            global $publishpress;
+            $publishpress->settings->helper_option_custom_post_type( $this->module );
+        }
+
+        public function get_email_from() {
+            if ( ! isset( $this->module->options->email_from_name ) ) {
+                $name = get_bloginfo( 'name' );
+            } else {
+                $name = $this->module->options->email_from_name;
+            }
+
+            if ( ! isset( $this->module->options->email_from ) ) {
+                $email = get_bloginfo( 'admin_email' );
+            } else {
+                $email = $this->module->options->email_from;
+            }
+
+            return [
+                'name'  => $name,
+                'email' => $email,
+            ];
+        }
+
+        /**
+         * Field to customize the email for the "email from".
+         */
+        public function settings_email_from_option() {
+            $email_from = $this->get_email_from();
+
+            echo '<input
                     id="' . $this->module->slug . '_email_from_name"
                     type="text"
                     style="min-width: 300px"
-                    placeholder="' . get_bloginfo('name') . '"
+                    placeholder="' . get_bloginfo( 'name' ) . '"
                     name="' . $this->module->options_group_name . '[email_from_name]"
                     value="' . $email_from['name'] . '" />
                 </label>';
-            echo '<br />';
-            echo '<input
+            echo '<br />';
+            echo '<input
                     id="' . $this->module->slug . '_email_from"
                     type="email"
                     style="min-width: 300px"
-                    placeholder="' . get_bloginfo('admin_email') . '"
+                    placeholder="' . get_bloginfo( 'admin_email' ) . '"
                     name="' . $this->module->options_group_name . '[email_from]"
                     value="' . $email_from['email'] . '" />
                 </label>';
-        }
-
-        /**
-         * Field to choose between auto select author for notifications.
-         */
-        public function settings_notify_author_by_default_option()
-        {
-            $checked = '1';
-            if (isset($this->module->options->notify_author_by_default))
-            {
-                $checked = $this->module->options->notify_author_by_default;
-            }
-
-            $checked = (bool)$checked ? 'checked="checked"' : '';
-
-            echo '<input
+        }
+
+        /**
+         * Field to choose between auto select author for notifications.
+         */
+        public function settings_notify_author_by_default_option() {
+            $checked = '1';
+            if ( isset( $this->module->options->notify_author_by_default ) ) {
+                $checked = $this->module->options->notify_author_by_default;
+            }
+
+            $checked = (bool) $checked ? 'checked="checked"' : '';
+
+            echo '<input
                     id="' . $this->module->slug . '_notify_author_by_default"
                     type="checkbox"
                     name="' . $this->module->options_group_name . '[notify_author_by_default]"
                     value="1" ' . $checked . '/>';
-        }
-
-        /**
-         * Field to choose between auto select current user for notifications.
-         */
-        public function settings_notify_current_user_by_default_option()
-        {
-            $checked = '1';
-            if (isset($this->module->options->notify_current_user_by_default))
-            {
-                $checked = $this->module->options->notify_current_user_by_default;
-            }
-
-            $checked = (bool)$checked ? 'checked="checked"' : '';
-
-            echo '<input
+        }
+
+        /**
+         * Field to choose between auto select current user for notifications.
+         */
+        public function settings_notify_current_user_by_default_option() {
+            $checked = '1';
+            if ( isset( $this->module->options->notify_current_user_by_default ) ) {
+                $checked = $this->module->options->notify_current_user_by_default;
+            }
+
+            $checked = (bool) $checked ? 'checked="checked"' : '';
+
+            echo '<input
                     id="' . $this->module->slug . '_notify_current_user_by_default"
                     type="checkbox"
                     name="' . $this->module->options_group_name . '[notify_current_user_by_default]"
                     value="1" ' . $checked . '/>';
-        }
-
-        /**
-         * Validate our user input as the settings are being saved
-         *
-         * @since 0.7
-         */
-        public function settings_validate($new_options)
-        {
-
-            // Whitelist validation for the post type options
-            if (!isset($new_options['post_types']))
-            {
-                $new_options['post_types'] = array();
-            }
-            $new_options['post_types'] = $this->clean_post_type_options($new_options['post_types'], $this->module->post_type_support);
-
-            if (isset($new_options['email_from']))
-            {
-                $new_options['email_from_name'] = filter_var($new_options['email_from_name'], FILTER_SANITIZE_STRING);
-                $new_options['email_from']      = filter_var($new_options['email_from'], FILTER_SANITIZE_EMAIL);
-            }
-
-
-            if (isset($new_options['notify_author_by_default']))
-            {
-                $new_options['notify_author_by_default'] = (bool)$new_options['notify_author_by_default'] ? '1' : '0';
-            } else
-            {
-                $new_options['notify_author_by_default'] = '0';
-            }
-
-
-            if (isset($new_options['notify_current_user_by_default']))
-            {
-                $new_options['notify_current_user_by_default'] = (bool)$new_options['notify_current_user_by_default'] ? '1' : '0';
-            } else
-            {
-                $new_options['notify_current_user_by_default'] = '0';
-            }
-
-            return $new_options;
-        }
-
-        /**
-         * Settings page for notifications
-         *
-         * @since 0.7
-         */
-        public function print_configure_view()
-        {
-            settings_fields($this->module->options_group_name);
-            do_settings_sections($this->module->options_group_name);
-        }
-
-        /**
-         * Gets a simple phrase containing the formatted date and time that the post is scheduled for.
-         *
-         * @since 0.8
-         *
-         * @param  obj $post Post object
-         * @return str    $scheduled_datetime The scheduled datetime in human-readable format
-         */
-        private function get_scheduled_datetime($post)
-        {
-            $scheduled_ts = strtotime($post->post_date);
-
-            $date = date_i18n(get_option('date_format'), $scheduled_ts);
-            $time = date_i18n(get_option('time_format'), $scheduled_ts);
-
-            return sprintf(__('%1$s at %2$s', 'publishpress'), $date, $time);
-        }
-
-        public function send_notification_status_update($args)
-        {
-            $new_status = $args['new_status'];
-            $old_status = $args['old_status'];
-            $post       = $args['post'];
-
-            // Get current user
-            $current_user = wp_get_current_user();
-
-            $post_author = get_userdata($post->post_author);
-            //$duedate = $publishpress->post_metadata->get_post_meta( $post->ID, 'duedate', true );
-
-            $blogname = get_option('blogname');
-
-            $body = '';
-
-            $post_id    = $post->ID;
-            $post_title = pp_draft_or_post_title($post_id);
-            $post_type  = get_post_type_object($post->post_type)->labels->singular_name;
-
-            if (0 != $current_user->ID)
-            {
-                $current_user_display_name = $current_user->display_name;
-                $current_user_email        = sprintf('(%s )', $current_user->user_email);
-            } else
-            {
-                $current_user_display_name = __('WordPress Scheduler', 'publishpress');
-                $current_user_email        = '';
-            }
-
-            // Email subject and first line of body
-            // Set message subjects according to what action is being taken on the Post
-            if ($old_status == 'new' || $old_status == 'auto-draft')
-            {
-                /* translators: 1: site name, 2: post type, 3. post title */
-                $subject = sprintf(__('[%1$s] New %2$s Created: "%3$s"', 'publishpress'), $blogname, $post_type, $post_title);
-                /* translators: 1: post type, 2: post id, 3. post title, 4. user name, 5. user email */
-                $body .= sprintf(__('A new %1$s (#%2$s "%3$s" ) was created by %4$s %5$s', 'publishpress'), $post_type, $post_id, $post_title, $current_user->display_name, $current_user->user_email) . "\r\n";
-            } else if ($new_status == 'trash')
-            {
-                /* translators: 1: site name, 2: post type, 3. post title */
-                $subject = sprintf(__('[%1$s] %2$s Trashed: "%3$s"', 'publishpress'), $blogname, $post_type, $post_title);
-                /* translators: 1: post type, 2: post id, 3. post title, 4. user name, 5. user email */
-                $body .= sprintf(__('%1$s #%2$s "%3$s" was moved to the trash by %4$s %5$s', 'publishpress'), $post_type, $post_id, $post_title, $current_user_display_name, $current_user_email) . "\r\n";
-            } else if ($old_status == 'trash')
-            {
-                /* translators: 1: site name, 2: post type, 3. post title */
-                $subject = sprintf(__('[%1$s] %2$s Restored (from Trash ): "%3$s"', 'publishpress'), $blogname, $post_type, $post_title);
-                /* translators: 1: post type, 2: post id, 3. post title, 4. user name, 5. user email */
-                $body .= sprintf(__('%1$s #%2$s "%3$s" was restored from trash by %4$s %5$s', 'publishpress'), $post_type, $post_id, $post_title, $current_user_display_name, $current_user_email) . "\r\n";
-            } else if ($new_status == 'future')
-            {
-                /* translators: 1: site name, 2: post type, 3. post title */
-                $subject = sprintf(__('[%1$s] %2$s Scheduled: "%3$s"'), $blogname, $post_type, $post_title);
-                /* translators: 1: post type, 2: post id, 3. post title, 4. user name, 5. user email 6. scheduled date  */
-                $body .= sprintf(__('%1$s #%2$s "%3$s" was scheduled by %4$s %5$s.  It will be published on %6$s'), $post_type, $post_id, $post_title, $current_user_display_name, $current_user_email, $this->get_scheduled_datetime($post)) . "\r\n";
-            } else if ($new_status == 'publish')
-            {
-                /* translators: 1: site name, 2: post type, 3. post title */
-                $subject = sprintf(__('[%1$s] %2$s Published: "%3$s"', 'publishpress'), $blogname, $post_type, $post_title);
-                /* translators: 1: post type, 2: post id, 3. post title, 4. user name, 5. user email */
-                $body .= sprintf(__('%1$s #%2$s "%3$s" was published by %4$s %5$s', 'publishpress'), $post_type, $post_id, $post_title, $current_user_display_name, $current_user_email) . "\r\n";
-            } else if ($old_status == 'publish')
-            {
-                /* translators: 1: site name, 2: post type, 3. post title */
-                $subject = sprintf(__('[%1$s] %2$s Unpublished: "%3$s"', 'publishpress'), $blogname, $post_type, $post_title);
-                /* translators: 1: post type, 2: post id, 3. post title, 4. user name, 5. user email */
-                $body .= sprintf(__('%1$s #%2$s "%3$s" was unpublished by %4$s %5$s', 'publishpress'), $post_type, $post_id, $post_title, $current_user_display_name, $current_user_email) . "\r\n";
-            } else
-            {
-                /* translators: 1: site name, 2: post type, 3. post title */
-                $subject = sprintf(__('[%1$s] %2$s Status Changed for "%3$s"', 'publishpress'), $blogname, $post_type, $post_title);
-                /* translators: 1: post type, 2: post id, 3. post title, 4. user name, 5. user email */
-                $body .= sprintf(__('Status was changed for %1$s #%2$s "%3$s" by %4$s %5$s', 'publishpress'), $post_type, $post_id, $post_title, $current_user_display_name, $current_user_email) . "\r\n";
-            }
-
-            /* translators: 1: date, 2: time, 3: timezone */
-            $body .= sprintf(__('This action was taken on %1$s at %2$s %3$s', 'publishpress'), date_i18n(get_option('date_format')), date_i18n(get_option('time_format')), get_option('timezone_string')) . "\r\n";
-
-            $old_status_friendly_name = $this->get_post_status_friendly_name($old_status);
-            $new_status_friendly_name = $this->get_post_status_friendly_name($new_status);
-
-            // Email body
-            $body .= "\r\n";
-            /* translators: 1: old status, 2: new status */
-            $body .= sprintf(__('%1$s => %2$s', 'publishpress'), $old_status_friendly_name, $new_status_friendly_name);
-            $body .= "\r\n\r\n";
-
-            $body .= "--------------------\r\n\r\n";
-
-            $body .= sprintf(__('== %s Details ==', 'publishpress'), $post_type) . "\r\n";
-            $body .= sprintf(__('Title: %s', 'publishpress'), $post_title) . "\r\n";
-            if (!empty($post_author))
-            {
-                /* translators: 1: author name, 2: author email */
-                $body .= sprintf(__('Author: %1$s (%2$s )', 'publishpress'), $post_author->display_name, $post_author->user_email) . "\r\n";
-            }
-
-            $admin_path = 'post.php?post=' . $post_id . '&action=edit';
-            $edit_link  = htmlspecialchars_decode(admin_url($admin_path));
-            if ($new_status != 'publish')
-            {
-                $view_link = add_query_arg(array('preview' => 'true'), wp_get_shortlink($post_id));
-            } else
-            {
-                $view_link = htmlspecialchars_decode(get_permalink($post_id));
-            }
-            $body .= "\r\n";
-            $body .= __('== Actions ==', 'publishpress') . "\r\n";
-            $body .= sprintf(__('Add editorial comment: %s', 'publishpress'), $edit_link . '#editorialcomments/add') . "\r\n";
-            $body .= sprintf(__('Edit: %s', 'publishpress'), $edit_link) . "\r\n";
-            $body .= sprintf(__('View: %s', 'publishpress'), $view_link) . "\r\n";
-
-            $body .= $this->get_notification_footer($post);
-
-            $this->send_email('status-change', $post, $subject, $body);
-        }
-
-        public function send_notification_comment($args)
-        {
-            /* translators: 1: blog name, 2: post title */
-            $subject = sprintf(__('[%1$s] New Editorial Comment: "%2$s"', 'publishpress'), $args['blogname'], $args['post_title']);
-
-            /* translators: 1: post id, 2: post title, 3. post type */
-            $body = sprintf(__('A new editorial comment was added to %3$s #%1$s "%2$s"', 'publishpress'), $args['post_id'], $args['post_title'], $args['post_type']) . "\r\n\r\n";
-            /* translators: 1: comment author, 2: author email, 3: date, 4: time */
-            $body .= sprintf(__('%1$s (%2$s ) said on %3$s at %4$s:', 'publishpress'), $args['current_user']->display_name, $args['current_user']->user_email, mysql2date(get_option('date_format'), $args['comment']->comment_date), mysql2date(get_option('time_format'), $args['comment']->comment_date)) . "\r\n";
-            $body .= "\r\n" . $args['comment']->comment_content . "\r\n";
-
-            // @TODO: mention if it was a reply
-            /*
-            if( $parent ) {
-
-            }
-            */
-
-            $body .= "\r\n--------------------\r\n";
-
-            $admin_path = 'post.php?post=' . $args['post_id'] . '&action=edit';
-            $edit_link  = htmlspecialchars_decode(admin_url($admin_path));
-            $view_link = htmlspecialchars_decode(get_permalink($args['post_id']));
-
-            $body .= "\r\n";
-            $body .= __('== Actions ==', 'publishpress') . "\r\n";
-            $body .= sprintf(__('Reply: %s', 'publishpress'), $edit_link . '#editorialcomments/reply/' . $args['comment']->comment_ID) . "\r\n";
-            $body .= sprintf(__('Add editorial comment: %s', 'publishpress'), $edit_link . '#editorialcomments/add') . "\r\n";
-            $body .= sprintf(__('Edit: %s', 'publishpress'), $edit_link) . "\r\n";
-            $body .= sprintf(__('View: %s', 'publishpress'), $view_link) . "\r\n";
-
-            $body .= "\r\n" . sprintf(__('You can see all editorial comments on this %s here: ', 'publishpress'), $args['post_type']) . "\r\n";
-            $body .= $edit_link . "#editorialcomments" . "\r\n\r\n";
-
-            $body .= $this->get_notification_footer($args['post']);
-
-            $this->send_email('comment', $args['post'], $subject, $body);
-        }
-    }
+        }
+
+        /**
+         * Validate our user input as the settings are being saved
+         *
+         * @since 0.7
+         */
+        public function settings_validate( $new_options ) {
+
+            // Whitelist validation for the post type options
+            if ( ! isset( $new_options['post_types'] ) ) {
+                $new_options['post_types'] = [];
+            }
+            $new_options['post_types'] = $this->clean_post_type_options( $new_options['post_types'],
+                $this->module->post_type_support );
+
+            if ( isset( $new_options['email_from'] ) ) {
+                $new_options['email_from_name'] = filter_var( $new_options['email_from_name'], FILTER_SANITIZE_STRING );
+                $new_options['email_from']      = filter_var( $new_options['email_from'], FILTER_SANITIZE_EMAIL );
+            }
+
+
+            if ( isset( $new_options['notify_author_by_default'] ) ) {
+                $new_options['notify_author_by_default'] = (bool) $new_options['notify_author_by_default'] ? '1' : '0';
+            } else {
+                $new_options['notify_author_by_default'] = '0';
+            }
+
+
+            if ( isset( $new_options['notify_current_user_by_default'] ) ) {
+                $new_options['notify_current_user_by_default'] = (bool) $new_options['notify_current_user_by_default'] ? '1' : '0';
+            } else {
+                $new_options['notify_current_user_by_default'] = '0';
+            }
+
+            return $new_options;
+        }
+
+        /**
+         * Settings page for notifications
+         *
+         * @since 0.7
+         */
+        public function print_configure_view() {
+            settings_fields( $this->module->options_group_name );
+            do_settings_sections( $this->module->options_group_name );
+        }
+
+        /**
+         * Gets a simple phrase containing the formatted date and time that the post is scheduled for.
+         *
+         * @since 0.8
+         *
+         * @param  obj $post Post object
+         *
+         * @return str    $scheduled_datetime The scheduled datetime in human-readable format
+         */
+        private function get_scheduled_datetime( $post ) {
+            $scheduled_ts = strtotime( $post->post_date );
+
+            $date = date_i18n( get_option( 'date_format' ), $scheduled_ts );
+            $time = date_i18n( get_option( 'time_format' ), $scheduled_ts );
+
+            return sprintf( __( '%1$s at %2$s', 'publishpress' ), $date, $time );
+        }
+
+        public function send_notification_status_update( $args ) {
+            $new_status = $args['new_status'];
+            $old_status = $args['old_status'];
+            $post       = $args['post'];
+
+            // Get current user
+            $current_user = wp_get_current_user();
+
+            $post_author = get_userdata( $post->post_author );
+            //$duedate = $publishpress->post_metadata->get_post_meta( $post->ID, 'duedate', true );
+
+            $blogname = get_option( 'blogname' );
+
+            $body = '';
+
+            $post_id    = $post->ID;
+            $post_title = pp_draft_or_post_title( $post_id );
+            $post_type  = get_post_type_object( $post->post_type )->labels->singular_name;
+
+            if ( 0 != $current_user->ID ) {
+                $current_user_display_name = $current_user->display_name;
+                $current_user_email        = sprintf( '(%s )', $current_user->user_email );
+            } else {
+                $current_user_display_name = __( 'WordPress Scheduler', 'publishpress' );
+                $current_user_email        = '';
+            }
+
+            // Email subject and first line of body
+            // Set message subjects according to what action is being taken on the Post
+            if ( $old_status == 'new' || $old_status == 'auto-draft' ) {
+                /* translators: 1: site name, 2: post type, 3. post title */
+                $subject = sprintf( __( '[%1$s] New %2$s Created: "%3$s"', 'publishpress' ), $blogname, $post_type,
+                    $post_title );
+                /* translators: 1: post type, 2: post id, 3. post title, 4. user name, 5. user email */
+                $body .= sprintf( __( 'A new %1$s (#%2$s "%3$s" ) was created by %4$s %5$s', 'publishpress' ),
+                        $post_type, $post_id, $post_title, $current_user->display_name,
+                        $current_user->user_email ) . "\r\n";
+            } elseif ( $new_status == 'trash' ) {
+                /* translators: 1: site name, 2: post type, 3. post title */
+                $subject = sprintf( __( '[%1$s] %2$s Trashed: "%3$s"', 'publishpress' ), $blogname, $post_type,
+                    $post_title );
+                /* translators: 1: post type, 2: post id, 3. post title, 4. user name, 5. user email */
+                $body .= sprintf( __( '%1$s #%2$s "%3$s" was moved to the trash by %4$s %5$s', 'publishpress' ),
+                        $post_type, $post_id, $post_title, $current_user_display_name, $current_user_email ) . "\r\n";
+            } elseif ( $old_status == 'trash' ) {
+                /* translators: 1: site name, 2: post type, 3. post title */
+                $subject = sprintf( __( '[%1$s] %2$s Restored (from Trash ): "%3$s"', 'publishpress' ), $blogname,
+                    $post_type, $post_title );
+                /* translators: 1: post type, 2: post id, 3. post title, 4. user name, 5. user email */
+                $body .= sprintf( __( '%1$s #%2$s "%3$s" was restored from trash by %4$s %5$s', 'publishpress' ),
+                        $post_type, $post_id, $post_title, $current_user_display_name, $current_user_email ) . "\r\n";
+            } elseif ( $new_status == 'future' ) {
+                /* translators: 1: site name, 2: post type, 3. post title */
+                $subject = sprintf( __( '[%1$s] %2$s Scheduled: "%3$s"' ), $blogname, $post_type, $post_title );
+                /* translators: 1: post type, 2: post id, 3. post title, 4. user name, 5. user email 6. scheduled date  */
+                $body .= sprintf( __( '%1$s #%2$s "%3$s" was scheduled by %4$s %5$s.  It will be published on %6$s' ),
+                        $post_type, $post_id, $post_title, $current_user_display_name, $current_user_email,
+                        $this->get_scheduled_datetime( $post ) ) . "\r\n";
+            } elseif ( $new_status == 'publish' ) {
+                /* translators: 1: site name, 2: post type, 3. post title */
+                $subject = sprintf( __( '[%1$s] %2$s Published: "%3$s"', 'publishpress' ), $blogname, $post_type,
+                    $post_title );
+                /* translators: 1: post type, 2: post id, 3. post title, 4. user name, 5. user email */
+                $body .= sprintf( __( '%1$s #%2$s "%3$s" was published by %4$s %5$s', 'publishpress' ), $post_type,
+                        $post_id, $post_title, $current_user_display_name, $current_user_email ) . "\r\n";
+            } elseif ( $old_status == 'publish' ) {
+                /* translators: 1: site name, 2: post type, 3. post title */
+                $subject = sprintf( __( '[%1$s] %2$s Unpublished: "%3$s"', 'publishpress' ), $blogname, $post_type,
+                    $post_title );
+                /* translators: 1: post type, 2: post id, 3. post title, 4. user name, 5. user email */
+                $body .= sprintf( __( '%1$s #%2$s "%3$s" was unpublished by %4$s %5$s', 'publishpress' ), $post_type,
+                        $post_id, $post_title, $current_user_display_name, $current_user_email ) . "\r\n";
+            } else {
+                /* translators: 1: site name, 2: post type, 3. post title */
+                $subject = sprintf( __( '[%1$s] %2$s Status Changed for "%3$s"', 'publishpress' ), $blogname,
+                    $post_type, $post_title );
+                /* translators: 1: post type, 2: post id, 3. post title, 4. user name, 5. user email */
+                $body .= sprintf( __( 'Status was changed for %1$s #%2$s "%3$s" by %4$s %5$s', 'publishpress' ),
+                        $post_type, $post_id, $post_title, $current_user_display_name, $current_user_email ) . "\r\n";
+            }
+
+            /* translators: 1: date, 2: time, 3: timezone */
+            $body .= sprintf( __( 'This action was taken on %1$s at %2$s %3$s', 'publishpress' ),
+                    date_i18n( get_option( 'date_format' ) ), date_i18n( get_option( 'time_format' ) ),
+                    get_option( 'timezone_string' ) ) . "\r\n";
+
+            $old_status_friendly_name = $this->get_post_status_friendly_name( $old_status );
+            $new_status_friendly_name = $this->get_post_status_friendly_name( $new_status );
+
+            // Email body
+            $body .= "\r\n";
+            /* translators: 1: old status, 2: new status */
+            $body .= sprintf( __( '%1$s => %2$s', 'publishpress' ), $old_status_friendly_name,
+                $new_status_friendly_name );
+            $body .= "\r\n\r\n";
+
+            $body .= "--------------------\r\n\r\n";
+
+            $body .= sprintf( __( '== %s Details ==', 'publishpress' ), $post_type ) . "\r\n";
+            $body .= sprintf( __( 'Title: %s', 'publishpress' ), $post_title ) . "\r\n";
+            if ( ! empty( $post_author ) ) {
+                /* translators: 1: author name, 2: author email */
+                $body .= sprintf( __( 'Author: %1$s (%2$s )', 'publishpress' ), $post_author->display_name,
+                        $post_author->user_email ) . "\r\n";
+            }
+
+            $admin_path = 'post.php?post=' . $post_id . '&action=edit';
+            $edit_link  = htmlspecialchars_decode( admin_url( $admin_path ) );
+            if ( $new_status != 'publish' ) {
+                $view_link = add_query_arg( [ 'preview' => 'true' ], wp_get_shortlink( $post_id ) );
+            } else {
+                $view_link = htmlspecialchars_decode( get_permalink( $post_id ) );
+            }
+            $body .= "\r\n";
+            $body .= __( '== Actions ==', 'publishpress' ) . "\r\n";
+            $body .= sprintf( __( 'Add editorial comment: %s', 'publishpress' ),
+                    $edit_link . '#editorialcomments/add' ) . "\r\n";
+            $body .= sprintf( __( 'Edit: %s', 'publishpress' ), $edit_link ) . "\r\n";
+            $body .= sprintf( __( 'View: %s', 'publishpress' ), $view_link ) . "\r\n";
+
+            $body .= $this->get_notification_footer( $post );
+
+            $this->send_email( 'status-change', $post, $subject, $body );
+        }
+
+        public function send_notification_comment( $args ) {
+            /* translators: 1: blog name, 2: post title */
+            $subject = sprintf( __( '[%1$s] New Editorial Comment: "%2$s"', 'publishpress' ), $args['blogname'],
+                $args['post_title'] );
+
+            /* translators: 1: post id, 2: post title, 3. post type */
+            $body = sprintf( __( 'A new editorial comment was added to %3$s #%1$s "%2$s"', 'publishpress' ),
+                    $args['post_id'], $args['post_title'], $args['post_type'] ) . "\r\n\r\n";
+            /* translators: 1: comment author, 2: author email, 3: date, 4: time */
+            $body .= sprintf( __( '%1$s (%2$s ) said on %3$s at %4$s:', 'publishpress' ),
+                    $args['current_user']->display_name, $args['current_user']->user_email,
+                    mysql2date( get_option( 'date_format' ), $args['comment']->comment_date ),
+                    mysql2date( get_option( 'time_format' ), $args['comment']->comment_date ) ) . "\r\n";
+            $body .= "\r\n" . $args['comment']->comment_content . "\r\n";
+
+            // @TODO: mention if it was a reply
+            /*
+            if( $parent ) {
+
+            }
+            */
+
+            $body .= "\r\n--------------------\r\n";
+
+            $admin_path = 'post.php?post=' . $args['post_id'] . '&action=edit';
+            $edit_link  = htmlspecialchars_decode( admin_url( $admin_path ) );
+            $view_link  = htmlspecialchars_decode( get_permalink( $args['post_id'] ) );
+
+            $body .= "\r\n";
+            $body .= __( '== Actions ==', 'publishpress' ) . "\r\n";
+            $body .= sprintf( __( 'Reply: %s', 'publishpress' ),
+                    $edit_link . '#editorialcomments/reply/' . $args['comment']->comment_ID ) . "\r\n";
+            $body .= sprintf( __( 'Add editorial comment: %s', 'publishpress' ),
+                    $edit_link . '#editorialcomments/add' ) . "\r\n";
+            $body .= sprintf( __( 'Edit: %s', 'publishpress' ), $edit_link ) . "\r\n";
+            $body .= sprintf( __( 'View: %s', 'publishpress' ), $view_link ) . "\r\n";
+
+            $body .= "\r\n" . sprintf( __( 'You can see all editorial comments on this %s here: ', 'publishpress' ),
+                    $args['post_type'] ) . "\r\n";
+            $body .= $edit_link . "#editorialcomments" . "\r\n\r\n";
+
+            $body .= $this->get_notification_footer( $args['post'] );
+
+            $this->send_email( 'comment', $args['post'], $subject, $body );
+        }
+    }
 }

publishpress/trunk/modules/roles/roles.php

@@ -150 +150 @@
 
             add_action('profile_update', [$this, 'action_profile_update'], 10, 2);
-            add_action('user_register', [$this, 'action_profile_update'], 10);
+            add_action('user_register', [$this, 'action_profile_update'], 9);
 
             if ($this->wasPublishPressInstalledBefore()) {

publishpress/trunk/publishpress.php

@@ -6 +6 @@
  * Author: PublishPress
  * Author URI: https://publishpress.com
- * Version: 1.12.0
+ * Version: 1.12.1
  * Text Domain: publishpress
  * Domain Path: /languages

publishpress/trunk/readme.txt

@@ -6 +6 @@
 Requires at least: 4.6
 Requires PHP: 5.4
-Tested up to: 4.9.4
-Stable tag: 1.12.0
+Tested up to: 4.9.5
+Stable tag: 1.12.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -133 +133 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
+
+= [1.12.1] - 2018-05-09  =
+
+*Fixed:*
+
+* Fixed PHP strict warning about trait and a redefined property;
+* Fixed duplicated notifications on some scenarios;
+
+*Changed:*
+
+* Increased the priority of the hook user_register to have the multiple roles loaded and available for add-ons;
 
 = [1.12.0] - 2018-04-18  =