s2Member Framework (Member Roles, Capabilities, Membership, PayPal

Version Description

= v160120 =

(Maintenance Release) Upgrade immediately.

Release Info

Developer	JasWSInc
Plugin	s2Member Framework (Member Roles, Capabilities, Membership, PayPal Members)
Version	160120
Comparing to
See all releases

Code changes from version 151218 to 160120

Files changed (16) hide show

changelog.md +17 -0
checksum.txt +1 -1
includes/classes/installation.inc.php +1 -1
includes/classes/menu-pages.inc.php +0 -3
includes/classes/mms-patches.inc.php +0 -149
includes/classes/op-notices.inc.php +2 -2
includes/hooks.inc.php +0 -1
includes/menu-pages/code-samples/mms-patch-load.x-php +0 -4
includes/menu-pages/code-samples/mms-patch-ms-functions.x-php +0 -3
includes/menu-pages/code-samples/mms-patch-user-new.x-php +0 -3
includes/menu-pages/code-samples/mms-patch-wp-login.x-php +0 -8
includes/menu-pages/mms-ops.inc.php +17 -251
includes/translations/s2member.pot +4 -4
readme-ms.txt +8 -2
readme.txt +20 -3
s2member.php +4 -4

changelog.md CHANGED Viewed

@@ -1,3 +1,20 @@
             = v151218 =
             - (s2Member Pro) **Reminder Email Notification Exclusions:** It is now possible to enable/disable EOT Renewal/Reminder Email notifications on a per-user basis. You can edit a user's profile in the WP Dashboard and check "_No (exclude)_" to prevent specific users from receiving any reminder emails that you configured. Props at @patdumond @luisrock. See also [this GitHub issue](https://github.com/websharks/s2member/issues/816).


1	+ = v160120 =
2	+
3	+ - (s2Member,s2Member Pro) Bug Fix: Resolved a minor glitch in the WordPress Dashboard → Settings → General panel, where s2Member's notice regarding Open Registration was inadvertently forcing the entire page into italics. Props @renzms @kristineds @raamdev ~ See also: [this GitHub issue](https://github.com/websharks/s2member/issues/831) if you'd like additional details.
4	+
5	+ - (s2Member) Multisite Support: This release of s2Member (the free version only) removes full support for Multisite Networks, which is now a Pro feature; i.e., only available in the Pro version.
6	+
7	+ ##### Is s2Member still compatible with WordPress Multisite Networking?
8	+ Multisite support is no longer included in the s2Member Framework. However, it is available with s2Member Pro. s2Member Pro is compatible with Multisite Networking. After you enable Multisite Networking, install the s2Member Pro Add-On. Then, navigate to `s2Member → Multisite (Config)` in the Dashboard of your Main Site. You can learn more about s2Member Pro at [s2Member.com](http://www.s2member.com/).
9	+
10	+ ##### I was using the free version in a Multisite Network before. What happened?
11	+ s2Member (when running on a Multisite Network) requires minor alterations in WordPress core that are not compatible with plugins available at WordPress.org (i.e., not allowed) at this time. For this reason, full support for Multisite Networks is now available only in the pro version.
12	+
13	+ ##### What if I already configured Multisite options on a site running the free version?
14	+ If you already customized s2Member's Multisite Network configuration options in a previous release, those settings will remain and still be functional over the short-term; i.e., the functionality that makes s2Member compatible with Multisite Networking is still included, even in the s2Member Framework. However, the routines that deal with core patches, and those that allow you to change Multisite options are no longer available. You will need to acquire the Pro version. Or, you can revert to [a previous release](http://s2member.com/release-archive/). s2Member Framework v151218 is suggested if you go that route.
15	+
16	+ _See also: [this GitHub issue](https://github.com/websharks/s2member/issues/850) for further details._
17	+
18	= v151218 =
19
20	- (s2Member Pro) Reminder Email Notification Exclusions: It is now possible to enable/disable EOT Renewal/Reminder Email notifications on a per-user basis. You can edit a user's profile in the WP Dashboard and check "_No (exclude)_" to prevent specific users from receiving any reminder emails that you configured. Props at @patdumond @luisrock. See also [this GitHub issue](https://github.com/websharks/s2member/issues/816).

checksum.txt CHANGED Viewed

	@@ -1 +1 @@
1	- ~~35a15209842402cdccb9dd5222d6bd47~~


1	+ 11d370c25f342a327ffe729210727337

includes/classes/installation.inc.php CHANGED Viewed

	@@ -124,7 +124,7 @@ if(!class_exists('c_ws_plugin__s2member_installation'))
124	c_ws_plugin__s2member_admin_notices::enqueue_admin_notice($notice, 'blog:users.php', FALSE, FALSE, TRUE);
125
126	$notice = '<strong>s2Member v'.esc_html(WS_PLUGIN__S2MEMBER_VERSION).' has been activated. Nice work!</strong><br />';
127	- $notice .= 'We suggest a review of the "Getting Started" page to familiarize yourself with s2Member terminology and basic configuration.<br />↳  Would you ~~want~~ to review now?     <a href="'.esc_attr(admin_url('/admin.php?page=ws-plugin--s2member-start')).'"><strong>Yes (explain)</strong></a>';
128
129	c_ws_plugin__s2member_admin_notices::enqueue_admin_notice($notice, array('blog\|network:plugins.php', 'blog\|network:ws-plugin--s2member-start', 'blog\|network:ws-plugin--s2member-mms-ops', 'blog\|network:ws-plugin--s2member-gen-ops', 'blog\|network:ws-plugin--s2member-res-ops'));
130	}


124	c_ws_plugin__s2member_admin_notices::enqueue_admin_notice($notice, 'blog:users.php', FALSE, FALSE, TRUE);
125
126	$notice = '<strong>s2Member v'.esc_html(WS_PLUGIN__S2MEMBER_VERSION).' has been activated. Nice work!</strong><br />';
127	+ $notice .= 'We suggest a review of the "Getting Started" page to familiarize yourself with s2Member terminology and basic configuration.<br />↳  Would you like to review now?     <a href="'.esc_attr(admin_url('/admin.php?page=ws-plugin--s2member-start')).'"><strong>Yes (explain)</strong></a>';
128
129	c_ws_plugin__s2member_admin_notices::enqueue_admin_notice($notice, array('blog\|network:plugins.php', 'blog\|network:ws-plugin--s2member-start', 'blog\|network:ws-plugin--s2member-mms-ops', 'blog\|network:ws-plugin--s2member-gen-ops', 'blog\|network:ws-plugin--s2member-res-ops'));
130	}

includes/classes/menu-pages.inc.php CHANGED Viewed

	@@ -538,9 +538,6 @@ if(!class_exists('c_ws_plugin__s2member_menu_pages'))
538	{
539	do_action('ws_plugin__s2member_before_mms_ops_page', get_defined_vars());
540
541	- if(c_ws_plugin__s2member_menu_pages::update_all_options())
542	- c_ws_plugin__s2member_mms_patches::mms_patches(TRUE);
543	-
544	include_once dirname(dirname(__FILE__)).'/menu-pages/mms-ops.inc.php';
545
546	do_action('ws_plugin__s2member_after_mms_ops_page', get_defined_vars());


538	{
539	do_action('ws_plugin__s2member_before_mms_ops_page', get_defined_vars());
540



541	include_once dirname(dirname(__FILE__)).'/menu-pages/mms-ops.inc.php';
542
543	do_action('ws_plugin__s2member_after_mms_ops_page', get_defined_vars());

includes/classes/mms-patches.inc.php DELETED Viewed

@@ -1,149 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
            * Main Multisite patches.
-            -
            *
-            -
            * Copyright: © 2009-2011
-            -
            * {@link http://websharks-inc.com/ WebSharks, Inc.}
-            -
            * (coded in the USA)
-            -
            *
-            -
            * Released under the terms of the GNU General Public License.
-            -
            * You should have received a copy of the GNU General Public License,
-            -
            * along with this software. In the main directory, see: /licensing/
-            -
            * If not, see: {@link http://www.gnu.org/licenses/}.
-            -
            *
-            -
            * @package s2Member\Main_Multisite_Patches
-            -
            * @since 3.5
-            -
            */
-            -
            if(!defined('WPINC')) // MUST have WordPress.
-            -
            	exit("Do not access this file directly.");
-            -
-            -
            if (!class_exists ("c_ws_plugin__s2member_mms_patches"))
-            -
            	{
-            -
            		/**
-            -
            		* Main Multisite patches.
-            -
            		*
-            -
            		* @package s2Member\Main_Multisite_Patches
-            -
            		* @since 3.5
-            -
            		*/
-            -
            		class c_ws_plugin__s2member_mms_patches
-            -
            			{
-            -
            				/**
-            -
            				* Synchronizes Multisite patches with WordPress core upgrades.
-            -
            				*
-            -
            				* @package s2Member\Main_Multisite_Patches
-            -
            				* @since 3.5
-            -
            				*
-            -
            				* @attaches-to ``add_filter("update_feedback");``
-            -
            				*
-            -
            				* @param string $message Expects message string passed through by the Filter.
-            -
            				* @return string Message after having been Filtered by this routine.
-            -
            				*/
-            -
            				public static function sync_mms_patches ($message = FALSE)
-            -
            					{
-            -
            						global $pagenow; // Need access to this global var.
-            -
-            -
            						foreach(array_keys(get_defined_vars())as$__v)$__refs[$__v]=&$$__v;
-            -
            						do_action("ws_plugin__s2member_before_sync_mms_patches", get_defined_vars ());
-            -
            						unset($__refs, $__v);
-            -
-            -
            						if (is_multisite () && is_network_admin () && $pagenow === "update-core.php")
-            -
            							if ($message === "Upgrading database&#8230;" && c_ws_plugin__s2member_mms_patches::mms_patches ())
-            -
            								apply_filters("update_feedback", "s2 Multisite patches applied&#8230;");
-            -
-            -
            						return apply_filters("ws_plugin__s2member_sync_mms_patches", $message, get_defined_vars ());
-            -
            					}
-            -
            				/**
-            -
            				* Handles patches on a Multisite Network installation.
-            -
            				*
-            -
            				* @package s2Member\Main_Multisite_Patches
-            -
            				* @since 3.5
-            -
            				*
-            -
            				* @param bool $display_notices Defaults to false. If true, notices are displayed.
-            -
            				* @return bool True if Multisite patches were processed, else false.
-            -
            				*/
-            -
            				public static function mms_patches ($display_notices = FALSE)
-            -
            					{
-            -
            						foreach(array_keys(get_defined_vars())as$__v)$__refs[$__v]=&$$__v;
-            -
            						do_action("ws_plugin__s2member_before_mms_patches", get_defined_vars ());
-            -
            						unset($__refs, $__v);
-            -
-            -
            						if (is_multisite () && is_admin () && is_main_site () && $GLOBALS["WS_PLUGIN__"]["s2member"]["c"]["configured"])
-            -
            							if ($GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["mms_auto_patch"] && (!defined ("DISALLOW_FILE_MODS") || !DISALLOW_FILE_MODS))
-            -
            								{
-            -
            									do_action("ws_plugin__s2member_during_mms_patches_before", get_defined_vars ());
-            -
-            -
            									$wp_login_file = ABSPATH . "wp-login.php"; // This works for WordPress 3.0, 3.1, all the way up to 3.7. WordPress 3.1+ uses: `site_url('wp-signup.php')`. WordPress 3.5+ uses: `network_site_url('wp-signup.php')`. WordPress v3.7 uses `$sign_up_url`.
-            -
            									$wp_login_section = "/(\s+)(wp_redirect( *?)\(( *?)apply_filters( *?)\(( *?)['\"]wp_signup_location['\"]( *?),( *?)(site_url( *?)\(( *?)['\"]wp-signup\.php['\"]( *?)\)|network_site_url( *?)\(( *?)['\"]wp-signup\.php['\"]( *?)\)|get_bloginfo( *?)\(['\"]wpurl['\"]\)( *?)\.( *?)['\"]\/wp-signup\.php['\"]|\\\$sign_?up_url)( *?)\)( *?)\)( *?);)(\s+)(exit( *?);)/";
-            -
            									$wp_login_replace = "\n\t\t// Modified for full plugin compatiblity.\n\t\t//wp_redirect( apply_filters( 'wp_signup_location', \$sign_up_url ) );\n\t\t//exit;";
-            -
-            -
            									if (file_exists ($wp_login_file) && ($wp_login = file_get_contents ($wp_login_file)) && is_writable ($wp_login_file))
-            -
            										{
-            -
            											if ((($wp_login_written = file_put_contents ($wp_login_file, preg_replace ($wp_login_section, $wp_login_replace, $wp_login, 1, $wp_login_patched))) && $wp_login_patched) || ($wp_login_patched_already = $wp_login_patched = strpos ($wp_login, $wp_login_replace)))
-            -
            												($display_notices) ? c_ws_plugin__s2member_admin_notices::display_admin_notice ('Your <code>/wp-login.php</code> file ' . (!empty($wp_login_patched_already) ? 'is patched' : 'has been patched successfully') . '.') : null;
-            -
            											else if (!$wp_login_written) // Otherwise, we need to report that /wp-login.php could NOT be updated. Possibly a permissions error.
-            -
            												($display_notices) ? c_ws_plugin__s2member_admin_notices::display_admin_notice ('Your <code>/wp-login.php</code> file could NOT be patched. Patch NOT written.', true) : null;
-            -
            											else if (!$wp_login_patched) // Otherwise, we need to report that /wp-login.php could NOT be updated. Wrong WordPress version?
-            -
            												($display_notices) ? c_ws_plugin__s2member_admin_notices::display_admin_notice ('Your <code>/wp-login.php</code> file could NOT be patched. Unverifiable.', true) : null;
-            -
            										}
-            -
            									else // Otherwise, we need to report that /wp-login.php could NOT be updated. Possibly a permissions error.
-            -
            										($display_notices) ? c_ws_plugin__s2member_admin_notices::display_admin_notice ('Your <code>/wp-login.php</code> file could NOT be patched. File NOT writable.', true) : null;
-            -
-            -
            									$load_file = ABSPATH . WPINC . "/load.php"; // WordPress v4.4 uses `wp_installing()` instead of `defined( 'WP_INSTALLING' )`
-            -
            									$load_section = "/([\r\n\t\s ]+)(if( *?)\(( *?)empty( *?)\(( *?)\\\$active_plugins( *?)\)( *?)\|\|( *?)(wp_installing\s*\(\s*\)|defined( *?)\(( *?)['\"]WP_INSTALLING['\"]( *?)\))( *?)\))/";
-            -
            									$load_replace = "\n\n\t// Modified for full plugin compatiblity.\n\t//if ( empty( \$active_plugins ) || wp_installing() )\n\tif ( empty( \$active_plugins ) || ( wp_installing() && !preg_match(\"/\/wp-activate\.php/\", \$_SERVER[\"REQUEST_URI\"]) ) )";
-            -
-            -
            									if (file_exists ($load_file) && ($load = file_get_contents ($load_file)) && is_writable ($load_file))
-            -
            										{
-            -
            											if ((($load_written = file_put_contents ($load_file, preg_replace ($load_section, $load_replace, $load, 1, $load_patched))) && $load_patched) || ($load_patched_already = $load_patched = strpos ($load, $load_replace)))
-            -
            												($display_notices) ? c_ws_plugin__s2member_admin_notices::display_admin_notice ('Your <code>/wp-includes/load.php</code> file ' . (!empty($load_patched_already) ? 'is patched' : 'has been patched successfully') . '.') : null;
-            -
            											else if (!$load_written) // Otherwise, we need to report that /wp-includes/load.php could NOT be updated. Possibly a permissions error.
-            -
            												($display_notices) ? c_ws_plugin__s2member_admin_notices::display_admin_notice ('Your <code>/wp-includes/load.php</code> file could NOT be patched. Patch NOT written.', true) : null;
-            -
            											else if (!$load_patched) // Otherwise, we need to report that /wp-includes/load.php could NOT be updated. Wrong WordPress version?
-            -
            												($display_notices) ? c_ws_plugin__s2member_admin_notices::display_admin_notice ('Your <code>/wp-includes/load.php</code> file could NOT be patched. Unverifiable.', true) : null;
-            -
            										}
-            -
            									else // Otherwise, we need to report that /wp-includes/load.php could NOT be updated. Possibly a permissions error.
-            -
            										($display_notices) ? c_ws_plugin__s2member_admin_notices::display_admin_notice ('Your <code>/wp-includes/load.php</code> file could NOT be patched. File NOT writable.', true) : null;
-            -
-            -
            									$user_new_file = ABSPATH . "wp-admin/user-new.php";
-            -
            									$user_new_section = "/([\r\n\t\s ]+)(wpmu_signup_user( *?)\(( *?)\\\$new_user_login,( *?)(?:\\\$new_user_email|\\\$_REQUEST\[( *?)'email'( *?)\]),( *?)array( *?)\(( *?)'add_to_blog'( *?)\=\>( *?)\\\$wpdb->blogid,( *?)'new_role'( *?)\=\>( *?)\\\$_REQUEST\[( *?)'role'( *?)\]( *?)\)( *?)\);)/";
-            -
            									$user_new_replace = "\n\t\t\t// Modified for full plugin compatiblity.\n\t\t\t//wpmu_signup_user( \$new_user_login, \$_REQUEST[ 'email' ], array( 'add_to_blog' => \$wpdb->blogid, 'new_role' => \$_REQUEST[ 'role' ] ) );\n\t\t\twpmu_signup_user( \$new_user_login, \$_REQUEST[ 'email' ], apply_filters( 'add_signup_meta', array( 'add_to_blog' => \$wpdb->blogid, 'new_role' => \$_REQUEST[ 'role' ] ) ) );";
-            -
-            -
            									if (file_exists ($user_new_file) && ($user_new = file_get_contents ($user_new_file)) && is_writable ($user_new_file))
-            -
            										{
-            -
            											if ((($user_new_written = file_put_contents ($user_new_file, preg_replace ($user_new_section, $user_new_replace, $user_new, 1, $user_new_patched))) && $user_new_patched) || ($user_new_patched_already = $user_new_patched = strpos ($user_new, $user_new_replace)))
-            -
            												($display_notices) ? c_ws_plugin__s2member_admin_notices::display_admin_notice ('Your <code>/wp-admin/user-new.php</code> file ' . (!empty($user_new_patched_already) ? 'is patched' : 'has been patched successfully') . '.') : null;
-            -
            											else if (!$user_new_written) // Otherwise, we need to report that /wp-admin/user-new.php could NOT be updated. Possibly a permissions error.
-            -
            												($display_notices) ? c_ws_plugin__s2member_admin_notices::display_admin_notice ('Your <code>/wp-admin/user-new.php</code> file could NOT be patched. Patch NOT written.', true) : null;
-            -
            											else if (!$user_new_patched) // Otherwise, we need to report that /wp-admin/user-new.php could NOT be updated. Wrong WordPress version?
-            -
            												($display_notices) ? c_ws_plugin__s2member_admin_notices::display_admin_notice ('Your <code>/wp-admin/user-new.php</code> file could NOT be patched. Unverifiable.', true) : null;
-            -
            										}
-            -
            									else // Otherwise, we need to report that /wp-admin/user-new.php could NOT be updated. Possibly a permissions error.
-            -
            										($display_notices) ? c_ws_plugin__s2member_admin_notices::display_admin_notice ('Your <code>/wp-admin/user-new.php</code> file could NOT be patched. File NOT writable.', true) : null;
-            -
-            -
            									$ms_functions_file = ABSPATH . "wp-includes/ms-functions.php";
-            -
            									$ms_functions_section = "/([\r\n\t\s ]+)(return new WP_Error( *?)\(( *?)'user_already_exists'( *?),( *?)__( *?)\(( *?)'That username is already activated.'( *?)\),( *?)\\\$signup( *?)\);)/";
-            -
            									$ms_functions_replace = "\n\t\t\t// Modified for full plugin compatiblity.\n\t\t\t//return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), \$signup);\n\t\t\treturn apply_filters('_wpmu_activate_existing_error_', new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), \$signup), get_defined_vars());";
-            -
-            -
            									if (file_exists ($ms_functions_file) && ($ms_functions = file_get_contents ($ms_functions_file)) && is_writable ($ms_functions_file))
-            -
            										{
-            -
            											if ((($ms_functions_written = file_put_contents ($ms_functions_file, preg_replace ($ms_functions_section, $ms_functions_replace, $ms_functions, 1, $ms_functions_patched))) && $ms_functions_patched) || ($ms_functions_patched_already = $ms_functions_patched = strpos ($ms_functions, $ms_functions_replace)))
-            -
            												($display_notices) ? c_ws_plugin__s2member_admin_notices::display_admin_notice ('Your <code>/wp-includes/ms-functions.php</code> file ' . (!empty($ms_functions_patched_already) ? 'is patched' : 'has been patched successfully') . '.') : null;
-            -
            											else if (!$ms_functions_written) // Otherwise, we need to report that /wp-includes/ms-functions.php could NOT be updated. Possibly a permissions error.
-            -
            												($display_notices) ? c_ws_plugin__s2member_admin_notices::display_admin_notice ('Your <code>/wp-includes/ms-functions.php</code> file could NOT be patched. Patch NOT written.', true) : null;
-            -
            											else if (!$ms_functions_patched) // Otherwise, we need to report that /wp-includes/ms-functions.php could NOT be updated. Wrong WordPress version?
-            -
            												($display_notices) ? c_ws_plugin__s2member_admin_notices::display_admin_notice ('Your <code>/wp-includes/ms-functions.php</code> file could NOT be patched. Unverifiable.', true) : null;
-            -
            										}
-            -
            									else // Otherwise, we need to report that /wp-includes/ms-functions.php could NOT be updated. Possibly a permissions error.
-            -
            										($display_notices) ? c_ws_plugin__s2member_admin_notices::display_admin_notice ('Your <code>/wp-includes/ms-functions.php</code> file could NOT be patched. File NOT writable.', true) : null;
-            -
-            -
            									$ran_mms_patches = true; // Flag indicating this routine was indeed processed.
-            -
-            -
            									do_action("ws_plugin__s2member_during_mms_patches_after", get_defined_vars ());
-            -
            								}
-            -
-            -
            						do_action("ws_plugin__s2member_after_mms_patches", get_defined_vars ());
-            -
-            -
            						return !empty($ran_mms_patches) ? $ran_mms_patches : false;
-            -
            					}
-            -
            			}
-            -
            	}

includes/classes/op-notices.inc.php CHANGED Viewed

	@@ -45,7 +45,7 @@ if (!class_exists ("c_ws_plugin__s2member_op_notices"))
45
46	if (is_blog_admin () && $pagenow === "options-general.php" && !isset ($_GET["page"]) && !is_multisite ()) // Multisite does NOT provide these options.
47	{
48	- $notice = "<em>* Note: The s2Member plugin has control over two options on this page.<br /><code>Anyone Can Register = " . esc_html (get_option ("users_can_register")) . "</code>, and <code>New User Default Role = " . esc_html (get_option ("default_role")) . "</code>.<br />For further details, see: <strong>s2Member → General Options → Open Registration</strong>.";
49
50	$js = '<script type="text/javascript">';
51	$js .= "jQuery(document).ready(function(\$){ \$('input#users_can_register, select#default_role').attr('disabled', 'disabled'); });";
	@@ -78,7 +78,7 @@ if (!class_exists ("c_ws_plugin__s2member_op_notices"))
78
79	if (is_multisite () && is_network_admin () && in_array($pagenow, array("settings.php")) && !isset ($_GET["page"]))
80	{
81	- $notice = "<em>* Note: The s2Member plugin has control over two options on this page.<br /><code>Allow Open Registration = " . esc_html (get_site_option ("registration")) . "</code> and <code>Add New Users = " . esc_html (get_site_option ("add_new_users")) . "</code>.<br />Please check: <strong>s2Member → Multisite (Config)</strong>.";
82
83	$js = '<script type="text/javascript">';
84	$js .= "jQuery(document).ready(function(\$){ \$('input[name=registration], input#add_new_users').attr('disabled', 'disabled'); });";


45
46	if (is_blog_admin () && $pagenow === "options-general.php" && !isset ($_GET["page"]) && !is_multisite ()) // Multisite does NOT provide these options.
47	{
48	+ $notice = "<em>* Note: The s2Member plugin has control over two options on this page.<br /><code>Anyone Can Register = " . esc_html (get_option ("users_can_register")) . "</code>, and <code>New User Default Role = " . esc_html (get_option ("default_role")) . "</code>.<br />For further details, see: <strong>s2Member → General Options → Open Registration</strong>.</em>";
49
50	$js = '<script type="text/javascript">';
51	$js .= "jQuery(document).ready(function(\$){ \$('input#users_can_register, select#default_role').attr('disabled', 'disabled'); });";

78
79	if (is_multisite () && is_network_admin () && in_array($pagenow, array("settings.php")) && !isset ($_GET["page"]))
80	{
81	+ $notice = "<em>* Note: The s2Member plugin has control over two options on this page.<br /><code>Allow Open Registration = " . esc_html (get_site_option ("registration")) . "</code> and <code>Add New Users = " . esc_html (get_site_option ("add_new_users")) . "</code>.<br />Please check: <strong>s2Member → Multisite (Config)</strong>.</em>";
82
83	$js = '<script type="text/javascript">';
84	$js .= "jQuery(document).ready(function(\$){ \$('input[name=registration], input#add_new_users').attr('disabled', 'disabled'); });";

includes/hooks.inc.php CHANGED Viewed

	@@ -156,7 +156,6 @@ add_action('network_admin_menu', 'c_ws_plugin__s2member_menu_pages::add_network_
156	add_action('admin_bar_menu', 'c_ws_plugin__s2member_admin_lockouts::filter_admin_menu_bar', 100);
157	add_action('admin_print_scripts', 'c_ws_plugin__s2member_menu_pages::add_admin_scripts');
158	add_action('admin_print_styles', 'c_ws_plugin__s2member_menu_pages::add_admin_styles');
159	- add_filter('update_feedback', 'c_ws_plugin__s2member_mms_patches::sync_mms_patches');
160
161	add_action('admin_notices', 'c_ws_plugin__s2member_admin_notices::admin_notices');
162	add_action('user_admin_notices', 'c_ws_plugin__s2member_admin_notices::admin_notices');


156	add_action('admin_bar_menu', 'c_ws_plugin__s2member_admin_lockouts::filter_admin_menu_bar', 100);
157	add_action('admin_print_scripts', 'c_ws_plugin__s2member_menu_pages::add_admin_scripts');
158	add_action('admin_print_styles', 'c_ws_plugin__s2member_menu_pages::add_admin_styles');

159
160	add_action('admin_notices', 'c_ws_plugin__s2member_admin_notices::admin_notices');
161	add_action('user_admin_notices', 'c_ws_plugin__s2member_admin_notices::admin_notices');

includes/menu-pages/code-samples/mms-patch-load.x-php DELETED Viewed

@@ -1,4 +0,0 @@
-            -
            	// Modified for full plugin compatiblity.
-            -
            	//if ( empty( $active_plugins ) || wp_installing() )
-            -
            	if ( empty( $active_plugins ) || ( wp_installing() && !preg_match("/\/wp-activate\.php/", $_SERVER["REQUEST_URI"]) ) )
-            -
            	return $plugins;

includes/menu-pages/code-samples/mms-patch-ms-functions.x-php DELETED Viewed

@@ -1,3 +0,0 @@
-            -
            	// Modified for full plugin compatiblity.
-            -
            	//return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup);
-            -
            	return apply_filters('_wpmu_activate_existing_error_', new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup), get_defined_vars());

includes/menu-pages/code-samples/mms-patch-user-new.x-php DELETED Viewed

@@ -1,3 +0,0 @@
-            -
            	// Modified for full plugin compatiblity.
-            -
            	//wpmu_signup_user( $new_user_login, $_REQUEST[ 'email' ], array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST[ 'role' ] ) );
-            -
            	wpmu_signup_user( $new_user_login, $_REQUEST[ 'email' ], apply_filters( 'add_signup_meta', array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST[ 'role' ] ) ) );

includes/menu-pages/code-samples/mms-patch-wp-login.x-php DELETED Viewed

@@ -1,8 +0,0 @@
-            -
            	case 'register' :
-            -
            	if ( is_multisite() ) {
-            -
            		$sign_up_url = network_site_url( 'wp-signup.php' );
-            -
            		// Multisite uses wp-signup.php
-            -
            		// Modified for full plugin compatiblity.
-            -
            		//wp_redirect( apply_filters( 'wp_signup_location', $sign_up_url ) );
-            -
            		//exit;
-            -
            	}

includes/menu-pages/mms-ops.inc.php CHANGED Viewed

@@ -29,6 +29,10 @@ if(!class_exists("c_ws_plugin__s2member_menu_page_mms_ops"))
+            			{
             				public function __construct()
+            					{
             						echo '<div class="wrap ws-menu-page">'."\n";
             						echo '<div class="ws-menu-page-toolbox">'."\n";
@@ -42,265 +46,25 @@ if(!class_exists("c_ws_plugin__s2member_menu_page_mms_ops"))
             						echo '<tr class="ws-menu-page-table-tr">'."\n";
             						echo '<td class="ws-menu-page-table-l">'."\n";
-            -
            						if(is_multisite() && is_main_site()) // These panels will ONLY be available on the Main Site; with Multisite Networking.
+            							{
-            -
            								echo '<form method="post" name="ws_plugin__s2member_options_form" id="ws-plugin--s2member-options-form" autocomplete="off">'."\n";
-            -
            								echo '<input type="hidden" name="ws_plugin__s2member_options_save" id="ws-plugin--s2member-options-save" value="'.esc_attr(wp_create_nonce("ws-plugin--s2member-options-save")).'" />'."\n";
-            -
            								echo '<input type="hidden" name="ws_plugin__s2member_configured" id="ws-plugin--s2member-configured" value="1" />'."\n";
-            -
-            -
            								do_action("ws_plugin__s2member_during_mms_ops_page_before_left_sections", get_defined_vars());
-            -
-            -
            								if(apply_filters("ws_plugin__s2member_during_mms_ops_page_during_left_sections_display_mms_patches", true, get_defined_vars()))
-            -
            									{
-            -
            										do_action("ws_plugin__s2member_during_mms_ops_page_during_left_sections_before_mms_patches", get_defined_vars());
-            -
-            -
            										echo '<div class="ws-menu-page-group" title="Multisite WordPress Patches" default-state="open">'."\n";
-            -
-            -
            										echo '<div class="ws-menu-page-section ws-plugin--s2member-mms-patches-section">'."\n";
-            -
            										echo '<img src="'.esc_attr($GLOBALS["WS_PLUGIN__"]["s2member"]["c"]["dir_url"]).'/images/small-icon.png" title="s2Member (a Membership management system for WordPress)" alt="" style="float:right; margin:0 0 0 25px; border:0;" />'."\n";
-            -
            										echo '<h3>Multisite WordPress Patches (required for compatiblity)</h3>'."\n";
-            -
            										echo '<p>In order for s2Member to function properly in a Multisite environment, you MUST implement four patches. One goes into your <code>/wp-login.php</code> file, one into <code>/wp-includes/load.php</code>, one into <code>/wp-includes/ms-functions.php</code>, and another into <code>/wp-admin/user-new.php</code>. Please use the automatic patcher below. All you do is check the box &amp; click Save.</p>'."\n";
-            -
            										do_action("ws_plugin__s2member_during_mms_ops_page_during_left_sections_during_mms_patches", get_defined_vars());
-            -
-            -
            										echo '<table class="form-table">'."\n";
-            -
            										echo '<tbody>'."\n";
-            -
            										echo '<tr>'."\n";
-            -
-            -
            										echo '<th>'."\n";
-            -
            										echo '<label for="ws-plugin--s2member-mms-auto-patch">'."\n";
-            -
            										echo 'Patch Automatically? (the easiest way)'."\n";
-            -
            										echo '</label>'."\n";
-            -
            										echo '</th>'."\n";
-            -
-            -
            										echo '</tr>'."\n";
-            -
            										echo '<tr>'."\n";
-            -
-            -
            										echo '<td>'."\n";
-            -
-            -
            										if(defined("DISALLOW_FILE_MODS") && DISALLOW_FILE_MODS)
-            -
            											{
-            -
            												echo '<select name="ws_plugin__s2member_mms_auto_patch" id="ws-plugin--s2member-mms-auto-patch" disabled="disabled">'."\n";
-            -
            												echo '<option value="0" selected="selected">No (I\'ll patch WordPress myself)</option>'."\n";
-            -
            												echo '</select><br />'."\n";
-            -
            												echo '<em class="ws-menu-page-hilite">This is now locked. Your <code>/wp-config.php</code> file says: <code>DISALLOW_FILE_MODS = true</code></em>.'."\n";
-            -
            											}
-            -
            										else // Otherwise we can display these options.
-            -
            											{
-            -
            												echo '<select name="ws_plugin__s2member_mms_auto_patch" id="ws-plugin--s2member-mms-auto-patch">'."\n";
-            -
            												echo '<option value="1"'.(($GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["mms_auto_patch"]) ? ' selected="selected"' : '').'>Yes (automatically patch WordPress)</option>'."\n";
-            -
            												echo '<option value="0"'.((!$GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["mms_auto_patch"]) ? ' selected="selected"' : '').'>No (I\'ll patch WordPress myself)</option>'."\n";
-            -
            												echo '</select><br />'."\n";
-            -
            												echo '<em class="ws-menu-page-hilite">These files MUST be patched, each time you upgrade the WordPress core. If you set this option to <code>Yes (Patch Automatically)</code>, s2Member will patch your installation now, and also in the future, should you upgrade to newer version. That way, you won\'t need to patch manually each time WordPress is upgraded.</em>'."\n";
-            -
            											}
-            -
-            -
            										echo '</td>'."\n";
-            -
-            -
            										echo '</tr>'."\n";
-            -
            										echo '</tbody>'."\n";
-            -
            										echo '</table>'."\n";
-            -
-            -
            										echo '<div class="ws-menu-page-hr"></div>'."\n";
-            -
-            -
            										echo '<div id="ws-plugin--s2member-mms-patches-details-wrapper">'."\n";
-            -
            										echo '<h3>Rather Do It Yourself? (<a href="#" onclick="jQuery(\'div#ws-plugin--s2member-mms-patches-details\').toggle(); return false;" class="ws-dotted-link">manual instructions</a>)</h3>'."\n";
-            -
            										echo '<div id="ws-plugin--s2member-mms-patches-details" style="display:none;">'."\n";
-            -
            										echo '<p><strong>Patch #1</strong> ( /wp-login.php )</p>'."\n";
-            -
            										echo '<p>'.c_ws_plugin__s2member_utils_strings::highlight_php(file_get_contents(dirname(__FILE__)."/code-samples/mms-patch-wp-login.x-php")).'</p>'."\n";
-            -
            										echo '<p><strong>Patch #2</strong> ( /wp-includes/load.php )</p>'."\n";
-            -
            										echo '<p>'.c_ws_plugin__s2member_utils_strings::highlight_php(file_get_contents(dirname(__FILE__)."/code-samples/mms-patch-load.x-php")).'</p>'."\n";
-            -
            										echo '<p><strong>Patch #3</strong> ( /wp-admin/user-new.php )</p>'."\n";
-            -
            										echo '<p>'.c_ws_plugin__s2member_utils_strings::highlight_php(file_get_contents(dirname(__FILE__)."/code-samples/mms-patch-user-new.x-php")).'</p>'."\n";
-            -
            										echo '<p><strong>Patch #4</strong> ( /wp-includes/ms-functions.php )</p>'."\n";
-            -
            										echo '<p>'.c_ws_plugin__s2member_utils_strings::highlight_php(file_get_contents(dirname(__FILE__)."/code-samples/mms-patch-ms-functions.x-php")).'</p>'."\n";
-            -
            										echo '<p><em class="ws-menu-page-hilite">Don\'t forget to patch these files again, each time you upgrade the WordPress core.</em></p>'."\n";
-            -
            										echo '</div>'."\n";
-            -
            										echo '</div>'."\n";
-            -
            										echo '</div>'."\n";
-            -
-            -
            										echo '</div>'."\n";
-            -
-            -
            										do_action("ws_plugin__s2member_during_mms_ops_page_during_left_sections_after_mms_patches", get_defined_vars());
-            -
            									}
-            -
            								if(apply_filters("ws_plugin__s2member_during_mms_ops_page_during_left_sections_display_mms_registration", true, get_defined_vars()))
+            									{
-            -
            										do_action("ws_plugin__s2member_during_mms_ops_page_during_left_sections_before_mms_registration", get_defined_vars());
-            -
-            -
            										echo '<div class="ws-menu-page-group" title="Multisite Registration Configuration" default-state="open">'."\n";
-            -
-            -
            										echo '<div class="ws-menu-page-section ws-plugin--s2member-mms-registration-section">'."\n";
-            -
            										echo '<img src="'.esc_attr($GLOBALS["WS_PLUGIN__"]["s2member"]["c"]["dir_url"]).'/images/large-icon.png" title="s2Member (a Membership management system for WordPress)" alt="" style="float:right; margin:0 0 0 25px; border:0;" />'."\n";
-            -
            										echo '<h3>Multisite Registration (Main Site Configuration)</h3>'."\n";
-            -
            										echo '<p>s2Member supports Free Subscribers <em>(at Level #0)</em>, and several Primary Roles created by the s2Member plugin (<em> i.e., s2Member Levels 1-4, or up to the number of configured Levels )</em>. If you want your visitors to be capable of registering absolutely free, you will want to "allow" Open Registration. Whenever a visitor registers without paying, they\'ll automatically become a Free Subscriber, at Level #0.</p>'."\n";
-            -
            										echo '<p><strong>Running A Multisite Blog Farm?</strong> With Multisite Networking enabled, your Main Site could ALSO offer a Customer access to create a Blog of their own <em>(optional)</em>, where a Customer becomes a "Member" of your Main Site, and also a Blog Owner/Administrator of at least one other Blog on your Network. With s2Member installed <em>(Network wide)</em>, each of your Blog Owners could offer Membership too, using a single copy of the s2Member plugin, which is a great selling point<em>!</em> We refer to this type of installation as a Multisite Blog Farm.</p>'."\n";
-            -
            										echo '<p>Multisite Networking makes a new Registration Form available <em>(driven by your theme)</em>; which we refer to as: <code>/wp-signup.php</code>. If, and only if, you\'re planning to offer Blogs, you MUST use <a href="'.esc_attr(c_ws_plugin__s2member_utils_urls::wp_signup_url()).'" target="_blank" rel="external" onclick="alert(\'s2Member will now open your Multisite Registration Form.\\n* s2Member makes this form available to logged-in Super Administrators, at all times (for testing purposes), regardless of configuration.'.((c_ws_plugin__s2member_utils_conds::bp_is_installed()) ? '\\n\\nBuddyPress: * BuddyPress will use its own Registration Form. Please note, you will probably be redirected away from the BuddyPress Registration Form ( '.c_ws_plugin__s2member_utils_strings::esc_js_sq(c_ws_plugin__s2member_utils_urls::bp_register_url()).' ), because you\\\'re ALREADY logged-in. Please log out before testing BuddyPress registration.' : '').'\');">/wp-signup.php</a>, instead of using the Standard Login/Registration Form. In a Multisite installation, we refer to the Standard Login/Registration Form, as: <a href="'.esc_attr(c_ws_plugin__s2member_utils_urls::wp_register_url()).'" target="_blank" rel="external" onclick="alert(\'s2Member will now open your Standard Registration Form.\\n* s2Member makes this form available to logged-in Administrators, at all times (for testing purposes), regardless of configuration.'.((c_ws_plugin__s2member_utils_conds::bp_is_installed()) ? '\\n\\nBuddyPress: * BuddyPress will use its own Registration Form. Please note, you will probably be redirected away from the BuddyPress Registration Form ( '.c_ws_plugin__s2member_utils_strings::esc_js_sq(c_ws_plugin__s2member_utils_urls::bp_register_url()).' ), because you\\\'re ALREADY logged-in. Please log out before testing BuddyPress registration.' : '').'\');">/wp-login.php?action=register</a>. If you\'re planning to offer Membership Access only, and NOT Blogs, you can simply use the <a href="'.esc_attr(c_ws_plugin__s2member_utils_urls::wp_register_url()).'" target="_blank" rel="external" onclick="alert(\'s2Member will now open your Standard Registration Form.\\n* s2Member makes this form available to logged-in Administrators, at all times (for testing purposes), regardless of configuration.'.((c_ws_plugin__s2member_utils_conds::bp_is_installed()) ? '\\n\\nBuddyPress: * BuddyPress will use its own Registration Form. Please note, you will probably be redirected away from the BuddyPress Registration Form ( '.c_ws_plugin__s2member_utils_strings::esc_js_sq(c_ws_plugin__s2member_utils_urls::bp_register_url()).' ), because you\\\'re ALREADY logged-in. Please log out before testing BuddyPress registration.' : '').'\');">Standard Login/Registration Form</a>, which is easily customized through <strong>s2Member → General Options → Login/Registration Design</strong>.</p>'."\n";
-            -
            										echo '<p>In either case, s2Member Pro-Forms are possible too. If you\'ve purchased s2Member Pro, you could use Pro-Forms instead of these WordPress defaults. That being said, even with s2Member Pro-Forms, if you are offering Blogs, you will still need to facilitate the actual creation of each Blog through <code>/wp-signup.php</code>. In other words, Customers can register through s2Member Pro-Forms, and even checkout. But when it comes time to setup a new Blog, you will need to redirect your Customer to <code>/wp-signup.php</code>, while they are logged-in. This will allow them to create a new Blog on your Network. That is, if they are allowed to <em>(based on your configuration below)</em>.</p>'."\n";
-            -
            										echo (c_ws_plugin__s2member_utils_conds::bp_is_installed()) ? '<p><em><strong>BuddyPress:</strong> BuddyPress will use its own Registration Form, powered by your theme.<br />(BuddyPress can handle both Membership and Blog creation in its integration)<br />(<a href="'.esc_attr(c_ws_plugin__s2member_utils_urls::bp_register_url()).'" target="_blank" rel="external" onclick="alert(\'s2Member will now open your BuddyPress Registration Form.\\n* However, you will probably be redirected away from this BuddyPress Registration Form ( '.c_ws_plugin__s2member_utils_strings::esc_js_sq(c_ws_plugin__s2member_utils_urls::bp_register_url()).' ), because you\\\'re ALREADY logged-in. Please log out before testing BuddyPress registration.\');">'.esc_html(c_ws_plugin__s2member_utils_urls::bp_register_url()).'</a>)</em></p>'."\n" : '';
-            -
            										do_action("ws_plugin__s2member_during_mms_ops_page_during_left_sections_during_mms_registration", get_defined_vars());
-            -
-            -
            										echo '<div id="ws-plugin--s2member-mms-registration-support-package-details-wrapper">'."\n";
-            -
            										echo '<h4 style="margin-bottom:0;">Running a Multisite Blog Farm? (<a href="#" onclick="jQuery(\'div#ws-plugin--s2member-mms-registration-support-package-details\').toggle(); return false;" class="ws-dotted-link">click here / please read</a>)</h4>'."\n";
-            -
            										echo '<div id="ws-plugin--s2member-mms-registration-support-package-details" style="display:none;">'."\n";
-            -
            										echo '<p>The most important thing to do when setting up a Blog Farm with s2Member, is to add this line to your <code>/wp-config.php</code> file: <code><span style="color:#0000BB;">define</span><span style="color:#007700;">(</span><span style="color:#DD0000;">"MULTISITE_FARM"</span>, <span style="color:#0000BB;">true</span><span style="color:#007700;">);</span></code>. This will add a default layer of security, to all Blogs within your Network, with respect to s2Member. <strong>But, before you go live</strong>, please contact <a href="'.esc_attr(c_ws_plugin__s2member_readmes::parse_readme_value("Pro Add-on / Prices")).'" target="_blank" rel="external">s2Member.com</a> for full documentation. There is some additional functionality that can be enabled for security on a Blog Farm installation; and also some menus/documentation/functionality that can be disabled. You will be asked to purchase our <a href="'.esc_attr(c_ws_plugin__s2member_readmes::parse_readme_value("Pro Add-on / Prices")).'" target="_blank" rel="external">Network Support Package</a> when you need assistance in this regard.</p>'."\n";
-            -
            										echo '<p>Multisite Blog Farms require a site owner that fully understands the potential security risks associated with Blog Farming. s2Member\'s <a href="'.esc_attr(c_ws_plugin__s2member_readmes::parse_readme_value("Pro Add-on / Prices")).'" target="_blank" rel="external">Network Support Package</a> provides you with the information you need, and priority support for anything about s2Member that you don\'t understand. In addition, our Network Support Package includes a lengthy PDF file that details a list of things affected by <code><span style="color:#0000BB;">define</span><span style="color:#007700;">(</span><span style="color:#DD0000;">"MULTISITE_FARM"</span>, <span style="color:#0000BB;">true</span><span style="color:#007700;">);</span></code>, best practices, and other supplemental documentation focused on Blog Farms.</p>'."\n";
-            -
            										echo '<p><em><strong>Definition of a Multisite Blog Farm:</strong> If your Network is making it possible for "Members" of your Main Site, to create and/or manage Blogs (in any way), s2Member will consider your installation to be a Multisite Blog Farm. That being said, some site owners run a Multisite Network for the purpose of maintaining their own sites. The term Multisite Blog Farm does NOT apply to a Network that hosts multiple Child Blogs, all of which are operated by a single site owner and/or a single company. Again, a Multisite Blog Farm (in the eyes of s2Member), is any Network that is making it possible for "Members" of its Main Site, to create and/or manage Blogs; where one or more of these Child Blogs is being administered by a Customer (i.e., if you offer both Membership and Blog creation, as configured below).</em></p>'."\n";
-            -
            										echo '<p><em><strong>When NOT to run a Multisite Blog Farm:</strong> If you run a Multisite Network for the purpose of maintaining your own sites. You should NOT run a Multisite Blog Farm. You can still activate s2Member Network-wide, if you like (optional), but the advanced security considerations offered through s2Member\'s Multisite Blog Farm functionality are NOT needed in this case; because all of the Child Blogs in your Network belong to trusted Administrators (i.e., your Customers are NOT going to run Child Blogs on your Network in this case).</em></p>'."\n";
-            -
            										echo '</div>'."\n";
-            -
            										echo '</div>'."\n";
-            -
             										echo '<div class="ws-menu-page-hr"></div>'."\n";
-            -
            										echo '<table class="form-table">'."\n";
-            -
            										echo '<tbody>'."\n";
-            -
            										echo '<tr>'."\n";
-            -
-            -
            										echo '<th>'."\n";
-            -
            										echo '<label for="ws-plugin--s2member-mms-registration-file">'."\n";
-            -
            										echo 'What Do You Plan To Offer? (please choose one)'."\n";
-            -
            										echo '</label>'."\n";
-            -
            										echo '</th>'."\n";
-            -
-            -
            										echo '</tr>'."\n";
-            -
            										echo '<tr>'."\n";
-            -
-            -
            										echo '<td>'."\n";
-            -
-            -
            										if(defined("MULTISITE_FARM") && MULTISITE_FARM) // Lock this down if a config option is set in /wp-config.php.
-            -
            											{
-            -
            												echo '<select name="ws_plugin__s2member_mms_registration_file" id="ws-plugin--s2member-mms-registration-file" disabled="disabled">'."\n";
-            -
            												echo '<option value="wp-signup" selected="selected">Blog Farm (I plan to offer both Membership &amp; Blog creation)</option>'."\n";
-            -
            												echo '</select><br />'."\n";
-            -
            												echo '<em class="ws-menu-page-hilite">This is now locked. Your <code>/wp-config.php</code> file says: <code>MULTISITE_FARM = true</code></em>.'."\n";
-            -
            											}
-            -
            										else // Otherwise we can display these options normally.
-            -
            											{
-            -
            												echo '<select name="ws_plugin__s2member_mms_registration_file" id="ws-plugin--s2member-mms-registration-file">'."\n";
-            -
            												echo '<option value="wp-login"'.(($GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["mms_registration_file"] === "wp-login") ? ' selected="selected"' : '').'>Membership Only (I\'m NOT offering Blogs)</option>'."\n";
-            -
            												echo '<option value="wp-signup"'.(($GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["mms_registration_file"] === "wp-signup") ? ' selected="selected"' : '').'>Blog Farm (I plan to offer both Membership &amp; Blog creation)</option>'."\n";
-            -
            												echo '</select><br />'."\n";
-            -
            												echo 'Depending on your selection, the options below may change.'."\n";
-            -
            											}
-            -
-            -
            										echo '</td>'."\n";
-            -
-            -
            										echo '</tr>'."\n";
-            -
            										echo '</tbody>'."\n";
-            -
            										echo '</table>'."\n";
-            -
-            -
            										echo '<div class="ws-menu-page-hr"></div>'."\n";
-            -
-            -
            										echo '<table class="form-table ws-plugin--s2member-mms-registration-wp-login" style="margin:0;">'."\n";
-            -
            										echo '<tbody>'."\n";
-            -
            										echo '<tr>'."\n";
-            -
-            -
            										echo '<th style="padding-top:0;">'."\n";
-            -
            										echo '<label for="ws-plugin--s2member-allow-subscribers-in">'."\n";
-            -
            										echo 'Your Main Site / Allow Open Registration? (via <code>wp-login.php?action=register</code>)'."\n";
-            -
            										echo '</label>'."\n";
-            -
            										echo '</th>'."\n";
-            -
-            -
            										echo '</tr>'."\n";
-            -
            										echo '<tr>'."\n";
-            -
-            -
            										echo '<td>'."\n";
-            -
            										echo '<select name="ws_plugin__s2member_allow_subscribers_in" id="ws-plugin--s2member-allow-subscribers-in">'."\n";
-            -
            										echo '<option value="0"'.((!$GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["allow_subscribers_in"]) ? ' selected="selected"' : '').'>No (do NOT allow Open Registration)</option>'."\n";
-            -
            										echo '<option value="1"'.(($GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["allow_subscribers_in"]) ? ' selected="selected"' : '').'>Yes (allow Open Registration; Free Subscribers at Level #0)</option>'."\n";
-            -
            										echo '</select><br />'."\n";
-            -
            										echo 'If you set this to <code>Yes</code>, you\'re unlocking <a href="'.esc_attr(c_ws_plugin__s2member_utils_urls::wp_register_url()).'" target="_blank" rel="external" onclick="alert(\'s2Member will now open your Standard Registration Form.\\n* s2Member makes this form available to logged-in Administrators, at all times (for testing purposes), regardless of configuration.'.((c_ws_plugin__s2member_utils_conds::bp_is_installed()) ? '\\n\\nBuddyPress: * BuddyPress will use its own Registration Form. Please note, you will probably be redirected away from the BuddyPress Registration Form ( '.c_ws_plugin__s2member_utils_strings::esc_js_sq(c_ws_plugin__s2member_utils_urls::bp_register_url()).' ), because you\\\'re ALREADY logged-in. Please log out before testing BuddyPress registration.' : '').'\');">wp-login.php?action=register</a> (on your Main Site). When a visitor registers without paying, they\'ll automatically become a Free Subscriber, at Level #0. The s2Member software reserves Level #0; to be used ONLY for Free Subscribers. All other Membership Levels [1-4] require payment.'."\n";
-            -
            										echo '</td>'."\n";
-            -
-            -
            										echo '</tr>'."\n";
-            -
            										echo '</tbody>'."\n";
-            -
            										echo '</table>'."\n";
-            -
-            -
            										echo '<table class="form-table ws-plugin--s2member-mms-registration-wp-signup" style="margin:0;">'."\n";
-            -
            										echo '<tbody>'."\n";
-            -
            										echo '<tr>'."\n";
-            -
-            -
            										echo '<th style="padding-top:0;">'."\n";
-            -
            										echo '<label for="ws-plugin--s2member-mms-registration-grants">'."\n";
-            -
            										echo 'Your Main Site / Allow Open Registration? (via <code>wp-signup.php</code>)'."\n";
-            -
            										echo '</label>'."\n";
-            -
            										echo '</th>'."\n";
-            -
-            -
            										echo '</tr>'."\n";
-            -
            										echo '<tr>'."\n";
-            -
-            -
            										echo '<td style="padding-bottom:0;">'."\n";
-            -
            										echo '<select name="ws_plugin__s2member_mms_registration_grants" id="ws-plugin--s2member-mms-registration-grants">'."\n";
-            -
            										echo '<option value="none"'.(($GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["mms_registration_grants"] === "none") ? ' selected="selected"' : '').'>No (do NOT allow Open Registration)</option>'."\n";
-            -
            										echo '<option value="user"'.(($GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["mms_registration_grants"] === "user") ? ' selected="selected"' : '').'>Yes (allow Open Registration; Free Subscribers at Level #0)</option>'."\n";
-            -
            										echo '<option value="all"'.(($GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["mms_registration_grants"] === "all") ? ' selected="selected"' : '').'>Yes (allow Open Registration; Free Subscribers, with a free Blog too)</option>'."\n";
-            -
            										echo '</select><br />'."\n";
-            -
            										echo 'If you set this to <code>Yes</code>, you\'re unlocking <a href="'.esc_attr(c_ws_plugin__s2member_utils_urls::wp_signup_url()).'" target="_blank" rel="external" onclick="alert(\'s2Member will now open your Multisite Registration Form.\\n* s2Member makes this form available to logged-in Super Administrators, at all times (for testing purposes), regardless of configuration.'.((c_ws_plugin__s2member_utils_conds::bp_is_installed()) ? '\\n\\nBuddyPress: * BuddyPress will use its own Registration Form. Please note, you will probably be redirected away from the BuddyPress Registration Form ( '.c_ws_plugin__s2member_utils_strings::esc_js_sq(c_ws_plugin__s2member_utils_urls::bp_register_url()).' ), because you\\\'re ALREADY logged-in. Please log out before testing BuddyPress registration.' : '').'\');">wp-signup.php</a> (on your Main Site).'."\n";
-            -
            										echo '</td>'."\n";
-            -
-            -
            										echo '</tr>'."\n";
-            -
            										echo '</tbody>'."\n";
-            -
            										echo '</table>'."\n";
-            -
-            -
            										echo '<table class="form-table ws-plugin--s2member-mms-registration-wp-signup ws-plugin--s2member-mms-registration-wp-signup-blogs-level0">'."\n";
-            -
            										echo '<tbody>'."\n";
-            -
            										echo '<tr>'."\n";
-            -
-            -
            										echo '<th>'."\n";
-            -
            										echo '<label for="ws-plugin--s2member-mms-registration-blogs-level0">'."\n";
-            -
            										echo 'Level #0 (Free Subscribers):'."\n";
-            -
            										echo '</label>'."\n";
-            -
            										echo '</th>'."\n";
-            -
-            -
            										echo '</tr>'."\n";
-            -
            										echo '<tr>'."\n";
-            -
-            -
            										echo '<td style="padding-bottom:0;">'."\n";
-            -
            										echo '<input type="text" autocomplete="off" name="ws_plugin__s2member_mms_registration_blogs_level0" id="ws-plugin--s2member-mms-registration-blogs-level0" value="'.format_to_edit($GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["mms_registration_blogs_level0"]).'" /><br />'."\n";
-            -
            										echo 'How many blogs can a Free Subscriber create?'."\n";
-            -
            										echo '</td>'."\n";
-            -
-            -
            										echo '</tr>'."\n";
-            -
            										echo '</tbody>'."\n";
-            -
            										echo '</table>'."\n";
-            -
-            -
            										echo '<div class="ws-menu-page-hr ws-plugin--s2member-mms-registration-wp-signup"></div>'."\n";
-            -
-            -
            										echo '<table class="form-table ws-plugin--s2member-mms-registration-wp-signup" style="margin:0;">'."\n";
-            -
            										echo '<tbody>'."\n";
-            -
-            -
            										for($n = 1; $n <= $GLOBALS["WS_PLUGIN__"]["s2member"]["c"]["levels"]; $n++)
-            -
            											{
-            -
            												echo '<tr>'."\n";
-            -
-            -
            												echo '<th style="padding-top:0;">'."\n";
-            -
            												echo '<label for="ws-plugin--s2member-mms-registration-blogs-level'.$n.'">'."\n";
-            -
            												echo 'Membership Level #'.$n.' / Maximum Blogs Allowed:'."\n";
-            -
            												echo '</label>'."\n";
-            -
            												echo '</th>'."\n";
-            -
-            -
            												echo '</tr>'."\n";
-            -
            												echo '<tr>'."\n";
-            -
-            -
            												echo '<td>'."\n";
-            -
            												echo '<input type="text" autocomplete="off" name="ws_plugin__s2member_mms_registration_blogs_level'.$n.'" id="ws-plugin--s2member-mms-registration-blogs-level'.$n.'" value="'.format_to_edit($GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["mms_registration_blogs_level".$n]).'" /><br />'."\n";
-            -
            												echo 'How many blogs can a Member ( at Level #'.$n.' ) create?'."\n";
-            -
            												echo '</td>'."\n";
-            -
-            -
            												echo '</tr>'."\n";
-            -
            											}
-            -
-            -
            										echo '</tbody>'."\n";
-            -
            										echo '</table>'."\n";
-            -
            										echo '</div>'."\n";
-            -
            										echo '</div>'."\n";
-            -
            										do_action("ws_plugin__s2member_during_mms_ops_page_during_left_sections_after_mms_registration", get_defined_vars());
+            									}
-            -
            								do_action("ws_plugin__s2member_during_mms_ops_page_after_left_sections", get_defined_vars());
-            -
-            -
            								echo '<p class="submit"><input type="submit" value="Save All Changes" /></p>'."\n";
-            -
-            -
            								echo '</form>'."\n";
+            							}
             						else // Otherwise, we can display a simple notation; leading into Multisite Networking.
+            							{
@@ -318,7 +82,9 @@ if(!class_exists("c_ws_plugin__s2member_menu_page_mms_ops"))
             										$ws_plugin__s2member_temp = preg_replace("/(\=)( )(.+?)( )(\=)/", "<h3>$3</h3>", $ws_plugin__s2member_temp);
             										$ws_plugin__s2member_temp = NC_Markdown($ws_plugin__s2member_temp);
             										echo preg_replace("/(\<a)( href)/i", "$1".' target="_blank" rel="nofollow external"'."$2", $ws_plugin__s2member_temp);
+            									}
+            							}

+            			{
             				public function __construct()
+            					{
+            +
            						if(c_ws_plugin__s2member_utils_conds::pro_is_installed()) {
+            +
            							c_ws_plugin__s2member_pro_menu_pages::mms_ops_page_display();
+            +
            							return; // Stop here.
+            +
            						}
             						echo '<div class="wrap ws-menu-page">'."\n";
             						echo '<div class="ws-menu-page-toolbox">'."\n";
             						echo '<tr class="ws-menu-page-table-tr">'."\n";
             						echo '<td class="ws-menu-page-table-l">'."\n";
+            +
            						if(is_multisite() && is_main_site()) // These panels will ONLY be available on the Main Site.
+            							{
+            +
            								echo '<img src="'.esc_attr($GLOBALS["WS_PLUGIN__"]["s2member"]["c"]["dir_url"]).'/images/large-icon.png" title="s2Member (a Membership management system for WordPress)" alt="" style="float:right; margin:25px 0 0 25px; border:0;" />'."\n";
+            +
            								if(file_exists($ws_plugin__s2member_temp = dirname(dirname(dirname(__FILE__)))."/readme-ms.txt"))
+            									{
             										echo '<div class="ws-menu-page-hr"></div>'."\n";
+            +
            										if(!function_exists("NC_Markdown"))
+            +
            											include_once dirname(dirname(__FILE__))."/externals/markdown/nc-markdown.inc.php";
+            +
            										$ws_plugin__s2member_temp = file_get_contents($ws_plugin__s2member_temp);
+            +
            										$ws_plugin__s2member_temp = preg_replace("/(\=)( )(.+?)( )(\=)/", "<h3>$3</h3>", $ws_plugin__s2member_temp);
+            +
            										$ws_plugin__s2member_temp = NC_Markdown($ws_plugin__s2member_temp);
+            +
            										echo '<div style="max-width:1024px;">';
+            +
            										echo preg_replace("/(\<a)( href)/i", "$1".' target="_blank" rel="nofollow external"'."$2", $ws_plugin__s2member_temp);
+            +
            										echo '</div>';
+            									}
+            							}
             						else // Otherwise, we can display a simple notation; leading into Multisite Networking.
+            							{
             										$ws_plugin__s2member_temp = preg_replace("/(\=)( )(.+?)( )(\=)/", "<h3>$3</h3>", $ws_plugin__s2member_temp);
             										$ws_plugin__s2member_temp = NC_Markdown($ws_plugin__s2member_temp);
+            +
            										echo '<div style="max-width:1024px;">';
             										echo preg_replace("/(\<a)( href)/i", "$1".' target="_blank" rel="nofollow external"'."$2", $ws_plugin__s2member_temp);
+            +
            										echo '</div>';
+            									}
+            							}

includes/translations/s2member.pot CHANGED Viewed

	@@ -1,14 +1,14 @@
1	- # Copyright (C) ~~2015~~
2	# This file is distributed under the same license as the package.
3	msgid ""
4	msgstr ""
5	- "Project-Id-Version: ~~151218~~\n"
6	"Report-Msgid-Bugs-To: http://wordpress.org/tag/s2member\n"
7	- "POT-Creation-Date: ~~2015~~-12-18 16:43:20+00:00\n"
8	"MIME-Version: 1.0\n"
9	"Content-Type: text/plain; charset=UTF-8\n"
10	"Content-Transfer-Encoding: 8bit\n"
11	- "PO-Revision-Date: ~~2015~~-MO-DA HO:MI+ZONE\n"
12	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13	"Language-Team: LANGUAGE <LL@li.org>\n"
14


1	+ # Copyright (C) 2016
2	# This file is distributed under the same license as the package.
3	msgid ""
4	msgstr ""
5	+ "Project-Id-Version: 160120\n"
6	"Report-Msgid-Bugs-To: http://wordpress.org/tag/s2member\n"
7	+ "POT-Creation-Date: 2016-01-20 00:02:36+00:00\n"
8	"MIME-Version: 1.0\n"
9	"Content-Type: text/plain; charset=UTF-8\n"
10	"Content-Transfer-Encoding: 8bit\n"
11	+ "PO-Revision-Date: 2016-MO-DA HO:MI+ZONE\n"
12	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13	"Language-Team: LANGUAGE <LL@li.org>\n"
14

readme-ms.txt CHANGED Viewed

@@ -1,4 +1,10 @@
             = Is s2Member compatible with WordPress Multisite Networking? =
-            -
            Yes. s2Member and s2Member Pro are both compatible with Multisite Networking. After you enable Multisite Networking, install the s2Member plugin. Then navigate to `s2Member → Multisite (Config)` in the Dashboard on your Main Site. You can get started now, by turning on [Multisite Networking](http://codex.wordpress.org/Create_A_Network) inside your installation of WordPress®.
-            -
            You can learn more about s2Member® at [s2Member.com](http://www.s2member.com/).


1	= Is s2Member compatible with WordPress Multisite Networking? =
2	+ Multisite support is no longer included in the s2Member Framework. However, it is available with s2Member Pro. s2Member Pro is compatible with Multisite Networking. After you enable Multisite Networking, install the s2Member Pro Add-On. Then, navigate to `s2Member → Multisite (Config)` in the Dashboard of your Main Site. You can learn more about s2Member Pro at [s2Member.com](http://www.s2member.com/).
3
4	+ = I was using the free version in a Multisite Network before. What happened? =
5	+ s2Member (when running on a Multisite Network) requires minor alterations in WordPress core that are not compatible with plugins available at WordPress.org (i.e., not allowed) at this time. For this reason, full support for Multisite Networks is now available only in the pro version.
6	+
7	+ = What if I have already configured Multisite Network options on this site? =
8	+ If you already customized s2Member's Multisite Network configuration options in a previous release, those settings will remain and still be functional over the short-term; i.e., the functionality that makes s2Member compatible with Multisite Networking is still included, even in the s2Member Framework. However, the routines that deal with core patches, and those that allow you to change Multisite options are no longer available. You will need to acquire the Pro version to regain that portion of the s2Member Dashboard.
9	+
10	+ _Or, you can revert to [a previous release](http://s2member.com/release-archive/) of s2Member if you'd like. s2Member Framework v151218 is suggested if you go that route._

readme.txt CHANGED Viewed

	@@ -1,7 +1,7 @@
1	=== s2Member Framework (Member Roles, Capabilities, Membership, PayPal Members) ===
2
3	- Version: ~~151218~~
4	- Stable tag: ~~151218~~
5
6	SSL Compatible: yes
7	bbPress® Compatible: yes
	@@ -169,12 +169,29 @@ Released under the terms of the [GNU General Public License](http://www.gnu.org/
169
170	== Upgrade Notice ==
171
172	- = ~~v151218~~ =
173
174	(Maintenance Release) Upgrade immediately.
175
176	== Changelog ==
177

















178	= v151218 =
179
180	- (s2Member Pro) Reminder Email Notification Exclusions: It is now possible to enable/disable EOT Renewal/Reminder Email notifications on a per-user basis. You can edit a user's profile in the WP Dashboard and check "_No (exclude)_" to prevent specific users from receiving any reminder emails that you configured. Props at @patdumond @luisrock. See also [this GitHub issue](https://github.com/websharks/s2member/issues/816).


1	=== s2Member Framework (Member Roles, Capabilities, Membership, PayPal Members) ===
2
3	+ Version: 160120
4	+ Stable tag: 160120
5
6	SSL Compatible: yes
7	bbPress® Compatible: yes

169
170	== Upgrade Notice ==
171
172	+ = v160120 =
173
174	(Maintenance Release) Upgrade immediately.
175
176	== Changelog ==
177
178	+ = v160120 =
179	+
180	+ - (s2Member,s2Member Pro) Bug Fix: Resolved a minor glitch in the WordPress Dashboard → Settings → General panel, where s2Member's notice regarding Open Registration was inadvertently forcing the entire page into italics. Props @renzms @kristineds @raamdev ~ See also: [this GitHub issue](https://github.com/websharks/s2member/issues/831) if you'd like additional details.
181	+
182	+ - (s2Member) Multisite Support: This release of s2Member (the free version only) removes full support for Multisite Networks, which is now a Pro feature; i.e., only available in the Pro version.
183	+
184	+ ##### Is s2Member still compatible with WordPress Multisite Networking?
185	+ Multisite support is no longer included in the s2Member Framework. However, it is available with s2Member Pro. s2Member Pro is compatible with Multisite Networking. After you enable Multisite Networking, install the s2Member Pro Add-On. Then, navigate to `s2Member → Multisite (Config)` in the Dashboard of your Main Site. You can learn more about s2Member Pro at [s2Member.com](http://www.s2member.com/).
186	+
187	+ ##### I was using the free version in a Multisite Network before. What happened?
188	+ s2Member (when running on a Multisite Network) requires minor alterations in WordPress core that are not compatible with plugins available at WordPress.org (i.e., not allowed) at this time. For this reason, full support for Multisite Networks is now available only in the pro version.
189	+
190	+ ##### What if I already configured Multisite options on a site running the free version?
191	+ If you already customized s2Member's Multisite Network configuration options in a previous release, those settings will remain and still be functional over the short-term; i.e., the functionality that makes s2Member compatible with Multisite Networking is still included, even in the s2Member Framework. However, the routines that deal with core patches, and those that allow you to change Multisite options are no longer available. You will need to acquire the Pro version. Or, you can revert to [a previous release](http://s2member.com/release-archive/). s2Member Framework v151218 is suggested if you go that route.
192	+
193	+ _See also: [this GitHub issue](https://github.com/websharks/s2member/issues/850) for further details._
194	+
195	= v151218 =
196
197	- (s2Member Pro) Reminder Email Notification Exclusions: It is now possible to enable/disable EOT Renewal/Reminder Email notifications on a per-user basis. You can edit a user's profile in the WP Dashboard and check "_No (exclude)_" to prevent specific users from receiving any reminder emails that you configured. Props at @patdumond @luisrock. See also [this GitHub issue](https://github.com/websharks/s2member/issues/816).

s2member.php CHANGED Viewed

	@@ -19,8 +19,8 @@
19	*/
20	/* -- This section for WordPress parsing. ------------------------------------------------------------------------------
21
22	- Version: ~~151218~~
23	- Stable tag: ~~151218~~
24
25	SSL Compatible: yes
26	bbPress Compatible: yes
	@@ -81,7 +81,7 @@ if(!defined('WPINC')) // MUST have WordPress.
81	* @var string
82	*/
83	if(!defined('WS_PLUGIN__S2MEMBER_VERSION'))
84	- define('WS_PLUGIN__S2MEMBER_VERSION', '~~151218~~' /* !#distro-version#! */);
85	/**
86	* Minimum PHP version required to run s2Member.
87	*
	@@ -111,7 +111,7 @@ if(!defined('WS_PLUGIN__S2MEMBER_MIN_WP_VERSION'))
111	* @var string
112	*/
113	if(!defined('WS_PLUGIN__S2MEMBER_MIN_PRO_VERSION'))
114	- define('WS_PLUGIN__S2MEMBER_MIN_PRO_VERSION', '~~151218~~' /* !#distro-version#! */);
115	/*
116	Several compatibility checks.
117	If all pass, load the s2Member plugin.


19	*/
20	/* -- This section for WordPress parsing. ------------------------------------------------------------------------------
21
22	+ Version: 160120
23	+ Stable tag: 160120
24
25	SSL Compatible: yes
26	bbPress Compatible: yes

81	* @var string
82	*/
83	if(!defined('WS_PLUGIN__S2MEMBER_VERSION'))
84	+ define('WS_PLUGIN__S2MEMBER_VERSION', '160120' /* !#distro-version#! */);
85	/**
86	* Minimum PHP version required to run s2Member.
87	*

111	* @var string
112	*/
113	if(!defined('WS_PLUGIN__S2MEMBER_MIN_PRO_VERSION'))
114	+ define('WS_PLUGIN__S2MEMBER_MIN_PRO_VERSION', '160120' /* !#distro-version#! */);
115	/*
116	Several compatibility checks.
117	If all pass, load the s2Member plugin.

s2Member Framework (Member Roles, Capabilities, Membership, PayPal Members) - Version 160120

Version Description

Release Info

Code changes from version 151218 to 160120