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

Version Description

= v130510 = (Maintenance Release) Upgrade immediately.

Download this release

Release Info

Developer WebSharks
Plugin Icon 128x128 s2Member Framework (Member Roles, Capabilities, Membership, PayPal Members)
Version 130510
Comparing to
See all releases

Code changes from version 130406 to 130510

checksum.txt CHANGED
@@ -1 +1 @@
1
- ebc230cc22eb153a6f57f791b3c0db0b
1
+ d7658341b8c8aff89c2d46de12573d1b
includes/classes/email-configs.inc.php CHANGED
@@ -183,10 +183,11 @@ if (!class_exists ("c_ws_plugin__s2member_email_configs"))
183
  * @param str $user_pass Optional. A plain text version of the User's password.
184
  * If omitted, a new password will be generated automatically.
185
  * @param array $notify An array of directives. Must be non-empty, with at least one of these values `user,admin`.
186
- This defaults to a value of `array('user')`. We notify the User/Member only (and NOT the administrator).
 
187
  * @return bool True if all required parameters are supplied, else false.
188
  */
189
- public static function reset_pass_resend_new_user_notification ($user_id = FALSE, $user_pass = FALSE, $notify = array ("user"))
190
  {
191
  foreach(array_keys(get_defined_vars())as$__v)$__refs[$__v]=&$$__v;
192
  do_action ("ws_plugin__s2member_before_reset_pass_resend_new_user_notification", get_defined_vars ());
@@ -195,10 +196,10 @@ if (!class_exists ("c_ws_plugin__s2member_email_configs"))
195
  if ($user_id && ($user = new WP_User ($user_id)) && !empty ($user->ID) && ($user_id = $user->ID) && is_array ($notify) && !empty ($notify))
196
  {
197
  $user_pass = (is_string($user_pass) && $user_pass) ? $user_pass : wp_generate_password();
198
-
199
  wp_set_password($user_pass, $user_id);
200
-
201
- $return = c_ws_plugin__s2member_email_configs::new_user_notification($user_id, $user_pass, $notify);
202
  }
203
  return apply_filters ("ws_plugin__s2member_reset_pass_resend_new_user_notification", ((!empty($return)) ? true : false), get_defined_vars ());
204
  }
@@ -212,9 +213,10 @@ if (!class_exists ("c_ws_plugin__s2member_email_configs"))
212
  * @param str $user_pass Optional. A plain text version of the User's password.
213
  * If omitted, only the administrative notification will be sent.
214
  * @param array $notify An array of directives. Must be non-empty, with at least one of these values `user,admin`.
 
215
  * @return bool True if all required parameters are supplied, else false.
216
  */
217
- public static function new_user_notification ($user_id = FALSE, $user_pass = FALSE, $notify = array ("user", "admin"))
218
  {
219
  foreach(array_keys(get_defined_vars())as$__v)$__refs[$__v]=&$$__v;
220
  do_action ("ws_plugin__s2member_before_new_user_notification", get_defined_vars ());
@@ -235,6 +237,7 @@ if (!class_exists ("c_ws_plugin__s2member_email_configs"))
235
  $level = c_ws_plugin__s2member_user_access::user_access_level($user);
236
  $ccaps = implode(",", c_ws_plugin__s2member_user_access::user_access_ccaps($user));
237
 
 
238
  $user_full_name = trim ($user->first_name . " " . $user->last_name);
239
  $user_ip = $_SERVER["REMOTE_ADDR"];
240
 
@@ -304,6 +307,7 @@ if (!class_exists ("c_ws_plugin__s2member_email_configs"))
304
  $level = c_ws_plugin__s2member_user_access::user_access_level($user);
305
  $ccaps = implode(",", c_ws_plugin__s2member_user_access::user_access_ccaps($user));
306
 
 
307
  $user_full_name = trim ($user->first_name . " " . $user->last_name);
308
  $user_ip = $_SERVER["REMOTE_ADDR"];
309
 
183
  * @param str $user_pass Optional. A plain text version of the User's password.
184
  * If omitted, a new password will be generated automatically.
185
  * @param array $notify An array of directives. Must be non-empty, with at least one of these values `user,admin`.
186
+ * This defaults to a value of `array('user')`. We notify the User/Member only (and NOT the administrator).
187
+ * @param str $user_email Optional. This defaults to the user's currently configured email address.
188
  * @return bool True if all required parameters are supplied, else false.
189
  */
190
+ public static function reset_pass_resend_new_user_notification ($user_id = FALSE, $user_pass = FALSE, $notify = array ("user"), $user_email = FALSE)
191
  {
192
  foreach(array_keys(get_defined_vars())as$__v)$__refs[$__v]=&$$__v;
193
  do_action ("ws_plugin__s2member_before_reset_pass_resend_new_user_notification", get_defined_vars ());
196
  if ($user_id && ($user = new WP_User ($user_id)) && !empty ($user->ID) && ($user_id = $user->ID) && is_array ($notify) && !empty ($notify))
197
  {
198
  $user_pass = (is_string($user_pass) && $user_pass) ? $user_pass : wp_generate_password();
199
+
200
  wp_set_password($user_pass, $user_id);
201
+
202
+ $return = c_ws_plugin__s2member_email_configs::new_user_notification($user_id, $user_pass, $notify, $user_email);
203
  }
204
  return apply_filters ("ws_plugin__s2member_reset_pass_resend_new_user_notification", ((!empty($return)) ? true : false), get_defined_vars ());
205
  }
213
  * @param str $user_pass Optional. A plain text version of the User's password.
214
  * If omitted, only the administrative notification will be sent.
215
  * @param array $notify An array of directives. Must be non-empty, with at least one of these values `user,admin`.
216
+ * @param str $user_email Optional. This defaults to the user's currently configured email address.
217
  * @return bool True if all required parameters are supplied, else false.
218
  */
219
+ public static function new_user_notification ($user_id = FALSE, $user_pass = FALSE, $notify = array ("user", "admin"), $user_email = FALSE)
220
  {
221
  foreach(array_keys(get_defined_vars())as$__v)$__refs[$__v]=&$$__v;
222
  do_action ("ws_plugin__s2member_before_new_user_notification", get_defined_vars ());
237
  $level = c_ws_plugin__s2member_user_access::user_access_level($user);
238
  $ccaps = implode(",", c_ws_plugin__s2member_user_access::user_access_ccaps($user));
239
 
240
+ $user->user_email = ($user_email) ? $user_email : $user->user_email;
241
  $user_full_name = trim ($user->first_name . " " . $user->last_name);
242
  $user_ip = $_SERVER["REMOTE_ADDR"];
243
 
307
  $level = c_ws_plugin__s2member_user_access::user_access_level($user);
308
  $ccaps = implode(",", c_ws_plugin__s2member_user_access::user_access_ccaps($user));
309
 
310
+ $user->user_email = ($user_email) ? $user_email : $user->user_email;
311
  $user_full_name = trim ($user->first_name . " " . $user->last_name);
312
  $user_ip = $_SERVER["REMOTE_ADDR"];
313
 
includes/classes/ip-restrictions.inc.php CHANGED
@@ -121,6 +121,40 @@ if(!class_exists("c_ws_plugin__s2member_ip_restrictions"))
121
 
122
  return apply_filters("ws_plugin__s2member_ip_restrictions_ok", true, get_defined_vars());
123
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
124
  /**
125
  * Queries Transients for specific IP Restrictions associated with a security breach.
126
  *
@@ -138,7 +172,7 @@ if(!class_exists("c_ws_plugin__s2member_ip_restrictions"))
138
  $transient_security_breach = $prefix.md5("s2member_ip_restrictions_".(string)$restriction."_security_breach");
139
  $breached_security = $associated_with_security_breach = (get_transient($transient_security_breach)) ? true : false;
140
 
141
- return apply_filters("ws_plugin__s2member_before_specific_ip_restriction_breached_security", $breached_security, get_defined_vars());
142
  }
143
  /**
144
  * Resets/deletes specific IP Restrictions.
121
 
122
  return apply_filters("ws_plugin__s2member_ip_restrictions_ok", true, get_defined_vars());
123
  }
124
+ /**
125
+ * Queries Transients for specific IP Restrictions at or above max allowable.
126
+ *
127
+ * @package s2Member\IP_Restrictions
128
+ * @since 130407
129
+ *
130
+ * @param str $restriction Unique IP Restriction name/identifier. Such as Username, or a unique access code.
131
+ * @return bool TRUE if at or above max allowable IPs; else FALSE.
132
+ */
133
+ public static function specific_ip_restriction_at_or_above_max($restriction = FALSE)
134
+ {
135
+ do_action("ws_plugin__s2member_before_specific_ip_restriction_at_or_above_max", get_defined_vars());
136
+
137
+ if(apply_filters("ws_plugin__s2member_disable_all_ip_restrictions", false, get_defined_vars())
138
+ || apply_filters("ws_plugin__s2member_disable_specific_ip_restriction", false, get_defined_vars())
139
+ || !$GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["max_ip_restriction"])
140
+ return false; // No IP Restrictions in this case.
141
+
142
+ $prefix = /* s2Member Transient prefix for all IP Restrictions. Allows s2Member to find these easily. */ "s2m_ipr_";
143
+ $transient_entries = $prefix.md5("s2member_ip_restrictions_".(string)$restriction."_entries");
144
+
145
+ // If you add Filters, use a string compatible with PHP's strtotime() function.
146
+ $concurrency = apply_filters("ws_plugin__s2member_ip_restrictions__concurrency_time_per_ip", "30 days");
147
+
148
+ $entries = (is_array($entries = get_transient($transient_entries))) ? $entries : array();
149
+
150
+ foreach /* Auto-expire entries, based on time. */($entries as $_entry => $_time)
151
+ if /* Based on time. */($_time < strtotime("-".$concurrency))
152
+ unset /* Unset this entry value. */($entries[$_entry]);
153
+
154
+ $at_or_above_max = (count($entries) >= $GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["max_ip_restriction"]);
155
+
156
+ return apply_filters("ws_plugin__s2member_specific_ip_restriction_at_or_above_max", $at_or_above_max, get_defined_vars());
157
+ }
158
  /**
159
  * Queries Transients for specific IP Restrictions associated with a security breach.
160
  *
172
  $transient_security_breach = $prefix.md5("s2member_ip_restrictions_".(string)$restriction."_security_breach");
173
  $breached_security = $associated_with_security_breach = (get_transient($transient_security_breach)) ? true : false;
174
 
175
+ return apply_filters("ws_plugin__s2member_specific_ip_restriction_breached_security", $breached_security, get_defined_vars());
176
  }
177
  /**
178
  * Resets/deletes specific IP Restrictions.
includes/classes/paypal-utilities.inc.php CHANGED
@@ -283,7 +283,7 @@ if(!class_exists("c_ws_plugin__s2member_paypal_utilities"))
283
  $post_vars = apply_filters("ws_plugin__s2member_paypal_payflow_api_post_vars", $post_vars, get_defined_vars());
284
  $post_vars = (is_array($post_vars)) ? $post_vars : array();
285
 
286
- $post_vars["VERBOSITY"] = "MEDIUM";
287
  $post_vars["USER"] = $GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["paypal_payflow_api_username"];
288
  $post_vars["PARTNER"] = $GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["paypal_payflow_api_partner"];
289
  $post_vars["VENDOR"] = $GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["paypal_payflow_api_vendor"];
@@ -363,16 +363,10 @@ if(!class_exists("c_ws_plugin__s2member_paypal_utilities"))
363
  do_action("_ws_plugin__s2member_before_paypal_payflow_api_response_filters", get_defined_vars());
364
  unset /* Unset defined __refs, __v. */($__refs, $__v);
365
 
366
- if(!empty($response["__error"]) && !empty($response["L_ERRORCODE0"]))
367
  {
368
- if((int)$response["L_ERRORCODE0"] === 10422)
369
- $response["__error"] = sprintf(_x("Error #%s. Transaction declined. Please use an alternate funding source.", "s2member-front", "s2member"), $response["L_ERRORCODE0"]);
370
-
371
- else if((int)$response["L_ERRORCODE0"] === 10435)
372
- $response["__error"] = sprintf(_x("Error #%s. Transaction declined. Express Checkout was NOT confirmed.", "s2member-front", "s2member"), $response["L_ERRORCODE0"]);
373
-
374
- else if((int)$response["L_ERRORCODE0"] === 10417)
375
- $response["__error"] = sprintf(_x("Error #%s. Transaction declined. Please use an alternate funding source.", "s2member-front", "s2member"), $response["L_ERRORCODE0"]);
376
  }
377
 
378
  return /* Filters already applied with: ``ws_plugin__s2member_paypal_payflow_api_response``. */ $response;
@@ -392,7 +386,7 @@ if(!class_exists("c_ws_plugin__s2member_paypal_utilities"))
392
  $value = (string)$value;
393
  $value = preg_replace('/"/', "'", $value);
394
 
395
- if(($key === "DESC" || $key === "BA_DESC" #
396
  || preg_match("/^L_NAME[0-9]+$/", $key) || preg_match("/^PAYMENTREQUEST_[0-9]+_DESC$/", $key) || preg_match("/^PAYMENTREQUEST_[0-9]+_NAME[0-9]+$/", $key) #
397
  || preg_match("/^L_BILLINGAGREEMENTDESCRIPTION[0-9]+$/", $key)) && strlen($value) > 60)
398
  $value = substr($value, 0, 57)."...";
283
  $post_vars = apply_filters("ws_plugin__s2member_paypal_payflow_api_post_vars", $post_vars, get_defined_vars());
284
  $post_vars = (is_array($post_vars)) ? $post_vars : array();
285
 
286
+ $post_vars["VERBOSITY"] = "HIGH";
287
  $post_vars["USER"] = $GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["paypal_payflow_api_username"];
288
  $post_vars["PARTNER"] = $GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["paypal_payflow_api_partner"];
289
  $post_vars["VENDOR"] = $GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["paypal_payflow_api_vendor"];
363
  do_action("_ws_plugin__s2member_before_paypal_payflow_api_response_filters", get_defined_vars());
364
  unset /* Unset defined __refs, __v. */($__refs, $__v);
365
 
366
+ if(!empty($response["__error"]) && !empty($response["HOSTCODE"]))
367
  {
368
+ if((int)$response["HOSTCODE"] === 11452)
369
+ $response["__error"] .= _x(" Please contact PayPal Merchant Technical Support (www.paypal.com/mts) and request `Recurring Billing` service, and also ask to have `Reference Transactions` enabled for Recurring Billing via Express Checkout.", "s2member-front", "s2member");
 
 
 
 
 
 
370
  }
371
 
372
  return /* Filters already applied with: ``ws_plugin__s2member_paypal_payflow_api_response``. */ $response;
386
  $value = (string)$value;
387
  $value = preg_replace('/"/', "'", $value);
388
 
389
+ if(($key === "DESC" || $key === "ORDERDESC" || $key === "BA_DESC" || $key === "BA_CUSTOM" #
390
  || preg_match("/^L_NAME[0-9]+$/", $key) || preg_match("/^PAYMENTREQUEST_[0-9]+_DESC$/", $key) || preg_match("/^PAYMENTREQUEST_[0-9]+_NAME[0-9]+$/", $key) #
391
  || preg_match("/^L_BILLINGAGREEMENTDESCRIPTION[0-9]+$/", $key)) && strlen($value) > 60)
392
  $value = substr($value, 0, 57)."...";
includes/classes/sc-files-in.inc.php CHANGED
@@ -102,7 +102,7 @@ if(!class_exists("c_ws_plugin__s2member_sc_files_in"))
102
 
103
  $attr = /* Force array; trim quote entities. */ c_ws_plugin__s2member_utils_strings::trim_qts_deep((array)$attr);
104
 
105
- $attr = shortcode_atts(array("download" => "", "download_key" => "", "stream" => "yes", "inline" => "yes", "storage" => "", "remote" => "", "ssl" => "", "rewrite" => "yes", "rewrite_base" => "", "skip_confirmation" => "", "url_to_storage_source" => "yes", "count_against_user" => "yes", "check_user" => "yes", /* Shortcode-specifics »» */ "file_download" => "", /* Configuration » */ "player" => "jwplayer-v6-rtmp", "player_id" => "s2-stream-".md5(uniqid("", TRUE)), "player_path" => "/jwplayer/jwplayer.js", "player_key" => "", "player_title" => "", "player_image" => "", "player_mediaid" => "", "player_description" => "", "player_captions" => "", /* Layout » */ "player_controls" => "yes", "player_skin" => "", "player_stretching" => "uniform", "player_width" => "480", "player_height" => "270", /* Playback » */ "player_autostart" => "no", "player_fallback" => "yes", "player_mute" => "no", "player_primary" => "flash", "player_repeat" => "no", "player_startparam" => "", /* Advanced option blocks » */ "player_option_blocks" => ""), $attr);
106
  $attr["download"] = (!empty($attr["file_download"])) ? $attr["file_download"] : $attr["download"];
107
 
108
  foreach(array_keys(get_defined_vars())as$__v)$__refs[$__v]=&$$__v;
@@ -121,12 +121,15 @@ if(!class_exists("c_ws_plugin__s2member_sc_files_in"))
121
  {
122
  $_get = c_ws_plugin__s2member_files::create_file_download_url($config, TRUE);
123
 
124
- if(is_array($_get) && !empty($_get) && $attr["player"] && file_exists(dirname(dirname(__FILE__))."/templates/players/".$attr["player"].".php") && $attr["player_id"] && $attr["player_path"])
125
  {
 
 
 
126
  if(strpos($attr["player"], "jwplayer-v6") === 0)
127
  {
128
- $get = trim(c_ws_plugin__s2member_utilities::evl(file_get_contents(dirname(dirname(__FILE__))."/templates/players/".$attr["player"].".php")));
129
-
130
  $get = preg_replace("/%%streamer%%/", $_get["streamer"], $get);
131
  $get = preg_replace("/%%prefix%%/", $_get["prefix"], $get);
132
  $get = preg_replace("/%%file%%/", $_get["file"], $get);
@@ -147,8 +150,9 @@ if(!class_exists("c_ws_plugin__s2member_sc_files_in"))
147
  else $get = preg_replace("/%%player_captions%%/", "[]", $get);
148
 
149
  $get = preg_replace("/%%player_controls%%/", ((filter_var($attr["player_controls"], FILTER_VALIDATE_BOOLEAN)) ? "true" : "false"), $get);
150
- $get = preg_replace("/%%player_width%%/", ((strpos($attr["player_width"], "%") !== FALSE) ? "'".c_ws_plugin__s2member_utils_strings::trim($attr["player_width"], NULL, "'\"")."'" : (integer)$attr["player_width"]), $get);
151
- $get = preg_replace("/%%player_height%%/", ((strpos($attr["player_height"], "%") !== FALSE) ? "'".c_ws_plugin__s2member_utils_strings::trim($attr["player_height"], NULL, "'\"")."'" : (integer)$attr["player_height"]), $get);
 
152
  $get = preg_replace("/%%player_skin%%/", $attr["player_skin"], $get);
153
  $get = preg_replace("/%%player_stretching%%/", $attr["player_stretching"], $get);
154
 
102
 
103
  $attr = /* Force array; trim quote entities. */ c_ws_plugin__s2member_utils_strings::trim_qts_deep((array)$attr);
104
 
105
+ $attr = shortcode_atts(array("download" => "", "download_key" => "", "stream" => "yes", "inline" => "yes", "storage" => "", "remote" => "", "ssl" => "", "rewrite" => "yes", "rewrite_base" => "", "skip_confirmation" => "", "url_to_storage_source" => "yes", "count_against_user" => "yes", "check_user" => "yes", /* Shortcode-specifics »» */ "file_download" => "", /* Configuration » */ "player" => "jwplayer-v6-rtmp", "player_id" => "s2-stream-".md5(uniqid("", TRUE)), "player_path" => "/jwplayer/jwplayer.js", "player_key" => "", "player_title" => "", "player_image" => "", "player_mediaid" => "", "player_description" => "", "player_captions" => "", /* Layout » */ "player_controls" => "yes", "player_skin" => "", "player_stretching" => "uniform", "player_width" => "480", "player_height" => "270", "player_aspectratio" => "", /* Playback » */ "player_autostart" => "no", "player_fallback" => "yes", "player_mute" => "no", "player_primary" => "flash", "player_repeat" => "no", "player_startparam" => "", /* Advanced option blocks » */ "player_option_blocks" => ""), $attr);
106
  $attr["download"] = (!empty($attr["file_download"])) ? $attr["file_download"] : $attr["download"];
107
 
108
  foreach(array_keys(get_defined_vars())as$__v)$__refs[$__v]=&$$__v;
121
  {
122
  $_get = c_ws_plugin__s2member_files::create_file_download_url($config, TRUE);
123
 
124
+ if(is_array($_get) && !empty($_get) && $attr["player"] && file_exists($template = dirname(dirname(__FILE__))."/templates/players/".$attr["player"].".php") && $attr["player_id"] && $attr["player_path"])
125
  {
126
+ $template = (file_exists(TEMPLATEPATH."/".basename($template))) ? TEMPLATEPATH."/".basename($template) : $template;
127
+ $template = (file_exists(WP_CONTENT_DIR."/".basename($template))) ? WP_CONTENT_DIR."/".basename($template) : $template;
128
+
129
  if(strpos($attr["player"], "jwplayer-v6") === 0)
130
  {
131
+ $get = trim(c_ws_plugin__s2member_utilities::evl(file_get_contents($template)));
132
+
133
  $get = preg_replace("/%%streamer%%/", $_get["streamer"], $get);
134
  $get = preg_replace("/%%prefix%%/", $_get["prefix"], $get);
135
  $get = preg_replace("/%%file%%/", $_get["file"], $get);
150
  else $get = preg_replace("/%%player_captions%%/", "[]", $get);
151
 
152
  $get = preg_replace("/%%player_controls%%/", ((filter_var($attr["player_controls"], FILTER_VALIDATE_BOOLEAN)) ? "true" : "false"), $get);
153
+ $get = preg_replace("/%%player_width%%/", ((strpos($attr["player_width"], "%") !== FALSE) ? "'".$attr["player_width"]."'" : (integer)$attr["player_width"]), $get);
154
+ $get = preg_replace("/%%player_height%%/", ($attr["player_aspectratio"]) ? "" : ((strpos($attr["player_height"], "%") !== FALSE) ? "'".$attr["player_height"]."'" : (integer)$attr["player_height"])), $get);
155
+ $get = preg_replace("/%%player_aspectratio%%/", $attr["player_aspectratio"], $get);
156
  $get = preg_replace("/%%player_skin%%/", $attr["player_skin"], $get);
157
  $get = preg_replace("/%%player_stretching%%/", $attr["player_stretching"], $get);
158
 
includes/classes/users-list-in.inc.php CHANGED
@@ -182,12 +182,12 @@ if(!class_exists("c_ws_plugin__s2member_users_list_in"))
182
  foreach(array_keys(get_defined_vars())as$__v)$__refs[$__v]=&$$__v;
183
  do_action("ws_plugin__s2member_during_users_list_edit_cols_before_reset_pass_resend", get_defined_vars());
184
  unset /* Unset defined __refs, __v. */ ($__refs, $__v);
185
-
186
  echo '<tr>'."\n";
187
  echo '<th><label for="ws-plugin--s2member-profile-reset-pass-resend">Reset Password &amp; Resend Welcome Email Message:</label> <a href="#" onclick="alert(\'Checking this box will tell s2Member® to reset this User\\\'s password and then reprocess the New User Email Notification message against this User\\\'s account. This way they\\\'ll get an email message with their Username/Password.\\n\\nThis can be helpful in cases where a User/Member missed the original email message for some reason.\\n\\nThe User\\\'s password is reset to a new auto-generated password by default. However, you can provide a custom password by entering a new password of your choosing in the field above — provided by WordPress® itself.\\n\\nIt is also possible to customize the New User Email Notification message with s2Member®. Please see: `Dashboard -› s2Member® -› General Options -› Email Configuration -› New User Notifications`.\'); return false;" tabindex="-1">[?]</a></th>'."\n";
188
  echo '<td><label><input type="checkbox" name="ws_plugin__s2member_profile_reset_pass_resend" id="ws-plugin--s2member-profile-reset-pass-resend" value="1" /> Yes, reset password &amp; resend welcome email message to this User.</label></td>'."\n";
189
  echo '</tr>'."\n";
190
-
191
  foreach(array_keys(get_defined_vars())as$__v)$__refs[$__v]=&$$__v;
192
  do_action("ws_plugin__s2member_during_users_list_edit_cols_after_reset_pass_resend", get_defined_vars());
193
  unset /* Unset defined __refs, __v. */ ($__refs, $__v);
@@ -234,7 +234,7 @@ if(!class_exists("c_ws_plugin__s2member_users_list_in"))
234
 
235
  echo '<tr>'."\n";
236
  echo '<th><label for="ws-plugin--s2member-profile-ip-restrictions">Reset IP Restrictions:</label> <a href="#" onclick="alert(\'A single Username is only valid for a certain number of unique IP addresses (as configured in your s2Member -› General Options). Once that limit is reached, s2Member assumes there has been a security breach. At that time, s2Member will place a temporary ban (preventing access).\\n\\nIf you have spoken to a legitimate Customer that is receiving an error upon logging in (ex: 503 / too many IP addresses), you can remove this temporary ban by checking the box below. If the abusive behavior continues, s2Member will automatically re-instate IP Restrictions in the future. If you would like to gain further control over IP Restrictions, please check your General Options panel for s2Member.\'); return false;" tabindex="-1">[?]</a></th>'."\n";
237
- echo '<td><label><input type="checkbox" name="ws_plugin__s2member_profile_ip_restrictions" id="ws-plugin--s2member-profile-ip-restrictions" value="1" /> Yes, delete/reset IP Restrictions associated with this Username.</label>'.((c_ws_plugin__s2member_ip_restrictions::specific_ip_restriction_breached_security(strtolower($user->user_login))) ? '<br /><em>*Note* this User HAS breached security through existing IP Restrictions.</em>' : '<br /><em>*Note* this User is NOT currently banned by any of your IP Restrictions.</em>').'</td>'."\n";
238
  echo '</tr>'."\n";
239
 
240
  foreach(array_keys(get_defined_vars())as$__v)$__refs[$__v]=&$$__v;
@@ -500,9 +500,9 @@ if(!class_exists("c_ws_plugin__s2member_users_list_in"))
500
 
501
  if /* Delete/reset IP Restrictions? */(!empty($_p["ws_plugin__s2member_profile_ip_restrictions"]))
502
  c_ws_plugin__s2member_ip_restrictions::delete_reset_specific_ip_restrictions(strtolower($user->user_login));
503
-
504
  if /* Reset password & resend email notification? */ (!empty($_p["ws_plugin__s2member_profile_reset_pass_resend"]) && c_ws_plugin__s2member_utils_conds::pro_is_installed())
505
- c_ws_plugin__s2member_email_configs::reset_pass_resend_new_user_notification($user_id, ((!empty($_p["pass1"])) ? $_p["pass1"] : ""));
506
 
507
  foreach(array_keys(get_defined_vars())as$__v)$__refs[$__v]=&$$__v;
508
  do_action("ws_plugin__s2member_during_users_list_update_cols", get_defined_vars());
182
  foreach(array_keys(get_defined_vars())as$__v)$__refs[$__v]=&$$__v;
183
  do_action("ws_plugin__s2member_during_users_list_edit_cols_before_reset_pass_resend", get_defined_vars());
184
  unset /* Unset defined __refs, __v. */ ($__refs, $__v);
185
+
186
  echo '<tr>'."\n";
187
  echo '<th><label for="ws-plugin--s2member-profile-reset-pass-resend">Reset Password &amp; Resend Welcome Email Message:</label> <a href="#" onclick="alert(\'Checking this box will tell s2Member® to reset this User\\\'s password and then reprocess the New User Email Notification message against this User\\\'s account. This way they\\\'ll get an email message with their Username/Password.\\n\\nThis can be helpful in cases where a User/Member missed the original email message for some reason.\\n\\nThe User\\\'s password is reset to a new auto-generated password by default. However, you can provide a custom password by entering a new password of your choosing in the field above — provided by WordPress® itself.\\n\\nIt is also possible to customize the New User Email Notification message with s2Member®. Please see: `Dashboard -› s2Member® -› General Options -› Email Configuration -› New User Notifications`.\'); return false;" tabindex="-1">[?]</a></th>'."\n";
188
  echo '<td><label><input type="checkbox" name="ws_plugin__s2member_profile_reset_pass_resend" id="ws-plugin--s2member-profile-reset-pass-resend" value="1" /> Yes, reset password &amp; resend welcome email message to this User.</label></td>'."\n";
189
  echo '</tr>'."\n";
190
+
191
  foreach(array_keys(get_defined_vars())as$__v)$__refs[$__v]=&$$__v;
192
  do_action("ws_plugin__s2member_during_users_list_edit_cols_after_reset_pass_resend", get_defined_vars());
193
  unset /* Unset defined __refs, __v. */ ($__refs, $__v);
234
 
235
  echo '<tr>'."\n";
236
  echo '<th><label for="ws-plugin--s2member-profile-ip-restrictions">Reset IP Restrictions:</label> <a href="#" onclick="alert(\'A single Username is only valid for a certain number of unique IP addresses (as configured in your s2Member -› General Options). Once that limit is reached, s2Member assumes there has been a security breach. At that time, s2Member will place a temporary ban (preventing access).\\n\\nIf you have spoken to a legitimate Customer that is receiving an error upon logging in (ex: 503 / too many IP addresses), you can remove this temporary ban by checking the box below. If the abusive behavior continues, s2Member will automatically re-instate IP Restrictions in the future. If you would like to gain further control over IP Restrictions, please check your General Options panel for s2Member.\'); return false;" tabindex="-1">[?]</a></th>'."\n";
237
+ echo '<td><label><input type="checkbox" name="ws_plugin__s2member_profile_ip_restrictions" id="ws-plugin--s2member-profile-ip-restrictions" value="1" /> Yes, delete/reset IP Restrictions associated with this Username.</label>'.((c_ws_plugin__s2member_ip_restrictions::specific_ip_restriction_at_or_above_max(strtolower($user->user_login)) || c_ws_plugin__s2member_ip_restrictions::specific_ip_restriction_breached_security(strtolower($user->user_login))) ? '<br /><em>*WARNING* this User is at (or above) max allowable IP addresses (based on your IP Restrictions).</em>' : '<br /><em>*Note* this User is NOT currently banned by any of your IP Restrictions.</em>').'</td>'."\n";
238
  echo '</tr>'."\n";
239
 
240
  foreach(array_keys(get_defined_vars())as$__v)$__refs[$__v]=&$$__v;
500
 
501
  if /* Delete/reset IP Restrictions? */(!empty($_p["ws_plugin__s2member_profile_ip_restrictions"]))
502
  c_ws_plugin__s2member_ip_restrictions::delete_reset_specific_ip_restrictions(strtolower($user->user_login));
503
+
504
  if /* Reset password & resend email notification? */ (!empty($_p["ws_plugin__s2member_profile_reset_pass_resend"]) && c_ws_plugin__s2member_utils_conds::pro_is_installed())
505
+ c_ws_plugin__s2member_email_configs::reset_pass_resend_new_user_notification($user_id, ((!empty($_p["pass1"])) ? $_p["pass1"] : ""), array("user"), $user->user_email);
506
 
507
  foreach(array_keys(get_defined_vars())as$__v)$__refs[$__v]=&$$__v;
508
  do_action("ws_plugin__s2member_during_users_list_update_cols", get_defined_vars());
includes/templates/cfg-files/s2member-files.php CHANGED
@@ -8,7 +8,7 @@ $ws_plugin__s2member_temp_s_base = (!empty ($base)) ? $base : c_ws_plugin__s2mem
8
  // Do NOT use ``site`` URL. Must use the `home` URL here, because that's what WordPress® uses in its own `mod_rewrite` implementation.
9
  ?>
10
 
11
- Options +FollowSymLinks -MultiViews -Indexes
12
 
13
  <IfModule mod_env.c>
14
  # No GZIP for script-based file downloads.
8
  // Do NOT use ``site`` URL. Must use the `home` URL here, because that's what WordPress® uses in its own `mod_rewrite` implementation.
9
  ?>
10
 
11
+ Options +FollowSymLinks -Indexes
12
 
13
  <IfModule mod_env.c>
14
  # No GZIP for script-based file downloads.
includes/templates/players/jwplayer-v6-rtmp-only.php CHANGED
@@ -32,6 +32,7 @@ if (realpath (__FILE__) === realpath ($_SERVER["SCRIPT_FILENAME"]))
32
  stretching: '%%player_stretching%%',
33
  width: %%player_width%%,
34
  height: %%player_height%%,
 
35
 
36
  autostart: %%player_autostart%%,
37
  fallback: %%player_fallback%%,
32
  stretching: '%%player_stretching%%',
33
  width: %%player_width%%,
34
  height: %%player_height%%,
35
+ aspectratio: %%player_aspectratio%%,
36
 
37
  autostart: %%player_autostart%%,
38
  fallback: %%player_fallback%%,
includes/templates/players/jwplayer-v6-rtmp.php CHANGED
@@ -33,6 +33,7 @@ if (realpath (__FILE__) === realpath ($_SERVER["SCRIPT_FILENAME"]))
33
  stretching: '%%player_stretching%%',
34
  width: %%player_width%%,
35
  height: %%player_height%%,
 
36
 
37
  autostart: %%player_autostart%%,
38
  fallback: %%player_fallback%%,
33
  stretching: '%%player_stretching%%',
34
  width: %%player_width%%,
35
  height: %%player_height%%,
36
+ aspectratio: %%player_aspectratio%%,
37
 
38
  autostart: %%player_autostart%%,
39
  fallback: %%player_fallback%%,
includes/templates/players/jwplayer-v6.php CHANGED
@@ -32,6 +32,7 @@ if (realpath (__FILE__) === realpath ($_SERVER["SCRIPT_FILENAME"]))
32
  stretching: '%%player_stretching%%',
33
  width: %%player_width%%,
34
  height: %%player_height%%,
 
35
 
36
  autostart: %%player_autostart%%,
37
  fallback: %%player_fallback%%,
32
  stretching: '%%player_stretching%%',
33
  width: %%player_width%%,
34
  height: %%player_height%%,
35
+ aspectratio: %%player_aspectratio%%,
36
 
37
  autostart: %%player_autostart%%,
38
  fallback: %%player_fallback%%,
includes/translations/s2member.pot CHANGED
@@ -4,7 +4,7 @@ msgid ""
4
  msgstr ""
5
  "Project-Id-Version: s2Member® Framework 130406\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/s2member\n"
7
- "POT-Creation-Date: 2013-04-07 00:38:06+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
@@ -676,14 +676,11 @@ msgstr ""
676
 
677
  #: s2member/includes/classes/paypal-utilities.inc.php:232
678
  #: s2member/includes/classes/paypal-utilities.inc.php:238
679
- #: s2member/includes/classes/paypal-utilities.inc.php:369
680
- #: s2member/includes/classes/paypal-utilities.inc.php:375
681
  msgctxt "s2member-front"
682
  msgid "Error #%s. Transaction declined. Please use an alternate funding source."
683
  msgstr ""
684
 
685
  #: s2member/includes/classes/paypal-utilities.inc.php:235
686
- #: s2member/includes/classes/paypal-utilities.inc.php:372
687
  msgctxt "s2member-front"
688
  msgid "Error #%s. Transaction declined. Express Checkout was NOT confirmed."
689
  msgstr ""
@@ -711,6 +708,11 @@ msgctxt "s2member-front"
711
  msgid "Error #%1$s. %2$s."
712
  msgstr ""
713
 
 
 
 
 
 
714
  #: s2member/includes/classes/profile-in.inc.php:78
715
  #: s2member/includes/classes/sc-profile-in.inc.php:94
716
  #: s2member-pro/includes/classes/login-widget.inc.php:121
@@ -1678,7 +1680,6 @@ msgstr ""
1678
 
1679
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:7
1680
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:7
1681
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:7
1682
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:7
1683
  msgctxt "s2member-admin"
1684
  msgid "Daily (recurring charge, for ongoing access)"
@@ -1687,7 +1688,7 @@ msgstr ""
1687
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:8
1688
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:7
1689
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:8
1690
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:8
1691
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:8
1692
  msgctxt "s2member-admin"
1693
  msgid "Weekly (recurring charge, for ongoing access)"
@@ -1696,7 +1697,7 @@ msgstr ""
1696
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:9
1697
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:8
1698
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:9
1699
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:9
1700
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:9
1701
  msgctxt "s2member-admin"
1702
  msgid "Bi-Weekly (recurring charge, for ongoing access)"
@@ -1706,7 +1707,7 @@ msgstr ""
1706
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:9
1707
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:7
1708
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:10
1709
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:10
1710
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:10
1711
  msgctxt "s2member-admin"
1712
  msgid "Monthly (recurring charge, for ongoing access)"
@@ -1725,7 +1726,7 @@ msgstr ""
1725
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:11
1726
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:9
1727
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:12
1728
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:11
1729
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:12
1730
  msgctxt "s2member-admin"
1731
  msgid "Quarterly (recurring charge, for ongoing access)"
@@ -1733,7 +1734,7 @@ msgstr ""
1733
 
1734
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:13
1735
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:12
1736
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:12
1737
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:13
1738
  msgctxt "s2member-admin"
1739
  msgid "Semi-Yearly (recurring charge, for ongoing access)"
@@ -1742,7 +1743,7 @@ msgstr ""
1742
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:14
1743
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:13
1744
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:13
1745
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:13
1746
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:14
1747
  msgctxt "s2member-admin"
1748
  msgid "Yearly (recurring charge, for ongoing access)"
@@ -1750,7 +1751,7 @@ msgstr ""
1750
 
1751
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:20
1752
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:19
1753
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:19
1754
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:20
1755
  msgctxt "s2member-admin"
1756
  msgid "One Time (for 1 day access, non-recurring)"
@@ -1758,7 +1759,7 @@ msgstr ""
1758
 
1759
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:21
1760
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:20
1761
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:20
1762
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:21
1763
  msgctxt "s2member-admin"
1764
  msgid "One Time (for 2 day access, non-recurring)"
@@ -1766,7 +1767,7 @@ msgstr ""
1766
 
1767
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:22
1768
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:21
1769
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:21
1770
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:22
1771
  msgctxt "s2member-admin"
1772
  msgid "One Time (for 3 day access, non-recurring)"
@@ -1774,7 +1775,7 @@ msgstr ""
1774
 
1775
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:23
1776
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:22
1777
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:22
1778
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:23
1779
  msgctxt "s2member-admin"
1780
  msgid "One Time (for 4 day access, non-recurring)"
@@ -1782,7 +1783,7 @@ msgstr ""
1782
 
1783
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:24
1784
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:23
1785
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:23
1786
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:24
1787
  msgctxt "s2member-admin"
1788
  msgid "One Time (for 5 day access, non-recurring)"
@@ -1790,7 +1791,7 @@ msgstr ""
1790
 
1791
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:25
1792
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:24
1793
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:24
1794
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:25
1795
  msgctxt "s2member-admin"
1796
  msgid "One Time (for 6 day access, non-recurring)"
@@ -1799,7 +1800,7 @@ msgstr ""
1799
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:27
1800
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:19
1801
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:26
1802
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:26
1803
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:27
1804
  msgctxt "s2member-admin"
1805
  msgid "One Time (for 1 week access, non-recurring)"
@@ -1808,7 +1809,7 @@ msgstr ""
1808
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:28
1809
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:20
1810
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:27
1811
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:27
1812
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:28
1813
  msgctxt "s2member-admin"
1814
  msgid "One Time (for 2 week access, non-recurring)"
@@ -1817,7 +1818,7 @@ msgstr ""
1817
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:29
1818
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:21
1819
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:28
1820
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:28
1821
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:29
1822
  msgctxt "s2member-admin"
1823
  msgid "One Time (for 3 week access, non-recurring)"
@@ -1826,7 +1827,7 @@ msgstr ""
1826
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:31
1827
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:23
1828
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:30
1829
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:30
1830
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:31
1831
  msgctxt "s2member-admin"
1832
  msgid "One Time (for 1 month access, non-recurring)"
@@ -1835,7 +1836,7 @@ msgstr ""
1835
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:32
1836
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:24
1837
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:31
1838
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:31
1839
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:32
1840
  msgctxt "s2member-admin"
1841
  msgid "One Time (for 2 month access, non-recurring)"
@@ -1844,7 +1845,7 @@ msgstr ""
1844
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:33
1845
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:25
1846
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:32
1847
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:32
1848
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:33
1849
  msgctxt "s2member-admin"
1850
  msgid "One Time (for 3 month access, non-recurring)"
@@ -1853,7 +1854,7 @@ msgstr ""
1853
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:34
1854
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:26
1855
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:33
1856
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:33
1857
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:34
1858
  msgctxt "s2member-admin"
1859
  msgid "One Time (for 4 month access, non-recurring)"
@@ -1862,7 +1863,7 @@ msgstr ""
1862
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:35
1863
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:27
1864
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:34
1865
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:34
1866
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:35
1867
  msgctxt "s2member-admin"
1868
  msgid "One Time (for 5 month access, non-recurring)"
@@ -1871,7 +1872,7 @@ msgstr ""
1871
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:36
1872
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:28
1873
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:35
1874
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:35
1875
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:36
1876
  msgctxt "s2member-admin"
1877
  msgid "One Time (for 6 month access, non-recurring)"
@@ -1880,7 +1881,7 @@ msgstr ""
1880
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:38
1881
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:30
1882
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:37
1883
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:37
1884
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:38
1885
  msgctxt "s2member-admin"
1886
  msgid "One Time (for 1 year access, non-recurring)"
@@ -1889,7 +1890,7 @@ msgstr ""
1889
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:44
1890
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:36
1891
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:43
1892
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:43
1893
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:44
1894
  msgctxt "s2member-admin"
1895
  msgid "One Time (for 1 day access, non-recurring, no trial)"
@@ -1899,7 +1900,7 @@ msgstr ""
1899
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:37
1900
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:15
1901
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:44
1902
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:44
1903
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:45
1904
  msgctxt "s2member-admin"
1905
  msgid "One Time (for 2 day access, non-recurring, no trial)"
@@ -1909,7 +1910,7 @@ msgstr ""
1909
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:38
1910
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:16
1911
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:45
1912
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:45
1913
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:46
1914
  msgctxt "s2member-admin"
1915
  msgid "One Time (for 3 day access, non-recurring, no trial)"
@@ -1919,7 +1920,7 @@ msgstr ""
1919
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:39
1920
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:17
1921
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:46
1922
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:46
1923
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:47
1924
  msgctxt "s2member-admin"
1925
  msgid "One Time (for 4 day access, non-recurring, no trial)"
@@ -1929,7 +1930,7 @@ msgstr ""
1929
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:40
1930
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:18
1931
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:47
1932
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:47
1933
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:48
1934
  msgctxt "s2member-admin"
1935
  msgid "One Time (for 5 day access, non-recurring, no trial)"
@@ -1939,7 +1940,7 @@ msgstr ""
1939
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:41
1940
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:19
1941
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:48
1942
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:48
1943
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:49
1944
  msgctxt "s2member-admin"
1945
  msgid "One Time (for 6 day access, non-recurring, no trial)"
@@ -1949,7 +1950,7 @@ msgstr ""
1949
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:43
1950
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:21
1951
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:50
1952
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:50
1953
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:51
1954
  msgctxt "s2member-admin"
1955
  msgid "One Time (for 1 week access, non-recurring, no trial)"
@@ -1959,7 +1960,7 @@ msgstr ""
1959
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:44
1960
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:22
1961
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:51
1962
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:51
1963
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:52
1964
  msgctxt "s2member-admin"
1965
  msgid "One Time (for 2 week access, non-recurring, no trial)"
@@ -1969,7 +1970,7 @@ msgstr ""
1969
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:45
1970
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:23
1971
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:52
1972
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:52
1973
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:53
1974
  msgctxt "s2member-admin"
1975
  msgid "One Time (for 3 week access, non-recurring, no trial)"
@@ -1979,7 +1980,7 @@ msgstr ""
1979
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:47
1980
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:25
1981
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:54
1982
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:54
1983
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:55
1984
  msgctxt "s2member-admin"
1985
  msgid "One Time (for 1 month access, non-recurring, no trial)"
@@ -1989,7 +1990,7 @@ msgstr ""
1989
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:48
1990
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:26
1991
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:55
1992
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:55
1993
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:56
1994
  msgctxt "s2member-admin"
1995
  msgid "One Time (for 2 month access, non-recurring, no trial)"
@@ -1999,7 +2000,7 @@ msgstr ""
1999
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:49
2000
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:27
2001
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:56
2002
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:56
2003
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:57
2004
  msgctxt "s2member-admin"
2005
  msgid "One Time (for 3 month access, non-recurring, no trial)"
@@ -2009,7 +2010,7 @@ msgstr ""
2009
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:50
2010
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:28
2011
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:57
2012
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:57
2013
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:58
2014
  msgctxt "s2member-admin"
2015
  msgid "One Time (for 4 month access, non-recurring, no trial)"
@@ -2019,7 +2020,7 @@ msgstr ""
2019
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:51
2020
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:29
2021
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:58
2022
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:58
2023
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:59
2024
  msgctxt "s2member-admin"
2025
  msgid "One Time (for 5 month access, non-recurring, no trial)"
@@ -2029,7 +2030,7 @@ msgstr ""
2029
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:52
2030
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:30
2031
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:59
2032
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:59
2033
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:60
2034
  msgctxt "s2member-admin"
2035
  msgid "One Time (for 6 month access, non-recurring, no trial)"
@@ -2039,7 +2040,7 @@ msgstr ""
2039
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:54
2040
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:32
2041
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:61
2042
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:61
2043
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:62
2044
  msgctxt "s2member-admin"
2045
  msgid "One Time (for 1 year access, non-recurring, no trial)"
@@ -2048,7 +2049,7 @@ msgstr ""
2048
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:63
2049
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:55
2050
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:62
2051
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:62
2052
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:63
2053
  msgctxt "s2member-admin"
2054
  msgid "One Time (for 2 year access, non-recurring, no trial)"
@@ -2057,7 +2058,7 @@ msgstr ""
2057
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:64
2058
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:56
2059
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:63
2060
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:63
2061
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:64
2062
  msgctxt "s2member-admin"
2063
  msgid "One Time (for 3 year access, non-recurring, no trial)"
@@ -2066,7 +2067,7 @@ msgstr ""
2066
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:65
2067
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:57
2068
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:64
2069
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:64
2070
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:65
2071
  msgctxt "s2member-admin"
2072
  msgid "One Time (for 4 year access, non-recurring, no trial)"
@@ -2075,7 +2076,7 @@ msgstr ""
2075
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:66
2076
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:58
2077
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:65
2078
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:65
2079
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:66
2080
  msgctxt "s2member-admin"
2081
  msgid "One Time (for 5 year access, non-recurring, no trial)"
@@ -2084,7 +2085,7 @@ msgstr ""
2084
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:68
2085
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:60
2086
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:67
2087
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:67
2088
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:68
2089
  msgctxt "s2member-admin"
2090
  msgid "One Time (for lifetime access, non-recurring, no trial)"
@@ -2459,9 +2460,9 @@ msgstr ""
2459
  #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-in.inc.php:127
2460
  #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-in.inc.php:139
2461
  #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-in.inc.php:147
2462
- #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-pf-in.inc.php:124
2463
- #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-pf-in.inc.php:136
2464
- #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-pf-in.inc.php:144
2465
  msgctxt "s2member-front"
2466
  msgid "<strong>Billing terminated.</strong> Your account has been cancelled."
2467
  msgstr ""
@@ -2469,87 +2470,87 @@ msgstr ""
2469
  #: s2member-pro/includes/classes/gateways/authnet/authnet-cancellation-in.inc.php:148
2470
  #: s2member-pro/includes/classes/gateways/authnet/authnet-update-in.inc.php:133
2471
  #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-in.inc.php:155
2472
- #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-pf-in.inc.php:152
2473
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-in.inc.php:150
2474
- #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:147
2475
  msgctxt "s2member-front"
2476
  msgid "You're <strong>NOT</strong> logged in."
2477
  msgstr ""
2478
 
2479
- #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:251
2480
- #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:586
2481
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:290
2482
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:606
2483
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:343
2484
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:679
2485
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:429
2486
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:860
2487
  msgctxt "s2member-front"
2488
  msgid "<strong>Thank you.</strong> Your account has been updated.<br />&mdash; Please <a href=\"%s\" rel=\"nofollow\">log back in</a> now."
2489
  msgstr ""
2490
 
2491
- #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:452
2492
- #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:704
2493
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:448
2494
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:755
2495
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:517
2496
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:833
2497
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:693
2498
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:1014
2499
  msgctxt "s2member-front"
2500
  msgid "<strong>Thank you.</strong> Your account has been approved.<br />&mdash; Please <a href=\"%s\" rel=\"nofollow\">login</a>."
2501
  msgstr ""
2502
 
2503
- #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:461
2504
- #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:485
2505
- #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:713
2506
- #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:734
2507
- #: s2member-pro/includes/classes/gateways/authnet/authnet-registration-in.inc.php:124
2508
- #: s2member-pro/includes/classes/gateways/authnet/authnet-registration-in.inc.php:141
2509
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:457
2510
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:478
2511
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:764
2512
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:785
2513
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:526
2514
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:547
2515
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:842
2516
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:863
2517
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:702
2518
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:723
2519
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:1023
2520
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:1044
2521
- #: s2member-pro/includes/classes/gateways/paypal/paypal-registration-in.inc.php:124
2522
- #: s2member-pro/includes/classes/gateways/paypal/paypal-registration-in.inc.php:141
2523
  msgctxt "s2member-front"
2524
  msgid "<strong>Oops.</strong> A slight problem. Please contact Support for assistance."
2525
  msgstr ""
2526
 
2527
- #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:476
2528
- #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:725
2529
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:469
2530
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:776
2531
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:538
2532
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:854
2533
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:714
2534
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:1035
2535
  msgctxt "s2member-front"
2536
  msgid "<strong>Thank you.</strong> Your account has been approved.<br />&mdash; You'll receive an email momentarily."
2537
  msgstr ""
2538
 
2539
- #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:745
2540
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:796
2541
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:874
2542
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:1055
2543
- #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:138
2544
  msgctxt "s2member-front"
2545
  msgid "<strong>Unknown error.</strong> Please contact Support for assistance."
2546
  msgstr ""
2547
 
2548
- #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:112
2549
- #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:220
2550
- #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:353
2551
- #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:474
2552
- #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:663
2553
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:116
2554
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:224
2555
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:356
@@ -2559,17 +2560,17 @@ msgctxt "s2member-front"
2559
  msgid "Security Code"
2560
  msgstr ""
2561
 
2562
- #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:187
2563
- #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:630
2564
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:192
2565
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:633
2566
  msgctxt "s2member-front"
2567
  msgid "Additional Info"
2568
  msgstr ""
2569
 
2570
- #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:320
2571
- #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:441
2572
- #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:594
2573
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:325
2574
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:445
2575
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:599
@@ -2577,9 +2578,9 @@ msgctxt "s2member-front"
2577
  msgid "Visa®"
2578
  msgstr ""
2579
 
2580
- #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:320
2581
- #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:441
2582
- #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:594
2583
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:325
2584
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:445
2585
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:599
@@ -2587,9 +2588,9 @@ msgctxt "s2member-front"
2587
  msgid "MasterCard®"
2588
  msgstr ""
2589
 
2590
- #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:320
2591
- #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:441
2592
- #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:594
2593
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:325
2594
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:445
2595
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:599
@@ -2597,9 +2598,9 @@ msgctxt "s2member-front"
2597
  msgid "Discover®"
2598
  msgstr ""
2599
 
2600
- #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:320
2601
- #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:441
2602
- #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:594
2603
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:325
2604
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:445
2605
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:599
@@ -2607,14 +2608,14 @@ msgctxt "s2member-front"
2607
  msgid "American Express®"
2608
  msgstr ""
2609
 
2610
- #: s2member-pro/includes/classes/gateways/authnet/authnet-registration-in.inc.php:117
2611
- #: s2member-pro/includes/classes/gateways/paypal/paypal-registration-in.inc.php:117
2612
  msgctxt "s2member-front"
2613
  msgid "<strong>Thank you.</strong> Please <a href=\"%s\" rel=\"nofollow\">login</a>."
2614
  msgstr ""
2615
 
2616
- #: s2member-pro/includes/classes/gateways/authnet/authnet-registration-in.inc.php:134
2617
- #: s2member-pro/includes/classes/gateways/paypal/paypal-registration-in.inc.php:134
2618
  msgctxt "s2member-front"
2619
  msgid "<strong>Thank you.</strong> You'll receive an email momentarily."
2620
  msgstr ""
@@ -3330,13 +3331,13 @@ msgctxt "s2member-front"
3330
  msgid "Unknown form submission type. Please contact Support."
3331
  msgstr ""
3332
 
3333
- #: s2member-pro/includes/classes/gateways/authnet/authnet-sp-checkout-in.inc.php:165
3334
  #: s2member-pro/includes/classes/gateways/paypal/paypal-sp-checkout-in.inc.php:282
3335
  msgctxt "s2member-front"
3336
  msgid "<strong>Thank you.</strong> Your purchase has been approved.<br />&mdash; Please <a href=\"%s\" rel=\"nofollow\">click here</a> to proceed."
3337
  msgstr ""
3338
 
3339
- #: s2member-pro/includes/classes/gateways/authnet/authnet-sp-checkout-in.inc.php:172
3340
  #: s2member-pro/includes/classes/gateways/paypal/paypal-sp-checkout-in.inc.php:289
3341
  msgctxt "s2member-front"
3342
  msgid "<strong>Oops.</strong> Unable to generate Access Link. Please contact Support for assistance."
@@ -3351,7 +3352,7 @@ msgstr ""
3351
 
3352
  #: s2member-pro/includes/classes/gateways/authnet/authnet-update-in.inc.php:119
3353
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-in.inc.php:128
3354
- #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:132
3355
  msgctxt "s2member-front"
3356
  msgid "<strong>Unable to update.</strong> You have NO recurring fees. Or, your billing profile is no longer active. Please contact Support if you need assistance."
3357
  msgstr ""
@@ -3364,14 +3365,14 @@ msgstr ""
3364
 
3365
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:666
3366
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:809
3367
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:271
3368
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:414
3369
  msgctxt "s2member-front percentage-symbol"
3370
  msgid "%"
3371
  msgstr ""
3372
 
3373
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:808
3374
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:413
3375
  msgctxt "s2member-front"
3376
  msgid " + tax"
3377
  msgstr ""
@@ -3382,12 +3383,12 @@ msgstr ""
3382
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:940
3383
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:1000
3384
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:1015
3385
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:458
3386
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:510
3387
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:523
3388
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:545
3389
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:605
3390
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:620
3391
  msgctxt "s2member-front"
3392
  msgid "COUPON %s off. (Now: %s)"
3393
  msgstr ""
@@ -3398,12 +3399,12 @@ msgstr ""
3398
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:941
3399
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:1001
3400
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:1016
3401
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:459
3402
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:511
3403
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:524
3404
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:546
3405
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:606
3406
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:621
3407
  msgctxt "s2member-front"
3408
  msgid "<div>Coupon: <strong>%s off</strong>. (Now: <strong>%s</strong>)</div>"
3409
  msgstr ""
@@ -3414,12 +3415,12 @@ msgstr ""
3414
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:955
3415
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:970
3416
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:985
3417
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:471
3418
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:484
3419
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:497
3420
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:560
3421
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:575
3422
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:590
3423
  msgctxt "s2member-front"
3424
  msgid "COUPON %s off. (Now: %s, then %s)"
3425
  msgstr ""
@@ -3430,38 +3431,38 @@ msgstr ""
3430
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:956
3431
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:971
3432
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:986
3433
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:472
3434
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:485
3435
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:498
3436
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:561
3437
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:576
3438
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:591
3439
  msgctxt "s2member-front"
3440
  msgid "<div>Coupon: <strong>%s off</strong>. (Now: <strong>%s, then %s</strong>)</div>"
3441
  msgstr ""
3442
 
3443
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:923
3444
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:1020
3445
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:528
3446
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:625
3447
  msgctxt "s2member-front"
3448
  msgid "<div>Sorry, your Coupon is not applicable.</div>"
3449
  msgstr ""
3450
 
3451
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:1024
3452
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:629
3453
  msgctxt "s2member-front"
3454
  msgid "<div>Coupon: <strong>%s0.00 off</strong>.</div>"
3455
  msgstr ""
3456
 
3457
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:1028
3458
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:633
3459
  msgctxt "s2member-front"
3460
  msgid "<div>Sorry, your Coupon cannot be applied to this particular purchase.</div>"
3461
  msgstr ""
3462
 
3463
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:1032
3464
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:637
3465
  msgctxt "s2member-front"
3466
  msgid "<div>Sorry, your Coupon <strong>expired</strong>: <em>%s</em>.</div>"
3467
  msgstr ""
@@ -3470,15 +3471,15 @@ msgstr ""
3470
  #. is original description.
3471
 
3472
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:1038
3473
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:643
3474
  msgctxt "s2member-front"
3475
  msgid "%1$s ~ ORIGINALLY: %2$s"
3476
  msgstr ""
3477
 
3478
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:1067
3479
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:1070
3480
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:672
3481
- #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:675
3482
  msgctxt "s2member-front"
3483
  msgid "<div>Sorry, your Coupon is N/A, invalid or expired.</div>"
3484
  msgstr ""
@@ -3499,7 +3500,7 @@ msgid ""
3499
  "This is most likely related to an invalid ClickBank® configuration. If you are the site owner, please check: s2Member -› ClickBank® Options."
3500
  msgstr ""
3501
 
3502
- #: s2member-pro/includes/classes/gateways/clickbank/clickbank-utilities.inc.php:167
3503
  msgctxt "s2member-front"
3504
  msgid "<strong>Reminder:</strong> Purchases at this site will appear on your credit card or bank statement as: <code>ClickBank®</code> or <code>CLKBANK*COM</code>."
3505
  msgstr ""
@@ -3584,7 +3585,6 @@ msgid "Cancel at any time to avoid charges."
3584
  msgstr ""
3585
 
3586
  #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-in.inc.php:123
3587
- #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-pf-in.inc.php:120
3588
  #: s2member-pro/includes/classes/gateways/paypal/paypal-responses.inc.php:247
3589
  #: s2member-pro/includes/classes/gateways/paypal/paypal-responses.inc.php:263
3590
  msgctxt "s2member-front"
@@ -3592,18 +3592,16 @@ msgid "<strong>Unable to cancel at this time.</strong> Your account is pending o
3592
  msgstr ""
3593
 
3594
  #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-in.inc.php:135
3595
- #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-pf-in.inc.php:132
3596
  #: s2member-pro/includes/classes/gateways/paypal/paypal-responses.inc.php:257
3597
  msgctxt "s2member-front"
3598
  msgid "Please <a href=\"%s\" rel=\"nofollow\">log in at PayPal®</a> to cancel your Subscription."
3599
  msgstr ""
3600
 
3601
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:302
3602
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:618
3603
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:355
3604
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:691
3605
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:446
3606
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:872
3607
  msgctxt "s2member-front"
3608
  msgid "<strong>Sorry.</strong> Your account is pending other changes. Please try again in 15 minutes."
3609
  msgstr ""
@@ -3661,7 +3659,7 @@ msgstr ""
3661
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-in.inc.php:132
3662
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-in.inc.php:136
3663
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:76
3664
- #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:136
3665
  msgctxt "s2member-front"
3666
  msgid "Please <a href=\"%s\" rel=\"nofollow\">log in at PayPal®</a> to update your billing information."
3667
  msgstr ""
@@ -3669,7 +3667,6 @@ msgstr ""
3669
  #: s2member-pro/includes/classes/gateways/paypal/paypal-responses.inc.php:286
3670
  #: s2member-pro/includes/classes/gateways/paypal/paypal-responses.inc.php:305
3671
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-in.inc.php:124
3672
- #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:128
3673
  msgctxt "s2member-front"
3674
  msgid "<strong>Unable to update at this time.</strong> Your account is pending other changes. Please try again in 15 minutes."
3675
  msgstr ""
@@ -3723,7 +3720,7 @@ msgstr ""
3723
 
3724
  #: s2member-pro/includes/classes/gateways/paypal/paypal-responses.inc.php:513
3725
  msgctxt "s2member-admin"
3726
- msgid "Invalid Payflow® form configuration. Invalid \"rt, rp, rr\" attributes. Payflow® supports a specific set of recurring intervals. Pro Forms can be configured to charge: daily, weekly, bi-weekly, monthly, quarterly, semi-yearly or yearly. Any other combination results in this error. This is a Payflow® limitation."
3727
  msgstr ""
3728
 
3729
  #: s2member-pro/includes/classes/gateways/paypal/paypal-responses.inc.php:516
@@ -3741,7 +3738,7 @@ msgctxt "s2member-admin"
3741
  msgid "Invalid form configuration. Invalid \"rr, rra\" attributes. When \"rr\" (Regular Recurring) is 0 or 1, \"rra\" (Recurring Retry Attempts) must be >= 0."
3742
  msgstr ""
3743
 
3744
- #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:142
3745
  msgctxt "s2member-front"
3746
  msgid "<strong>No Subscr. ID.</strong> Please contact Support for assistance."
3747
  msgstr ""
@@ -4498,14 +4495,14 @@ msgid "Google® (Subscriptions)"
4498
  msgstr ""
4499
 
4500
  #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:6
4501
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:18
4502
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:6
4503
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:19
4504
  msgctxt "s2member-admin"
4505
  msgid "PayPal® Pro (Subscriptions)"
4506
  msgstr ""
4507
 
4508
- #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:42
4509
  #: s2member-pro/includes/templates/options/paypal-membership-ccap-terms.php:6
4510
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:43
4511
  msgctxt "s2member-admin"
4
  msgstr ""
5
  "Project-Id-Version: s2Member® Framework 130406\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/s2member\n"
7
+ "POT-Creation-Date: 2013-05-11 07:15:51+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
676
 
677
  #: s2member/includes/classes/paypal-utilities.inc.php:232
678
  #: s2member/includes/classes/paypal-utilities.inc.php:238
 
 
679
  msgctxt "s2member-front"
680
  msgid "Error #%s. Transaction declined. Please use an alternate funding source."
681
  msgstr ""
682
 
683
  #: s2member/includes/classes/paypal-utilities.inc.php:235
 
684
  msgctxt "s2member-front"
685
  msgid "Error #%s. Transaction declined. Express Checkout was NOT confirmed."
686
  msgstr ""
708
  msgid "Error #%1$s. %2$s."
709
  msgstr ""
710
 
711
+ #: s2member/includes/classes/paypal-utilities.inc.php:369
712
+ msgctxt "s2member-front"
713
+ msgid " Please contact PayPal Merchant Technical Support (www.paypal.com/mts) and request `Recurring Billing` service, and also ask to have `Reference Transactions` enabled for Recurring Billing via Express Checkout."
714
+ msgstr ""
715
+
716
  #: s2member/includes/classes/profile-in.inc.php:78
717
  #: s2member/includes/classes/sc-profile-in.inc.php:94
718
  #: s2member-pro/includes/classes/login-widget.inc.php:121
1680
 
1681
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:7
1682
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:7
 
1683
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:7
1684
  msgctxt "s2member-admin"
1685
  msgid "Daily (recurring charge, for ongoing access)"
1688
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:8
1689
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:7
1690
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:8
1691
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:7
1692
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:8
1693
  msgctxt "s2member-admin"
1694
  msgid "Weekly (recurring charge, for ongoing access)"
1697
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:9
1698
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:8
1699
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:9
1700
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:8
1701
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:9
1702
  msgctxt "s2member-admin"
1703
  msgid "Bi-Weekly (recurring charge, for ongoing access)"
1707
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:9
1708
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:7
1709
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:10
1710
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:9
1711
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:10
1712
  msgctxt "s2member-admin"
1713
  msgid "Monthly (recurring charge, for ongoing access)"
1726
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:11
1727
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:9
1728
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:12
1729
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:10
1730
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:12
1731
  msgctxt "s2member-admin"
1732
  msgid "Quarterly (recurring charge, for ongoing access)"
1734
 
1735
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:13
1736
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:12
1737
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:11
1738
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:13
1739
  msgctxt "s2member-admin"
1740
  msgid "Semi-Yearly (recurring charge, for ongoing access)"
1743
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:14
1744
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:13
1745
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:13
1746
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:12
1747
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:14
1748
  msgctxt "s2member-admin"
1749
  msgid "Yearly (recurring charge, for ongoing access)"
1751
 
1752
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:20
1753
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:19
1754
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:18
1755
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:20
1756
  msgctxt "s2member-admin"
1757
  msgid "One Time (for 1 day access, non-recurring)"
1759
 
1760
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:21
1761
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:20
1762
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:19
1763
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:21
1764
  msgctxt "s2member-admin"
1765
  msgid "One Time (for 2 day access, non-recurring)"
1767
 
1768
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:22
1769
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:21
1770
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:20
1771
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:22
1772
  msgctxt "s2member-admin"
1773
  msgid "One Time (for 3 day access, non-recurring)"
1775
 
1776
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:23
1777
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:22
1778
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:21
1779
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:23
1780
  msgctxt "s2member-admin"
1781
  msgid "One Time (for 4 day access, non-recurring)"
1783
 
1784
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:24
1785
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:23
1786
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:22
1787
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:24
1788
  msgctxt "s2member-admin"
1789
  msgid "One Time (for 5 day access, non-recurring)"
1791
 
1792
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:25
1793
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:24
1794
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:23
1795
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:25
1796
  msgctxt "s2member-admin"
1797
  msgid "One Time (for 6 day access, non-recurring)"
1800
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:27
1801
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:19
1802
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:26
1803
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:25
1804
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:27
1805
  msgctxt "s2member-admin"
1806
  msgid "One Time (for 1 week access, non-recurring)"
1809
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:28
1810
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:20
1811
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:27
1812
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:26
1813
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:28
1814
  msgctxt "s2member-admin"
1815
  msgid "One Time (for 2 week access, non-recurring)"
1818
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:29
1819
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:21
1820
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:28
1821
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:27
1822
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:29
1823
  msgctxt "s2member-admin"
1824
  msgid "One Time (for 3 week access, non-recurring)"
1827
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:31
1828
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:23
1829
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:30
1830
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:29
1831
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:31
1832
  msgctxt "s2member-admin"
1833
  msgid "One Time (for 1 month access, non-recurring)"
1836
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:32
1837
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:24
1838
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:31
1839
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:30
1840
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:32
1841
  msgctxt "s2member-admin"
1842
  msgid "One Time (for 2 month access, non-recurring)"
1845
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:33
1846
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:25
1847
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:32
1848
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:31
1849
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:33
1850
  msgctxt "s2member-admin"
1851
  msgid "One Time (for 3 month access, non-recurring)"
1854
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:34
1855
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:26
1856
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:33
1857
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:32
1858
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:34
1859
  msgctxt "s2member-admin"
1860
  msgid "One Time (for 4 month access, non-recurring)"
1863
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:35
1864
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:27
1865
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:34
1866
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:33
1867
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:35
1868
  msgctxt "s2member-admin"
1869
  msgid "One Time (for 5 month access, non-recurring)"
1872
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:36
1873
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:28
1874
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:35
1875
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:34
1876
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:36
1877
  msgctxt "s2member-admin"
1878
  msgid "One Time (for 6 month access, non-recurring)"
1881
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:38
1882
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:30
1883
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:37
1884
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:36
1885
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:38
1886
  msgctxt "s2member-admin"
1887
  msgid "One Time (for 1 year access, non-recurring)"
1890
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:44
1891
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:36
1892
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:43
1893
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:42
1894
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:44
1895
  msgctxt "s2member-admin"
1896
  msgid "One Time (for 1 day access, non-recurring, no trial)"
1900
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:37
1901
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:15
1902
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:44
1903
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:43
1904
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:45
1905
  msgctxt "s2member-admin"
1906
  msgid "One Time (for 2 day access, non-recurring, no trial)"
1910
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:38
1911
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:16
1912
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:45
1913
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:44
1914
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:46
1915
  msgctxt "s2member-admin"
1916
  msgid "One Time (for 3 day access, non-recurring, no trial)"
1920
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:39
1921
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:17
1922
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:46
1923
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:45
1924
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:47
1925
  msgctxt "s2member-admin"
1926
  msgid "One Time (for 4 day access, non-recurring, no trial)"
1930
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:40
1931
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:18
1932
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:47
1933
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:46
1934
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:48
1935
  msgctxt "s2member-admin"
1936
  msgid "One Time (for 5 day access, non-recurring, no trial)"
1940
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:41
1941
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:19
1942
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:48
1943
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:47
1944
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:49
1945
  msgctxt "s2member-admin"
1946
  msgid "One Time (for 6 day access, non-recurring, no trial)"
1950
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:43
1951
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:21
1952
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:50
1953
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:49
1954
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:51
1955
  msgctxt "s2member-admin"
1956
  msgid "One Time (for 1 week access, non-recurring, no trial)"
1960
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:44
1961
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:22
1962
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:51
1963
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:50
1964
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:52
1965
  msgctxt "s2member-admin"
1966
  msgid "One Time (for 2 week access, non-recurring, no trial)"
1970
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:45
1971
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:23
1972
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:52
1973
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:51
1974
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:53
1975
  msgctxt "s2member-admin"
1976
  msgid "One Time (for 3 week access, non-recurring, no trial)"
1980
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:47
1981
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:25
1982
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:54
1983
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:53
1984
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:55
1985
  msgctxt "s2member-admin"
1986
  msgid "One Time (for 1 month access, non-recurring, no trial)"
1990
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:48
1991
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:26
1992
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:55
1993
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:54
1994
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:56
1995
  msgctxt "s2member-admin"
1996
  msgid "One Time (for 2 month access, non-recurring, no trial)"
2000
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:49
2001
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:27
2002
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:56
2003
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:55
2004
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:57
2005
  msgctxt "s2member-admin"
2006
  msgid "One Time (for 3 month access, non-recurring, no trial)"
2010
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:50
2011
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:28
2012
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:57
2013
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:56
2014
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:58
2015
  msgctxt "s2member-admin"
2016
  msgid "One Time (for 4 month access, non-recurring, no trial)"
2020
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:51
2021
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:29
2022
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:58
2023
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:57
2024
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:59
2025
  msgctxt "s2member-admin"
2026
  msgid "One Time (for 5 month access, non-recurring, no trial)"
2030
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:52
2031
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:30
2032
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:59
2033
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:58
2034
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:60
2035
  msgctxt "s2member-admin"
2036
  msgid "One Time (for 6 month access, non-recurring, no trial)"
2040
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:54
2041
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:32
2042
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:61
2043
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:60
2044
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:62
2045
  msgctxt "s2member-admin"
2046
  msgid "One Time (for 1 year access, non-recurring, no trial)"
2049
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:63
2050
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:55
2051
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:62
2052
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:61
2053
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:63
2054
  msgctxt "s2member-admin"
2055
  msgid "One Time (for 2 year access, non-recurring, no trial)"
2058
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:64
2059
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:56
2060
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:63
2061
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:62
2062
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:64
2063
  msgctxt "s2member-admin"
2064
  msgid "One Time (for 3 year access, non-recurring, no trial)"
2067
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:65
2068
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:57
2069
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:64
2070
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:63
2071
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:65
2072
  msgctxt "s2member-admin"
2073
  msgid "One Time (for 4 year access, non-recurring, no trial)"
2076
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:66
2077
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:58
2078
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:65
2079
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:64
2080
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:66
2081
  msgctxt "s2member-admin"
2082
  msgid "One Time (for 5 year access, non-recurring, no trial)"
2085
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:68
2086
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:60
2087
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:67
2088
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:66
2089
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:68
2090
  msgctxt "s2member-admin"
2091
  msgid "One Time (for lifetime access, non-recurring, no trial)"
2460
  #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-in.inc.php:127
2461
  #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-in.inc.php:139
2462
  #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-in.inc.php:147
2463
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-pf-in.inc.php:120
2464
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-pf-in.inc.php:132
2465
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-pf-in.inc.php:140
2466
  msgctxt "s2member-front"
2467
  msgid "<strong>Billing terminated.</strong> Your account has been cancelled."
2468
  msgstr ""
2470
  #: s2member-pro/includes/classes/gateways/authnet/authnet-cancellation-in.inc.php:148
2471
  #: s2member-pro/includes/classes/gateways/authnet/authnet-update-in.inc.php:133
2472
  #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-in.inc.php:155
2473
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-pf-in.inc.php:148
2474
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-in.inc.php:150
2475
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:143
2476
  msgctxt "s2member-front"
2477
  msgid "You're <strong>NOT</strong> logged in."
2478
  msgstr ""
2479
 
2480
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:255
2481
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:594
2482
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:291
2483
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:607
2484
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:354
2485
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:689
2486
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:430
2487
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:861
2488
  msgctxt "s2member-front"
2489
  msgid "<strong>Thank you.</strong> Your account has been updated.<br />&mdash; Please <a href=\"%s\" rel=\"nofollow\">log back in</a> now."
2490
  msgstr ""
2491
 
2492
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:459
2493
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:713
2494
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:449
2495
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:756
2496
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:529
2497
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:841
2498
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:694
2499
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:1015
2500
  msgctxt "s2member-front"
2501
  msgid "<strong>Thank you.</strong> Your account has been approved.<br />&mdash; Please <a href=\"%s\" rel=\"nofollow\">login</a>."
2502
  msgstr ""
2503
 
2504
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:468
2505
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:492
2506
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:722
2507
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:743
2508
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-registration-in.inc.php:125
2509
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-registration-in.inc.php:142
2510
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:458
2511
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:479
2512
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:765
2513
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:786
2514
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:538
2515
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:559
2516
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:850
2517
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:871
2518
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:703
2519
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:724
2520
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:1024
2521
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:1045
2522
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-registration-in.inc.php:125
2523
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-registration-in.inc.php:142
2524
  msgctxt "s2member-front"
2525
  msgid "<strong>Oops.</strong> A slight problem. Please contact Support for assistance."
2526
  msgstr ""
2527
 
2528
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:483
2529
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:734
2530
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:470
2531
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:777
2532
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:550
2533
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:862
2534
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:715
2535
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:1036
2536
  msgctxt "s2member-front"
2537
  msgid "<strong>Thank you.</strong> Your account has been approved.<br />&mdash; You'll receive an email momentarily."
2538
  msgstr ""
2539
 
2540
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:754
2541
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:797
2542
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:882
2543
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:1056
2544
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:134
2545
  msgctxt "s2member-front"
2546
  msgid "<strong>Unknown error.</strong> Please contact Support for assistance."
2547
  msgstr ""
2548
 
2549
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:111
2550
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:219
2551
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:352
2552
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:473
2553
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:662
2554
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:116
2555
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:224
2556
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:356
2560
  msgid "Security Code"
2561
  msgstr ""
2562
 
2563
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:186
2564
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:629
2565
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:192
2566
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:633
2567
  msgctxt "s2member-front"
2568
  msgid "Additional Info"
2569
  msgstr ""
2570
 
2571
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:319
2572
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:440
2573
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:593
2574
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:325
2575
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:445
2576
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:599
2578
  msgid "Visa®"
2579
  msgstr ""
2580
 
2581
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:319
2582
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:440
2583
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:593
2584
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:325
2585
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:445
2586
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:599
2588
  msgid "MasterCard®"
2589
  msgstr ""
2590
 
2591
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:319
2592
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:440
2593
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:593
2594
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:325
2595
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:445
2596
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:599
2598
  msgid "Discover®"
2599
  msgstr ""
2600
 
2601
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:319
2602
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:440
2603
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-form-in.inc.php:593
2604
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:325
2605
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:445
2606
  #: s2member-pro/includes/classes/gateways/paypal/paypal-form-in.inc.php:599
2608
  msgid "American Express®"
2609
  msgstr ""
2610
 
2611
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-registration-in.inc.php:118
2612
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-registration-in.inc.php:118
2613
  msgctxt "s2member-front"
2614
  msgid "<strong>Thank you.</strong> Please <a href=\"%s\" rel=\"nofollow\">login</a>."
2615
  msgstr ""
2616
 
2617
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-registration-in.inc.php:135
2618
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-registration-in.inc.php:135
2619
  msgctxt "s2member-front"
2620
  msgid "<strong>Thank you.</strong> You'll receive an email momentarily."
2621
  msgstr ""
3331
  msgid "Unknown form submission type. Please contact Support."
3332
  msgstr ""
3333
 
3334
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-sp-checkout-in.inc.php:166
3335
  #: s2member-pro/includes/classes/gateways/paypal/paypal-sp-checkout-in.inc.php:282
3336
  msgctxt "s2member-front"
3337
  msgid "<strong>Thank you.</strong> Your purchase has been approved.<br />&mdash; Please <a href=\"%s\" rel=\"nofollow\">click here</a> to proceed."
3338
  msgstr ""
3339
 
3340
+ #: s2member-pro/includes/classes/gateways/authnet/authnet-sp-checkout-in.inc.php:173
3341
  #: s2member-pro/includes/classes/gateways/paypal/paypal-sp-checkout-in.inc.php:289
3342
  msgctxt "s2member-front"
3343
  msgid "<strong>Oops.</strong> Unable to generate Access Link. Please contact Support for assistance."
3352
 
3353
  #: s2member-pro/includes/classes/gateways/authnet/authnet-update-in.inc.php:119
3354
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-in.inc.php:128
3355
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:128
3356
  msgctxt "s2member-front"
3357
  msgid "<strong>Unable to update.</strong> You have NO recurring fees. Or, your billing profile is no longer active. Please contact Support if you need assistance."
3358
  msgstr ""
3365
 
3366
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:666
3367
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:809
3368
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:295
3369
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:438
3370
  msgctxt "s2member-front percentage-symbol"
3371
  msgid "%"
3372
  msgstr ""
3373
 
3374
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:808
3375
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:437
3376
  msgctxt "s2member-front"
3377
  msgid " + tax"
3378
  msgstr ""
3383
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:940
3384
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:1000
3385
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:1015
3386
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:482
3387
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:534
3388
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:547
3389
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:569
3390
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:629
3391
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:644
3392
  msgctxt "s2member-front"
3393
  msgid "COUPON %s off. (Now: %s)"
3394
  msgstr ""
3399
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:941
3400
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:1001
3401
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:1016
3402
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:483
3403
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:535
3404
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:548
3405
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:570
3406
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:630
3407
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:645
3408
  msgctxt "s2member-front"
3409
  msgid "<div>Coupon: <strong>%s off</strong>. (Now: <strong>%s</strong>)</div>"
3410
  msgstr ""
3415
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:955
3416
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:970
3417
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:985
3418
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:495
3419
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:508
3420
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:521
3421
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:584
3422
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:599
3423
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:614
3424
  msgctxt "s2member-front"
3425
  msgid "COUPON %s off. (Now: %s, then %s)"
3426
  msgstr ""
3431
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:956
3432
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:971
3433
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:986
3434
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:496
3435
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:509
3436
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:522
3437
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:585
3438
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:600
3439
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:615
3440
  msgctxt "s2member-front"
3441
  msgid "<div>Coupon: <strong>%s off</strong>. (Now: <strong>%s, then %s</strong>)</div>"
3442
  msgstr ""
3443
 
3444
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:923
3445
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:1020
3446
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:552
3447
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:649
3448
  msgctxt "s2member-front"
3449
  msgid "<div>Sorry, your Coupon is not applicable.</div>"
3450
  msgstr ""
3451
 
3452
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:1024
3453
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:653
3454
  msgctxt "s2member-front"
3455
  msgid "<div>Coupon: <strong>%s0.00 off</strong>.</div>"
3456
  msgstr ""
3457
 
3458
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:1028
3459
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:657
3460
  msgctxt "s2member-front"
3461
  msgid "<div>Sorry, your Coupon cannot be applied to this particular purchase.</div>"
3462
  msgstr ""
3463
 
3464
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:1032
3465
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:661
3466
  msgctxt "s2member-front"
3467
  msgid "<div>Sorry, your Coupon <strong>expired</strong>: <em>%s</em>.</div>"
3468
  msgstr ""
3471
  #. is original description.
3472
 
3473
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:1038
3474
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:667
3475
  msgctxt "s2member-front"
3476
  msgid "%1$s ~ ORIGINALLY: %2$s"
3477
  msgstr ""
3478
 
3479
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:1067
3480
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:1070
3481
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:696
3482
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-utilities.inc.php:699
3483
  msgctxt "s2member-front"
3484
  msgid "<div>Sorry, your Coupon is N/A, invalid or expired.</div>"
3485
  msgstr ""
3500
  "This is most likely related to an invalid ClickBank® configuration. If you are the site owner, please check: s2Member -› ClickBank® Options."
3501
  msgstr ""
3502
 
3503
+ #: s2member-pro/includes/classes/gateways/clickbank/clickbank-utilities.inc.php:168
3504
  msgctxt "s2member-front"
3505
  msgid "<strong>Reminder:</strong> Purchases at this site will appear on your credit card or bank statement as: <code>ClickBank®</code> or <code>CLKBANK*COM</code>."
3506
  msgstr ""
3585
  msgstr ""
3586
 
3587
  #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-in.inc.php:123
 
3588
  #: s2member-pro/includes/classes/gateways/paypal/paypal-responses.inc.php:247
3589
  #: s2member-pro/includes/classes/gateways/paypal/paypal-responses.inc.php:263
3590
  msgctxt "s2member-front"
3592
  msgstr ""
3593
 
3594
  #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-in.inc.php:135
3595
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-pf-in.inc.php:128
3596
  #: s2member-pro/includes/classes/gateways/paypal/paypal-responses.inc.php:257
3597
  msgctxt "s2member-front"
3598
  msgid "Please <a href=\"%s\" rel=\"nofollow\">log in at PayPal®</a> to cancel your Subscription."
3599
  msgstr ""
3600
 
3601
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:303
3602
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:619
3603
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:447
3604
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:873
 
 
3605
  msgctxt "s2member-front"
3606
  msgid "<strong>Sorry.</strong> Your account is pending other changes. Please try again in 15 minutes."
3607
  msgstr ""
3659
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-in.inc.php:132
3660
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-in.inc.php:136
3661
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:76
3662
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:132
3663
  msgctxt "s2member-front"
3664
  msgid "Please <a href=\"%s\" rel=\"nofollow\">log in at PayPal®</a> to update your billing information."
3665
  msgstr ""
3667
  #: s2member-pro/includes/classes/gateways/paypal/paypal-responses.inc.php:286
3668
  #: s2member-pro/includes/classes/gateways/paypal/paypal-responses.inc.php:305
3669
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-in.inc.php:124
 
3670
  msgctxt "s2member-front"
3671
  msgid "<strong>Unable to update at this time.</strong> Your account is pending other changes. Please try again in 15 minutes."
3672
  msgstr ""
3720
 
3721
  #: s2member-pro/includes/classes/gateways/paypal/paypal-responses.inc.php:513
3722
  msgctxt "s2member-admin"
3723
+ msgid "Invalid Payflow® form configuration. Invalid \"rt, rp, rr\" attributes. Payflow® supports a specific set of recurring intervals. Pro Forms can be configured to charge: weekly, bi-weekly, monthly, quarterly, semi-yearly or yearly. Any other combination results in this error. This is a Payflow® limitation."
3724
  msgstr ""
3725
 
3726
  #: s2member-pro/includes/classes/gateways/paypal/paypal-responses.inc.php:516
3738
  msgid "Invalid form configuration. Invalid \"rr, rra\" attributes. When \"rr\" (Regular Recurring) is 0 or 1, \"rra\" (Recurring Retry Attempts) must be >= 0."
3739
  msgstr ""
3740
 
3741
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:138
3742
  msgctxt "s2member-front"
3743
  msgid "<strong>No Subscr. ID.</strong> Please contact Support for assistance."
3744
  msgstr ""
4495
  msgstr ""
4496
 
4497
  #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:6
4498
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:17
4499
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:6
4500
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:19
4501
  msgctxt "s2member-admin"
4502
  msgid "PayPal® Pro (Subscriptions)"
4503
  msgstr ""
4504
 
4505
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:41
4506
  #: s2member-pro/includes/templates/options/paypal-membership-ccap-terms.php:6
4507
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:43
4508
  msgctxt "s2member-admin"
readme.txt CHANGED
@@ -1,7 +1,7 @@
1
  === s2Member® Framework (Member Roles, Capabilities, Membership, PayPal Members) ===
2
 
3
- Version: 130406
4
- Stable tag: 130406
5
 
6
  SSL Compatible: yes
7
  bbPress® Compatible: yes
@@ -92,58 +92,87 @@ Please see [this FAQ entry](http://www.s2member.com/faqs/#s2-faqs-translations)
92
 
93
  == Upgrade Notice ==
94
 
95
- = v130406 =
96
  (Maintenance Release) Upgrade immediately.
97
 
98
  == Changelog ==
99
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
100
  = v130406 =
101
- * (s2Member/s2Member Pro) **Multisite Networks (WebSharks/Private#145)** Bug fix on Multisite Networks related to User deletions and subsequent logins on child blogs. For further details, please see [this thread](http://www.s2member.com/forums/topic/deleted-users-can-log-in/#post-46738).
102
- * (s2Member Pro) **New Feature (WebSharks/Private#59)** It is now possible to Edit a User in the Dashboard and check a box to have the User's password reset, and an email message sent automatically to the User/Member with a copy of the Username/Password. This requires s2Member® Pro.
103
- * (s2Member Pro) **API Functions (WebSharks/Private#158)** New PayPal® Pro API Functions (`s2member_pro_paypal_rbp_for_user`, `s2member_pro_paypal_rbp_times_for_user`). These are for developers. For further details, please see [this article](http://www.s2member.com/codex/stable/s2member/api_functions/package-summary/) in the s2Member® Codex.
104
- * (s2Member Pro) **API Functions (WebSharks/Private#158)** New PayPal® Pro (PayFlow® Edition) API Functions (`s2member_pro_payflow_rbp_for_user`, `s2member_pro_payflow_rbp_times_for_user`). These are for developers. For further details, please see [this article](http://www.s2member.com/codex/stable/s2member/api_functions/package-summary/) in the s2Member® Codex.
105
 
106
  = v130404 =
107
- * (s2Member Pro) **Compatibility (WebSharks/Private#108)** Updating s2Member® Pro's integration with Authorize.Net to allow charges up to `$99,999.00` (formerly `$10,000.00`).
108
- * (s2Member/s2Member Pro) **User Searches (WebSharks/Private#91)** Updating `pre_user_query` filter to include `first_name/last_name` (instead of only the `display_name`).
109
- * (s2Member/s2Member Pro) **bbPress Integration (WebSharks/Private#88)** Updating bbPress Role/Cap filter to exclude itself during bbPress deactivation. This was causing a loss of the `read` Capability inadvertently.
110
- * (s2Member/s2Member Pro) **PayPal® 20% Rule (WebSharks/Private#100)** Removing mention of the PayPal® 20% rule/limitation in the inline documentation. We confirmed with PayPal this ridiculous rule no longer applies to PayPal Standard Buttons.
111
- * (s2Member/s2Member Pro) **File Downloads (WebSharks/Private#73)** Fixed bug related to `%2F` in file download URLs leading to a `ccap` directory.
112
- * (s2Member/s2Member Pro) **Debug Logging (WebSharks/Private#69)** Logging now disabled by default. New log recommendation/warning notices updated throughout all menu pages for s2Member®.
113
- * (s2Member/s2Member Pro) **Debug Logging (WebSharks/Private#69)** Logging must now be disabled (and the logs directory must be non-existent or empty) for an s2Member® Security Badge to go green. There is only one way to bypass this security check. See KB Article: [s2Member® Security Badges](http://www.s2member.com/kb/security-badges/). Notices are displayed on activation of this version to warn site owners about this change.
114
- * (s2Member/s2Member Pro) **JW Player (WebSharks/Private#121)** Adding CSS `class` attribute to all JW Player template files used in conjunction with the `s2Stream` shortcode. New CSS class name: `s2member-jwplayer-v6`.
115
- * (s2Member/s2Member Pro) **JW Player (WebSharks/Private#121)** Adding support for percentage-based width/height values in `player_width="" player_height=""` attributes of an s2Stream shortcode that generates a JW Player. Example: `player_width="100%"`.
116
 
117
  = v130221 =
118
- * (s2Member/s2Member Pro) **Bug Fix (Issue #41)** Custom Registration/Profile Fields with an ID that ended with `-[0-9]+` or `_[0-9]+` was failing JavaScript validation due to a parsing issue. Fixed in this release.
119
- * (s2Member/s2Member Pro) **Bug Fix (Issue #43)** A bug first introduced in the last release of s2Member® v130220 was preventing Administrative New User Notifications from being sent by s2Member®. Fixed in this release.
120
 
121
  = v130220 =
122
- * (s2Member Pro) **Feature Enhancement/User Exportation (Issue #33)** Adding support for UTF-8 BOM in CSV User export files. Now a configurable option during User/Member Exportation.
123
- * (s2Member/s2Member Pro) **Feature Enhancement/Emails (Issue #21)** Adding additional Replacement Codes for New User Email Notifications (for both the User/Member Notification and also for the Administrator Notification). The following Replacement Codes are now possible: `%%role%%`, `%%label%%`, `%%level%%`, `%%ccaps%%`. Also adding four new Filters for developers. These include: `ws_plugin__s2member_welcome_email_sbj`, `ws_plugin__s2member_welcome_email_msg`, `ws_plugin__s2member_admin_new_user_email_sbj`, `ws_plugin__s2member_admin_new_user_email_msg`. See `Dashboard -› General Options -› Email Configuration` for further details.
124
- * (s2Member/s2Member Pro) **Feature Enhancement/Emails (Issue #30)** Adding support for PHP tags in the following emails: New User Notification, Administrative New User Notification, Signup Confirmation Email, Specific Post/Page Confirmation Email. See the relevant sections in your Dashboard for further details. Such as: `s2Member® -› General Options -› Email Configuration` and `s2Member® -› PayPal® Options -› Signup Confirmation Email`.
125
- * (s2Member/s2Member Pro) **Feature Enhancement/Shortcodes (Issue #23)** Adding support for the `lang=""` Attribute in PayPal Buttons, PayPal Pro Forms, and in Google Checkout Buttons. This is a bit different from the existing `lc=""` value. The `lc=""` value controls the interface at PayPal, while the `lang=""` value controls the language of the Standard and/or Express Checkout Button itself (with respect to s2Member®). For further details, please see: `Dashboard -› PayPal Buttons (or Pro Forms) -› Shortcode Attributes (Explained)`.
126
  * (s2Member/s2Member Pro) **Bug Fix** Fixing bug in User Access Package. Now checking if `$cap_enabled` also is `TRUE`; just in case another plugin or hack file attempts to disable Custom Capabilities without removing them. Not likely, but we can support this easily with a quick update in this release. Note... this has no impact on s2Member's existing functionality. Custom Capabilities continue to work just as they always have.
127
  * (s2Member/s2Member Pro) **Feature Enhancement/Logging** Adding new logger. Logs to file `reg-handler.log`. Includes all User/Member registrations handled by s2Member® (either directly or indirectly). Only if logging is enabled. For further details, please check your Dashboard here: `s2Member® -› Log Files (Debug)`.
128
- * (s2Member/s2Member Pro) **Feature Enhancement/EOTs (Issue #29)** Adding UI option for EOT Grace Time. For further details, please see: `Dashboard -› PayPal Options -› Automatic EOT Behavior`. Also adding a new Filter for developers: `ws_plugin__s2member_eot_grace_time`.
129
  * (s2Member/s2Member Pro) **Feature Enhancement/EOTs** Adding UI option for EOT Custom Capability Removal. For further details, please see: `Dashboard -› PayPal Options -› Automatic EOT Behavior`. Also adding a new Filter for developers: `ws_plugin__s2member_remove_ccaps_during_eot_events`.
130
- * (s2Member/s2Member Pro) **Feature Enhancement/s2Stream Shortcode (Issue #32)** Adding additional support for JW Player™ Captions, Titles, Descriptions, and Media IDs (i.e. `player_title=""`, `player_description=""`, `player_mediaid=""`, `player_captions=""`). Please check the Shortcode Attributes tab in [this KB article](http://www.s2member.com/kb/jwplayer-s2stream-shortcodes/#using-s2stream-shortcodes) for further details.
131
 
132
  = v130214 =
133
  * **(Maintenance Release) Upgrade immediately.**
134
- * (s2Member/s2Member Pro) **Log Viewer (Issue #16)** Additional log file descriptions have been added to the Dashboard, along with some other UI enhancements in this section.
135
- * (s2Member/s2Member Pro) **Bug Fix (Issue #18)** Usernames consisting of all numeric values were not always being redirected to the Login Welcome Page upon logging in, even when s2Member® was configured to do so. Fixed in this release. Discussed in [this thread](http://www.s2member.com/forums/topic/subscribers-not-taken-to-welcome-page/page/2/#post-41663).
136
- * (s2Member Pro) **Coupon Codes (Issue #19)** Adding new Replacement Codes: `%%full_coupon_code%%`, `%%coupon_code%%` and `%%coupon_affiliate_id%%`. These are now available in all API Tracking Codes, in all Custom Return URLs for Pro Forms, and in most API Notifications.
137
- * (s2Member Pro) **Coupon Codes (Issue #19)** Deprecating the `%%affiliate_id%%` Replacement Code for tracking Affiliate Coupon Codes in favor of `%%coupon_affiliate_id%%`.
138
  * (s2Member/s2Member Pro) **Last Login Time** Improving readability of Last Login Time in list of Users/Members.
139
  * (s2Member/s2Member Pro) **Compatibility** Improving support for WordPress® v3.6-alpha with respect to `tabindex` values on `/wp-login.php`.
140
  * (s2Member/s2Member Pro) **Compatibility** Bumping minimum WordPress® requirement from v3.2 up to v3.3. Starting with this release, s2Member® is no longer compatible with the much older WordPress® v3.2.
141
 
142
  = v130213 =
143
  * **(Maintenance Release) Upgrade immediately.**
144
- * (s2Member Pro) **Compatibility (Issue #13)** PayPal® Payments Pro, PayPal® Payments Pro (Payflow Edition), and Authorize.Net. s2Member® Pro now supports a recurring interval of Semi-Yearly (e.g. charges occur every six months). This has always been possible by manipulating Shortcode Attribues, but it's now officially supported by Pro Form Generators in your Dashboard — which come with s2Member® Pro.
145
- * (s2Member Pro) **Compatibility (Issue #13)** ClickBank® Recurring Products. ClickBank® has started allowing a Weekly recurring interval and stopped allowing Yearly. s2Member® has been updated in this release to support a Weekly recurring interval with ClickBank®; and to remove the Yearly option in the ClickBank® Button Generator.
146
- * (s2Member Pro) **Compatibility (Issue #13)** PayPal® Payments Pro (Payflow Edition). PayPal® Payments Pro (Payflow Edition) has started allowing a Daily recurring interval. s2Member® has been updated in this release to support a Daily recurring interval with PayPal® Payments Pro (Payflow Edition). Daily recurring intervals remain possible with PayPal® Pro accounts that do not include the additional Payflow API. This change simply adds official support for Daily recurring billing with PayPal® Payments Pro (Payflow Edition).
147
  * (s2Member) **Debugging Assistance** Updating s2Member's PayPal® PDT/Auto-Return handler to better handle scenarios where a site owner is missing a PayPal® PDT Identity Token in their s2Member® configuration, or has incorrectly set the `custom=""` Shortcode Attribute in Payment Buttons generated with s2Member®. Administrative notices are now displayed in the Dashboard when/if this occurs and s2Member® can catch the issue during post-processing of a transaction.
148
  * (s2Member/s2Member Pro) **General Code Cleanup** Removing all `/**/` markers in the s2Member® codebase. These were used in conjunction with PolyStyle® code formatting tools to preserve line breaks in the code. The WebSharks™ development team no longer uses PolyStyle®, making these obsolete now. Removed in this release to improve readability for developers.
149
  * (s2Member/s2Member Pro) **General Code Cleanup** Removing all unnecessary uses of PHP's `eval()` function in s2Member's codebase. These were used to keep repetitive code all in a single line; part of a standard the WebSharks™ development team is now moving away from. Removed in this release to improve readability for developers; and to prevent unnecessary confusion.
@@ -177,43 +206,43 @@ Please see [this FAQ entry](http://www.s2member.com/faqs/#s2-faqs-translations)
177
 
178
  = v130207 =
179
  * **(Maintenance Release) Upgrade immediately.**
180
- * (s2Member Pro) **Bug Fix (Issue #2)** Modification Tracking Codes not working properly under s2Member's Authorize.Net integration. Fixed in this release. Discussed in [this thread](http://www.s2member.com/forums/topic/shareasale-integration-not-working/#post-40954).
181
- * (s2Member) **Compatibility (Issue #4)** PayPal® integrated into a site charging in the JPY currency was incorrectly limited to an amount of 10000.00. Fixed in this release. Discussed in [this thread](http://www.s2member.com/forums/topic/default-currency-can-i-change-it-to-yen/#post-40590).
182
- * (s2Member) **Compatibility (Issue #5)** Incorrect `tabindex` values in WordPress® v3.5+. Fixed in this release. Discussed in [this thread](http://www.s2member.com/forums/topic/tabindex-messed-up-on-registration-page/#post-40591).
183
- * (s2Member/s2Member Pro) **Line Breaks (Issue #3)** Some line breaks in both s2Member® and s2Member® Pro were converted to CRLF inadvertently in the previous release. No real harm done, but this was causing some problems for the s2Member® Server Scanner because it uses a checksum against installation files; which was being thrown off balance due to the unexpected line break style. Fixed in this release. A symptom of this bug was to see invalid checksums when running diagnostics with the s2Member® Server Scanner.
184
- * (s2Member/s2Member Pro) **Compatibility (Issue #6)** s2Member® File Downloads (audio/video files) with spaces in a file name were not always being handled properly. Fixed in this release. Discussed in [this thread](http://www.s2member.com/forums/topic/jwplayer-filename-bug/#post-40799).
185
 
186
  = v130203 =
187
  * **(New Release) Please read this changelog for important details.**
188
  * (s2Member Pro) **Remote Ops API (`create_user`)** s2Member® Pro's Remote Operations API, for the `create_user` Operation has been updated to support a new specification: `modify_if_login_exists`. For further details, please check your s2Member® Pro Dashboard here: `s2Member® -› API / Scripting -› Remote Operations API`.
189
  * (s2Member Pro) **Remote Ops API (`modify_user`,`delete_user`)** s2Member® Pro's Remote Operations API has been updated to support two additional Operations: `update_user` and `delete_user`. For further details on these new Operations, please check your s2Member® Pro Dashboard here: `s2Member® -› API / Scripting -› Remote Operations API`.
190
  * (s2Member Pro) **Remote Ops API (`init` hook priority)** s2Member® Pro's Remote Operations API has been updated to prevent conflicts when running in concert with BuddyPress v1.6.4+. Hook priority now running at default value of `11`, right after BuddyPress v1.6.4 at hook priority `10`.
191
- * (s2Member/s2Member Pro) **s2Stream Shortcode (Issue #88)** s2Member® now supports JW Player® license keys (for the professional edition) using Shortcode Attribute `player_key=""` (or they can be specified sitewide via JavaScript provided by Longtail Video — optional). See [this discussion](http://www.s2member.com/forums/topic/jwplayer-shortcode-for-poster-not-working/#post-40435). See also: [this KB article](http://www.s2member.com/kb/jwplayer-s2stream-shortcodes/#using-s2stream-shortcodes).
192
- * (s2Member/s2Member Pro) **s2Stream Shortcode (Issue #88)** Bug fix. The s2Stream Shortcode was not working properly (with respect to a specific Shortcode Attribute: `player_image=""`). Fixed in this release. See [this discussion](http://www.s2member.com/forums/topic/jwplayer-shortcode-for-poster-not-working/#post-40128). See also: [this KB article](http://www.s2member.com/kb/jwplayer-s2stream-shortcodes/#using-s2stream-shortcodes).
193
- * (s2Member Pro) **User Exportation (Issue #89)** s2Member® Pro's User Exportation now includes separate data columns for each Custom Registration/Profile Field that you've configured with s2Member®. Also, s2Member® Pro will now include ALL Custom Registration/Profile Fields (even if there is no value associated with certain Fields, for specific Users/Members — e.g. empty column values will now be included by s2Member® Pro). This provides a more consistent/readable CSV export file; a major improvement. Discussed in [this KB article](http://www.s2member.com/kb/importing-updating-users/#custom-registration-profile-fields).
194
- * (s2Member Pro) **User Importation (Issue #89)** s2Member® Pro's User/Member Import format changed in this release (with respect to Custom Registration/Profile Fields only). If you are importing Custom Registration/Profile Fields, please review [this KB article](http://www.s2member.com/kb/importing-updating-users/#custom-registration-profile-fields) before you import new Users/Members or mass update any existing Users/Members. ALSO NOTE: User/Member CSV Export Files generated by previous versions of s2Member® Pro (if they contained any Custom Registration/Profile Fields) will NOT be compatible with this latest release (e.g. you should NOT attempt to re-import those old files in an effort to mass update existing Users/Members). Please generate a new User/Member CSV Export File in the latest release of s2Member® Pro before attempting to edit and/or mass update existing Users/Members with applications like MS Excel or OpenOffice.
195
 
196
  = v130123 =
197
  * **(Maintenance Release) Upgrade immediately.**
198
- * (s2Member/s2Member Pro) **s2Stream Shortcode (Issue #78)** s2Member® now supports JW Player® license keys using Shortcode Attribute `player_key=""`. See [this KB article](http://www.s2member.com/kb/jwplayer-s2stream-shortcodes/) please. Also discussed in [this thread](http://www.s2member.com/forums/topic/new-jw-player-6-s2-video-audio-shortcodes/#post-38768).
199
- * (s2Member/s2Member Pro) **s2Stream Shortcode (Issue #79)** s2Member® now supports JW Player® [Advanced Option Blocks](http://www.longtailvideo.com/support/jw-player/28839/embedding-the-player) using Shortcode Attribute `player_option_blocks=""`. Example: `player_option_blocks="sharing:{}"`. See [this KB article](http://www.s2member.com/kb/jwplayer-s2stream-shortcodes/) please. Also discussed in [this thread](http://www.s2member.com/forums/topic/new-jw-player-6-s2-video-audio-shortcodes/#post-38768).
200
- * (s2Member Pro) **User Exportation (Issue #80)** s2Member® Pro User Exportation now occurs with MySQL `ORDER BY ID`, instead of no `ORDER BY` at all. This helps to prevent confusion and buggy behavior. Discussed in [this thread](http://www.s2member.com/forums/topic/user-export-not-working-properly/#post-39123).
201
- * (s2Member Pro) **User Exportation (Issue #81)** s2Member Pro's User Exportation now supports the exporation of up to `1000` User/Member table rows at once. Of course it remains possible to export ALL of your Users/Members with s2Member® Pro. All we've done here is bump the default limit from `250` up to `1000` at a time. In addition, there is a new Filter making it possible to extend this limit further on servers that can handle it. Use Filter: `ws_plugin__s2member_pro_export_users_limit` if you would like to export more Users all at once. See also: `Dashboard -› s2Member® Pro -› User/Member Exportation`.
202
  * (s2Member/s2Member Pro) **KB Articles** Inline documentation updated in some areas, with a few links pointing to helpful/related KB articles.
203
 
204
  = v130121 =
205
  * **(Maintenance Release) Upgrade immediately.**
206
  * **New Feature** s2Member® now comes with a new Shortcode `[s2Stream file_download="video.mp4" player="jwplayer-v6" ... /]`, making it MUCH easier for site owners to implemement RTMP streams of audio/video content. For further details, please check your Dashboard under: `s2Member® -› Download Options -› JW Player® v6 and RTMP Protocol Examples`. See also: `s2Member® -› Download Options -› Shortcode Attributes (Explained)`.
207
- * **Compatibility (Issue #75)** Updated s2Member's local file storage engine (for File Downloads via s2Member®), to support special characters in file names. Discussed in [this thread](http://www.s2member.com/forums/topic/problem-with-quotes-in-filename-downloads/#post-38395).
208
- * **Bug Fix (Issue #71)** A bug first introduced in the previous release of v130116, where we added support for byte-range requests to s2Member's File Download functionality, was causing multiple byte-range requests (processed by s2Member) to count against each User/Member as multiple File Downloads. Fixed in this release.
209
  * **Compatibility** Updated s2Member's integration with Amazon® S3 to extend the default 30 second connection timeout (which was too conservative for many integrations) up to 24 hours by default, making it match the same as s2Member's Amazon® CloudFront connection timeout. For further details, please check your Dashboard under: `s2Member® -› Download Options -› Amazon® S3/CDN Storage -› Dev Note w/Technical Details`. It is possible to modify this connection timeout through a Filter discussed there.
210
 
211
  = v130116 =
212
  * **(Maintenance Release) Upgrade immediately.**
213
- * **Compatibility (Issue #39)** Updated codes samples for JW Player®, to include the `mp4:` prefix when implementing RTMP streams against MP4 video files. Discussed in [this thread](http://www.s2member.com/forums/topic/cloudfront-subfolder-streaming-error/#post-35750).
214
- * **Compatibility (Issue #51)** Updated Payflow® API to support recurring billing every six months. Discussed in [this thread](http://www.s2member.com/forums/topic/payflow-error-6-month-recurring-membership/#post-36053).
215
- * **Bug Fix (Issue #69)** Updated multisite user imporation routine, to support a specific scenario not covered under WordPress v3.5. Discussed in [this thread](http://www.s2member.com/forums/topic/users-on-multisite/).
216
- * **Feature Improvement (Issue #71)** s2Member® has been updated to support byte-range requests with it's default local file storage engine, served from the `/s2member-files/` directory. s2Member® has always supported byte-range requests when integrated with Amazon® CloudFront. Now it supports byte-range requests in it's default local storage engine too. This will improve compatibility with mobile devices, iTunes™ and other devices that use byte-range requests. Discussed in [this thread](http://www.s2member.com/forums/topic/any-way-to-set-accept-ranges-for-downloads/#post-15871).
217
 
218
  = v121213 =
219
  * **(Maintenance Release) Upgrade immediately.**
1
  === s2Member® Framework (Member Roles, Capabilities, Membership, PayPal Members) ===
2
 
3
+ Version: 130510
4
+ Stable tag: 130510
5
 
6
  SSL Compatible: yes
7
  bbPress® Compatible: yes
92
 
93
  == Upgrade Notice ==
94
 
95
+ = v130510 =
96
  (Maintenance Release) Upgrade immediately.
97
 
98
  == Changelog ==
99
 
100
+ = v130510 =
101
+ * (s2Member Pro) **Authorize.Net UK (and Other Currencies) (#104)** Adding support for Authorize.Net UK and other currencies too. s2Member Pro now officially supports Authorize.Net UK Edition. It is now possible to change your Authorize.Net Pro Form Shortcode Attribute `cc="USD"` to one of these values: `cc="USD"`, or `cc="CAD"` or `cc="EUR"` or `cc="GBP"`. For further details, please see: `Dashboard -› Authorize.Net Pro Forms -› Shortcode Attributes (Explained)`.
102
+ * (s2Member Pro) **ClickBank Skins (#227)** Adding support for the `cbskin=""` Shortcode Attribute. For further details, please see: `Dashboard -› ClickBank Buttons -› Shortcode Attributes (Explained)`.
103
+ * (s2Member Pro) **ClickBank PitchPlus Upsell Flows (#227)** Adding support for ClickBank PitchPlus Upsell Flows via new Shortcode Attributes: `cbfid=""`, `cbur=""`, `cbf="auto"`. s2Member Pro now officially supports ClickBank PitchPlus Upsell Flows. We support PitchPlus Basic and PitchPlus Advanced too. For further details, please see: `Dashboard -› ClickBank Buttons -› Shortcode Attributes (Explained)`.
104
+ * (s2Member/s2Member Pro) **Codestyling Localization** Adding automatic symlink creator for improved compatibility with the CodeStyling Localization plugin. A symlink is created automatically whenever the CodeStyling Localization plugin is installed, and s2Member® Pro is installed as well. The symlink allows the CodeStyling Localization plugin to scan files from the s2Member® Pro directory too; instead of only scanning the s2Member® Framework directory. s2Member and s2Member Pro are now both compatible with the Codestyling Localization plugin (optional).
105
+ * (s2Member/s2Member Pro) **Custom Templates w/ s2Stream Shortcode** Adding support for custom templates to be used in conjunction with the `s2Stream` Shortcode. It is now possible to take the default player templates from `/s2member/includes/templates/players/` and put these files inside your own WordPress® theme directory (or inside the `/wp-content/` directory). s2Member will automatically find your template files in these locations. Your custom template files will then be used instead of the built-in defaults.
106
+ * (s2Member/s2Member Pro) **Bug Fix (#59)** Resending a password to a User from the Dashboard (while changing the User's email address at the same time); resulted in the email being sent to the previous email address instead of the new one. Fixed in this release.
107
+ * (s2Member/s2Member Pro) **Bug Fix (#216)** Removing `-MultiViews` from s2Member's `.htaccess` file in the `/s2member-files/` directory. This improves compatibility with some Apache installations that simply have `AllowOverride All`; because `All` may not include `MultiViews` in some versions of Apache.
108
+ * (s2Member/s2Member Pro) **IP Restrictions (#149)** In the Dashboard, we now report if a User is at (or above) max allowable IPs; instead of reporting only if they have actually triggered an internal security breach (which times out quickly in most cases). Fixed in this release.
109
+ * (s2Member/s2Member Pro) **Enhancing JW Player Integration (#251)** Adding support for s2Stream Shortcode Attribute `player_aspectratio="12:5"` (as one example). See also [this post](http://www.longtailvideo.com/blog/32697/new-in-jw-player-responsive-design) at Longtail Video.
110
+ * (s2Member Pro) **Updating Payflow Integration (#193)** Removing DAILY `D` option for Payflow Recurring Billing. No longer supported by Payflow. However, s2Member will let a `D` value slip by Shortcode Attribute validation in case a site owner has arranged for this to become available against their Payflow account somehow; and to remain backward compatible with previous versions of s2Member Pro. Moving forward, it is NO longer possible to bill customers on a daily basis with PayPal Payments Pro (Payflow Edition). This is a PayPal limitation.
111
+ * (s2Member Pro) **Updating Payflow Integration w/ Payflow Bug Workaround (#193)** Updating Payflow integration to support Billing Agreement IDs (aka: `BAID` values) when working together with Payflow Express Checkout APIs (and where a site owner is charging on a recurring basis).
112
+
113
+ This improvement also allows s2Member to work around a Payflow bug where `BILLINGTYPE=RecurringPayments` results in error `#7 (Invalid/Expired TOKEN)` whenever Payflow attempts to rebill a customer. s2Member now sets `BILLINGTYPE=RecurringBilling`; and we pass `BAID=B-xxxxxx` instead of passing `TOKEN=xxxxxx`.
114
+
115
+ Site owners also need to [contact PayPal MTS](http://www.paypal.com/mts) and ask to have `Reference Transactions` (free) enabled for `Recurring Billing` service. ~ However, you ONLY need `Recurring Billing` service and `Reference Transactions` enabled IF you're operating a PayPal Payments Pro (Payflow Edition) account; and only IF you're charging customers on a recurring basis.
116
+
117
+ All of these changes related to Payflow (as detailed in this changelog entry), impact only ONE specific scenario.
118
+ - You have a PayPal Payments Pro (Payflow Edition) account.
119
+ - You charge your customers on a recurring basis.
120
+ - A customer chooses PayPal as their billing method during checkout.
121
+
122
+ No other part of s2Member's integration with Payflow was modified in this release.
123
+
124
+ For further details, please see [this thread](http://www.s2member.com/forums/topic/paypal-expired-security-token/page/2/) (or monitor the [s2Member KB](http://www.s2member.com/kb/) for new articles on this subject).
125
+ * (s2Member Pro) **Payflow API Docs** Updating `s2m-pro-extras.zip` to include the latest versions of the PayPal Pro (Payflow Edition) APIs. s2Member Pro customers can download this optional ZIP file from their My Account page at s2Member.com. These are extras only, they are NOT part of the s2Member application.
126
+ * (s2Member Pro) **Google Checkout Bug Fix (#214)** Updating s2Member's Google Checkout integration to properly support the `rrt` Shortcode Attribute. Fixed in this release. For further details please see [this thread](http://www.s2member.com/forums/topic/google-recurring-problem/#post-48218).
127
+ * (s2Member Pro) **Username Validation (#246)** Now forcing user input (during Pro Form registration) to lowercase on Multisite Networks to prevent unnecessary validation errors during checkout (saving a customer time). Also, s2Member now validates a customer's Username before it is passed through `sanitize_user()` (a core WordPress® function). This prevents confusion for a customer where certain characters were stripped out automatically, causing them problems when attempting to log in for the first time (e.g. the customer thinks their Username is `john~doe`; when it is actually `johndoe` because WordPress (when running a Multisite Network) removes anything that is NOT `a-z0-9 _.-@` (and s2Member removes whitespace as well).
128
+
129
  = v130406 =
130
+ * (s2Member/s2Member Pro) **Multisite Networks (#145)** Bug fix on Multisite Networks related to User deletions and subsequent logins on child blogs. For further details, please see [this thread](http://www.s2member.com/forums/topic/deleted-users-can-log-in/#post-46738).
131
+ * (s2Member Pro) **New Feature (#59)** It is now possible to Edit a User in the Dashboard and check a box to have the User's password reset, and an email message sent automatically to the User/Member with a copy of the Username/Password. This requires s2Member® Pro.
132
+ * (s2Member Pro) **API Functions (#158)** New PayPal® Pro API Functions (`s2member_pro_paypal_rbp_for_user`, `s2member_pro_paypal_rbp_times_for_user`). These are for developers. For further details, please see [this article](http://www.s2member.com/codex/stable/s2member/api_functions/package-summary/) in the s2Member® Codex.
133
+ * (s2Member Pro) **API Functions (#158)** New PayPal® Pro (PayFlow® Edition) API Functions (`s2member_pro_payflow_rbp_for_user`, `s2member_pro_payflow_rbp_times_for_user`). These are for developers. For further details, please see [this article](http://www.s2member.com/codex/stable/s2member/api_functions/package-summary/) in the s2Member® Codex.
134
 
135
  = v130404 =
136
+ * (s2Member Pro) **Compatibility (#108)** Updating s2Member® Pro's integration with Authorize.Net to allow charges up to `$99,999.00` (formerly `$10,000.00`).
137
+ * (s2Member/s2Member Pro) **User Searches (#91)** Updating `pre_user_query` filter to include `first_name/last_name` (instead of only the `display_name`).
138
+ * (s2Member/s2Member Pro) **bbPress Integration (#88)** Updating bbPress Role/Cap filter to exclude itself during bbPress deactivation. This was causing a loss of the `read` Capability inadvertently.
139
+ * (s2Member/s2Member Pro) **PayPal® 20% Rule (#100)** Removing mention of the PayPal® 20% rule/limitation in the inline documentation. We confirmed with PayPal this ridiculous rule no longer applies to PayPal Standard Buttons.
140
+ * (s2Member/s2Member Pro) **File Downloads (#73)** Fixed bug related to `%2F` in file download URLs leading to a `ccap` directory.
141
+ * (s2Member/s2Member Pro) **Debug Logging (#69)** Logging now disabled by default. New log recommendation/warning notices updated throughout all menu pages for s2Member®.
142
+ * (s2Member/s2Member Pro) **Debug Logging (#69)** Logging must now be disabled (and the logs directory must be non-existent or empty) for an s2Member® Security Badge to go green. There is only one way to bypass this security check. See KB Article: [s2Member® Security Badges](http://www.s2member.com/kb/security-badges/). Notices are displayed on activation of this version to warn site owners about this change.
143
+ * (s2Member/s2Member Pro) **JW Player (#121)** Adding CSS `class` attribute to all JW Player template files used in conjunction with the `s2Stream` shortcode. New CSS class name: `s2member-jwplayer-v6`.
144
+ * (s2Member/s2Member Pro) **JW Player (#121)** Adding support for percentage-based width/height values in `player_width="" player_height=""` attributes of an s2Stream shortcode that generates a JW Player. Example: `player_width="100%"`.
145
 
146
  = v130221 =
147
+ * (s2Member/s2Member Pro) **Bug Fix (#41)** Custom Registration/Profile Fields with an ID that ended with `-[0-9]+` or `_[0-9]+` was failing JavaScript validation due to a parsing issue. Fixed in this release.
148
+ * (s2Member/s2Member Pro) **Bug Fix (#43)** A bug first introduced in the last release of s2Member® v130220 was preventing Administrative New User Notifications from being sent by s2Member®. Fixed in this release.
149
 
150
  = v130220 =
151
+ * (s2Member Pro) **Feature Enhancement/User Exportation (#33)** Adding support for UTF-8 BOM in CSV User export files. Now a configurable option during User/Member Exportation.
152
+ * (s2Member/s2Member Pro) **Feature Enhancement/Emails (#21)** Adding additional Replacement Codes for New User Email Notifications (for both the User/Member Notification and also for the Administrator Notification). The following Replacement Codes are now possible: `%%role%%`, `%%label%%`, `%%level%%`, `%%ccaps%%`. Also adding four new Filters for developers. These include: `ws_plugin__s2member_welcome_email_sbj`, `ws_plugin__s2member_welcome_email_msg`, `ws_plugin__s2member_admin_new_user_email_sbj`, `ws_plugin__s2member_admin_new_user_email_msg`. See `Dashboard -› General Options -› Email Configuration` for further details.
153
+ * (s2Member/s2Member Pro) **Feature Enhancement/Emails (#30)** Adding support for PHP tags in the following emails: New User Notification, Administrative New User Notification, Signup Confirmation Email, Specific Post/Page Confirmation Email. See the relevant sections in your Dashboard for further details. Such as: `s2Member® -› General Options -› Email Configuration` and `s2Member® -› PayPal® Options -› Signup Confirmation Email`.
154
+ * (s2Member/s2Member Pro) **Feature Enhancement/Shortcodes (#23)** Adding support for the `lang=""` Attribute in PayPal Buttons, PayPal Pro Forms, and in Google Checkout Buttons. This is a bit different from the existing `lc=""` value. The `lc=""` value controls the interface at PayPal, while the `lang=""` value controls the language of the Standard and/or Express Checkout Button itself (with respect to s2Member®). For further details, please see: `Dashboard -› PayPal Buttons (or Pro Forms) -› Shortcode Attributes (Explained)`.
155
  * (s2Member/s2Member Pro) **Bug Fix** Fixing bug in User Access Package. Now checking if `$cap_enabled` also is `TRUE`; just in case another plugin or hack file attempts to disable Custom Capabilities without removing them. Not likely, but we can support this easily with a quick update in this release. Note... this has no impact on s2Member's existing functionality. Custom Capabilities continue to work just as they always have.
156
  * (s2Member/s2Member Pro) **Feature Enhancement/Logging** Adding new logger. Logs to file `reg-handler.log`. Includes all User/Member registrations handled by s2Member® (either directly or indirectly). Only if logging is enabled. For further details, please check your Dashboard here: `s2Member® -› Log Files (Debug)`.
157
+ * (s2Member/s2Member Pro) **Feature Enhancement/EOTs (#29)** Adding UI option for EOT Grace Time. For further details, please see: `Dashboard -› PayPal Options -› Automatic EOT Behavior`. Also adding a new Filter for developers: `ws_plugin__s2member_eot_grace_time`.
158
  * (s2Member/s2Member Pro) **Feature Enhancement/EOTs** Adding UI option for EOT Custom Capability Removal. For further details, please see: `Dashboard -› PayPal Options -› Automatic EOT Behavior`. Also adding a new Filter for developers: `ws_plugin__s2member_remove_ccaps_during_eot_events`.
159
+ * (s2Member/s2Member Pro) **Feature Enhancement/s2Stream Shortcode (#32)** Adding additional support for JW Player™ Captions, Titles, Descriptions, and Media IDs (i.e. `player_title=""`, `player_description=""`, `player_mediaid=""`, `player_captions=""`). Please check the Shortcode Attributes tab in [this KB article](http://www.s2member.com/kb/jwplayer-s2stream-shortcodes/#using-s2stream-shortcodes) for further details.
160
 
161
  = v130214 =
162
  * **(Maintenance Release) Upgrade immediately.**
163
+ * (s2Member/s2Member Pro) **Log Viewer (#16)** Additional log file descriptions have been added to the Dashboard, along with some other UI enhancements in this section.
164
+ * (s2Member/s2Member Pro) **Bug Fix (#18)** Usernames consisting of all numeric values were not always being redirected to the Login Welcome Page upon logging in, even when s2Member® was configured to do so. Fixed in this release. Discussed in [this thread](http://www.s2member.com/forums/topic/subscribers-not-taken-to-welcome-page/page/2/#post-41663).
165
+ * (s2Member Pro) **Coupon Codes (#19)** Adding new Replacement Codes: `%%full_coupon_code%%`, `%%coupon_code%%` and `%%coupon_affiliate_id%%`. These are now available in all API Tracking Codes, in all Custom Return URLs for Pro Forms, and in most API Notifications.
166
+ * (s2Member Pro) **Coupon Codes (#19)** Deprecating the `%%affiliate_id%%` Replacement Code for tracking Affiliate Coupon Codes in favor of `%%coupon_affiliate_id%%`.
167
  * (s2Member/s2Member Pro) **Last Login Time** Improving readability of Last Login Time in list of Users/Members.
168
  * (s2Member/s2Member Pro) **Compatibility** Improving support for WordPress® v3.6-alpha with respect to `tabindex` values on `/wp-login.php`.
169
  * (s2Member/s2Member Pro) **Compatibility** Bumping minimum WordPress® requirement from v3.2 up to v3.3. Starting with this release, s2Member® is no longer compatible with the much older WordPress® v3.2.
170
 
171
  = v130213 =
172
  * **(Maintenance Release) Upgrade immediately.**
173
+ * (s2Member Pro) **Compatibility (#13)** PayPal® Payments Pro, PayPal® Payments Pro (Payflow Edition), and Authorize.Net. s2Member® Pro now supports a recurring interval of Semi-Yearly (e.g. charges occur every six months). This has always been possible by manipulating Shortcode Attribues, but it's now officially supported by Pro Form Generators in your Dashboard — which come with s2Member® Pro.
174
+ * (s2Member Pro) **Compatibility (#13)** ClickBank® Recurring Products. ClickBank® has started allowing a Weekly recurring interval and stopped allowing Yearly. s2Member® has been updated in this release to support a Weekly recurring interval with ClickBank®; and to remove the Yearly option in the ClickBank® Button Generator.
175
+ * (s2Member Pro) **Compatibility (#13)** PayPal® Payments Pro (Payflow Edition). PayPal® Payments Pro (Payflow Edition) has started allowing a Daily recurring interval. s2Member® has been updated in this release to support a Daily recurring interval with PayPal® Payments Pro (Payflow Edition). Daily recurring intervals remain possible with PayPal® Pro accounts that do not include the additional Payflow API. This change simply adds official support for Daily recurring billing with PayPal® Payments Pro (Payflow Edition).
176
  * (s2Member) **Debugging Assistance** Updating s2Member's PayPal® PDT/Auto-Return handler to better handle scenarios where a site owner is missing a PayPal® PDT Identity Token in their s2Member® configuration, or has incorrectly set the `custom=""` Shortcode Attribute in Payment Buttons generated with s2Member®. Administrative notices are now displayed in the Dashboard when/if this occurs and s2Member® can catch the issue during post-processing of a transaction.
177
  * (s2Member/s2Member Pro) **General Code Cleanup** Removing all `/**/` markers in the s2Member® codebase. These were used in conjunction with PolyStyle® code formatting tools to preserve line breaks in the code. The WebSharks™ development team no longer uses PolyStyle®, making these obsolete now. Removed in this release to improve readability for developers.
178
  * (s2Member/s2Member Pro) **General Code Cleanup** Removing all unnecessary uses of PHP's `eval()` function in s2Member's codebase. These were used to keep repetitive code all in a single line; part of a standard the WebSharks™ development team is now moving away from. Removed in this release to improve readability for developers; and to prevent unnecessary confusion.
206
 
207
  = v130207 =
208
  * **(Maintenance Release) Upgrade immediately.**
209
+ * (s2Member Pro) **Bug Fix (#2)** Modification Tracking Codes not working properly under s2Member's Authorize.Net integration. Fixed in this release. Discussed in [this thread](http://www.s2member.com/forums/topic/shareasale-integration-not-working/#post-40954).
210
+ * (s2Member) **Compatibility (#4)** PayPal® integrated into a site charging in the JPY currency was incorrectly limited to an amount of 10000.00. Fixed in this release. Discussed in [this thread](http://www.s2member.com/forums/topic/default-currency-can-i-change-it-to-yen/#post-40590).
211
+ * (s2Member) **Compatibility (#5)** Incorrect `tabindex` values in WordPress® v3.5+. Fixed in this release. Discussed in [this thread](http://www.s2member.com/forums/topic/tabindex-messed-up-on-registration-page/#post-40591).
212
+ * (s2Member/s2Member Pro) **Line Breaks (#3)** Some line breaks in both s2Member® and s2Member® Pro were converted to CRLF inadvertently in the previous release. No real harm done, but this was causing some problems for the s2Member® Server Scanner because it uses a checksum against installation files; which was being thrown off balance due to the unexpected line break style. Fixed in this release. A symptom of this bug was to see invalid checksums when running diagnostics with the s2Member® Server Scanner.
213
+ * (s2Member/s2Member Pro) **Compatibility (#6)** s2Member® File Downloads (audio/video files) with spaces in a file name were not always being handled properly. Fixed in this release. Discussed in [this thread](http://www.s2member.com/forums/topic/jwplayer-filename-bug/#post-40799).
214
 
215
  = v130203 =
216
  * **(New Release) Please read this changelog for important details.**
217
  * (s2Member Pro) **Remote Ops API (`create_user`)** s2Member® Pro's Remote Operations API, for the `create_user` Operation has been updated to support a new specification: `modify_if_login_exists`. For further details, please check your s2Member® Pro Dashboard here: `s2Member® -› API / Scripting -› Remote Operations API`.
218
  * (s2Member Pro) **Remote Ops API (`modify_user`,`delete_user`)** s2Member® Pro's Remote Operations API has been updated to support two additional Operations: `update_user` and `delete_user`. For further details on these new Operations, please check your s2Member® Pro Dashboard here: `s2Member® -› API / Scripting -› Remote Operations API`.
219
  * (s2Member Pro) **Remote Ops API (`init` hook priority)** s2Member® Pro's Remote Operations API has been updated to prevent conflicts when running in concert with BuddyPress v1.6.4+. Hook priority now running at default value of `11`, right after BuddyPress v1.6.4 at hook priority `10`.
220
+ * (s2Member/s2Member Pro) **s2Stream Shortcode (#88)** s2Member® now supports JW Player® license keys (for the professional edition) using Shortcode Attribute `player_key=""` (or they can be specified sitewide via JavaScript provided by Longtail Video — optional). See [this discussion](http://www.s2member.com/forums/topic/jwplayer-shortcode-for-poster-not-working/#post-40435). See also: [this KB article](http://www.s2member.com/kb/jwplayer-s2stream-shortcodes/#using-s2stream-shortcodes).
221
+ * (s2Member/s2Member Pro) **s2Stream Shortcode (#88)** Bug fix. The s2Stream Shortcode was not working properly (with respect to a specific Shortcode Attribute: `player_image=""`). Fixed in this release. See [this discussion](http://www.s2member.com/forums/topic/jwplayer-shortcode-for-poster-not-working/#post-40128). See also: [this KB article](http://www.s2member.com/kb/jwplayer-s2stream-shortcodes/#using-s2stream-shortcodes).
222
+ * (s2Member Pro) **User Exportation (#89)** s2Member® Pro's User Exportation now includes separate data columns for each Custom Registration/Profile Field that you've configured with s2Member®. Also, s2Member® Pro will now include ALL Custom Registration/Profile Fields (even if there is no value associated with certain Fields, for specific Users/Members — e.g. empty column values will now be included by s2Member® Pro). This provides a more consistent/readable CSV export file; a major improvement. Discussed in [this KB article](http://www.s2member.com/kb/importing-updating-users/#custom-registration-profile-fields).
223
+ * (s2Member Pro) **User Importation (#89)** s2Member® Pro's User/Member Import format changed in this release (with respect to Custom Registration/Profile Fields only). If you are importing Custom Registration/Profile Fields, please review [this KB article](http://www.s2member.com/kb/importing-updating-users/#custom-registration-profile-fields) before you import new Users/Members or mass update any existing Users/Members. ALSO NOTE: User/Member CSV Export Files generated by previous versions of s2Member® Pro (if they contained any Custom Registration/Profile Fields) will NOT be compatible with this latest release (e.g. you should NOT attempt to re-import those old files in an effort to mass update existing Users/Members). Please generate a new User/Member CSV Export File in the latest release of s2Member® Pro before attempting to edit and/or mass update existing Users/Members with applications like MS Excel or OpenOffice.
224
 
225
  = v130123 =
226
  * **(Maintenance Release) Upgrade immediately.**
227
+ * (s2Member/s2Member Pro) **s2Stream Shortcode (#78)** s2Member® now supports JW Player® license keys using Shortcode Attribute `player_key=""`. See [this KB article](http://www.s2member.com/kb/jwplayer-s2stream-shortcodes/) please. Also discussed in [this thread](http://www.s2member.com/forums/topic/new-jw-player-6-s2-video-audio-shortcodes/#post-38768).
228
+ * (s2Member/s2Member Pro) **s2Stream Shortcode (#79)** s2Member® now supports JW Player® [Advanced Option Blocks](http://www.longtailvideo.com/support/jw-player/28839/embedding-the-player) using Shortcode Attribute `player_option_blocks=""`. Example: `player_option_blocks="sharing:{}"`. See [this KB article](http://www.s2member.com/kb/jwplayer-s2stream-shortcodes/) please. Also discussed in [this thread](http://www.s2member.com/forums/topic/new-jw-player-6-s2-video-audio-shortcodes/#post-38768).
229
+ * (s2Member Pro) **User Exportation (#80)** s2Member® Pro User Exportation now occurs with MySQL `ORDER BY ID`, instead of no `ORDER BY` at all. This helps to prevent confusion and buggy behavior. Discussed in [this thread](http://www.s2member.com/forums/topic/user-export-not-working-properly/#post-39123).
230
+ * (s2Member Pro) **User Exportation (#81)** s2Member Pro's User Exportation now supports the exporation of up to `1000` User/Member table rows at once. Of course it remains possible to export ALL of your Users/Members with s2Member® Pro. All we've done here is bump the default limit from `250` up to `1000` at a time. In addition, there is a new Filter making it possible to extend this limit further on servers that can handle it. Use Filter: `ws_plugin__s2member_pro_export_users_limit` if you would like to export more Users all at once. See also: `Dashboard -› s2Member® Pro -› User/Member Exportation`.
231
  * (s2Member/s2Member Pro) **KB Articles** Inline documentation updated in some areas, with a few links pointing to helpful/related KB articles.
232
 
233
  = v130121 =
234
  * **(Maintenance Release) Upgrade immediately.**
235
  * **New Feature** s2Member® now comes with a new Shortcode `[s2Stream file_download="video.mp4" player="jwplayer-v6" ... /]`, making it MUCH easier for site owners to implemement RTMP streams of audio/video content. For further details, please check your Dashboard under: `s2Member® -› Download Options -› JW Player® v6 and RTMP Protocol Examples`. See also: `s2Member® -› Download Options -› Shortcode Attributes (Explained)`.
236
+ * **Compatibility (#75)** Updated s2Member's local file storage engine (for File Downloads via s2Member®), to support special characters in file names. Discussed in [this thread](http://www.s2member.com/forums/topic/problem-with-quotes-in-filename-downloads/#post-38395).
237
+ * **Bug Fix (#71)** A bug first introduced in the previous release of v130116, where we added support for byte-range requests to s2Member's File Download functionality, was causing multiple byte-range requests (processed by s2Member) to count against each User/Member as multiple File Downloads. Fixed in this release.
238
  * **Compatibility** Updated s2Member's integration with Amazon® S3 to extend the default 30 second connection timeout (which was too conservative for many integrations) up to 24 hours by default, making it match the same as s2Member's Amazon® CloudFront connection timeout. For further details, please check your Dashboard under: `s2Member® -› Download Options -› Amazon® S3/CDN Storage -› Dev Note w/Technical Details`. It is possible to modify this connection timeout through a Filter discussed there.
239
 
240
  = v130116 =
241
  * **(Maintenance Release) Upgrade immediately.**
242
+ * **Compatibility (#39)** Updated codes samples for JW Player®, to include the `mp4:` prefix when implementing RTMP streams against MP4 video files. Discussed in [this thread](http://www.s2member.com/forums/topic/cloudfront-subfolder-streaming-error/#post-35750).
243
+ * **Compatibility (#51)** Updated Payflow® API to support recurring billing every six months. Discussed in [this thread](http://www.s2member.com/forums/topic/payflow-error-6-month-recurring-membership/#post-36053).
244
+ * **Bug Fix (#69)** Updated multisite user imporation routine, to support a specific scenario not covered under WordPress v3.5. Discussed in [this thread](http://www.s2member.com/forums/topic/users-on-multisite/).
245
+ * **Feature Improvement (#71)** s2Member® has been updated to support byte-range requests with it's default local file storage engine, served from the `/s2member-files/` directory. s2Member® has always supported byte-range requests when integrated with Amazon® CloudFront. Now it supports byte-range requests in it's default local storage engine too. This will improve compatibility with mobile devices, iTunes™ and other devices that use byte-range requests. Discussed in [this thread](http://www.s2member.com/forums/topic/any-way-to-set-accept-ranges-for-downloads/#post-15871).
246
 
247
  = v121213 =
248
  * **(Maintenance Release) Upgrade immediately.**
s2member.php CHANGED
@@ -19,8 +19,8 @@
19
  */
20
  /* -- This section for WordPress® parsing. ------------------------------------------------------------------------------
21
 
22
- Version: 130406
23
- Stable tag: 130406
24
 
25
  SSL Compatible: yes
26
  bbPress® Compatible: yes
@@ -75,7 +75,7 @@ if(realpath(__FILE__) === realpath($_SERVER["SCRIPT_FILENAME"]))
75
  * @var str
76
  */
77
  if(!defined("WS_PLUGIN__S2MEMBER_VERSION"))
78
- define("WS_PLUGIN__S2MEMBER_VERSION", "130406" /* !#distro-version#! */);
79
  /**
80
  * Minimum PHP version required to run s2Member.
81
  *
@@ -105,7 +105,7 @@ if(!defined("WS_PLUGIN__S2MEMBER_MIN_WP_VERSION"))
105
  * @var str
106
  */
107
  if(!defined("WS_PLUGIN__S2MEMBER_MIN_PRO_VERSION"))
108
- define("WS_PLUGIN__S2MEMBER_MIN_PRO_VERSION", "130406" /* !#distro-version#! */);
109
  /*
110
  Several compatibility checks.
111
  If all pass, load the s2Member plugin.
@@ -133,7 +133,11 @@ if(version_compare(PHP_VERSION, WS_PLUGIN__S2MEMBER_MIN_PHP_VERSION, ">=") && ve
133
  Load a possible Pro module, if/when available.
134
  */
135
  if(apply_filters("ws_plugin__s2member_load_pro", true) && file_exists(dirname(__FILE__)."-pro/pro-module.php"))
136
- include_once dirname(__FILE__)."-pro/pro-module.php";
 
 
 
 
137
  /*
138
  Configure options and their defaults.
139
  */
19
  */
20
  /* -- This section for WordPress® parsing. ------------------------------------------------------------------------------
21
 
22
+ Version: 130510
23
+ Stable tag: 130510
24
 
25
  SSL Compatible: yes
26
  bbPress® Compatible: yes
75
  * @var str
76
  */
77
  if(!defined("WS_PLUGIN__S2MEMBER_VERSION"))
78
+ define("WS_PLUGIN__S2MEMBER_VERSION", "130510" /* !#distro-version#! */);
79
  /**
80
  * Minimum PHP version required to run s2Member.
81
  *
105
  * @var str
106
  */
107
  if(!defined("WS_PLUGIN__S2MEMBER_MIN_PRO_VERSION"))
108
+ define("WS_PLUGIN__S2MEMBER_MIN_PRO_VERSION", "130510" /* !#distro-version#! */);
109
  /*
110
  Several compatibility checks.
111
  If all pass, load the s2Member plugin.
133
  Load a possible Pro module, if/when available.
134
  */
135
  if(apply_filters("ws_plugin__s2member_load_pro", true) && file_exists(dirname(__FILE__)."-pro/pro-module.php"))
136
+ {
137
+ include_once dirname(__FILE__)."-pro/pro-module.php";
138
+ if(is_dir(WP_PLUGIN_DIR."/codestyling-localization") && !is_dir(dirname(__FILE__)."/s2member-pro") && function_exists("symlink"))
139
+ @symlink(dirname(__FILE__)."-pro", dirname(__FILE__)."/s2member-pro"); // For CS localization compatibility.
140
+ }
141
  /*
142
  Configure options and their defaults.
143
  */