Release s2Member v170425-RC (Release Candidate)

CHANGELOG.md

@@ -1,4 +1,4 @@
-= $v =
+= v170425-RC =
 
 - (s2Member/s2Member Pro) **PHP v7 Compat. Enhancements**: This release adds an integration with the [Defuse encryption library](https://github.com/defuse/php-encryption) for PHP, making it possible for s2Member to move away from the `mcrypt_*()` family of functions in versions of PHP >= 7.0.4, where the mcrypt library has been deprecated — `mcrypt_*()` will eventually be removed entirely.
 

readme.txt

@@ -1,7 +1,7 @@
 === s2Member Framework (Member Roles, Capabilities, Membership, PayPal Members) ===
 
-Version: 170221
-Stable tag: 170221
+Version: 170425-RC
+Stable tag: 170425-RC
 
 SSL Compatible: yes
 bbPress® Compatible: yes
@@ -21,7 +21,7 @@ Tested up to: 4.8-alpha
 Requires at least: 4.2
 
 Requires PHP: 5.2
-Tested up to PHP: 7.0.15
+Tested up to PHP: 7.0.17
 
 Copyright: © 2009 WebSharks, Inc.
 License: GNU General Public License v2 or later.

s2member.php

@@ -20,8 +20,8 @@
  */
 /* -- This section for WordPress parsing. ------------------------------------------------------------------------------
 
-Version: 170221
-Stable tag: 170221
+Version: 170425-RC
+Stable tag: 170425-RC
 
 SSL Compatible: yes
 bbPress Compatible: yes
@@ -40,7 +40,7 @@
 Requires at least: 4.2
 
 Requires PHP: 5.2
-Tested up to PHP: 7.0.15
+Tested up to PHP: 7.0.17
 
 Copyright: © 2009 WebSharks, Inc.
 License: GNU General Public License
@@ -77,7 +77,7 @@
  *
  * @var string
  */
-${__FILE__}['tmp'] = '170221'; //version//
+${__FILE__}['tmp'] = '170425-RC'; //version//
 if(!defined('WS_PLUGIN__S2MEMBER_VERSION'))
 	define('WS_PLUGIN__S2MEMBER_VERSION', ${__FILE__}['tmp']);
 /**
@@ -110,7 +110,7 @@
  *
  * @var string
  */
-${__FILE__}['tmp'] = '170221'; //version//
+${__FILE__}['tmp'] = '170425-RC'; //version//
 if(!defined('WS_PLUGIN__S2MEMBER_MIN_PRO_VERSION'))
 	define('WS_PLUGIN__S2MEMBER_MIN_PRO_VERSION', ${__FILE__}['tmp']);
 /*

src/includes/translations/s2member.pot

@@ -2,9 +2,9 @@
 # This file is distributed under the same license as the  package.
 msgid ""
 msgstr ""
-"Project-Id-Version:  170221\n"
+"Project-Id-Version:  170425-RC\n"
 "Report-Msgid-Bugs-To: http://wordpress.org/tag/s2member\n"
-"POT-Creation-Date: 2017-02-21 00:07:54+00:00\n"
+"POT-Creation-Date: 2017-04-25 23:31:31+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1975,7 +1975,7 @@ msgctxt "s2member-front"
 msgid "No Billing Method; please try again."
 msgstr ""
 
-#: pro/src/includes/syscon.inc.php:95 src/includes/syscon.inc.php:241
+#: pro/src/includes/syscon.inc.php:95 src/includes/syscon.inc.php:246
 msgctxt "s2member-front"
 msgid "Congratulations! (your membership has been approved)"
 msgstr ""
@@ -1997,7 +1997,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pro/src/includes/syscon.inc.php:99 src/includes/syscon.inc.php:253
+#: pro/src/includes/syscon.inc.php:99 src/includes/syscon.inc.php:258
 msgctxt "s2member-front"
 msgid "Thank You! (instructions for access)"
 msgstr ""
@@ -3881,7 +3881,7 @@ msgid "as a Member"
 msgstr ""
 
 #: src/includes/classes/email-configs.inc.php:254
-#: src/includes/syscon.inc.php:215
+#: src/includes/syscon.inc.php:220
 msgctxt "s2member-front"
 msgid ""
 "Your Username/Password for:\n"
@@ -4549,27 +4549,27 @@ msgctxt "s2member-front"
 msgid "If you need assistance, please <a href=\"%s\" target=\"_blank\">contact support</a>."
 msgstr ""
 
-#: src/includes/classes/sc-eots-in.inc.php:74
+#: src/includes/classes/sc-eots-in.inc.php:76
 msgctxt "s2member-front"
 msgid "Access Expires:"
 msgstr ""
 
-#: src/includes/classes/sc-eots-in.inc.php:75
+#: src/includes/classes/sc-eots-in.inc.php:77
 msgctxt "s2member-front"
 msgid "Access Expired:"
 msgstr ""
 
-#: src/includes/classes/sc-eots-in.inc.php:76
+#: src/includes/classes/sc-eots-in.inc.php:78
 msgctxt "s2member-front"
 msgid "Next Payment:"
 msgstr ""
 
-#: src/includes/classes/sc-eots-in.inc.php:77
+#: src/includes/classes/sc-eots-in.inc.php:79
 msgctxt "s2member-front"
 msgid "N/A"
 msgstr ""
 
-#: src/includes/classes/sc-eots-in.inc.php:77
+#: src/includes/classes/sc-eots-in.inc.php:79
 msgctxt "s2member-front"
 msgid "—"
 msgstr ""
@@ -4745,115 +4745,115 @@ msgid_plural "about %s years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/includes/classes/utils-time.inc.php:277
+#: src/includes/classes/utils-time.inc.php:278
 msgctxt "s2member-front"
 msgid "Daily"
 msgstr ""
 
-#: src/includes/classes/utils-time.inc.php:277
+#: src/includes/classes/utils-time.inc.php:278
 msgctxt "s2member-front"
 msgid "Weekly"
 msgstr ""
 
-#: src/includes/classes/utils-time.inc.php:277
+#: src/includes/classes/utils-time.inc.php:278
 msgctxt "s2member-front"
 msgid "Monthly"
 msgstr ""
 
-#: src/includes/classes/utils-time.inc.php:277
+#: src/includes/classes/utils-time.inc.php:278
 msgctxt "s2member-front"
 msgid "Yearly"
 msgstr ""
 
-#: src/includes/classes/utils-time.inc.php:277
-#: src/includes/classes/utils-time.inc.php:288
+#: src/includes/classes/utils-time.inc.php:278
+#: src/includes/classes/utils-time.inc.php:289
 msgctxt "s2member-front"
 msgid "Lifetime"
 msgstr ""
 
-#: src/includes/classes/utils-time.inc.php:281
+#: src/includes/classes/utils-time.inc.php:282
 msgctxt "s2member-front"
 msgid "Bi-Weekly"
 msgstr ""
 
-#: src/includes/classes/utils-time.inc.php:282
+#: src/includes/classes/utils-time.inc.php:283
 msgctxt "s2member-front"
 msgid "Bi-Monthly"
 msgstr ""
 
-#: src/includes/classes/utils-time.inc.php:283
+#: src/includes/classes/utils-time.inc.php:284
 msgctxt "s2member-front"
 msgid "Quarterly"
 msgstr ""
 
-#: src/includes/classes/utils-time.inc.php:284
+#: src/includes/classes/utils-time.inc.php:285
 msgctxt "s2member-front"
 msgid "Semi-Yearly"
 msgstr ""
 
-#: src/includes/classes/utils-time.inc.php:288
+#: src/includes/classes/utils-time.inc.php:289
 msgctxt "s2member-front"
 msgid "Day"
 msgstr ""
 
-#: src/includes/classes/utils-time.inc.php:288
+#: src/includes/classes/utils-time.inc.php:289
 msgctxt "s2member-front"
 msgid "Week"
 msgstr ""
 
-#: src/includes/classes/utils-time.inc.php:288
+#: src/includes/classes/utils-time.inc.php:289
 msgctxt "s2member-front"
 msgid "Month"
 msgstr ""
 
-#: src/includes/classes/utils-time.inc.php:288
+#: src/includes/classes/utils-time.inc.php:289
 msgctxt "s2member-front"
 msgid "Year"
 msgstr ""
 
-#: src/includes/classes/utils-time.inc.php:294
+#: src/includes/classes/utils-time.inc.php:295
 msgctxt "s2member-front"
 msgid "Days"
 msgstr ""
 
-#: src/includes/classes/utils-time.inc.php:294
+#: src/includes/classes/utils-time.inc.php:295
 msgctxt "s2member-front"
 msgid "Weeks"
 msgstr ""
 
-#: src/includes/classes/utils-time.inc.php:294
+#: src/includes/classes/utils-time.inc.php:295
 msgctxt "s2member-front"
 msgid "Months"
 msgstr ""
 
-#: src/includes/classes/utils-time.inc.php:294
+#: src/includes/classes/utils-time.inc.php:295
 msgctxt "s2member-front"
 msgid "Years"
 msgstr ""
 
-#: src/includes/classes/utils-time.inc.php:294
+#: src/includes/classes/utils-time.inc.php:295
 msgctxt "s2member-front"
 msgid "Lifetimes"
 msgstr ""
 
 #. translators: Each cycle ( i.e., `each day/week/month` or `every 2
 #. days/weeks/months`, etc. ). Cycles are translated elsewhere.
-#: src/includes/classes/utils-time.inc.php:331
-#: src/includes/classes/utils-time.inc.php:374
+#: src/includes/classes/utils-time.inc.php:332
+#: src/includes/classes/utils-time.inc.php:375
 msgctxt "s2member-front"
 msgid "each %2$s"
 msgid_plural "every %1$s %3$s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/includes/classes/utils-time.inc.php:334
+#: src/includes/classes/utils-time.inc.php:335
 msgctxt "s2member-front"
 msgid "lifetime"
 msgstr ""
 
 #. translators: Membership cycle ( i.e., `1 day/week/month` or `2
 #. days/weeks/months`, etc. ). Most of this is translated elsewhere.
-#: src/includes/classes/utils-time.inc.php:338
+#: src/includes/classes/utils-time.inc.php:339
 msgctxt "s2member-front"
 msgid "%1$s %2$s"
 msgid_plural "%1$s %3$s"
@@ -4862,7 +4862,7 @@ msgstr[1] ""
 
 #. translators: Cycle ( i.e., `for 1 day/week/month` or `for 2
 #. days/weeks/months`, etc. ). Most of this is translated elsewhere.
-#: src/includes/classes/utils-time.inc.php:381
+#: src/includes/classes/utils-time.inc.php:382
 msgctxt "s2member-front"
 msgid "for %1$s %2$s"
 msgid_plural "for %1$s %3$s"
@@ -5001,22 +5001,22 @@ msgctxt "s2member-front recaptcha-lang-code"
 msgid "en"
 msgstr ""
 
-#: src/includes/syscon.inc.php:157
+#: src/includes/syscon.inc.php:162
 msgctxt "s2member-front"
 msgid "Yes, I want to receive updates via email."
 msgstr ""
 
-#: src/includes/syscon.inc.php:214
+#: src/includes/syscon.inc.php:219
 msgctxt "s2member-front"
 msgid "[%s] Username/Password"
 msgstr ""
 
-#: src/includes/syscon.inc.php:218
+#: src/includes/syscon.inc.php:223
 msgctxt "s2member-front"
 msgid "[%s] New User Registration"
 msgstr ""
 
-#: src/includes/syscon.inc.php:219
+#: src/includes/syscon.inc.php:224
 msgctxt "s2member-front"
 msgid ""
 "New User Registration on your site:\n"
@@ -5028,7 +5028,7 @@ msgid ""
 "IP Address: %%%%user_ip%%%%"
 msgstr ""
 
-#: src/includes/syscon.inc.php:242
+#: src/includes/syscon.inc.php:247
 msgctxt "s2member-front"
 msgid ""
 "Thanks %%%%first_name%%%%! Your membership has been approved.\n"
@@ -5044,12 +5044,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/includes/syscon.inc.php:245 src/includes/syscon.inc.php:249
+#: src/includes/syscon.inc.php:250 src/includes/syscon.inc.php:254
 msgctxt "s2member-front"
 msgid "Thank you! Your account has been updated."
 msgstr ""
 
-#: src/includes/syscon.inc.php:246 src/includes/syscon.inc.php:250
+#: src/includes/syscon.inc.php:251 src/includes/syscon.inc.php:255
 msgctxt "s2member-front"
 msgid ""
 "Thanks %%%%first_name%%%%! Your account now has access to: %%%%item_name%%%%.\n"
@@ -5060,7 +5060,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/includes/syscon.inc.php:254
+#: src/includes/syscon.inc.php:259
 msgctxt "s2member-front"
 msgid ""
 "Thanks %%%%first_name%%%%!\n"
@@ -5077,32 +5077,32 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/includes/syscon.inc.php:293
+#: src/includes/syscon.inc.php:298
 msgctxt "s2member-front"
 msgid "Free Subscriber"
 msgstr ""
 
-#: src/includes/syscon.inc.php:293
+#: src/includes/syscon.inc.php:298
 msgctxt "s2member-front"
 msgid "Bronze Member"
 msgstr ""
 
-#: src/includes/syscon.inc.php:293
+#: src/includes/syscon.inc.php:298
 msgctxt "s2member-front"
 msgid "Silver Member"
 msgstr ""
 
-#: src/includes/syscon.inc.php:293
+#: src/includes/syscon.inc.php:298
 msgctxt "s2member-front"
 msgid "Gold Member"
 msgstr ""
 
-#: src/includes/syscon.inc.php:293
+#: src/includes/syscon.inc.php:298
 msgctxt "s2member-front"
 msgid "Platinum Member"
 msgstr ""
 
-#: src/includes/syscon.inc.php:293
+#: src/includes/syscon.inc.php:298
 msgctxt "s2member-front"
 msgid "Level %s Member"
 msgstr ""