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

Version Description

= v120608 = Maintenance release. Upgrade immediately.

Download this release

Release Info

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

Code changes from version 120601 to 120608

Files changed (6) hide show
  1. includes/classes/login-customizations.inc.php +1 -1
  2. includes/classes/paypal-utilities.inc.php +6 -1
  3. includes/classes/utils-urls.inc.php +1 -2
  4. includes/translations/s2member.pot +57 -57
  5. readme.txt +19 -4
  6. s2member.php +5 -5
includes/classes/login-customizations.inc.php CHANGED
@@ -97,7 +97,7 @@ if(!class_exists("c_ws_plugin__s2member_login_customizations"))
97
  $a[] = 'body, body * { font-family:'.$GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["login_reg_font_family"].$i.'; }';
98
  /**/
99
  $a[] = 'div#login { width:'.$GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["login_reg_logo_src_width"].'px'.$i.'; }';
100
- $a[] = 'div#login h1 a { background:url('.$GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["login_reg_logo_src"].') no-repeat top center'.$i.'; }';
101
  $a[] = 'div#login h1 a { display:block'.$i.'; width:100%'.$i.'; height:'.$GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["login_reg_logo_src_height"].'px'.$i.'; }';
102
  /**/
103
  $a[] = 'div#login form { -moz-box-shadow:1px 1px 5px #'.$GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["login_reg_background_box_shadow_color"].', -1px -1px 5px #'.$GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["login_reg_background_box_shadow_color"].$i.'; -webkit-box-shadow:1px 1px 5px #'.$GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["login_reg_background_box_shadow_color"].', -1px -1px 5px #'.$GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["login_reg_background_box_shadow_color"].$i.'; box-shadow:1px 1px 5px #'.$GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["login_reg_background_box_shadow_color"].', -1px -1px 5px #'.$GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["login_reg_background_box_shadow_color"].$i.'; }';
97
  $a[] = 'body, body * { font-family:'.$GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["login_reg_font_family"].$i.'; }';
98
  /**/
99
  $a[] = 'div#login { width:'.$GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["login_reg_logo_src_width"].'px'.$i.'; }';
100
+ $a[] = 'div#login h1 a { background:url('.$GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["login_reg_logo_src"].') no-repeat top center'.$i.'; background-size:auto'.$i.'; }';
101
  $a[] = 'div#login h1 a { display:block'.$i.'; width:100%'.$i.'; height:'.$GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["login_reg_logo_src_height"].'px'.$i.'; }';
102
  /**/
103
  $a[] = 'div#login form { -moz-box-shadow:1px 1px 5px #'.$GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["login_reg_background_box_shadow_color"].', -1px -1px 5px #'.$GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["login_reg_background_box_shadow_color"].$i.'; -webkit-box-shadow:1px 1px 5px #'.$GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["login_reg_background_box_shadow_color"].', -1px -1px 5px #'.$GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["login_reg_background_box_shadow_color"].$i.'; box-shadow:1px 1px 5px #'.$GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["login_reg_background_box_shadow_color"].', -1px -1px 5px #'.$GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["login_reg_background_box_shadow_color"].$i.'; }';
includes/classes/paypal-utilities.inc.php CHANGED
@@ -257,7 +257,12 @@ if(!class_exists("c_ws_plugin__s2member_paypal_utilities"))
257
  /**/
258
  $input_time = /* Record input/nvp for logging. */ date("D M j, Y g:i:s a T");
259
  /**/
260
- $nvp = trim(c_ws_plugin__s2member_utils_urls::remote($url, $post_vars, array("timeout" => 20)));
 
 
 
 
 
261
  /**/
262
  $output_time = /* Now record after output time. */ date("D M j, Y g:i:s a T");
263
  /**/
257
  /**/
258
  $input_time = /* Record input/nvp for logging. */ date("D M j, Y g:i:s a T");
259
  /**/
260
+ $nvp_post_vars = "";
261
+ foreach($post_vars as $_key => $_value /* A ridiculous `text/namevalue` format. */)
262
+ $nvp_post_vars .= (($nvp_post_vars) ? "&" : "").$_key."[".strlen($_value)."]=".$_value;
263
+ unset($_key, $_value);
264
+ /**/
265
+ $nvp = trim(c_ws_plugin__s2member_utils_urls::remote($url, $nvp_post_vars, array("timeout" => 20, "headers" => array("Content-Type" => "text/namevalue"))));
266
  /**/
267
  $output_time = /* Now record after output time. */ date("D M j, Y g:i:s a T");
268
  /**/
includes/classes/utils-urls.inc.php CHANGED
@@ -198,8 +198,7 @@ if(!class_exists("c_ws_plugin__s2member_utils_urls"))
198
  if((is_array($post_vars) || is_string($post_vars)) && !empty($post_vars))
199
  $args = array_merge($args, array("method" => "POST", "body" => $post_vars));
200
  /**/
201
- if(!empty($args["method"]) && strcasecmp((string)$args["method"], "DELETE") === 0)
202
- /* WordPress® v3.3 and prior, does NOT support `DELETE` via cURL unfortunately. */
203
  add_filter("use_curl_transport", "__return_false", /* ID via priority. */ 111209554);
204
  /**/
205
  eval('foreach(array_keys(get_defined_vars())as$__v)$__refs[$__v]=&$$__v;');
198
  if((is_array($post_vars) || is_string($post_vars)) && !empty($post_vars))
199
  $args = array_merge($args, array("method" => "POST", "body" => $post_vars));
200
  /**/
201
+ if(!empty($args["method"]) && strcasecmp((string)$args["method"], "DELETE") === 0 && version_compare(get_bloginfo("version"), "3.4", "<"))
 
202
  add_filter("use_curl_transport", "__return_false", /* ID via priority. */ 111209554);
203
  /**/
204
  eval('foreach(array_keys(get_defined_vars())as$__v)$__refs[$__v]=&$$__v;');
includes/translations/s2member.pot CHANGED
@@ -2,9 +2,9 @@
2
  # This file is distributed under the same license as the s2Member® Framework package.
3
  msgid ""
4
  msgstr ""
5
- "Project-Id-Version: s2Member® Framework 120517\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/___s2member\n"
7
- "POT-Creation-Date: 2012-06-01 15:20:42+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
@@ -666,8 +666,8 @@ msgid "Error #%1$s. %2$s. %3$s."
666
  msgstr ""
667
 
668
  #: s2member/includes/classes/paypal-utilities.inc.php:178
669
- #: s2member/includes/classes/paypal-utilities.inc.php:273
670
- #: s2member/includes/classes/paypal-utilities.inc.php:281
671
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:96
672
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:318
673
  msgctxt "s2member-front"
@@ -676,14 +676,14 @@ msgstr ""
676
 
677
  #: s2member/includes/classes/paypal-utilities.inc.php:219
678
  #: s2member/includes/classes/paypal-utilities.inc.php:225
679
- #: s2member/includes/classes/paypal-utilities.inc.php:322
680
- #: s2member/includes/classes/paypal-utilities.inc.php:328
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:222
686
- #: s2member/includes/classes/paypal-utilities.inc.php:325
687
  msgctxt "s2member-front"
688
  msgid "Error #%s. Transaction declined. Express Checkout was NOT confirmed."
689
  msgstr ""
@@ -703,8 +703,8 @@ msgstr ""
703
  #. ``$response["__error"]`` with
704
  #. `ws_plugin__s2member_pro_authnet_arb_response`.
705
 
706
- #: s2member/includes/classes/paypal-utilities.inc.php:271
707
- #: s2member/includes/classes/paypal-utilities.inc.php:279
708
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:93
709
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:315
710
  msgctxt "s2member-front"
@@ -2457,31 +2457,31 @@ msgstr ""
2457
  #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-in.inc.php:154
2458
  #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-pf-in.inc.php:151
2459
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-in.inc.php:150
2460
- #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:146
2461
  msgctxt "s2member-front"
2462
  msgid "You're <strong>NOT</strong> logged in."
2463
  msgstr ""
2464
 
2465
  #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:248
2466
  #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:580
2467
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:289
2468
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:612
2469
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:332
2470
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:662
2471
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:420
2472
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:848
2473
  msgctxt "s2member-front"
2474
  msgid "<strong>Thank you.</strong> Your account has been updated.<br />&mdash; Please <a href=\"%s\" rel=\"nofollow\">log back in</a> now."
2475
  msgstr ""
2476
 
2477
  #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:447
2478
  #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:696
2479
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:451
2480
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:764
2481
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:501
2482
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:814
2483
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:682
2484
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:1000
2485
  msgctxt "s2member-front"
2486
  msgid "<strong>Thank you.</strong> Your account has been approved.<br />&mdash; Please <a href=\"%s\" rel=\"nofollow\">login</a>."
2487
  msgstr ""
@@ -2492,18 +2492,18 @@ msgstr ""
2492
  #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:726
2493
  #: s2member-pro/includes/classes/gateways/authnet/authnet-registration-in.inc.php:124
2494
  #: s2member-pro/includes/classes/gateways/authnet/authnet-registration-in.inc.php:141
2495
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:460
2496
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:481
2497
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:773
2498
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:794
2499
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:510
2500
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:531
2501
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:823
2502
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:844
2503
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:691
2504
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:712
2505
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:1009
2506
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:1030
2507
  #: s2member-pro/includes/classes/gateways/paypal/paypal-registration-in.inc.php:124
2508
  #: s2member-pro/includes/classes/gateways/paypal/paypal-registration-in.inc.php:141
2509
  msgctxt "s2member-front"
@@ -2512,21 +2512,21 @@ msgstr ""
2512
 
2513
  #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:471
2514
  #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:717
2515
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:472
2516
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:785
2517
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:522
2518
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:835
2519
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:703
2520
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:1021
2521
  msgctxt "s2member-front"
2522
  msgid "<strong>Thank you.</strong> Your account has been approved.<br />&mdash; You'll receive an email momentarily."
2523
  msgstr ""
2524
 
2525
  #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:737
2526
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:805
2527
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:855
2528
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:1041
2529
- #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:137
2530
  msgctxt "s2member-front"
2531
  msgid "<strong>Unknown error.</strong> Please contact Support for assistance."
2532
  msgstr ""
@@ -3326,27 +3326,27 @@ msgid "Unknown form submission type. Please contact Support."
3326
  msgstr ""
3327
 
3328
  #: s2member-pro/includes/classes/gateways/authnet/authnet-sp-checkout-in.inc.php:163
3329
- #: s2member-pro/includes/classes/gateways/paypal/paypal-sp-checkout-in.inc.php:275
3330
  msgctxt "s2member-front"
3331
  msgid "<strong>Thank you.</strong> Your purchase has been approved.<br />&mdash; Please <a href=\"%s\" rel=\"nofollow\">click here</a> to proceed."
3332
  msgstr ""
3333
 
3334
  #: s2member-pro/includes/classes/gateways/authnet/authnet-sp-checkout-in.inc.php:170
3335
- #: s2member-pro/includes/classes/gateways/paypal/paypal-sp-checkout-in.inc.php:282
3336
  msgctxt "s2member-front"
3337
  msgid "<strong>Oops.</strong> Unable to generate Access Link. Please contact Support for assistance."
3338
  msgstr ""
3339
 
3340
  #: s2member-pro/includes/classes/gateways/authnet/authnet-update-in.inc.php:107
3341
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-in.inc.php:112
3342
- #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:115
3343
  msgctxt "s2member-front"
3344
  msgid "<strong>Confirmed.</strong> Your billing information has been updated."
3345
  msgstr ""
3346
 
3347
  #: s2member-pro/includes/classes/gateways/authnet/authnet-update-in.inc.php:119
3348
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-in.inc.php:128
3349
- #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:131
3350
  msgctxt "s2member-front"
3351
  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."
3352
  msgstr ""
@@ -3593,12 +3593,12 @@ msgctxt "s2member-front"
3593
  msgid "Please <a href=\"%s\" rel=\"nofollow\">log in at PayPal®</a> to cancel your Subscription."
3594
  msgstr ""
3595
 
3596
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:301
3597
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:624
3598
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:344
3599
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:674
3600
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:437
3601
- #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:860
3602
  msgctxt "s2member-front"
3603
  msgid "<strong>Sorry.</strong> Your account is pending other changes. Please try again in 15 minutes."
3604
  msgstr ""
@@ -3650,7 +3650,7 @@ msgstr ""
3650
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-in.inc.php:132
3651
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-in.inc.php:136
3652
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:76
3653
- #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:135
3654
  msgctxt "s2member-front"
3655
  msgid "Please <a href=\"%s\" rel=\"nofollow\">log in at PayPal®</a> to update your billing information."
3656
  msgstr ""
@@ -3658,7 +3658,7 @@ msgstr ""
3658
  #: s2member-pro/includes/classes/gateways/paypal/paypal-responses.inc.php:294
3659
  #: s2member-pro/includes/classes/gateways/paypal/paypal-responses.inc.php:315
3660
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-in.inc.php:124
3661
- #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:127
3662
  msgctxt "s2member-front"
3663
  msgid "<strong>Unable to update at this time.</strong> Your account is pending other changes. Please try again in 15 minutes."
3664
  msgstr ""
@@ -3714,7 +3714,7 @@ msgctxt "s2member-admin"
3714
  msgid "Invalid form configuration. Invalid \"rr, rra\" attributes. When \"rr\" ( Regular Recurring ) is 0 or 1, \"rra\" ( Recurring Retry Attempts ) must be >= 0."
3715
  msgstr ""
3716
 
3717
- #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:141
3718
  msgctxt "s2member-front"
3719
  msgid "<strong>No Subscr. ID.</strong> Please contact Support for assistance."
3720
  msgstr ""
2
  # This file is distributed under the same license as the s2Member® Framework package.
3
  msgid ""
4
  msgstr ""
5
+ "Project-Id-Version: s2Member® Framework 120601\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/___s2member\n"
7
+ "POT-Creation-Date: 2012-06-08 20:17:39+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
666
  msgstr ""
667
 
668
  #: s2member/includes/classes/paypal-utilities.inc.php:178
669
+ #: s2member/includes/classes/paypal-utilities.inc.php:278
670
+ #: s2member/includes/classes/paypal-utilities.inc.php:286
671
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:96
672
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:318
673
  msgctxt "s2member-front"
676
 
677
  #: s2member/includes/classes/paypal-utilities.inc.php:219
678
  #: s2member/includes/classes/paypal-utilities.inc.php:225
679
+ #: s2member/includes/classes/paypal-utilities.inc.php:327
680
+ #: s2member/includes/classes/paypal-utilities.inc.php:333
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:222
686
+ #: s2member/includes/classes/paypal-utilities.inc.php:330
687
  msgctxt "s2member-front"
688
  msgid "Error #%s. Transaction declined. Express Checkout was NOT confirmed."
689
  msgstr ""
703
  #. ``$response["__error"]`` with
704
  #. `ws_plugin__s2member_pro_authnet_arb_response`.
705
 
706
+ #: s2member/includes/classes/paypal-utilities.inc.php:276
707
+ #: s2member/includes/classes/paypal-utilities.inc.php:284
708
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:93
709
  #: s2member-pro/includes/classes/gateways/authnet/authnet-utilities.inc.php:315
710
  msgctxt "s2member-front"
2457
  #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-in.inc.php:154
2458
  #: s2member-pro/includes/classes/gateways/paypal/paypal-cancellation-pf-in.inc.php:151
2459
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-in.inc.php:150
2460
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:147
2461
  msgctxt "s2member-front"
2462
  msgid "You're <strong>NOT</strong> logged in."
2463
  msgstr ""
2464
 
2465
  #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:248
2466
  #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:580
2467
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:291
2468
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:614
2469
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:333
2470
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:664
2471
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:422
2472
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:850
2473
  msgctxt "s2member-front"
2474
  msgid "<strong>Thank you.</strong> Your account has been updated.<br />&mdash; Please <a href=\"%s\" rel=\"nofollow\">log back in</a> now."
2475
  msgstr ""
2476
 
2477
  #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:447
2478
  #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:696
2479
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:453
2480
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:766
2481
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:503
2482
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:816
2483
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:684
2484
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:1002
2485
  msgctxt "s2member-front"
2486
  msgid "<strong>Thank you.</strong> Your account has been approved.<br />&mdash; Please <a href=\"%s\" rel=\"nofollow\">login</a>."
2487
  msgstr ""
2492
  #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:726
2493
  #: s2member-pro/includes/classes/gateways/authnet/authnet-registration-in.inc.php:124
2494
  #: s2member-pro/includes/classes/gateways/authnet/authnet-registration-in.inc.php:141
2495
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:462
2496
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:483
2497
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:775
2498
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:796
2499
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:512
2500
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:533
2501
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:825
2502
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:846
2503
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:693
2504
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:714
2505
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:1011
2506
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:1032
2507
  #: s2member-pro/includes/classes/gateways/paypal/paypal-registration-in.inc.php:124
2508
  #: s2member-pro/includes/classes/gateways/paypal/paypal-registration-in.inc.php:141
2509
  msgctxt "s2member-front"
2512
 
2513
  #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:471
2514
  #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:717
2515
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:474
2516
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:787
2517
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:524
2518
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:837
2519
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:705
2520
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:1023
2521
  msgctxt "s2member-front"
2522
  msgid "<strong>Thank you.</strong> Your account has been approved.<br />&mdash; You'll receive an email momentarily."
2523
  msgstr ""
2524
 
2525
  #: s2member-pro/includes/classes/gateways/authnet/authnet-checkout-in.inc.php:737
2526
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:807
2527
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:857
2528
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:1043
2529
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:138
2530
  msgctxt "s2member-front"
2531
  msgid "<strong>Unknown error.</strong> Please contact Support for assistance."
2532
  msgstr ""
3326
  msgstr ""
3327
 
3328
  #: s2member-pro/includes/classes/gateways/authnet/authnet-sp-checkout-in.inc.php:163
3329
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-sp-checkout-in.inc.php:277
3330
  msgctxt "s2member-front"
3331
  msgid "<strong>Thank you.</strong> Your purchase has been approved.<br />&mdash; Please <a href=\"%s\" rel=\"nofollow\">click here</a> to proceed."
3332
  msgstr ""
3333
 
3334
  #: s2member-pro/includes/classes/gateways/authnet/authnet-sp-checkout-in.inc.php:170
3335
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-sp-checkout-in.inc.php:284
3336
  msgctxt "s2member-front"
3337
  msgid "<strong>Oops.</strong> Unable to generate Access Link. Please contact Support for assistance."
3338
  msgstr ""
3339
 
3340
  #: s2member-pro/includes/classes/gateways/authnet/authnet-update-in.inc.php:107
3341
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-in.inc.php:112
3342
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:116
3343
  msgctxt "s2member-front"
3344
  msgid "<strong>Confirmed.</strong> Your billing information has been updated."
3345
  msgstr ""
3346
 
3347
  #: s2member-pro/includes/classes/gateways/authnet/authnet-update-in.inc.php:119
3348
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-in.inc.php:128
3349
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:132
3350
  msgctxt "s2member-front"
3351
  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."
3352
  msgstr ""
3593
  msgid "Please <a href=\"%s\" rel=\"nofollow\">log in at PayPal®</a> to cancel your Subscription."
3594
  msgstr ""
3595
 
3596
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:303
3597
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php:626
3598
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:345
3599
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php:676
3600
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:439
3601
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php:862
3602
  msgctxt "s2member-front"
3603
  msgid "<strong>Sorry.</strong> Your account is pending other changes. Please try again in 15 minutes."
3604
  msgstr ""
3650
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-in.inc.php:132
3651
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-in.inc.php:136
3652
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:76
3653
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:136
3654
  msgctxt "s2member-front"
3655
  msgid "Please <a href=\"%s\" rel=\"nofollow\">log in at PayPal®</a> to update your billing information."
3656
  msgstr ""
3658
  #: s2member-pro/includes/classes/gateways/paypal/paypal-responses.inc.php:294
3659
  #: s2member-pro/includes/classes/gateways/paypal/paypal-responses.inc.php:315
3660
  #: s2member-pro/includes/classes/gateways/paypal/paypal-update-in.inc.php:124
3661
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:128
3662
  msgctxt "s2member-front"
3663
  msgid "<strong>Unable to update at this time.</strong> Your account is pending other changes. Please try again in 15 minutes."
3664
  msgstr ""
3714
  msgid "Invalid form configuration. Invalid \"rr, rra\" attributes. When \"rr\" ( Regular Recurring ) is 0 or 1, \"rra\" ( Recurring Retry Attempts ) must be >= 0."
3715
  msgstr ""
3716
 
3717
+ #: s2member-pro/includes/classes/gateways/paypal/paypal-update-pf-in.inc.php:142
3718
  msgctxt "s2member-front"
3719
  msgid "<strong>No Subscr. ID.</strong> Please contact Support for assistance."
3720
  msgstr ""
readme.txt CHANGED
@@ -1,7 +1,7 @@
1
  === s2Member® Framework (Member Roles, Capabilities, Membership, PayPal Members) ===
2
 
3
- Version: 120601
4
- Stable tag: 120601
5
 
6
  SSL Compatible: yes
7
  bbPress® Compatible: yes
@@ -16,7 +16,7 @@ Authorize.Net® Compatible: yes w/s2Member® Pro
16
  Google® Checkout Compatible: yes w/s2Member® Pro
17
  ClickBank® Compatible: yes w/s2Member® Pro
18
 
19
- Tested up to: 3.3.2
20
  Requires at least: 3.2
21
 
22
  Copyright: © 2009 WebSharks, Inc.
@@ -48,6 +48,8 @@ s2Member®, a powerful (free) membership plugin for WordPress®. Protect/secure
48
 
49
  == Installation ==
50
 
 
 
51
  = s2Member® is very easy to install (instructions) =
52
  1. Upload the `/s2member` folder to your `/wp-content/plugins/` directory.
53
  2. Activate the plugin through the `Plugins` menu in WordPress®.
@@ -61,6 +63,8 @@ Yes. s2Member and s2Member Pro, are also both compatible with Multisite Networki
61
 
62
  == Description ==
63
 
 
 
64
  [youtube http://www.youtube.com/watch?v=neGsNjWhOBs /]
65
 
66
  The s2Member® Framework (free) integrates with PayPal® Website Payments Standard (also free), and fully supports recurring billing. s2Member supports custom Pages for registration (including Custom Registration/Profile Fields), account access, and a lot more. s2Member is compatible with Multisite Networking too, and even with BuddyPress and bbPress. With the s2Member® Pro add-on (an optional paid upgrade), you can add support for unlimited Membership Levels, PayPal® Website Payments Pro (w/ Pro Forms to facilitate on-site credit card processing), Authorize.Net® (also with Pro Forms), Google® Checkout, ClickBank®, advanced User Import/Export tools, the ability to use Coupon Codes, and many other enhancements. Videos available at: [s2Member.com / Videos](http://www.s2member.com/videos/).
@@ -73,6 +77,8 @@ You can learn more about s2Member® at [s2Member.com](http://www.s2member.com/).
73
 
74
  == Frequently Asked Questions ==
75
 
 
 
76
  = Please check the following s2Member® resources: =
77
  * s2Member FAQs: http://www.s2member.com/faqs/
78
  * Knowledge Base: http://www.s2member.com/kb/
@@ -85,16 +91,25 @@ Please see [this FAQ entry](http://www.s2member.com/faqs/#s2-faqs-translations)
85
 
86
  == Upgrade Notice ==
87
 
88
- = v120601 =
89
  Maintenance release. Upgrade immediately.
90
 
91
  == Changelog ==
92
 
 
 
 
 
 
 
 
93
  = v120601 =
94
  * **(Maintenance Release) Upgrade immediately.**
95
  * (s2Member Pro) **ClickBank® Button Shortcodes**. This release works around a bug that has been discovered on the ClickBank® side of things, when a `+` character appears in the `desc=""` attribute of your ClickBank® Button Shortcode. Resolved in this release. Please see [this thread](http://www.s2member.com/forums/topic/clickbank-output-url/#post-15166) for further details.
96
  * (s2Member Pro) **Payflow® Daily Recurrence (Limitation)**. PayPal® Pro accounts with the Payflow® Edition API, are NOT capable of charging on a `daily` recurring basis. Previous releases of s2Member® Pro mistakenly documented this as being possible. Resolved in this release. PayPal® Pro accounts operating with the Payflow® Edition (and integrated with s2Member®), are only capable of charging recurring fees on the following schedules: `weekly, bi-weekly, monthly, quarterly, or yearly`. This is in large part, a limitation in the Payflow® API, which we hope will be resolved by PayPal® in a future version. Please feel free to contact PayPal® if you'd like to vote for this feature! This limitation does NOT affect existing PayPal® Pro accounts operating exclusively under the PayPal® Pro API (e.g. without Payflow®).
97
  * (s2Member Pro) **New ccBill® Shortcodes**. s2Member® Pro now includes two new Shortcode Attributes for ccBill® payment button integrations. These include: `sub_account` and `form`. Making it possible to integrate a single installation of s2Member® Pro with multiple ccBill® sub-accounts, and/or multiple ccBill® forms (as they exist in your ccBill® account). For further details, please read the Shortcode documentation, found in your Dashboard under: `s2Member® -> ccBill® Buttons -> Shortcode Attributes (Explained)`.
 
 
98
  = v120517 =
99
  * **(Maintenance Release) Upgrade immediately.**
100
  * (s2Member Pro) **PayPal® Pro Forms**. This release removes all limitations on the maximum length of an initial trial/period. It is now possible to offer any number of days/weeks/months/years for free, or at a different initial rate.
1
  === s2Member® Framework (Member Roles, Capabilities, Membership, PayPal Members) ===
2
 
3
+ Version: 120608
4
+ Stable tag: 120608
5
 
6
  SSL Compatible: yes
7
  bbPress® Compatible: yes
16
  Google® Checkout Compatible: yes w/s2Member® Pro
17
  ClickBank® Compatible: yes w/s2Member® Pro
18
 
19
+ Tested up to: 3.4
20
  Requires at least: 3.2
21
 
22
  Copyright: © 2009 WebSharks, Inc.
48
 
49
  == Installation ==
50
 
51
+ **NOTE:** Please do NOT use the WordPress® forums to seek company support. Support for s2Member® is handled in [our own support forums](http://www.s2member.com/forums/).
52
+
53
  = s2Member® is very easy to install (instructions) =
54
  1. Upload the `/s2member` folder to your `/wp-content/plugins/` directory.
55
  2. Activate the plugin through the `Plugins` menu in WordPress®.
63
 
64
  == Description ==
65
 
66
+ **NOTE:** Please do NOT use the WordPress® forums to seek company support. Support for s2Member® is handled in [our own support forums](http://www.s2member.com/forums/).
67
+
68
  [youtube http://www.youtube.com/watch?v=neGsNjWhOBs /]
69
 
70
  The s2Member® Framework (free) integrates with PayPal® Website Payments Standard (also free), and fully supports recurring billing. s2Member supports custom Pages for registration (including Custom Registration/Profile Fields), account access, and a lot more. s2Member is compatible with Multisite Networking too, and even with BuddyPress and bbPress. With the s2Member® Pro add-on (an optional paid upgrade), you can add support for unlimited Membership Levels, PayPal® Website Payments Pro (w/ Pro Forms to facilitate on-site credit card processing), Authorize.Net® (also with Pro Forms), Google® Checkout, ClickBank®, advanced User Import/Export tools, the ability to use Coupon Codes, and many other enhancements. Videos available at: [s2Member.com / Videos](http://www.s2member.com/videos/).
77
 
78
  == Frequently Asked Questions ==
79
 
80
+ **NOTE:** Please do NOT use the WordPress® forums to seek company support. Support for s2Member® is handled in [our own support forums](http://www.s2member.com/forums/).
81
+
82
  = Please check the following s2Member® resources: =
83
  * s2Member FAQs: http://www.s2member.com/faqs/
84
  * Knowledge Base: http://www.s2member.com/kb/
91
 
92
  == Upgrade Notice ==
93
 
94
+ = v120608 =
95
  Maintenance release. Upgrade immediately.
96
 
97
  == Changelog ==
98
 
99
+ = v120608 =
100
+ * **(Maintenance Release) Upgrade immediately.**
101
+ * (s2Member/s2Member Pro) **WordPress® v3.4**. Updated for compatibility with the coming release of [WordPress® v3.4](http://wordpress.org/news/2012/06/wordpress-3-4-release-candidate-2/).
102
+ * (s2Member/s2Member Pro) **Payflow® Bug Fix**. This release addresses two bugs that existed in s2Member's Payflow® integration. Resolved in this release. Please see [this thread](http://www.s2member.com/forums/topic/transactions-not-going-through/#post-15896) for further details.
103
+ * (s2Member Pro) **PayPal® Express Checkout**. This release enables "PayPal Account Optional" for PayPal® Express Checkout, via s2Member Pro Forms. In other words, this release makes the PayPal® Express Checkout option through Pro Forms, behave more like a standard PayPal® Button; where a customer is not always required to have a PayPal® account during checkout. This functionality is enabled automatically, there's nothing you need to change in your s2Member® integration. However, we do suggest that you turn "PayPal Account Optional" (on) inside your PayPal® account. Please see [this thread](http://www.s2member.com/forums/topic/paypal-express-for-paypal-pro-user/#post-15892) for further details.
104
+ * (s2Member) **Documentation**. Code samples for Content Dripping have been updated in the Dashboard, in order to correct a date comparison snippet, which was WRONG. Please check your Dashboard under: `s2Member® -> API Scripting -> Content Dripping -> Example #2`, for the updated code sample.
105
+
106
  = v120601 =
107
  * **(Maintenance Release) Upgrade immediately.**
108
  * (s2Member Pro) **ClickBank® Button Shortcodes**. This release works around a bug that has been discovered on the ClickBank® side of things, when a `+` character appears in the `desc=""` attribute of your ClickBank® Button Shortcode. Resolved in this release. Please see [this thread](http://www.s2member.com/forums/topic/clickbank-output-url/#post-15166) for further details.
109
  * (s2Member Pro) **Payflow® Daily Recurrence (Limitation)**. PayPal® Pro accounts with the Payflow® Edition API, are NOT capable of charging on a `daily` recurring basis. Previous releases of s2Member® Pro mistakenly documented this as being possible. Resolved in this release. PayPal® Pro accounts operating with the Payflow® Edition (and integrated with s2Member®), are only capable of charging recurring fees on the following schedules: `weekly, bi-weekly, monthly, quarterly, or yearly`. This is in large part, a limitation in the Payflow® API, which we hope will be resolved by PayPal® in a future version. Please feel free to contact PayPal® if you'd like to vote for this feature! This limitation does NOT affect existing PayPal® Pro accounts operating exclusively under the PayPal® Pro API (e.g. without Payflow®).
110
  * (s2Member Pro) **New ccBill® Shortcodes**. s2Member® Pro now includes two new Shortcode Attributes for ccBill® payment button integrations. These include: `sub_account` and `form`. Making it possible to integrate a single installation of s2Member® Pro with multiple ccBill® sub-accounts, and/or multiple ccBill® forms (as they exist in your ccBill® account). For further details, please read the Shortcode documentation, found in your Dashboard under: `s2Member® -> ccBill® Buttons -> Shortcode Attributes (Explained)`.
111
+ * (s2Member/s2Member Pro) **Bug Fix**. A bug related to inaccurate role assignment, under certain scenarios (for administrative accounts). Resolved in this release. Please see [this thread](http://www.s2member.com/forums/topic/inaccurate-role-assignment-in-s2member-pro/#post-14122) for further details.
112
+
113
  = v120517 =
114
  * **(Maintenance Release) Upgrade immediately.**
115
  * (s2Member Pro) **PayPal® Pro Forms**. This release removes all limitations on the maximum length of an initial trial/period. It is now possible to offer any number of days/weeks/months/years for free, or at a different initial rate.
s2member.php CHANGED
@@ -19,8 +19,8 @@
19
  */
20
  /* -- This section for WordPress® parsing. ------------------------------------------------------------------------------
21
 
22
- Version: 120601
23
- Stable tag: 120601
24
 
25
  SSL Compatible: yes
26
  bbPress® Compatible: yes
@@ -35,7 +35,7 @@ Authorize.Net® Compatible: yes w/s2Member® Pro
35
  Google® Checkout Compatible: yes w/s2Member® Pro
36
  ClickBank® Compatible: yes w/s2Member® Pro
37
 
38
- Tested up to: 3.3.2
39
  Requires at least: 3.2
40
 
41
  Copyright: © 2009 WebSharks, Inc.
@@ -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", "120601" /* !#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", "120601" /* !#distro-version#! */);
109
  /*
110
  Several compatibility checks.
111
  If all pass, load the s2Member plugin.
19
  */
20
  /* -- This section for WordPress® parsing. ------------------------------------------------------------------------------
21
 
22
+ Version: 120608
23
+ Stable tag: 120608
24
 
25
  SSL Compatible: yes
26
  bbPress® Compatible: yes
35
  Google® Checkout Compatible: yes w/s2Member® Pro
36
  ClickBank® Compatible: yes w/s2Member® Pro
37
 
38
+ Tested up to: 3.4
39
  Requires at least: 3.2
40
 
41
  Copyright: © 2009 WebSharks, Inc.
75
  * @var str
76
  */
77
  if(!defined("WS_PLUGIN__S2MEMBER_VERSION"))
78
+ define("WS_PLUGIN__S2MEMBER_VERSION", "120608" /* !#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", "120608" /* !#distro-version#! */);
109
  /*
110
  Several compatibility checks.
111
  If all pass, load the s2Member plugin.