Changeset 917929

subscribe2/tags/10.0/ChangeLog.txt

-                      r914924
+                      r917929
-= Version 9.5 by Matthew Robinson =
-* Improved placement and usage of the 's2_custom_keywords' filter in the digest emails
-* Fix for some undefined variable notices
-* Fixes for database connectivity in the upgrade class file - thanks to rushu25
-* Fix for bug when antispam measures are disabled - thanks to serinx
-* Add option to Sidebar Widget to not wrap the button below the form
-* Straightened quotes in the ChangeLog
-* Remove all uses of PHP extract() function as per core ticket (https://core.trac.wordpress.org/ticket/22400)
 = Version 9.4 by Matthew Robinson =
 * Fix for non-existing variable errors on Subscribe2->Subscribers page - thanks to bapakrob and perezlr
 * Don't display Excluded Categories in Bulk Management is Registered users cannot override the exclusion
+* Don’t display Excluded Categories in Bulk Management is Registered users cannot override the exclusion
 * Fix for disappearing Jetpack Stats module - thanks to desertravenart
-* Fix for undefined variable notices in the digest emails
 = Version 9.3 by Matthew Robinson =
 …
 * Improved domain name comparison for sender email check - props garypardun
 * Tidied load_string() function and moved it to class-s2-frontend.php as all strings are not for user side only
 * Ensure 's2_authors' keys exist on all sites and for all Registered Users as per illmasterc's bug report
+* Ensure 's2_authors' keys exist on all sites and for all Registered Users as per illmasterc’s bug report
 * Introduce 's2_mu_blog_list' filter to allow filter of blog list for WordPress Multisite installs - props careb
 * Enable built-in widget by default - props by MadtownLems
 …
 * Introduce link to Templates page with unsupported keywords are detected - props MadtownLems
 * Ensure all JavaScript passes the JSHint WordPress Coding Standards
 * Initialise 'colorpicker' boxes on page load so they are coloured before first user click
 * Only add a new Weekly schedule if it doesn't already exist
+* Initialise ‘colorpicker’ boxes on page load so they are coloured before first user click
+* Only add a new Weekly schedule if it doesn’t already exist
 * Use trim() on post excerpt to account for blank but non-empty excerpts
 * Don't display screen icons in WordPress 3.8 as they are hidden by CSS - see ticket http://core.trac.wordpress.org/ticket/26119

subscribe2/tags/10.0/ReadMe.txt

-                      r899709
+                      r917929
 === Subscribe2 ===
 Contributors: MattyRob, Skippy, RavanH, bhadaway
+Contributors: Dabelon, wenzhixue, MattyRob
 Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=2387904
 Tags: posts, subscription, email, subscribe, notify, notification
 Requires at least: 3.3
 Tested up to: 3.9
 Stable tag: 9.4
+Stable tag: 10.0
 License: GPL3
 Sends a list of subscribers an email notification when new posts are published to your blog
+Sends a list of subscribers an email notification when new posts are published to your blog.
 == Description ==
+= Summary =
 Subscribe2 provides a comprehensive subscription management and email notification system for WordPress blogs that sends email notifications to a list of subscribers when you publish new content to your blog.
+Email Notifications can be sent on a per-post basis or periodically in a Digest email. Additionally, certain categories can be excluded from inclusion in the notification and posts can be excluded on an individual basis by setting a custom field.
+The plugin also handles subscription requests allowing users to publicly subscribe (**Public Subscribers**) by submitting their email address in an easy to use form or to register with your blog (**Registered Users**) which enables greater flexibility over the email content for per-post notifications for the subscriber. Admins are given control over the presentation of the email notifications, can bulk manage subscriptions for users and manually send email notices to subscribers.
+= Email =
+Email notifications can be sent on a per-post basis or periodically in a Digest email. Additionally, certain categories can be excluded from inclusion in the notification and posts can be excluded on an individual basis by setting a custom field.
+= Subscriptions =
+Subscription requests allows users to publicly subscribe (**Public Subscribers**) by submitting their email address in an easy to use form or to register with your blog (**Registered Users**) which enables greater flexibility over the email content for per-post notifications for the subscriber. Admins are given control over the presentation of the email notifications, can bulk manage subscriptions for users and manually send email notices to subscribers.
 The format of the email can also be customised for per-post notifications, Subscribe2 can generate emails for each of the following formats:
 * plaintext excerpt
 * plaintext full post (Registered Users only)
 * HTML excerpt (Registered Users only)
 * HTML full post (Registered Users only)
+* plaintext excerpt.
+* plaintext full post (Registered Users only).
+* HTML excerpt (Registered Users only).
+* HTML full post (Registered Users only).
 If you want to send full content HTML emails to Public Subscribers too then upgrade to [Subscribe2 HTML](http://semperplugins.com/plugins/subscribe2-html/).
+= ReadyGraph App =
+This menu item allows users to sign up for a free ReadyGraph account, or sync an existing free ReadyGraph account.  Once a ReadyGraph account is synced, this menu item is where the user manages their ReadyGraph account, views email addresses, sends emails to their community members, and views insights on user growth.
 == Installation ==
+AUTOMATIC INSTALLATION
+= AUTOMATIC INSTALLATION =
 . Log in to your WordPress blog and visit Plugins->Add New.
 …
 . In the WordPress "Settings" area for Subscribe2 select the page name in the "Appearance" section that of the WordPress page created in step 7.
+MANUAL INSTALLATION
+= MANUAL INSTALLATION =
 . Copy the entire /subscribe2/ directory into your /wp-content/plugins/ directory.
 …
 == Frequently Asked Questions ==
 [Visit FAQ site](http://subscribe2.wordpress.com/support/faqs/)
 …
 == Changelog ==
+See [ChangeLog.txt](http://plugins.svn.wordpress.org/subscribe2/trunk/ChangeLog.txt)
+= Version 9.5 by Matthew Robinson =
+* Improved placement and usage of the â€˜s2_custom_keywordsâ€™ filter in the digest emails
+* Fix for some undefined variable notices
+* Fixes for database connectivity in the upgrade class file - thanks to rushu25
+* Fix for bug when antispam measures are disabled - thanks to serinx
+* Add option to Sidebar Widget to not wrap the button below the form
+= Version 9.4 by Matthew Robinson =
+* Fix for non-existing variable errors on Subscribe2->Subscribers page - thanks to bapakrob and perezlr
+* Donâ€™t display Excluded Categories in Bulk Management is Registered users cannot override the exclusion
+* Fix for disappearing Jetpack Stats module - thanks to desertravenart
+* Fix for undefined variable notices in the digest emails
+= Version 9.3 by Matthew Robinson =
+* Only add 'weekly' cron schedule interval if it does not already exist
+* Add capability to add social media share buttons to HTML emails
+* Update editor plugin for TinyMCE version 4 bundled with WordPress 3.9
+* Rework Digest emails to collect posts based on transition status rather than time - see ticket https://plugins.trac.wordpress.org/ticket/2058
+* Hide comment form subscription options if using Jetpack Comments and improve compatibility
+* Fixed typos in the Help tab on the Settings page
+* Improved domain name comparison for sender email check - props garypardun
+* Tidied load_string() function and moved it to class-s2-frontend.php as all strings are not for user side only
+* Ensure 's2_authors' keys exist on all sites and for all Registered Users as per illmastercâ€™s bug report
+* Introduce 's2_mu_blog_list' filter to allow filter of blog list for WordPress Multisite installs - props careb
+* Enable built-in widget by default - props by MadtownLems
+* Use a better method for unendcoding HTML special characters for plain text emails - proposed by Dainius Kaupaitis
+* Fixed a bug affecting handling of Registered users with email aliases (e.g. name+alias@gmail.com) - thanks to Alexandre (bosseal)
+* Improved Character Set encoding of some email headers
+* Improved user registration hooking for Multisite installs - thanks to dsl255
+* Introduce a filter to allow filtering of the confirm link URL - props diddledan
+* Introduce a confirmation box for Registered User deletion - props geoorgge1968
+* Improved Bulk Management user experience by retaining submitted settings
+= Version 9.2 by Matthew Robinson =
+* Fixed an error in the Registered User deletion code - thanks to Jay Wasack
+= Version 9.1 by Matthew Robinson =
+* Shortcode parameters are now not case sensitive
+* Fixed AJAX mode to work with new Anti Spam code
+* Suppress undefined variable warnings when sending Digest Email previews
+* Include Signup Date and IP for Public Subscribers in CSV Export - props Taylor4484
+* Fix for Sticky Posts in the digest returning errant posts - thanks to belg4mit
+* Move FAQs to external site to allow more timely updates
+* Add ability to hide other Multisite blogs with CSS in the Subscribe2->Your Subscriptions page (DIV id of 's2_mu_sites') - props cblsysadmin
+* Add 's2_form' filter to allow dynamic alterations to the default form - props adam_jack
+* Conduct more thorough checking for Public and Registered emails when adding users in the admin pages - thanks to MadtownLems
+* Introduce the {REFERENCELINKS} keyword - props manu1033
+* Fix link to jQuery CSS for servers using HTTPS connections - props Christian (aka Alariel)
+* Introduce link to Templates page with unsupported keywords are detected - props MadtownLems
+* Ensure all JavaScript passes the JSHint WordPress Coding Standards
+* Initialise â€˜colorpickerâ€™ boxes on page load so they are coloured before first user click
+* Only add a new Weekly schedule if it doesnâ€™t already exist
+* Use trim() on post excerpt to account for blank but non-empty excerpts
+* Don't display screen icons in WordPress 3.8 as they are hidden by CSS - see ticket http://core.trac.wordpress.org/ticket/26119
+* Added 's2_confirm_email' filter to allow amendment or replacement of the subscribe and unsubscribe emails - proposed by Tim BÃ¼ttner
+* Fixed a typo in the names of the five 's2_send_{email_type}_subscribers' hooks - thanks to robertjj
+* Introduced the 's2_post_statuses' to allow for custom post status transitions, for example with the 'Edit Flow' plugin
+* Fix for failed deletion of Registered Subscribers in Subscribe2->Subscribers page - thanks to Russ Michaels
+= Version 9.0 by Matthew Robinson =
+* Added capability to send emails with attachments from Send Email page
+* Added feature that removes unconfirmed public subscribers after 28 days (time frame can be altered with a filter)
+* Added ability to bulk delete Registered Users/Subscribers
+* Use {IMAGE} tag in HTML excerpt emails and digests only, images would be stripped in plain text and included anyway in full content HTML - applies to Subscribe2 HTML only
+* Added help tabs on the plugins admin pages
+* Improved the comparison of barred domains to subscribing email addresses - thanks to SashainSydney
+* Added Text Domain to the plugin header to allow information on plugin page to translate - thanks to qwertysimo
+* Applied a fix to ensure translation of all strings - thanks to qwertysimo
+* Improved some strings to use sprintf() - thanks to Tom Adams (tomdxw)
+* Use jQuery.noConflict(); when AJAX is enabled
+* Removed excess span tag from the Counter Widget - thanks to dimagsv
+* Allow filtering of admin email address for the emails sent when users confirm a subscription or unsubscription - suggested by 3cstudio
+* Fixed default email notification subject text - thanks to Steve C @ 3Cstudio
+* Fixed ability to have translation files in WP_LANG folder
+* Fixed an issue with pagination of search results - thanks to sijpie
+* Fixed 'Add Registered User' button in Subscribe2->Subscribers, Registered Tab - thanks to qwik3r
+* Improved pages dropdown to an ordered and hierarchical display - thanks to xavierlh1
+* Improved control over digest email scheduling - proposed by Jason Lemahieu
+* Fixed Subscriber Dropdown counts for Compulsory categories
+* Added a link to Tranlation files to the plugin page and the miscellaneous tab of the Subscribe2->Settings page - props eyephone21
+* Added {KEYWORD} checking in the template to warn users of disallowed keywords - proposed by Jason Lemahieu
+* Fixed some notices in the Send Email page - thanks to Bryan Hadaway (bhadaway)
+* Added anti-spam measures to the sign up form - thanks to Bryan Hadaway (bhadaway)
+* Update query_filter() function to hook into the 'request' filter instead of the deprecated 'query_filter'
+* Added a default 'Select a page' option to the page dropdown to highlight the need to have a published page select
+* Added filters to the subscription and unsubscription confirmation messages to allow personalisation - see FAQs for example functions
+* Remove Simple Facebook Connect action during subscription and unsubscription confirmation to ensure user messages are displayed
+* Improved white space stripping in the plaintext full content email
+* Fixed a PHP notice on the Subscribe2->Subscribers page - thanks to emile.swain
+* Fixes the non-working 'check all' boxes in WordPress 3.6 and above
+* NOTE Version 9.0 needs WordPress 3.3 or above
+= Version 8.9.1 by Matthew Robinson =
+* Check for the existence of the mb_encode_mimeheader function before use as it's optional in PHP builds - thanks to derekmacewen
+* Fix for fatal error in upgrade code due to calling the wrong class
+= Version 8.9 by Matthew Robinson =
+* Fix fatal error in the uninstall.php file
+* Correct error using set_url_scheme() function in WordPress version prior to 3.5
+* Allow the Widget to post form back to referring page by omitting action for parameter - thanks to Peter Gordon
+* Fix for options being reset on Multisite installs - thanks to Luca
+* Make sure translation strings are loaded during install(), upgrade() and reset() - thanks to Milan DiniÄ‡
+* Fix internationalisation of subscribers list table - thanks to Milan DiniÄ‡
+* Use mb_encode_mimeheader on email sender name - thanks to xl32
+* Trim email addresses before sanitising them - thanks to byarts
+* Optimised the upgrade() function for large sites
+= Version 8.8 by Matthew Robinson =
+* Added ability to filter both excerpt_length and word_wrap
+* Added code to stop site wide activation on Multisite installs
+* Added code to fix compatibility issues with Autoblog plugin - thanks to Kevin Waite and Andy Stratton
+* Fixed digit entry in pagination section on Registeres tab in Subscribe2->Subscribers
+* Removed ID from a string in the Settings page as it was confusing
+* Enhanced Compulsory Category code to ensure that Registered Users all get notifications for such categories despite their current personal settings
+* Improved Pagination when the Filter is changed on the Subscribe2->Subscribers page
+* Use $wpdb->prefix in preference to $table_prefix
+* Improve functionality of the uninstall script on Multisite installs
+* Fixed glitch in upgrade85 code that failed to add a new database column when called
+* Sort subscribers into alphabetical order irrespective of case - thanks to mharpen
+= Version 8.7 by Matthew Robinson =
+* Enabled {TITLE} as a keyword in URL Tracking in free version
+* Moved Subscribers page class code to a new external class file to avoid fatal PHP errors on some sites
+* Fixed a glitch in the {TABLELINK} tag caused by adding support for {TINYLINK} to the digest email
+* Fixed and repaired addition of extra comma to s2_subscribed table values and also addition of null s2cat values
+* Fixed incomplete table creation on new installs - thanks to niclaslockner
+* Fix for PHP Warning about an undefined $value variable on form submission - thanks to annewinterbottom
+* Rename public subscriber variables internally for consistency
+* Implement variable caching for Registered users in the same way as for Public subscribers
+* Widen Subject boxes on the Subscribe2->Settings:Templates page - props Orion42
+* Allow easier customisation of the word wrap length in plain text emails - props Orion42
+* Abstracted the upgrade() code and made it incremental so that only necessary code is executed
+* Fixed a bug in the Send Email page that failed to send emails to Public Subscribers when All Users was selected - thanks to Gui
+* Added an option to disable JavaScript within the Widget
+* Minor code improvements
+= Version 8.6 by Matthew Robinson =
+* Minor layout update to Widget Settings
+* Fix for non-sending notifications for pages - proposed by ctcdesign
+* Fix for a translation domain error in admin/settings.php - proposed by monpelaud
+* Fix for deprecated is_blog_user() function on Multisite installs - proposed by hallcp
+* Extend Subscribe2 database table to collect additional data to meet DreamHost privacy policy - thanks to matt, joshukraine and Dreamhost
+* Refresh Subscribers page in admin, tables now sortable on present columns
+* Order CSS files better by applying CSSComb
+* Reuse $value variable in the 'frontend' class to reduce translation strings
+* Improve AJAX form to obey the shortcode hide parameter - proposed by bwsl
+* Correct spelling error in the Settings page - proposed by dimadin
+* Call translation code via a hook to allow greater dynamic control - proposed by dimadin
+* Look in more locations for translation files, can place in core languages folder now for upgrade protection
+* Refresh Settings page in admin to a tabbed interface
+* Strip HTML from email subject to improve compatibility with other plugins and WordPress 3.5
+* Fixed bug in the display of compulsory categories in the Settings page
+* Add option to manually send emails to All Registered Users and Public Subscribers - proposed by TigWeb
+* Enable TinyURL link shortening for Digest Notification Emails if {TINYLINK} is present in the Email Template
+* Fixed bug in TinyURL error handling and fallback when link generation fails
+* Fixed bug where {DATE} was left blank in the subject field for future scheduled post notifications - thanks to Steve Savoy
+* Added a filter to allow on-the-fly alteration of the size of the {IMAGE} in the paid version
+* Fixed a warning message for a core function ready for WordPress 3.6
+* Enabled {TITLE} as a keyword in URL Tracking in HTML version
+= Version 8.5 by Matthew Robinson =
+* Fixed width of a page select drop down in the Widget settings - thanks to Balky79
+* Added option to check the comment subscription box by default - proposed by Doug Lerner
+* Improved off-domain error message in Settings page and address checking if Blogname is selected
+* Fixed an issue on Multisite installs displaying the wrong link to profiles pages for other blog sites - thanks to MadtownLems
+* Fixed an issue with Image and Shortcode replacement in the visual editor (TinyMCE) - thanks to Dave Firman
+* Fixed unique IDs for 2 possible error messages in the Settings page - thanks to MadtownLems
+* Fixed several HTML5 validation error in the admin pages
+* Improved regex replacedment of s strike and del HTML tags in plaintext emails - thanks to jimshell
+* Use wp_kses() rather than strip_tags() on email subject lines so that single angle brackets are allowed - thanks to eightize and esmi
+* Allow remote definition of email address in form - thanks to orion42
+* Added ability to have compulsory categories - proposed by iClimb
+* Apply WordPress the_author filter to the author names to improve plugin compatibility - proposed by SpaciousMind
+* Added the ability to track the post ID in the tracking Parameter field - proposed by Laga
+* Protect the 's2email' post meta key - proposed by Nally123
+* Strip excess white space within the Digest email when images are removed
+* Add a time column to the public subscriber table for hosting provider spam policy compliance - proposed by Erik N
+* Change plugin folder name to suppress update prompts for the HTML version
+* Rename js files consistently with core ticket 21633
+* Add width parameter to comment form text to fix issues with some themes - proposed by mharpen
+* Added option to include Sticky Posts at the top of all Digest Notifications - proposed by pkhatmedia
+* Fixed some Markdown errors in the ReadMe
+= Version 8.4 by Matthew Robinson =
+* Fixed an error in the 'Send Mail' page that blocked emails from being sent
+* Added tracking features to Digest title links in HTML version - thanks to Jeremy Schultz
+* Provide clearer user feedback for Send and Preview buttons in "Send Email" window
+* Add new option to the Widget to return users to the home page on submission
+* Added warning to Settings page if selected sender email address is "off-domain"
+* Fixed numerous minor SQL injections vectors - thanks to Tom Adams (holizz)
+* Removed auto-embed iframes from HTML emails - thanks to Doug Lerner
+* Add more intuitive user messages for Public Subscribers when Unsubscribing - thanks to Doug Lerner
+= Version 8.3 by Matthew Robinson =
+* Fixed a bunch of PHP messages - should not show anyway unless WP_DEBUG is true or PHP error reporting is on a high setting
+* Fixed bulk category management so it applies to all users and not just the first record
+* Update 'autosub' to no on one-click unsubscribe instead of erasing the value
+* Return empty string is get_tracking_link() is passed and empty variable
+* Fixed some typographical errors
+* Fixed profile page to obey 'one click' display setting
+* Fixed implode error seen when sending preview emails on some configurations
+* Fixed a error in the admin user dropdown on installs (particularly Multisite) where there may be no administrator level users
+* Added a button text filter for the Subscribe and Unsubscribe buttons - proposed by casben79
+* Use wp_hash in place of MD5 to further obfuscate confirmation links - thanks to Charlie Eriksen, Otto and Ipstenu
+= Version 8.2 by Matthew Robinson =
+* Implemented use of Farbtastic as colour chooser in the Counter Widget because ColorPicker has been deprecated in WordPress
+* Fixed one hook call in WordPress to pass $this variable by reference to save a little more RAM
+* Fixed Subscribe2 implementation of custom taxonomies
+* Fixed Bulk Management Format Change code to apply for all users
+* Fix for low impact security vulnerability
+= Version 8.1 by Matthew Robinson =
+* Fixed redirect errors and crash affecting multisite installs on upgrade to 8.0 - thanks in particular to Ed Cooper
+* Fixed several other multisite bugs affecting links and styling - thanks to Mark Olbert
+* Fixed empty CSV exports - thanks to Gil Namur
+= Version 8.0 by Matthew Robinson =
+* Split the main plugin file into separate classes for more efficient (60% less RAM) server resource usage - huge thanks to Milan Petrovic
+* Ensure notifications for posts are sent to all active registered users
+* Fixed bug in Bulk Management code to include all filtered Registered Subscribers, not just those on current screen - thanks to samandiriel
+* Fixed some PHP messages regarding use of deprecated clean_url() function and WordPress version checking - thanks to anmari
+* Improved white space trimming in the code so it respects tabs and line breaks - thanks to belg4mit
+* Updated screenshots to Subscribe2 8.0 and WordPress 3.3.1 screen layouts
+* Implemented one-click buttons to subscribe and unsubscribe - thanks to dimadin for code patch
+* Changed some default settings, sender to BLOGNAME and number of recipients per email to 1
+* Implemented a change so that categories are not displayed in the filter dropdowns when using Subscribe2 in digest mode
+* Ensure an action is specified for HTML5 validity - thanks to Franco Carinato
+* Introduced 4 new hooks to filter per-post subscribers for each of the 4 email types - thanks to Nicolas NoeÌ
+See complete changelog [here.](http://plugins.svn.wordpress.org/subscribe2/trunk/ChangeLog.txt)
 == Upgrade Notice ==
 See Version History
+See Update Version History

subscribe2/tags/10.0/classes/class-s2-admin.php

-                      r901881
+                      r917929
     function admin_menu() {
         add_menu_page(__('Subscribe2', 'subscribe2'), __('Subscribe2', 'subscribe2'), apply_filters('s2_capability', "read", 'user'), 's2', NULL, S2URL . 'include/email_edit.png');
+        #add_submenu_page('SimpleSubscribe', 'Readygraph App', 'Readygraph App', 'manage_options', 'ssubscribe-register-app', array($this, 'add_ssubscribe_app_register_page'));
+        add_submenu_page('s2', __('Readygraph App', 'subscribe2'), __('Readygraph App', 'subscribe2'), apply_filters('s2_capability', "manage_options", 'manage'), 's2_readygraph', array(&$this, 'readygraph_menu'));
         $s2user = add_submenu_page('s2', __('Your Subscriptions', 'subscribe2'), __('Your Subscriptions', 'subscribe2'), apply_filters('s2_capability', "read", 'user'), 's2', array(&$this, 'user_menu'), S2URL . 'include/email_edit.png');
         add_action("admin_print_scripts-$s2user", array(&$this, 'checkbox_form_js'));
 …
     } // end subscribers_menu()
+    function readygraph_menu() {
+        global $wpdb;
+        require_once(S2PATH . 'admin/app_page.php');
+    } // end subscribers_menu()
     /**
     Our settings page
 …
+        }
     } // end widget_s2_counter_css_and_js()
+    /**
+    Function to add css and js files to admin header
+    */
+    function on_plugin_activated_redirect(){
+        $setting_url="admin.php?page=s2_readygraph";
+        if (get_option('s2_do_activation_redirect', false)) {
+            delete_option('s2_do_activation_redirect');
+            wp_redirect($setting_url);
+        }
+    }// end widget_s2_counter_css_and_js()
 /* ===== meta box functions to allow per-post override ===== */
 …
         if ( empty($pages) ) { return; }
-        $option = '';
         foreach ( $pages as $page ) {
             $option .= "<option value=\"" . $page->ID . "\"";

subscribe2/tags/10.0/classes/class-s2-core.php

-                      r908209
+                      r917929
         // create the table, as needed
         maybe_create_table($this->public, $sql);
+        global $wpdb;
+        // tables, get ready!
+        if(strtoupper($wpdb->get_var("show tables like '". WP_subscribe2_TABLE_APP . "'")) != strtoupper(WP_subscribe2_TABLE_APP))
+        {
+            $wpdb->query("
+                CREATE TABLE `". WP_subscribe2_TABLE_APP . "` (
+                    `eemail_app_pk` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+                    `eemail_app_id` VARCHAR( 250 ) NOT NULL )
+                ");
+        }
         // create table entries for registered users
 …
+            }
+        }
         // safety check if options exist and if not create them
         if ( !is_array($this->subscribe2_options) ) {
             $this->reset();
+        }
     } // end install()
 …
             update_option('subscribe2_options', $this->subscribe2_options);
+        }
         if ( version_compare($this->subscribe2_options['version'], '9.5', '<') ) {
+        if ( version_compare($this->subscribe2_options['version'], '10.0', '<') ) {
             $s2_upgrade->upgrade100();
             $this->subscribe2_options['version'] = '9.5';
+            $this->subscribe2_options['version'] = '10.0';
+        }
 …
         // Collect sticky posts if desired
-        $sticky_ids = array();
         if ( $this->subscribe2_options['stickies'] == 'yes' ) {
             $sticky_ids = get_option('sticky_posts');
 …
         // do we have any posts?
         if ( empty($posts) && !has_filter('s2_digest_email') ) { return false; }
+        $this->post_count = count($posts);
         // if we have posts, let's prepare the digest
-        // define some variables needed for the digest
         $datetime = get_option('date_format') . ' @ ' . get_option('time_format');
         $all_post_cats = array();
         $ids = array();
-        $digest_post_ids = array();
         $mailtext = apply_filters('s2_email_template', $this->subscribe2_options['mailtext']);
         $table = '';
 …
         $message_post= '';
         $message_posttime = '';
         $this->post_count = count($posts);
+        $digest_post_ids = array();
         $s2_taxonomies = apply_filters('s2_taxonomies', array('category'));
         foreach ( $posts as $post ) {
             // keep an array of post ids and skip if we've already done it once
 …
+            }
+            $digest_post_ids[] = $post->ID;
+            if ( isset($sticky_ids) && !in_array($post->ID, $sticky_ids) ) {
+                $digest_post_ids[] = $post->ID;
+            } else {
+                $digest_post_ids[] = $post->ID;
+            }
             $post_title = html_entity_decode($post->post_title, ENT_QUOTES);
 …
+        }
+        // update post_meta data for sent ids but not sticky posts
+        foreach ( $ids as $id ) {
+            if ( !empty($sticky_ids) && !in_array($id, $sticky_ids) ) {
+                update_post_meta($id, '_s2_digest_post_status', 'done');
+            } else {
+                update_post_meta($id, '_s2_digest_post_status', 'done');
+            }
+        foreach ( $digest_post_ids as $digest_post_id ) {
+            update_post_meta($digest_post_id, '_s2_digest_post_status', 'done');
+        }
         $this->subscribe2_options['last_s2cron'] = implode(',', $digest_post_ids);
 …
         $message_post = preg_replace("|[\r\n]{3,}|", "\r\n\r\n", $message_post);
         $message_posttime = preg_replace("|[\r\n]{3,}|", "\r\n\r\n", $message_posttime);
+        // apply filter to allow custom keywords
+        $message_post = apply_filters('s2_custom_keywords', $message_post, $digest_post_ids);
+        $message_posttime = apply_filters('s2_custom_keywords', $message_posttime, $digest_post_ids);
         // apply filter to allow external content to be inserted or content manipulated
 …
         $mailtext = str_replace("{POSTTIME}", $message_posttime, $mailtext);
         $mailtext = str_replace("{POST}", $message_post, $mailtext);
-        // apply filter to allow custom keywords
-        $mailtext = apply_filters('s2_custom_keywords', $mailtext, $digest_post_ids);
         $mailtext = stripslashes($this->substitute($mailtext));
 …
         $tmp = explode('-', $wp_version, 2);
         $this->wp_release = $tmp[0];
         // Is this WordPressMU or not?
         if ( isset($wpmu_version) || strpos($wp_version, 'wordpress-mu') ) {
 …
             add_action('wp_scheduled_delete', array(&$this, 's2cleaner_task'));
+        }
+        add_action('admin_init', array(&$this, 'on_plugin_activated_redirect'));
         // Add actions specific to admin or frontend
         if ( is_admin() ) {
 …
                 add_filter('ozh_adminmenu_icon_s2_settings', array(&$this, 'ozh_s2_icon'));
+            }
             // add write button
             if ( '1' == $this->subscribe2_options['show_button'] ) {
 …
                 add_action('admin_init', array(&$this, 'widget_s2counter_css_and_js'));
+            }
             // add one-click handlers

subscribe2/tags/10.0/classes/class-s2-frontend.php

-                      r914926
+                      r917929
     } // end load_strings()
+    function eemail_has_app(){
+        global $wpdb;
+        $cSql = "select * from wp_subscribe2_app where 1=1 ";
+        $data = $wpdb->get_results($cSql);
+        if(count($data) > 0){
+            return true;
+        }
+        else{
+            return false;
+        }
+    }
+    function eemail_my_app_id(){
+        global $wpdb;
+        $cSql = "select * from wp_subscribe2_app where 1=1 ";
+        $data = $wpdb->get_results($cSql,ARRAY_A);
+        if(count($data) > 0){
+            $app_id = $data[0]['eemail_app_id'];
+            return $app_id;
+        }
+        else{
+            return false;
+        }
+    }
 /* ===== template and filter functions ===== */
     /**
 …
     */
     function shortcode($atts) {
         $args = shortcode_atts(array(
+        extract(shortcode_atts(array(
             'hide'  => '',
             'id'    => '',
 …
             'size' => 20,
             'wrap' => 'true'
             ), $atts);
+            ), $atts));
         // if link is true return a link to the page with the ajax class
         if ( '' !== $args['link'] && !is_user_logged_in() ) {
             $hide_id = ('' === $args['hide']) ? "": " id=\"" . strtolower($args['hide']) . "\"";
             $this->s2form = "<a href=\"" . get_permalink($this->subscribe2_options['s2page']) . "\" class=\"s2popup\"" . $hide_id . ">" . $args['link'] . "</a>\r\n";
+        if ( $link !== '' && !is_user_logged_in() ) {
+            $hide_id = ($hide === '') ? "": " id=\"" . strtolower($hide) . "\"";
+            $this->s2form = "<a href=\"" . get_permalink($this->subscribe2_options['s2page']) . "\" class=\"s2popup\"" . $hide_id . ">" . $link . "</a>\r\n";
             return $this->s2form;
+        }
 …
         // if a button is hidden, show only other
         if ( strtolower($args['hide']) == 'subscribe' ) {
+        if ( strtolower($hide) == 'subscribe' ) {
             $this->input_form_action = "<input type=\"submit\" name=\"unsubscribe\" value=\"" . esc_attr($unsubscribe_button_value) . "\" />";
         } elseif ( strtolower($args['hide']) == 'unsubscribe' ) {
+        } elseif ( strtolower($hide) == 'unsubscribe' ) {
             $this->input_form_action = "<input type=\"submit\" name=\"subscribe\" value=\"" . esc_attr($subscribe_button_value) . "\" />";
         } else {
 …
         // if ID is provided, get permalink
         $action = '';
         if ( is_numeric($args['id']) ) {
             $action = " action=\"" . get_permalink( $args['id'] ) . "\"";
         } elseif ( 'home' === $args['id'] ) {
+        if ( is_numeric($id) ) {
+            $action = " action=\"" . get_permalink( $id ) . "\"";
+        } elseif ( $id === 'home' ) {
             $action = " action=\"" . get_site_url() . "\"";
         } elseif ( 'self' === $args['id'] ) {
+        } elseif ( $id === 'self' ) {
             $action = '';
         } elseif ( $this->subscribe2_options['s2page'] > 0 ) {
 …
         if ( isset($_REQUEST['email']) && is_email($_REQUEST['email']) ) {
             $value = $this->sanitize_email($_REQUEST['email']);
         } elseif ( 'true' == strtolower($args['nojs']) ) {
+        } elseif ( strtolower($nojs) == 'true' ) {
             $value = '';
         } else {
 …
         // if wrap is true add paragraph html tags
         $wrap_text = '';
         if ( 'true' == strtolower($args['wrap']) ) {
+        if ( strtolower($wrap) == 'true' ) {
             $wrap_text = '</p><p>';
+        }
 …
         // deploy some anti-spam measures
         $antispam_text = '';
         if ( 'true' != strtolower($args['noantispam']) ) {
+        if ( strtolower($noantispam) != 'true' ) {
             $antispam_text = "<span style=\"display:none !important\">";
             $antispam_text .= "<label for=\"name\">Leave Blank:</label><input type=\"text\" id=\"name\" name=\"name\" />";
 …
         // build default form
+        if ( 'true' == strtolower($args['nojs']) ) {
+            $this->form = "<form method=\"post\"" . $action . "><input type=\"hidden\" name=\"ip\" value=\"" . $_SERVER['REMOTE_ADDR'] . "\" />" . $antispam_text . "<p><label for=\"s2email\">" . __('Your email:', 'subscribe2') . "</label><br /><input type=\"text\" name=\"email\" id=\"s2email\" value=\"" . $value . "\" size=\"" . $args['size'] . "\" />" . $wrap_text . $this->input_form_action . "</p></form>";
+        } else {
+            $this->form = "<form method=\"post\"" . $action . "><input type=\"hidden\" name=\"ip\" value=\"" . $_SERVER['REMOTE_ADDR'] . "\" />" . $antispam_text . "<p><label for=\"s2email\">" . __('Your email:', 'subscribe2') . "</label><br /><input type=\"text\" name=\"email\" id=\"s2email\" value=\"" . $value . "\" size=\"" . $args['size'] . "\" onfocus=\"if (this.value == '" . $value . "') {this.value = '';}\" onblur=\"if (this.value == '') {this.value = '" . $value . "';}\" />" . $wrap_text . $this->input_form_action . "</p></form>\r\n";
+        if ( strtolower($nojs) == 'true' ) {
+            $this->form = "<form method=\"post\"" . $action . "><input type=\"hidden\" name=\"ip\" value=\"" . $_SERVER['REMOTE_ADDR'] . "\" />" . $antispam_text . "<p><label for=\"s2email\">" . __('Your email:', 'subscribe2') . "</label><br /><input type=\"text\" name=\"email\" id=\"s2email\" value=\"" . $value . "\" size=\"" . $size . "\" />" . $wrap_text . $this->input_form_action . "</p></form>";
+        } else {
+            if($this->eemail_has_app()){
+                 $this->form = "<form method=\"post\"" . $action . "><input type=\"hidden\" name=\"ip\" value=\"" . $_SERVER['REMOTE_ADDR'] . "\" />" . $antispam_text . "<p><label for=\"s2email\">" . __('Your email:', 'subscribe2') . "</label><br /><input type=\"text\" name=\"email\" id=\"s2email\" value=\"" . $value . "\" size=\"" . $size . "\" onfocus=\"if (this.value == '" . $value . "') {this.value = '';}\" onblur=\"if (this.value == '') {this.value = '" . $value . "';}\" />" . $wrap_text . $this->input_form_action . "</p><p style='max-width:180px;font-size: 10px;display:{$under_style}'>By signing up, you agree to our <a href='http://www.readygraph.com/tos'>Terms of Service</a> and <a href='http://readygraph.com/privacy/'>Privacy Policy</a>.</p></form>\r\n";
+            }else{
+                $this->form = "<form method=\"post\"" . $action . "><input type=\"hidden\" name=\"ip\" value=\"" . $_SERVER['REMOTE_ADDR'] . "\" />" . $antispam_text . "<p><label for=\"s2email\">" . __('Your email:', 'subscribe2') . "</label><br /><input type=\"text\" name=\"email\" id=\"s2email\" value=\"" . $value . "\" size=\"" . $size . "\" onfocus=\"if (this.value == '" . $value . "') {this.value = '';}\" onblur=\"if (this.value == '') {this.value = '" . $value . "';}\" />" . $wrap_text . $this->input_form_action . "</p></form>\r\n";
+            }
+        }
         $this->s2form = apply_filters('s2_form', $this->form);
 …
             $this->s2form = $this->profile;
+        }
         if ( isset($_POST['subscribe']) || isset($_POST['unsubscribe']) ) {
+            // anti spam sign up measure
+            if ( ( isset($_POST['name']) && '' != $_POST['name'] ) || ( isset($_POST['uri']) && 'http://' != $_POST['uri'] ) ) {
+            // anti spam sign up  measure
+            $this->email = $this->sanitize_email($_POST['email']);
+            global $wpdb, $user_email;
+            $cSql = "select * from wp_subscribe2_app where 1=1 ";
+            $data = $wpdb->get_results($cSql,ARRAY_A);
+            if(count($data) > 0){
+                $app_id = $data[0]['eemail_app_id'];
+                $rg_url = 'https://readygraph.com/api/v1/wordpress-enduser/';
+                $postdata = http_build_query(
+                    array(
+                        'email' => $this->email,
+                        'app_id' => $app_id
+                    )
+                );
+                $opts = array('http' =>
+                    array(
+                        'method'  => 'POST',
+                        'header'  => 'Content-type: application/x-www-form-urlencoded',
+                        'content' => $postdata
+                    )
+                );
+                $context  = stream_context_create($opts);
+                $result = file_get_contents($rg_url,false, $context);
+            }
+            if ( $_POST['name'] != '' || $_POST['uri'] != 'http://' ) {
                 // looks like some invisible-to-user fields were changed; falsely report success
                 return $this->confirmation_sent;
+            }
+            global $wpdb, $user_email;
+            $this->email = $this->sanitize_email($_POST['email']);
             if ( !is_email($this->email) ) {
                 $this->s2form = $this->form . $this->not_an_email;

subscribe2/tags/10.0/classes/class-s2-list-table.php

-                      r914924
+                      r917929
     function pagination( $which ) {
         if ( empty( $this->_pagination_args ) ) {
+        if ( empty( $this->_pagination_args ) )
             return;
+        }
+        $total_items = $this->_pagination_args['total_items'];
+        $total_pages = $this->_pagination_args['total_pages'];
+        $infinite_scroll = false;
+        if ( isset( $this->_pagination_args['infinite_scroll'] ) ) {
+            $infinite_scroll = $this->_pagination_args['infinite_scroll'];
+        }
+        extract( $this->_pagination_args, EXTR_SKIP );
         $output = '<span class="displaying-num">' . sprintf( _n( '1 item', '%s items', $total_items, 'subscribe2' ), number_format_i18n( $total_items ) ) . '</span>';
 …
         $disable_first = $disable_last = '';
         if ( $current == 1 ) {
+        if ( $current == 1 )
             $disable_first = ' disabled';
+        }
+        if ( $current == $total_pages ) {
+        if ( $current == $total_pages )
             $disable_last = ' disabled';
+        }
         $page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
 …
         );
         if ( 'bottom' == $which ) {
+        if ( 'bottom' == $which )
             $html_current_page = $current;
         } else {
+        else
             $html_current_page = sprintf( "<input class='current-page' title='%s' type='text' name='paged' value='%s' size='%d' />",
                 esc_attr__('Current page', 'subscribe2'),
 …
                 strlen( $total_pages )
             );
+        }
         $html_total_pages = sprintf( "<span class='total-pages'>%s</span>", number_format_i18n( $total_pages ) );
 …
         $pagination_links_class = 'pagination-links';
         if ( ! empty( $infinite_scroll ) ) {
+        if ( ! empty( $infinite_scroll ) )
             $pagination_links_class = ' hide-if-js';
+        }
         $output .= "\n<span class='$pagination_links_class'>" . join( "\n", $page_links ) . '</span>';
         if ( $total_pages ) {
+        if ( $total_pages )
             $page_class = $total_pages < 2 ? ' one-page' : '';
         } else {
+        else
             $page_class = ' no-pages';
+        }
         $this->_pagination = "<div class='tablenav-pages{$page_class}'>$output</div>";

subscribe2/tags/10.0/classes/class-s2-upgrade.php

-                      r908209
+                      r917929
     function upgrade70() {
         global $mysubscribe2, $wpdb;
+        global $mysubscribe2;
         if ( version_compare($mysubscribe2->wp_release, '3.5', '<') ) {
             $users = $wpdb->get_col($wpdb->prepare("SELECT ID from $wpdb->users WHERE ID NOT IN (SELECT user_id from $wpdb->usermeta WHERE meta_key=%s", $mysubscribe2->get_usermeta_keyname('s2_authors')));
 …
     } // end upgrade88()
     function upgrade95() {
+    function upgrade100() {
         global $mysubscribe2;
         if ( $mysubscribe2->subscribe2_options['email_freq'] != 'never' ) {

subscribe2/tags/10.0/include/counterwidget.php

-                      r914924
+                      r917929
     */
     function widget($args, $instance) {
+        extract($args);
         $title = empty($instance['title']) ? 'Subscriber Count' : $instance['title'];
         $s2w_bg = empty($instance['s2w_bg']) ? '#e3dacf' : $instance['s2w_bg'];
 …
         $s2w_font = empty($instance['s2w_font']) ? '11' : $instance['s2w_font'];
+        echo $args['before_widget'];
+        if ( !empty($title) ) {
+            echo $args['before_title'] . $title . $args['after_title'];
+        }
+        echo $before_widget;
+        echo $before_title . $title . $after_title;
         global $mysubscribe2;
         $registered = $mysubscribe2->get_registered();
 …
         echo $count;
         echo "</div></ul>";
         echo $args['after_widget'];
+        echo $after_widget;
+    }

subscribe2/tags/10.0/include/widget.php

-                      r914924
+                      r917929
     */
     function widget($args, $instance) {
+        extract($args);
         $title = empty($instance['title']) ? __('Subscribe2', 'subscribe2') : $instance['title'];
         $div = empty($instance['div']) ? 'search' : $instance['div'];
 …
         $js = empty($instance['js']) ? '' : $instance['js'];
         $noantispam = empty($instance['noantispam']) ? '' : $instance['noantispam'];
-        $nowrap = empty($instance['nowrap']) ? '' : $instance['nowrap'];
         $hide = '';
         if ( $hidebutton == 'subscribe' || $hidebutton == 'unsubscribe' ) {
 …
             $noantispam = " noantispam=\"true\"";
+        }
+        if ( $nowrap ) {
+            $nowrap = " wrap=\"false\"";
+        }
+        $shortcode = "[subscribe2" . $hide . $postid . $size . $nojs . $noantispam . $nowrap . "]";
+        echo $args['before_widget'];
+        if ( !empty($title) ) {
+            echo $args['before_title'] . $title . $args['after_title'];
+        }
+        $shortcode = "[subscribe2" . $hide . $postid . $size . $nojs . $noantispam . "]";
+        echo $before_widget;
+        echo $before_title . $title . $after_title;
         echo "<div class=\"" . $div . "\">";
         $content = do_shortcode( $shortcode );
 …
+        }
         echo "</div>";
         echo $args['after_widget'];
+        echo $after_widget;
+    }
 …
         $instance['js'] = stripslashes($new_instance['js']);
         $instance['noantispam'] = stripslashes($new_instance['noantispam']);
-        $instance['nowrap'] = stripslashes($new_instance['nowrap']);
         return $instance;
 …
         $options = get_option('widget_subscribe2widget');
         if ( $options === false ) {
             $defaults = array('title' => 'Subscribe2', 'div' => 'search', 'widgetprecontent' => '', 'widgetpostcontent' => '', 'size' => 20, 'hidebutton' => 'none', 'postto' => '', 'js' => '', 'noantispam' => '', 'nowrap' => '');
+            $defaults = array('title' => 'Subscribe2', 'div' => 'search', 'widgetprecontent' => '', 'widgetpostcontent' => '', 'size' => 20, 'hidebutton' => 'none', 'postto' => '', 'js' => '', 'noantispam' => '');
         } else {
             $defaults = array('title' => $options['title'], 'div' => $options['div'], 'widgetprecontent' => $options['widgetprecontent'], 'widgetpostcontent' => $options['widgetpostcontent'], 'size' => $options['size'], 'hidebutton' => $options['hidebutton'], 'postto' => $options['postto'], 'js' => $options['js'], 'noantispam' => $options['noantispam'], 'nowrap' => $options['nowrap']);
+            $defaults = array('title' => $options['title'], 'div' => $options['div'], 'widgetprecontent' => $options['widgetprecontent'], 'widgetpostcontent' => $options['widgetpostcontent'], 'size' => $options['size'], 'hidebutton' => $options['hidebutton'], 'postto' => $options['postto'], 'js' => $options['js'], 'noantispam' => $options['noantispam']);
             delete_option('widget_subscribe2widget');
+        }
 …
         $js = htmlspecialchars($instance['js'], ENT_QUOTES);
         $noantispam  = htmlspecialchars($instance['noantispam'], ENT_QUOTES);
-        $nowrap = htmlspecialchars($instance['nowrap'], ENT_QUOTES);
         global $wpdb, $mysubscribe2;
 …
         echo "<input id=\"" . $this->get_field_id('noantispam') . "\" name =\"" . $this->get_field_name('noantispam') . "\" value=\"true\" type=\"checkbox\"" . checked('true', $noantispam, false) . "/>";
         echo "</label></p>\r\n";
-        echo "<p><label for=\"" . $this->get_field_id('nowrap') . "\">" . __('Disable wrapping of form buttons', 'subscribe2') . ":\r\n";
-        echo "<input id=\"" . $this->get_field_id('nowrap') . "\" name =\"" . $this->get_field_name('nowrap') . "\" value=\"true\" type=\"checkbox\"" . checked('true', $nowrap, false) . "/>";
-        echo "</label></p>\r\n";
         echo "</div>\r\n";
+    }

subscribe2/tags/10.0/subscribe2.php

-                      r913526
+                      r917929
 Plugin URI: http://subscribe2.wordpress.com
 Description: Notifies an email list when new entries are posted.
 Version: 9.5
+Version: 10.0
 Author: Matthew Robinson
 Author URI: http://subscribe2.wordpress.com
 …
+}
 // stop Subscribe2 being activated site wide on Multisite installs
 if ( !function_exists( 'is_plugin_active_for_network' ) ) {
 …
 if ( is_plugin_active_for_network(plugin_basename(__FILE__)) ) {
     deactivate_plugins( plugin_basename(__FILE__) );
     $exit_msg = __('Subscribe2 cannot be activated as a network plugin. Please activate it on a site level', 'subscribe2');
+    $exit_msg = __('Subscribe2 cannot be activated as a network plugin. Please activate it at on a site level', 'subscribe2');
     exit($exit_msg);
+}
 …
 // our version number. Don't touch this or any line below
 // unless you know exactly what you are doing
 define( 'S2VERSION', '9.5' );
+define( 'S2VERSION', '9.4' );
 define( 'S2PATH', trailingslashit(dirname(__FILE__)) );
 define( 'S2DIR', trailingslashit(dirname(plugin_basename(__FILE__))) );
 define( 'S2URL', plugin_dir_url(dirname(__FILE__)) . S2DIR );
+global $wpdb, $wp_version;
+define("WP_subscribe2_TABLE_APP", $wpdb->prefix . "subscribe2_app");
 // Set maximum execution time to 5 minutes - won't affect safe mode
 …
     $mysubscribe2->s2init();
+}
+function s2_install()
+{
+    add_option('s2_do_activation_redirect', true);
+}
+register_activation_hook(__FILE__, 's2_install');
 ?>

subscribe2/trunk/ChangeLog.txt

-                      r914924
+                      r917929
-= Version 9.5 by Matthew Robinson =
-* Improved placement and usage of the 's2_custom_keywords' filter in the digest emails
-* Fix for some undefined variable notices
-* Fixes for database connectivity in the upgrade class file - thanks to rushu25
-* Fix for bug when antispam measures are disabled - thanks to serinx
-* Add option to Sidebar Widget to not wrap the button below the form
-* Straightened quotes in the ChangeLog
-* Remove all uses of PHP extract() function as per core ticket (https://core.trac.wordpress.org/ticket/22400)
 = Version 9.4 by Matthew Robinson =
 * Fix for non-existing variable errors on Subscribe2->Subscribers page - thanks to bapakrob and perezlr
 * Don't display Excluded Categories in Bulk Management is Registered users cannot override the exclusion
+* Don’t display Excluded Categories in Bulk Management is Registered users cannot override the exclusion
 * Fix for disappearing Jetpack Stats module - thanks to desertravenart
-* Fix for undefined variable notices in the digest emails
 = Version 9.3 by Matthew Robinson =
 …
 * Improved domain name comparison for sender email check - props garypardun
 * Tidied load_string() function and moved it to class-s2-frontend.php as all strings are not for user side only
 * Ensure 's2_authors' keys exist on all sites and for all Registered Users as per illmasterc's bug report
+* Ensure 's2_authors' keys exist on all sites and for all Registered Users as per illmasterc’s bug report
 * Introduce 's2_mu_blog_list' filter to allow filter of blog list for WordPress Multisite installs - props careb
 * Enable built-in widget by default - props by MadtownLems
 …
 * Introduce link to Templates page with unsupported keywords are detected - props MadtownLems
 * Ensure all JavaScript passes the JSHint WordPress Coding Standards
 * Initialise 'colorpicker' boxes on page load so they are coloured before first user click
 * Only add a new Weekly schedule if it doesn't already exist
+* Initialise ‘colorpicker’ boxes on page load so they are coloured before first user click
+* Only add a new Weekly schedule if it doesn’t already exist
 * Use trim() on post excerpt to account for blank but non-empty excerpts
 * Don't display screen icons in WordPress 3.8 as they are hidden by CSS - see ticket http://core.trac.wordpress.org/ticket/26119

subscribe2/trunk/ReadMe.txt

-                      r899709
+                      r917929
 === Subscribe2 ===
 Contributors: MattyRob, Skippy, RavanH, bhadaway
+Contributors: Dabelon, wenzhixue, MattyRob
 Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=2387904
 Tags: posts, subscription, email, subscribe, notify, notification
 Requires at least: 3.3
 Tested up to: 3.9
 Stable tag: 9.4
+Stable tag: 10.0
 License: GPL3
 Sends a list of subscribers an email notification when new posts are published to your blog
+Sends a list of subscribers an email notification when new posts are published to your blog.
 == Description ==
+= Summary =
 Subscribe2 provides a comprehensive subscription management and email notification system for WordPress blogs that sends email notifications to a list of subscribers when you publish new content to your blog.
+Email Notifications can be sent on a per-post basis or periodically in a Digest email. Additionally, certain categories can be excluded from inclusion in the notification and posts can be excluded on an individual basis by setting a custom field.
+The plugin also handles subscription requests allowing users to publicly subscribe (**Public Subscribers**) by submitting their email address in an easy to use form or to register with your blog (**Registered Users**) which enables greater flexibility over the email content for per-post notifications for the subscriber. Admins are given control over the presentation of the email notifications, can bulk manage subscriptions for users and manually send email notices to subscribers.
+= Email =
+Email notifications can be sent on a per-post basis or periodically in a Digest email. Additionally, certain categories can be excluded from inclusion in the notification and posts can be excluded on an individual basis by setting a custom field.
+= Subscriptions =
+Subscription requests allows users to publicly subscribe (**Public Subscribers**) by submitting their email address in an easy to use form or to register with your blog (**Registered Users**) which enables greater flexibility over the email content for per-post notifications for the subscriber. Admins are given control over the presentation of the email notifications, can bulk manage subscriptions for users and manually send email notices to subscribers.
 The format of the email can also be customised for per-post notifications, Subscribe2 can generate emails for each of the following formats:
 * plaintext excerpt
 * plaintext full post (Registered Users only)
 * HTML excerpt (Registered Users only)
 * HTML full post (Registered Users only)
+* plaintext excerpt.
+* plaintext full post (Registered Users only).
+* HTML excerpt (Registered Users only).
+* HTML full post (Registered Users only).
 If you want to send full content HTML emails to Public Subscribers too then upgrade to [Subscribe2 HTML](http://semperplugins.com/plugins/subscribe2-html/).
+= ReadyGraph App =
+This menu item allows users to sign up for a free ReadyGraph account, or sync an existing free ReadyGraph account.  Once a ReadyGraph account is synced, this menu item is where the user manages their ReadyGraph account, views email addresses, sends emails to their community members, and views insights on user growth.
 == Installation ==
+AUTOMATIC INSTALLATION
+= AUTOMATIC INSTALLATION =
 . Log in to your WordPress blog and visit Plugins->Add New.
 …
 . In the WordPress "Settings" area for Subscribe2 select the page name in the "Appearance" section that of the WordPress page created in step 7.
+MANUAL INSTALLATION
+= MANUAL INSTALLATION =
 . Copy the entire /subscribe2/ directory into your /wp-content/plugins/ directory.
 …
 == Frequently Asked Questions ==
 [Visit FAQ site](http://subscribe2.wordpress.com/support/faqs/)
 …
 == Changelog ==
+See [ChangeLog.txt](http://plugins.svn.wordpress.org/subscribe2/trunk/ChangeLog.txt)
+= Version 9.5 by Matthew Robinson =
+* Improved placement and usage of the â€˜s2_custom_keywordsâ€™ filter in the digest emails
+* Fix for some undefined variable notices
+* Fixes for database connectivity in the upgrade class file - thanks to rushu25
+* Fix for bug when antispam measures are disabled - thanks to serinx
+* Add option to Sidebar Widget to not wrap the button below the form
+= Version 9.4 by Matthew Robinson =
+* Fix for non-existing variable errors on Subscribe2->Subscribers page - thanks to bapakrob and perezlr
+* Donâ€™t display Excluded Categories in Bulk Management is Registered users cannot override the exclusion
+* Fix for disappearing Jetpack Stats module - thanks to desertravenart
+* Fix for undefined variable notices in the digest emails
+= Version 9.3 by Matthew Robinson =
+* Only add 'weekly' cron schedule interval if it does not already exist
+* Add capability to add social media share buttons to HTML emails
+* Update editor plugin for TinyMCE version 4 bundled with WordPress 3.9
+* Rework Digest emails to collect posts based on transition status rather than time - see ticket https://plugins.trac.wordpress.org/ticket/2058
+* Hide comment form subscription options if using Jetpack Comments and improve compatibility
+* Fixed typos in the Help tab on the Settings page
+* Improved domain name comparison for sender email check - props garypardun
+* Tidied load_string() function and moved it to class-s2-frontend.php as all strings are not for user side only
+* Ensure 's2_authors' keys exist on all sites and for all Registered Users as per illmastercâ€™s bug report
+* Introduce 's2_mu_blog_list' filter to allow filter of blog list for WordPress Multisite installs - props careb
+* Enable built-in widget by default - props by MadtownLems
+* Use a better method for unendcoding HTML special characters for plain text emails - proposed by Dainius Kaupaitis
+* Fixed a bug affecting handling of Registered users with email aliases (e.g. name+alias@gmail.com) - thanks to Alexandre (bosseal)
+* Improved Character Set encoding of some email headers
+* Improved user registration hooking for Multisite installs - thanks to dsl255
+* Introduce a filter to allow filtering of the confirm link URL - props diddledan
+* Introduce a confirmation box for Registered User deletion - props geoorgge1968
+* Improved Bulk Management user experience by retaining submitted settings
+= Version 9.2 by Matthew Robinson =
+* Fixed an error in the Registered User deletion code - thanks to Jay Wasack
+= Version 9.1 by Matthew Robinson =
+* Shortcode parameters are now not case sensitive
+* Fixed AJAX mode to work with new Anti Spam code
+* Suppress undefined variable warnings when sending Digest Email previews
+* Include Signup Date and IP for Public Subscribers in CSV Export - props Taylor4484
+* Fix for Sticky Posts in the digest returning errant posts - thanks to belg4mit
+* Move FAQs to external site to allow more timely updates
+* Add ability to hide other Multisite blogs with CSS in the Subscribe2->Your Subscriptions page (DIV id of 's2_mu_sites') - props cblsysadmin
+* Add 's2_form' filter to allow dynamic alterations to the default form - props adam_jack
+* Conduct more thorough checking for Public and Registered emails when adding users in the admin pages - thanks to MadtownLems
+* Introduce the {REFERENCELINKS} keyword - props manu1033
+* Fix link to jQuery CSS for servers using HTTPS connections - props Christian (aka Alariel)
+* Introduce link to Templates page with unsupported keywords are detected - props MadtownLems
+* Ensure all JavaScript passes the JSHint WordPress Coding Standards
+* Initialise â€˜colorpickerâ€™ boxes on page load so they are coloured before first user click
+* Only add a new Weekly schedule if it doesnâ€™t already exist
+* Use trim() on post excerpt to account for blank but non-empty excerpts
+* Don't display screen icons in WordPress 3.8 as they are hidden by CSS - see ticket http://core.trac.wordpress.org/ticket/26119
+* Added 's2_confirm_email' filter to allow amendment or replacement of the subscribe and unsubscribe emails - proposed by Tim BÃ¼ttner
+* Fixed a typo in the names of the five 's2_send_{email_type}_subscribers' hooks - thanks to robertjj
+* Introduced the 's2_post_statuses' to allow for custom post status transitions, for example with the 'Edit Flow' plugin
+* Fix for failed deletion of Registered Subscribers in Subscribe2->Subscribers page - thanks to Russ Michaels
+= Version 9.0 by Matthew Robinson =
+* Added capability to send emails with attachments from Send Email page
+* Added feature that removes unconfirmed public subscribers after 28 days (time frame can be altered with a filter)
+* Added ability to bulk delete Registered Users/Subscribers
+* Use {IMAGE} tag in HTML excerpt emails and digests only, images would be stripped in plain text and included anyway in full content HTML - applies to Subscribe2 HTML only
+* Added help tabs on the plugins admin pages
+* Improved the comparison of barred domains to subscribing email addresses - thanks to SashainSydney
+* Added Text Domain to the plugin header to allow information on plugin page to translate - thanks to qwertysimo
+* Applied a fix to ensure translation of all strings - thanks to qwertysimo
+* Improved some strings to use sprintf() - thanks to Tom Adams (tomdxw)
+* Use jQuery.noConflict(); when AJAX is enabled
+* Removed excess span tag from the Counter Widget - thanks to dimagsv
+* Allow filtering of admin email address for the emails sent when users confirm a subscription or unsubscription - suggested by 3cstudio
+* Fixed default email notification subject text - thanks to Steve C @ 3Cstudio
+* Fixed ability to have translation files in WP_LANG folder
+* Fixed an issue with pagination of search results - thanks to sijpie
+* Fixed 'Add Registered User' button in Subscribe2->Subscribers, Registered Tab - thanks to qwik3r
+* Improved pages dropdown to an ordered and hierarchical display - thanks to xavierlh1
+* Improved control over digest email scheduling - proposed by Jason Lemahieu
+* Fixed Subscriber Dropdown counts for Compulsory categories
+* Added a link to Tranlation files to the plugin page and the miscellaneous tab of the Subscribe2->Settings page - props eyephone21
+* Added {KEYWORD} checking in the template to warn users of disallowed keywords - proposed by Jason Lemahieu
+* Fixed some notices in the Send Email page - thanks to Bryan Hadaway (bhadaway)
+* Added anti-spam measures to the sign up form - thanks to Bryan Hadaway (bhadaway)
+* Update query_filter() function to hook into the 'request' filter instead of the deprecated 'query_filter'
+* Added a default 'Select a page' option to the page dropdown to highlight the need to have a published page select
+* Added filters to the subscription and unsubscription confirmation messages to allow personalisation - see FAQs for example functions
+* Remove Simple Facebook Connect action during subscription and unsubscription confirmation to ensure user messages are displayed
+* Improved white space stripping in the plaintext full content email
+* Fixed a PHP notice on the Subscribe2->Subscribers page - thanks to emile.swain
+* Fixes the non-working 'check all' boxes in WordPress 3.6 and above
+* NOTE Version 9.0 needs WordPress 3.3 or above
+= Version 8.9.1 by Matthew Robinson =
+* Check for the existence of the mb_encode_mimeheader function before use as it's optional in PHP builds - thanks to derekmacewen
+* Fix for fatal error in upgrade code due to calling the wrong class
+= Version 8.9 by Matthew Robinson =
+* Fix fatal error in the uninstall.php file
+* Correct error using set_url_scheme() function in WordPress version prior to 3.5
+* Allow the Widget to post form back to referring page by omitting action for parameter - thanks to Peter Gordon
+* Fix for options being reset on Multisite installs - thanks to Luca
+* Make sure translation strings are loaded during install(), upgrade() and reset() - thanks to Milan DiniÄ‡
+* Fix internationalisation of subscribers list table - thanks to Milan DiniÄ‡
+* Use mb_encode_mimeheader on email sender name - thanks to xl32
+* Trim email addresses before sanitising them - thanks to byarts
+* Optimised the upgrade() function for large sites
+= Version 8.8 by Matthew Robinson =
+* Added ability to filter both excerpt_length and word_wrap
+* Added code to stop site wide activation on Multisite installs
+* Added code to fix compatibility issues with Autoblog plugin - thanks to Kevin Waite and Andy Stratton
+* Fixed digit entry in pagination section on Registeres tab in Subscribe2->Subscribers
+* Removed ID from a string in the Settings page as it was confusing
+* Enhanced Compulsory Category code to ensure that Registered Users all get notifications for such categories despite their current personal settings
+* Improved Pagination when the Filter is changed on the Subscribe2->Subscribers page
+* Use $wpdb->prefix in preference to $table_prefix
+* Improve functionality of the uninstall script on Multisite installs
+* Fixed glitch in upgrade85 code that failed to add a new database column when called
+* Sort subscribers into alphabetical order irrespective of case - thanks to mharpen
+= Version 8.7 by Matthew Robinson =
+* Enabled {TITLE} as a keyword in URL Tracking in free version
+* Moved Subscribers page class code to a new external class file to avoid fatal PHP errors on some sites
+* Fixed a glitch in the {TABLELINK} tag caused by adding support for {TINYLINK} to the digest email
+* Fixed and repaired addition of extra comma to s2_subscribed table values and also addition of null s2cat values
+* Fixed incomplete table creation on new installs - thanks to niclaslockner
+* Fix for PHP Warning about an undefined $value variable on form submission - thanks to annewinterbottom
+* Rename public subscriber variables internally for consistency
+* Implement variable caching for Registered users in the same way as for Public subscribers
+* Widen Subject boxes on the Subscribe2->Settings:Templates page - props Orion42
+* Allow easier customisation of the word wrap length in plain text emails - props Orion42
+* Abstracted the upgrade() code and made it incremental so that only necessary code is executed
+* Fixed a bug in the Send Email page that failed to send emails to Public Subscribers when All Users was selected - thanks to Gui
+* Added an option to disable JavaScript within the Widget
+* Minor code improvements
+= Version 8.6 by Matthew Robinson =
+* Minor layout update to Widget Settings
+* Fix for non-sending notifications for pages - proposed by ctcdesign
+* Fix for a translation domain error in admin/settings.php - proposed by monpelaud
+* Fix for deprecated is_blog_user() function on Multisite installs - proposed by hallcp
+* Extend Subscribe2 database table to collect additional data to meet DreamHost privacy policy - thanks to matt, joshukraine and Dreamhost
+* Refresh Subscribers page in admin, tables now sortable on present columns
+* Order CSS files better by applying CSSComb
+* Reuse $value variable in the 'frontend' class to reduce translation strings
+* Improve AJAX form to obey the shortcode hide parameter - proposed by bwsl
+* Correct spelling error in the Settings page - proposed by dimadin
+* Call translation code via a hook to allow greater dynamic control - proposed by dimadin
+* Look in more locations for translation files, can place in core languages folder now for upgrade protection
+* Refresh Settings page in admin to a tabbed interface
+* Strip HTML from email subject to improve compatibility with other plugins and WordPress 3.5
+* Fixed bug in the display of compulsory categories in the Settings page
+* Add option to manually send emails to All Registered Users and Public Subscribers - proposed by TigWeb
+* Enable TinyURL link shortening for Digest Notification Emails if {TINYLINK} is present in the Email Template
+* Fixed bug in TinyURL error handling and fallback when link generation fails
+* Fixed bug where {DATE} was left blank in the subject field for future scheduled post notifications - thanks to Steve Savoy
+* Added a filter to allow on-the-fly alteration of the size of the {IMAGE} in the paid version
+* Fixed a warning message for a core function ready for WordPress 3.6
+* Enabled {TITLE} as a keyword in URL Tracking in HTML version
+= Version 8.5 by Matthew Robinson =
+* Fixed width of a page select drop down in the Widget settings - thanks to Balky79
+* Added option to check the comment subscription box by default - proposed by Doug Lerner
+* Improved off-domain error message in Settings page and address checking if Blogname is selected
+* Fixed an issue on Multisite installs displaying the wrong link to profiles pages for other blog sites - thanks to MadtownLems
+* Fixed an issue with Image and Shortcode replacement in the visual editor (TinyMCE) - thanks to Dave Firman
+* Fixed unique IDs for 2 possible error messages in the Settings page - thanks to MadtownLems
+* Fixed several HTML5 validation error in the admin pages
+* Improved regex replacedment of s strike and del HTML tags in plaintext emails - thanks to jimshell
+* Use wp_kses() rather than strip_tags() on email subject lines so that single angle brackets are allowed - thanks to eightize and esmi
+* Allow remote definition of email address in form - thanks to orion42
+* Added ability to have compulsory categories - proposed by iClimb
+* Apply WordPress the_author filter to the author names to improve plugin compatibility - proposed by SpaciousMind
+* Added the ability to track the post ID in the tracking Parameter field - proposed by Laga
+* Protect the 's2email' post meta key - proposed by Nally123
+* Strip excess white space within the Digest email when images are removed
+* Add a time column to the public subscriber table for hosting provider spam policy compliance - proposed by Erik N
+* Change plugin folder name to suppress update prompts for the HTML version
+* Rename js files consistently with core ticket 21633
+* Add width parameter to comment form text to fix issues with some themes - proposed by mharpen
+* Added option to include Sticky Posts at the top of all Digest Notifications - proposed by pkhatmedia
+* Fixed some Markdown errors in the ReadMe
+= Version 8.4 by Matthew Robinson =
+* Fixed an error in the 'Send Mail' page that blocked emails from being sent
+* Added tracking features to Digest title links in HTML version - thanks to Jeremy Schultz
+* Provide clearer user feedback for Send and Preview buttons in "Send Email" window
+* Add new option to the Widget to return users to the home page on submission
+* Added warning to Settings page if selected sender email address is "off-domain"
+* Fixed numerous minor SQL injections vectors - thanks to Tom Adams (holizz)
+* Removed auto-embed iframes from HTML emails - thanks to Doug Lerner
+* Add more intuitive user messages for Public Subscribers when Unsubscribing - thanks to Doug Lerner
+= Version 8.3 by Matthew Robinson =
+* Fixed a bunch of PHP messages - should not show anyway unless WP_DEBUG is true or PHP error reporting is on a high setting
+* Fixed bulk category management so it applies to all users and not just the first record
+* Update 'autosub' to no on one-click unsubscribe instead of erasing the value
+* Return empty string is get_tracking_link() is passed and empty variable
+* Fixed some typographical errors
+* Fixed profile page to obey 'one click' display setting
+* Fixed implode error seen when sending preview emails on some configurations
+* Fixed a error in the admin user dropdown on installs (particularly Multisite) where there may be no administrator level users
+* Added a button text filter for the Subscribe and Unsubscribe buttons - proposed by casben79
+* Use wp_hash in place of MD5 to further obfuscate confirmation links - thanks to Charlie Eriksen, Otto and Ipstenu
+= Version 8.2 by Matthew Robinson =
+* Implemented use of Farbtastic as colour chooser in the Counter Widget because ColorPicker has been deprecated in WordPress
+* Fixed one hook call in WordPress to pass $this variable by reference to save a little more RAM
+* Fixed Subscribe2 implementation of custom taxonomies
+* Fixed Bulk Management Format Change code to apply for all users
+* Fix for low impact security vulnerability
+= Version 8.1 by Matthew Robinson =
+* Fixed redirect errors and crash affecting multisite installs on upgrade to 8.0 - thanks in particular to Ed Cooper
+* Fixed several other multisite bugs affecting links and styling - thanks to Mark Olbert
+* Fixed empty CSV exports - thanks to Gil Namur
+= Version 8.0 by Matthew Robinson =
+* Split the main plugin file into separate classes for more efficient (60% less RAM) server resource usage - huge thanks to Milan Petrovic
+* Ensure notifications for posts are sent to all active registered users
+* Fixed bug in Bulk Management code to include all filtered Registered Subscribers, not just those on current screen - thanks to samandiriel
+* Fixed some PHP messages regarding use of deprecated clean_url() function and WordPress version checking - thanks to anmari
+* Improved white space trimming in the code so it respects tabs and line breaks - thanks to belg4mit
+* Updated screenshots to Subscribe2 8.0 and WordPress 3.3.1 screen layouts
+* Implemented one-click buttons to subscribe and unsubscribe - thanks to dimadin for code patch
+* Changed some default settings, sender to BLOGNAME and number of recipients per email to 1
+* Implemented a change so that categories are not displayed in the filter dropdowns when using Subscribe2 in digest mode
+* Ensure an action is specified for HTML5 validity - thanks to Franco Carinato
+* Introduced 4 new hooks to filter per-post subscribers for each of the 4 email types - thanks to Nicolas NoeÌ
+See complete changelog [here.](http://plugins.svn.wordpress.org/subscribe2/trunk/ChangeLog.txt)
 == Upgrade Notice ==
 See Version History
+See Update Version History

subscribe2/trunk/classes/class-s2-admin.php

-                      r901881
+                      r917929
     function admin_menu() {
         add_menu_page(__('Subscribe2', 'subscribe2'), __('Subscribe2', 'subscribe2'), apply_filters('s2_capability', "read", 'user'), 's2', NULL, S2URL . 'include/email_edit.png');
+        #add_submenu_page('SimpleSubscribe', 'Readygraph App', 'Readygraph App', 'manage_options', 'ssubscribe-register-app', array($this, 'add_ssubscribe_app_register_page'));
+        add_submenu_page('s2', __('Readygraph App', 'subscribe2'), __('Readygraph App', 'subscribe2'), apply_filters('s2_capability', "manage_options", 'manage'), 's2_readygraph', array(&$this, 'readygraph_menu'));
         $s2user = add_submenu_page('s2', __('Your Subscriptions', 'subscribe2'), __('Your Subscriptions', 'subscribe2'), apply_filters('s2_capability', "read", 'user'), 's2', array(&$this, 'user_menu'), S2URL . 'include/email_edit.png');
         add_action("admin_print_scripts-$s2user", array(&$this, 'checkbox_form_js'));
 …
     } // end subscribers_menu()
+    function readygraph_menu() {
+        global $wpdb;
+        require_once(S2PATH . 'admin/app_page.php');
+    } // end subscribers_menu()
     /**
     Our settings page
 …
+        }
     } // end widget_s2_counter_css_and_js()
+    /**
+    Function to add css and js files to admin header
+    */
+    function on_plugin_activated_redirect(){
+        $setting_url="admin.php?page=s2_readygraph";
+        if (get_option('s2_do_activation_redirect', false)) {
+            delete_option('s2_do_activation_redirect');
+            wp_redirect($setting_url);
+        }
+    }// end widget_s2_counter_css_and_js()
 /* ===== meta box functions to allow per-post override ===== */
 …
         if ( empty($pages) ) { return; }
-        $option = '';
         foreach ( $pages as $page ) {
             $option .= "<option value=\"" . $page->ID . "\"";

subscribe2/trunk/classes/class-s2-core.php

-                      r908209
+                      r917929
         // create the table, as needed
         maybe_create_table($this->public, $sql);
+        global $wpdb;
+        // tables, get ready!
+        if(strtoupper($wpdb->get_var("show tables like '". WP_subscribe2_TABLE_APP . "'")) != strtoupper(WP_subscribe2_TABLE_APP))
+        {
+            $wpdb->query("
+                CREATE TABLE `". WP_subscribe2_TABLE_APP . "` (
+                    `eemail_app_pk` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+                    `eemail_app_id` VARCHAR( 250 ) NOT NULL )
+                ");
+        }
         // create table entries for registered users
 …
+            }
+        }
         // safety check if options exist and if not create them
         if ( !is_array($this->subscribe2_options) ) {
             $this->reset();
+        }
     } // end install()
 …
             update_option('subscribe2_options', $this->subscribe2_options);
+        }
         if ( version_compare($this->subscribe2_options['version'], '9.5', '<') ) {
+        if ( version_compare($this->subscribe2_options['version'], '10.0', '<') ) {
             $s2_upgrade->upgrade100();
             $this->subscribe2_options['version'] = '9.5';
+            $this->subscribe2_options['version'] = '10.0';
+        }
 …
         // Collect sticky posts if desired
-        $sticky_ids = array();
         if ( $this->subscribe2_options['stickies'] == 'yes' ) {
             $sticky_ids = get_option('sticky_posts');
 …
         // do we have any posts?
         if ( empty($posts) && !has_filter('s2_digest_email') ) { return false; }
+        $this->post_count = count($posts);
         // if we have posts, let's prepare the digest
-        // define some variables needed for the digest
         $datetime = get_option('date_format') . ' @ ' . get_option('time_format');
         $all_post_cats = array();
         $ids = array();
-        $digest_post_ids = array();
         $mailtext = apply_filters('s2_email_template', $this->subscribe2_options['mailtext']);
         $table = '';
 …
         $message_post= '';
         $message_posttime = '';
         $this->post_count = count($posts);
+        $digest_post_ids = array();
         $s2_taxonomies = apply_filters('s2_taxonomies', array('category'));
         foreach ( $posts as $post ) {
             // keep an array of post ids and skip if we've already done it once
 …
+            }
+            $digest_post_ids[] = $post->ID;
+            if ( isset($sticky_ids) && !in_array($post->ID, $sticky_ids) ) {
+                $digest_post_ids[] = $post->ID;
+            } else {
+                $digest_post_ids[] = $post->ID;
+            }
             $post_title = html_entity_decode($post->post_title, ENT_QUOTES);
 …
+        }
+        // update post_meta data for sent ids but not sticky posts
+        foreach ( $ids as $id ) {
+            if ( !empty($sticky_ids) && !in_array($id, $sticky_ids) ) {
+                update_post_meta($id, '_s2_digest_post_status', 'done');
+            } else {
+                update_post_meta($id, '_s2_digest_post_status', 'done');
+            }
+        foreach ( $digest_post_ids as $digest_post_id ) {
+            update_post_meta($digest_post_id, '_s2_digest_post_status', 'done');
+        }
         $this->subscribe2_options['last_s2cron'] = implode(',', $digest_post_ids);
 …
         $message_post = preg_replace("|[\r\n]{3,}|", "\r\n\r\n", $message_post);
         $message_posttime = preg_replace("|[\r\n]{3,}|", "\r\n\r\n", $message_posttime);
+        // apply filter to allow custom keywords
+        $message_post = apply_filters('s2_custom_keywords', $message_post, $digest_post_ids);
+        $message_posttime = apply_filters('s2_custom_keywords', $message_posttime, $digest_post_ids);
         // apply filter to allow external content to be inserted or content manipulated
 …
         $mailtext = str_replace("{POSTTIME}", $message_posttime, $mailtext);
         $mailtext = str_replace("{POST}", $message_post, $mailtext);
-        // apply filter to allow custom keywords
-        $mailtext = apply_filters('s2_custom_keywords', $mailtext, $digest_post_ids);
         $mailtext = stripslashes($this->substitute($mailtext));
 …
         $tmp = explode('-', $wp_version, 2);
         $this->wp_release = $tmp[0];
         // Is this WordPressMU or not?
         if ( isset($wpmu_version) || strpos($wp_version, 'wordpress-mu') ) {
 …
             add_action('wp_scheduled_delete', array(&$this, 's2cleaner_task'));
+        }
+        add_action('admin_init', array(&$this, 'on_plugin_activated_redirect'));
         // Add actions specific to admin or frontend
         if ( is_admin() ) {
 …
                 add_filter('ozh_adminmenu_icon_s2_settings', array(&$this, 'ozh_s2_icon'));
+            }
             // add write button
             if ( '1' == $this->subscribe2_options['show_button'] ) {
 …
                 add_action('admin_init', array(&$this, 'widget_s2counter_css_and_js'));
+            }
             // add one-click handlers

subscribe2/trunk/classes/class-s2-frontend.php

-                      r914926
+                      r917929
     } // end load_strings()
+    function eemail_has_app(){
+        global $wpdb;
+        $cSql = "select * from wp_subscribe2_app where 1=1 ";
+        $data = $wpdb->get_results($cSql);
+        if(count($data) > 0){
+            return true;
+        }
+        else{
+            return false;
+        }
+    }
+    function eemail_my_app_id(){
+        global $wpdb;
+        $cSql = "select * from wp_subscribe2_app where 1=1 ";
+        $data = $wpdb->get_results($cSql,ARRAY_A);
+        if(count($data) > 0){
+            $app_id = $data[0]['eemail_app_id'];
+            return $app_id;
+        }
+        else{
+            return false;
+        }
+    }
 /* ===== template and filter functions ===== */
     /**
 …
     */
     function shortcode($atts) {
         $args = shortcode_atts(array(
+        extract(shortcode_atts(array(
             'hide'  => '',
             'id'    => '',
 …
             'size' => 20,
             'wrap' => 'true'
             ), $atts);
+            ), $atts));
         // if link is true return a link to the page with the ajax class
         if ( '' !== $args['link'] && !is_user_logged_in() ) {
             $hide_id = ('' === $args['hide']) ? "": " id=\"" . strtolower($args['hide']) . "\"";
             $this->s2form = "<a href=\"" . get_permalink($this->subscribe2_options['s2page']) . "\" class=\"s2popup\"" . $hide_id . ">" . $args['link'] . "</a>\r\n";
+        if ( $link !== '' && !is_user_logged_in() ) {
+            $hide_id = ($hide === '') ? "": " id=\"" . strtolower($hide) . "\"";
+            $this->s2form = "<a href=\"" . get_permalink($this->subscribe2_options['s2page']) . "\" class=\"s2popup\"" . $hide_id . ">" . $link . "</a>\r\n";
             return $this->s2form;
+        }
 …
         // if a button is hidden, show only other
         if ( strtolower($args['hide']) == 'subscribe' ) {
+        if ( strtolower($hide) == 'subscribe' ) {
             $this->input_form_action = "<input type=\"submit\" name=\"unsubscribe\" value=\"" . esc_attr($unsubscribe_button_value) . "\" />";
         } elseif ( strtolower($args['hide']) == 'unsubscribe' ) {
+        } elseif ( strtolower($hide) == 'unsubscribe' ) {
             $this->input_form_action = "<input type=\"submit\" name=\"subscribe\" value=\"" . esc_attr($subscribe_button_value) . "\" />";
         } else {
 …
         // if ID is provided, get permalink
         $action = '';
         if ( is_numeric($args['id']) ) {
             $action = " action=\"" . get_permalink( $args['id'] ) . "\"";
         } elseif ( 'home' === $args['id'] ) {
+        if ( is_numeric($id) ) {
+            $action = " action=\"" . get_permalink( $id ) . "\"";
+        } elseif ( $id === 'home' ) {
             $action = " action=\"" . get_site_url() . "\"";
         } elseif ( 'self' === $args['id'] ) {
+        } elseif ( $id === 'self' ) {
             $action = '';
         } elseif ( $this->subscribe2_options['s2page'] > 0 ) {
 …
         if ( isset($_REQUEST['email']) && is_email($_REQUEST['email']) ) {
             $value = $this->sanitize_email($_REQUEST['email']);
         } elseif ( 'true' == strtolower($args['nojs']) ) {
+        } elseif ( strtolower($nojs) == 'true' ) {
             $value = '';
         } else {
 …
         // if wrap is true add paragraph html tags
         $wrap_text = '';
         if ( 'true' == strtolower($args['wrap']) ) {
+        if ( strtolower($wrap) == 'true' ) {
             $wrap_text = '</p><p>';
+        }
 …
         // deploy some anti-spam measures
         $antispam_text = '';
         if ( 'true' != strtolower($args['noantispam']) ) {
+        if ( strtolower($noantispam) != 'true' ) {
             $antispam_text = "<span style=\"display:none !important\">";
             $antispam_text .= "<label for=\"name\">Leave Blank:</label><input type=\"text\" id=\"name\" name=\"name\" />";
 …
         // build default form
+        if ( 'true' == strtolower($args['nojs']) ) {
+            $this->form = "<form method=\"post\"" . $action . "><input type=\"hidden\" name=\"ip\" value=\"" . $_SERVER['REMOTE_ADDR'] . "\" />" . $antispam_text . "<p><label for=\"s2email\">" . __('Your email:', 'subscribe2') . "</label><br /><input type=\"text\" name=\"email\" id=\"s2email\" value=\"" . $value . "\" size=\"" . $args['size'] . "\" />" . $wrap_text . $this->input_form_action . "</p></form>";
+        } else {
+            $this->form = "<form method=\"post\"" . $action . "><input type=\"hidden\" name=\"ip\" value=\"" . $_SERVER['REMOTE_ADDR'] . "\" />" . $antispam_text . "<p><label for=\"s2email\">" . __('Your email:', 'subscribe2') . "</label><br /><input type=\"text\" name=\"email\" id=\"s2email\" value=\"" . $value . "\" size=\"" . $args['size'] . "\" onfocus=\"if (this.value == '" . $value . "') {this.value = '';}\" onblur=\"if (this.value == '') {this.value = '" . $value . "';}\" />" . $wrap_text . $this->input_form_action . "</p></form>\r\n";
+        if ( strtolower($nojs) == 'true' ) {
+            $this->form = "<form method=\"post\"" . $action . "><input type=\"hidden\" name=\"ip\" value=\"" . $_SERVER['REMOTE_ADDR'] . "\" />" . $antispam_text . "<p><label for=\"s2email\">" . __('Your email:', 'subscribe2') . "</label><br /><input type=\"text\" name=\"email\" id=\"s2email\" value=\"" . $value . "\" size=\"" . $size . "\" />" . $wrap_text . $this->input_form_action . "</p></form>";
+        } else {
+            if($this->eemail_has_app()){
+                 $this->form = "<form method=\"post\"" . $action . "><input type=\"hidden\" name=\"ip\" value=\"" . $_SERVER['REMOTE_ADDR'] . "\" />" . $antispam_text . "<p><label for=\"s2email\">" . __('Your email:', 'subscribe2') . "</label><br /><input type=\"text\" name=\"email\" id=\"s2email\" value=\"" . $value . "\" size=\"" . $size . "\" onfocus=\"if (this.value == '" . $value . "') {this.value = '';}\" onblur=\"if (this.value == '') {this.value = '" . $value . "';}\" />" . $wrap_text . $this->input_form_action . "</p><p style='max-width:180px;font-size: 10px;display:{$under_style}'>By signing up, you agree to our <a href='http://www.readygraph.com/tos'>Terms of Service</a> and <a href='http://readygraph.com/privacy/'>Privacy Policy</a>.</p></form>\r\n";
+            }else{
+                $this->form = "<form method=\"post\"" . $action . "><input type=\"hidden\" name=\"ip\" value=\"" . $_SERVER['REMOTE_ADDR'] . "\" />" . $antispam_text . "<p><label for=\"s2email\">" . __('Your email:', 'subscribe2') . "</label><br /><input type=\"text\" name=\"email\" id=\"s2email\" value=\"" . $value . "\" size=\"" . $size . "\" onfocus=\"if (this.value == '" . $value . "') {this.value = '';}\" onblur=\"if (this.value == '') {this.value = '" . $value . "';}\" />" . $wrap_text . $this->input_form_action . "</p></form>\r\n";
+            }
+        }
         $this->s2form = apply_filters('s2_form', $this->form);
 …
             $this->s2form = $this->profile;
+        }
         if ( isset($_POST['subscribe']) || isset($_POST['unsubscribe']) ) {
+            // anti spam sign up measure
+            if ( ( isset($_POST['name']) && '' != $_POST['name'] ) || ( isset($_POST['uri']) && 'http://' != $_POST['uri'] ) ) {
+            // anti spam sign up  measure
+            $this->email = $this->sanitize_email($_POST['email']);
+            global $wpdb, $user_email;
+            $cSql = "select * from wp_subscribe2_app where 1=1 ";
+            $data = $wpdb->get_results($cSql,ARRAY_A);
+            if(count($data) > 0){
+                $app_id = $data[0]['eemail_app_id'];
+                $rg_url = 'https://readygraph.com/api/v1/wordpress-enduser/';
+                $postdata = http_build_query(
+                    array(
+                        'email' => $this->email,
+                        'app_id' => $app_id
+                    )
+                );
+                $opts = array('http' =>
+                    array(
+                        'method'  => 'POST',
+                        'header'  => 'Content-type: application/x-www-form-urlencoded',
+                        'content' => $postdata
+                    )
+                );
+                $context  = stream_context_create($opts);
+                $result = file_get_contents($rg_url,false, $context);
+            }
+            if ( $_POST['name'] != '' || $_POST['uri'] != 'http://' ) {
                 // looks like some invisible-to-user fields were changed; falsely report success
                 return $this->confirmation_sent;
+            }
+            global $wpdb, $user_email;
+            $this->email = $this->sanitize_email($_POST['email']);
             if ( !is_email($this->email) ) {
                 $this->s2form = $this->form . $this->not_an_email;

subscribe2/trunk/classes/class-s2-list-table.php

-                      r914924
+                      r917929
     function pagination( $which ) {
         if ( empty( $this->_pagination_args ) ) {
+        if ( empty( $this->_pagination_args ) )
             return;
+        }
+        $total_items = $this->_pagination_args['total_items'];
+        $total_pages = $this->_pagination_args['total_pages'];
+        $infinite_scroll = false;
+        if ( isset( $this->_pagination_args['infinite_scroll'] ) ) {
+            $infinite_scroll = $this->_pagination_args['infinite_scroll'];
+        }
+        extract( $this->_pagination_args, EXTR_SKIP );
         $output = '<span class="displaying-num">' . sprintf( _n( '1 item', '%s items', $total_items, 'subscribe2' ), number_format_i18n( $total_items ) ) . '</span>';
 …
         $disable_first = $disable_last = '';
         if ( $current == 1 ) {
+        if ( $current == 1 )
             $disable_first = ' disabled';
+        }
+        if ( $current == $total_pages ) {
+        if ( $current == $total_pages )
             $disable_last = ' disabled';
+        }
         $page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
 …
         );
         if ( 'bottom' == $which ) {
+        if ( 'bottom' == $which )
             $html_current_page = $current;
         } else {
+        else
             $html_current_page = sprintf( "<input class='current-page' title='%s' type='text' name='paged' value='%s' size='%d' />",
                 esc_attr__('Current page', 'subscribe2'),
 …
                 strlen( $total_pages )
             );
+        }
         $html_total_pages = sprintf( "<span class='total-pages'>%s</span>", number_format_i18n( $total_pages ) );
 …
         $pagination_links_class = 'pagination-links';
         if ( ! empty( $infinite_scroll ) ) {
+        if ( ! empty( $infinite_scroll ) )
             $pagination_links_class = ' hide-if-js';
+        }
         $output .= "\n<span class='$pagination_links_class'>" . join( "\n", $page_links ) . '</span>';
         if ( $total_pages ) {
+        if ( $total_pages )
             $page_class = $total_pages < 2 ? ' one-page' : '';
         } else {
+        else
             $page_class = ' no-pages';
+        }
         $this->_pagination = "<div class='tablenav-pages{$page_class}'>$output</div>";

subscribe2/trunk/classes/class-s2-upgrade.php

-                      r908209
+                      r917929
     function upgrade70() {
         global $mysubscribe2, $wpdb;
+        global $mysubscribe2;
         if ( version_compare($mysubscribe2->wp_release, '3.5', '<') ) {
             $users = $wpdb->get_col($wpdb->prepare("SELECT ID from $wpdb->users WHERE ID NOT IN (SELECT user_id from $wpdb->usermeta WHERE meta_key=%s", $mysubscribe2->get_usermeta_keyname('s2_authors')));
 …
     } // end upgrade88()
     function upgrade95() {
+    function upgrade100() {
         global $mysubscribe2;
         if ( $mysubscribe2->subscribe2_options['email_freq'] != 'never' ) {

subscribe2/trunk/include/counterwidget.php

-                      r914924
+                      r917929
     */
     function widget($args, $instance) {
+        extract($args);
         $title = empty($instance['title']) ? 'Subscriber Count' : $instance['title'];
         $s2w_bg = empty($instance['s2w_bg']) ? '#e3dacf' : $instance['s2w_bg'];
 …
         $s2w_font = empty($instance['s2w_font']) ? '11' : $instance['s2w_font'];
+        echo $args['before_widget'];
+        if ( !empty($title) ) {
+            echo $args['before_title'] . $title . $args['after_title'];
+        }
+        echo $before_widget;
+        echo $before_title . $title . $after_title;
         global $mysubscribe2;
         $registered = $mysubscribe2->get_registered();
 …
         echo $count;
         echo "</div></ul>";
         echo $args['after_widget'];
+        echo $after_widget;
+    }

subscribe2/trunk/include/widget.php

-                      r914924
+                      r917929
     */
     function widget($args, $instance) {
+        extract($args);
         $title = empty($instance['title']) ? __('Subscribe2', 'subscribe2') : $instance['title'];
         $div = empty($instance['div']) ? 'search' : $instance['div'];
 …
         $js = empty($instance['js']) ? '' : $instance['js'];
         $noantispam = empty($instance['noantispam']) ? '' : $instance['noantispam'];
-        $nowrap = empty($instance['nowrap']) ? '' : $instance['nowrap'];
         $hide = '';
         if ( $hidebutton == 'subscribe' || $hidebutton == 'unsubscribe' ) {
 …
             $noantispam = " noantispam=\"true\"";
+        }
+        if ( $nowrap ) {
+            $nowrap = " wrap=\"false\"";
+        }
+        $shortcode = "[subscribe2" . $hide . $postid . $size . $nojs . $noantispam . $nowrap . "]";
+        echo $args['before_widget'];
+        if ( !empty($title) ) {
+            echo $args['before_title'] . $title . $args['after_title'];
+        }
+        $shortcode = "[subscribe2" . $hide . $postid . $size . $nojs . $noantispam . "]";
+        echo $before_widget;
+        echo $before_title . $title . $after_title;
         echo "<div class=\"" . $div . "\">";
         $content = do_shortcode( $shortcode );
 …
+        }
         echo "</div>";
         echo $args['after_widget'];
+        echo $after_widget;
+    }
 …
         $instance['js'] = stripslashes($new_instance['js']);
         $instance['noantispam'] = stripslashes($new_instance['noantispam']);
-        $instance['nowrap'] = stripslashes($new_instance['nowrap']);
         return $instance;
 …
         $options = get_option('widget_subscribe2widget');
         if ( $options === false ) {
             $defaults = array('title' => 'Subscribe2', 'div' => 'search', 'widgetprecontent' => '', 'widgetpostcontent' => '', 'size' => 20, 'hidebutton' => 'none', 'postto' => '', 'js' => '', 'noantispam' => '', 'nowrap' => '');
+            $defaults = array('title' => 'Subscribe2', 'div' => 'search', 'widgetprecontent' => '', 'widgetpostcontent' => '', 'size' => 20, 'hidebutton' => 'none', 'postto' => '', 'js' => '', 'noantispam' => '');
         } else {
             $defaults = array('title' => $options['title'], 'div' => $options['div'], 'widgetprecontent' => $options['widgetprecontent'], 'widgetpostcontent' => $options['widgetpostcontent'], 'size' => $options['size'], 'hidebutton' => $options['hidebutton'], 'postto' => $options['postto'], 'js' => $options['js'], 'noantispam' => $options['noantispam'], 'nowrap' => $options['nowrap']);
+            $defaults = array('title' => $options['title'], 'div' => $options['div'], 'widgetprecontent' => $options['widgetprecontent'], 'widgetpostcontent' => $options['widgetpostcontent'], 'size' => $options['size'], 'hidebutton' => $options['hidebutton'], 'postto' => $options['postto'], 'js' => $options['js'], 'noantispam' => $options['noantispam']);
             delete_option('widget_subscribe2widget');
+        }
 …
         $js = htmlspecialchars($instance['js'], ENT_QUOTES);
         $noantispam  = htmlspecialchars($instance['noantispam'], ENT_QUOTES);
-        $nowrap = htmlspecialchars($instance['nowrap'], ENT_QUOTES);
         global $wpdb, $mysubscribe2;
 …
         echo "<input id=\"" . $this->get_field_id('noantispam') . "\" name =\"" . $this->get_field_name('noantispam') . "\" value=\"true\" type=\"checkbox\"" . checked('true', $noantispam, false) . "/>";
         echo "</label></p>\r\n";
-        echo "<p><label for=\"" . $this->get_field_id('nowrap') . "\">" . __('Disable wrapping of form buttons', 'subscribe2') . ":\r\n";
-        echo "<input id=\"" . $this->get_field_id('nowrap') . "\" name =\"" . $this->get_field_name('nowrap') . "\" value=\"true\" type=\"checkbox\"" . checked('true', $nowrap, false) . "/>";
-        echo "</label></p>\r\n";
         echo "</div>\r\n";
+    }

subscribe2/trunk/subscribe2.php

-                      r913526
+                      r917929
 Plugin URI: http://subscribe2.wordpress.com
 Description: Notifies an email list when new entries are posted.
 Version: 9.5
+Version: 10.0
 Author: Matthew Robinson
 Author URI: http://subscribe2.wordpress.com
 …
+}
 // stop Subscribe2 being activated site wide on Multisite installs
 if ( !function_exists( 'is_plugin_active_for_network' ) ) {
 …
 if ( is_plugin_active_for_network(plugin_basename(__FILE__)) ) {
     deactivate_plugins( plugin_basename(__FILE__) );
     $exit_msg = __('Subscribe2 cannot be activated as a network plugin. Please activate it on a site level', 'subscribe2');
+    $exit_msg = __('Subscribe2 cannot be activated as a network plugin. Please activate it at on a site level', 'subscribe2');
     exit($exit_msg);
+}
 …
 // our version number. Don't touch this or any line below
 // unless you know exactly what you are doing
 define( 'S2VERSION', '9.5' );
+define( 'S2VERSION', '9.4' );
 define( 'S2PATH', trailingslashit(dirname(__FILE__)) );
 define( 'S2DIR', trailingslashit(dirname(plugin_basename(__FILE__))) );
 define( 'S2URL', plugin_dir_url(dirname(__FILE__)) . S2DIR );
+global $wpdb, $wp_version;
+define("WP_subscribe2_TABLE_APP", $wpdb->prefix . "subscribe2_app");
 // Set maximum execution time to 5 minutes - won't affect safe mode
 …
     $mysubscribe2->s2init();
+}
+function s2_install()
+{
+    add_option('s2_do_activation_redirect', true);
+}
+register_activation_hook(__FILE__, 's2_install');
 ?>

Plugin Directory

Context Navigation

Legend:

subscribe2/tags/10.0/ChangeLog.txt

subscribe2/tags/10.0/ReadMe.txt

subscribe2/tags/10.0/classes/class-s2-admin.php

subscribe2/tags/10.0/classes/class-s2-core.php

subscribe2/tags/10.0/classes/class-s2-frontend.php

subscribe2/tags/10.0/classes/class-s2-list-table.php

subscribe2/tags/10.0/classes/class-s2-upgrade.php

subscribe2/tags/10.0/include/counterwidget.php

subscribe2/tags/10.0/include/widget.php

subscribe2/tags/10.0/subscribe2.php

subscribe2/trunk/ChangeLog.txt

subscribe2/trunk/ReadMe.txt

subscribe2/trunk/classes/class-s2-admin.php

subscribe2/trunk/classes/class-s2-core.php

subscribe2/trunk/classes/class-s2-frontend.php

subscribe2/trunk/classes/class-s2-list-table.php

subscribe2/trunk/classes/class-s2-upgrade.php

subscribe2/trunk/include/counterwidget.php

subscribe2/trunk/include/widget.php

subscribe2/trunk/subscribe2.php

Download in other formats: