WP eCommerce - Version 3.9.5

Version Description

  • Fix: 4.3 Compatibility w/ WP_Widget constructors.
Download this release

Release Info

Developer JustinSainton
Plugin Icon 128x128 WP eCommerce
Version 3.9.5
Comparing to
See all releases

Code changes from version 3.9.4 to 3.9.5

license.txt ADDED
@@ -0,0 +1,281 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ GNU GENERAL PUBLIC LICENSE
2
+ Version 2, June 1991
3
+
4
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
5
+ 51 Franklin St, Fifth Floor, Boston, MA 02110, USA
6
+
7
+ Everyone is permitted to copy and distribute verbatim copies
8
+ of this license document, but changing it is not allowed.
9
+
10
+ Preamble
11
+
12
+ The licenses for most software are designed to take away your
13
+ freedom to share and change it. By contrast, the GNU General Public
14
+ License is intended to guarantee your freedom to share and change free
15
+ software--to make sure the software is free for all its users. This
16
+ General Public License applies to most of the Free Software
17
+ Foundation's software and to any other program whose authors commit to
18
+ using it. (Some other Free Software Foundation software is covered by
19
+ the GNU Library General Public License instead.) You can apply it to
20
+ your programs, too.
21
+
22
+ When we speak of free software, we are referring to freedom, not
23
+ price. Our General Public Licenses are designed to make sure that you
24
+ have the freedom to distribute copies of free software (and charge for
25
+ this service if you wish), that you receive source code or can get it
26
+ if you want it, that you can change the software or use pieces of it
27
+ in new free programs; and that you know you can do these things.
28
+
29
+ To protect your rights, we need to make restrictions that forbid
30
+ anyone to deny you these rights or to ask you to surrender the rights.
31
+ These restrictions translate to certain responsibilities for you if you
32
+ distribute copies of the software, or if you modify it.
33
+
34
+ For example, if you distribute copies of such a program, whether
35
+ gratis or for a fee, you must give the recipients all the rights that
36
+ you have. You must make sure that they, too, receive or can get the
37
+ source code. And you must show them these terms so they know their
38
+ rights.
39
+
40
+ We protect your rights with two steps: (1) copyright the software, and
41
+ (2) offer you this license which gives you legal permission to copy,
42
+ distribute and/or modify the software.
43
+
44
+ Also, for each author's protection and ours, we want to make certain
45
+ that everyone understands that there is no warranty for this free
46
+ software. If the software is modified by someone else and passed on, we
47
+ want its recipients to know that what they have is not the original, so
48
+ that any problems introduced by others will not reflect on the original
49
+ authors' reputations.
50
+
51
+ Finally, any free program is threatened constantly by software
52
+ patents. We wish to avoid the danger that redistributors of a free
53
+ program will individually obtain patent licenses, in effect making the
54
+ program proprietary. To prevent this, we have made it clear that any
55
+ patent must be licensed for everyone's free use or not licensed at all.
56
+
57
+ The precise terms and conditions for copying, distribution and
58
+ modification follow.
59
+
60
+ GNU GENERAL PUBLIC LICENSE
61
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
62
+
63
+ 0. This License applies to any program or other work which contains
64
+ a notice placed by the copyright holder saying it may be distributed
65
+ under the terms of this General Public License. The "Program", below,
66
+ refers to any such program or work, and a "work based on the Program"
67
+ means either the Program or any derivative work under copyright law:
68
+ that is to say, a work containing the Program or a portion of it,
69
+ either verbatim or with modifications and/or translated into another
70
+ language. (Hereinafter, translation is included without limitation in
71
+ the term "modification".) Each licensee is addressed as "you".
72
+
73
+ Activities other than copying, distribution and modification are not
74
+ covered by this License; they are outside its scope. The act of
75
+ running the Program is not restricted, and the output from the Program
76
+ is covered only if its contents constitute a work based on the
77
+ Program (independent of having been made by running the Program).
78
+ Whether that is true depends on what the Program does.
79
+
80
+ 1. You may copy and distribute verbatim copies of the Program's
81
+ source code as you receive it, in any medium, provided that you
82
+ conspicuously and appropriately publish on each copy an appropriate
83
+ copyright notice and disclaimer of warranty; keep intact all the
84
+ notices that refer to this License and to the absence of any warranty;
85
+ and give any other recipients of the Program a copy of this License
86
+ along with the Program.
87
+
88
+ You may charge a fee for the physical act of transferring a copy, and
89
+ you may at your option offer warranty protection in exchange for a fee.
90
+
91
+ 2. You may modify your copy or copies of the Program or any portion
92
+ of it, thus forming a work based on the Program, and copy and
93
+ distribute such modifications or work under the terms of Section 1
94
+ above, provided that you also meet all of these conditions:
95
+
96
+ a) You must cause the modified files to carry prominent notices
97
+ stating that you changed the files and the date of any change.
98
+
99
+ b) You must cause any work that you distribute or publish, that in
100
+ whole or in part contains or is derived from the Program or any
101
+ part thereof, to be licensed as a whole at no charge to all third
102
+ parties under the terms of this License.
103
+
104
+ c) If the modified program normally reads commands interactively
105
+ when run, you must cause it, when started running for such
106
+ interactive use in the most ordinary way, to print or display an
107
+ announcement including an appropriate copyright notice and a
108
+ notice that there is no warranty (or else, saying that you provide
109
+ a warranty) and that users may redistribute the program under
110
+ these conditions, and telling the user how to view a copy of this
111
+ License. (Exception: if the Program itself is interactive but
112
+ does not normally print such an announcement, your work based on
113
+ the Program is not required to print an announcement.)
114
+
115
+ These requirements apply to the modified work as a whole. If
116
+ identifiable sections of that work are not derived from the Program,
117
+ and can be reasonably considered independent and separate works in
118
+ themselves, then this License, and its terms, do not apply to those
119
+ sections when you distribute them as separate works. But when you
120
+ distribute the same sections as part of a whole which is a work based
121
+ on the Program, the distribution of the whole must be on the terms of
122
+ this License, whose permissions for other licensees extend to the
123
+ entire whole, and thus to each and every part regardless of who wrote it.
124
+ Thus, it is not the intent of this section to claim rights or contest
125
+ your rights to work written entirely by you; rather, the intent is to
126
+ exercise the right to control the distribution of derivative or
127
+ collective works based on the Program.
128
+
129
+ In addition, mere aggregation of another work not based on the Program
130
+ with the Program (or with a work based on the Program) on a volume of
131
+ a storage or distribution medium does not bring the other work under
132
+ the scope of this License.
133
+
134
+ 3. You may copy and distribute the Program (or a work based on it,
135
+ under Section 2) in object code or executable form under the terms of
136
+ Sections 1 and 2 above provided that you also do one of the following:
137
+
138
+ a) Accompany it with the complete corresponding machine-readable
139
+ source code, which must be distributed under the terms of Sections
140
+ 1 and 2 above on a medium customarily used for software interchange; or,
141
+
142
+ b) Accompany it with a written offer, valid for at least three
143
+ years, to give any third party, for a charge no more than your
144
+ cost of physically performing source distribution, a complete
145
+ machine-readable copy of the corresponding source code, to be
146
+ distributed under the terms of Sections 1 and 2 above on a medium
147
+ customarily used for software interchange; or,
148
+
149
+ c) Accompany it with the information you received as to the offer
150
+ to distribute corresponding source code. (This alternative is
151
+ allowed only for noncommercial distribution and only if you
152
+ received the program in object code or executable form with such
153
+ an offer, in accord with Subsection b above.)
154
+
155
+ The source code for a work means the preferred form of the work for
156
+ making modifications to it. For an executable work, complete source
157
+ code means all the source code for all modules it contains, plus any
158
+ associated interface definition files, plus the scripts used to
159
+ control compilation and installation of the executable. However, as a
160
+ special exception, the source code distributed need not include
161
+ anything that is normally distributed (in either source or binary
162
+ form) with the major components (compiler, kernel, and so on) of the
163
+ operating system on which the executable runs, unless that component
164
+ itself accompanies the executable.
165
+
166
+ If distribution of executable or object code is made by offering
167
+ access to copy from a designated place, then offering equivalent
168
+ access to copy the source code from the same place counts as
169
+ distribution of the source code, even though third parties are not
170
+ compelled to copy the source along with the object code.
171
+
172
+ 4. You may not copy, modify, sublicense, or distribute the Program
173
+ except as expressly provided under this License. Any attempt
174
+ otherwise to copy, modify, sublicense or distribute the Program is
175
+ void, and will automatically terminate your rights under this License.
176
+ However, parties who have received copies, or rights, from you under
177
+ this License will not have their licenses terminated so long as such
178
+ parties remain in full compliance.
179
+
180
+ 5. You are not required to accept this License, since you have not
181
+ signed it. However, nothing else grants you permission to modify or
182
+ distribute the Program or its derivative works. These actions are
183
+ prohibited by law if you do not accept this License. Therefore, by
184
+ modifying or distributing the Program (or any work based on the
185
+ Program), you indicate your acceptance of this License to do so, and
186
+ all its terms and conditions for copying, distributing or modifying
187
+ the Program or works based on it.
188
+
189
+ 6. Each time you redistribute the Program (or any work based on the
190
+ Program), the recipient automatically receives a license from the
191
+ original licensor to copy, distribute or modify the Program subject to
192
+ these terms and conditions. You may not impose any further
193
+ restrictions on the recipients' exercise of the rights granted herein.
194
+ You are not responsible for enforcing compliance by third parties to
195
+ this License.
196
+
197
+ 7. If, as a consequence of a court judgment or allegation of patent
198
+ infringement or for any other reason (not limited to patent issues),
199
+ conditions are imposed on you (whether by court order, agreement or
200
+ otherwise) that contradict the conditions of this License, they do not
201
+ excuse you from the conditions of this License. If you cannot
202
+ distribute so as to satisfy simultaneously your obligations under this
203
+ License and any other pertinent obligations, then as a consequence you
204
+ may not distribute the Program at all. For example, if a patent
205
+ license would not permit royalty-free redistribution of the Program by
206
+ all those who receive copies directly or indirectly through you, then
207
+ the only way you could satisfy both it and this License would be to
208
+ refrain entirely from distribution of the Program.
209
+
210
+ If any portion of this section is held invalid or unenforceable under
211
+ any particular circumstance, the balance of the section is intended to
212
+ apply and the section as a whole is intended to apply in other
213
+ circumstances.
214
+
215
+ It is not the purpose of this section to induce you to infringe any
216
+ patents or other property right claims or to contest validity of any
217
+ such claims; this section has the sole purpose of protecting the
218
+ integrity of the free software distribution system, which is
219
+ implemented by public license practices. Many people have made
220
+ generous contributions to the wide range of software distributed
221
+ through that system in reliance on consistent application of that
222
+ system; it is up to the author/donor to decide if he or she is willing
223
+ to distribute software through any other system and a licensee cannot
224
+ impose that choice.
225
+
226
+ This section is intended to make thoroughly clear what is believed to
227
+ be a consequence of the rest of this License.
228
+
229
+ 8. If the distribution and/or use of the Program is restricted in
230
+ certain countries either by patents or by copyrighted interfaces, the
231
+ original copyright holder who places the Program under this License
232
+ may add an explicit geographical distribution limitation excluding
233
+ those countries, so that distribution is permitted only in or among
234
+ countries not thus excluded. In such case, this License incorporates
235
+ the limitation as if written in the body of this License.
236
+
237
+ 9. The Free Software Foundation may publish revised and/or new versions
238
+ of the General Public License from time to time. Such new versions will
239
+ be similar in spirit to the present version, but may differ in detail to
240
+ address new problems or concerns.
241
+
242
+ Each version is given a distinguishing version number. If the Program
243
+ specifies a version number of this License which applies to it and "any
244
+ later version", you have the option of following the terms and conditions
245
+ either of that version or of any later version published by the Free
246
+ Software Foundation. If the Program does not specify a version number of
247
+ this License, you may choose any version ever published by the Free Software
248
+ Foundation.
249
+
250
+ 10. If you wish to incorporate parts of the Program into other free
251
+ programs whose distribution conditions are different, write to the author
252
+ to ask for permission. For software which is copyrighted by the Free
253
+ Software Foundation, write to the Free Software Foundation; we sometimes
254
+ make exceptions for this. Our decision will be guided by the two goals
255
+ of preserving the free status of all derivatives of our free software and
256
+ of promoting the sharing and reuse of software generally.
257
+
258
+ NO WARRANTY
259
+
260
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
261
+ FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
262
+ OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
263
+ PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
264
+ OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
265
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
266
+ TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
267
+ PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
268
+ REPAIR OR CORRECTION.
269
+
270
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
271
+ WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
272
+ REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
273
+ INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
274
+ OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
275
+ TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
276
+ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
277
+ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
278
+ POSSIBILITY OF SUCH DAMAGES.
279
+
280
+ END OF TERMS AND CONDITIONS
281
+
package.json ADDED
@@ -0,0 +1,16 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "name": "wp-e-commerce",
3
+ "version": "3.9.5",
4
+ "private": true,
5
+ "devDependencies": {
6
+ "grunt": "~0.4.5",
7
+ "grunt-exec": "~0.4.5",
8
+ "grunt-potomo": "~2.1.0",
9
+ "grunt-wp-i18n": "~0.4.9",
10
+ "load-grunt-tasks": "~0.2.0",
11
+ "grunt-contrib-compress": "~0.8.0",
12
+ "grunt-contrib-clean": "~0.5.0",
13
+ "grunt-contrib-copy": "~0.5.0",
14
+ "grunt-contrib-jshint": "^0.10.0"
15
+ }
16
+ }
phpunit.xml ADDED
@@ -0,0 +1,14 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <phpunit
2
+ bootstrap="tests/bootstrap.php"
3
+ backupGlobals="false"
4
+ colors="true"
5
+ convertErrorsToExceptions="true"
6
+ convertNoticesToExceptions="false"
7
+ convertWarningsToExceptions="false"
8
+ >
9
+ <testsuites>
10
+ <testsuite>
11
+ <directory prefix="test-" suffix=".php">./tests/</directory>
12
+ </testsuite>
13
+ </testsuites>
14
+ </phpunit>
readme.md ADDED
@@ -0,0 +1,39 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ WP eCommerce [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wp-e-commerce/WP-e-Commerce/badges/quality-score.png?s=155ede743c82bcf5116904bf155dcf215da820b0)](https://scrutinizer-ci.com/g/wp-e-commerce/WP-e-Commerce/) [![Coverage Status](https://img.shields.io/coveralls/wp-e-commerce/WP-e-Commerce.svg)](https://coveralls.io/r/wp-e-commerce/WP-e-Commerce) [![Build Status](https://travis-ci.org/wp-e-commerce/WP-e-Commerce.svg?branch=master)](https://travis-ci.org/wp-e-commerce/WP-e-Commerce)
2
+ ============
3
+
4
+ About
5
+ -----
6
+
7
+ WP eCommerce is a free open-source WordPress Shopping Cart Plugin that lets customers buy your products, services and digital downloads online.
8
+
9
+ More details about this plugin features can be found on our website at [wpecommerce.org](http://wpecommerce.org/features/).
10
+
11
+ User documentation can be found at [docs.wpecommerce.org](http://docs.wpecommerce.org).
12
+
13
+ If you're looking for general user support, please submit your support request on [our community support forums](https://wordpress.org/support/plugin/wp-e-commerce).
14
+
15
+ Development status
16
+ -------------------------
17
+
18
+ * The latest stable version is [3.9.5](http://wordpress.org/extend/plugins/wp-e-commerce).
19
+ * Active development version: 4.0-dev (branch [master](https://github.com/wp-e-commerce/WP-e-Commerce))
20
+ * [Roadmap for 4.0](https://github.com/wp-e-commerce/wp-e-commerce/wiki/Roadmap)
21
+ * [4.0 tickets](https://github.com/wp-e-commerce/WP-e-Commerce/milestones/4.0)
22
+
23
+ How to contribute code
24
+ -----------------------------
25
+ * [Coding standards and code quality](https://github.com/wp-e-commerce/wp-e-commerce/wiki/Coding-Standards-and-Code-Quality)
26
+ * [Submitting code](https://github.com/wp-e-commerce/wp-e-commerce/wiki/Submitting-Code)
27
+ * [Code review](https://github.com/wp-e-commerce/wp-e-commerce/wiki/Code-Review)
28
+ * [Merging pull requests](https://github.com/wp-e-commerce/wp-e-commerce/wiki/Merging-Pull-Requests)
29
+
30
+ How to report issues
31
+ --------------------
32
+ * [Reporting a security issue](wiki/Reporting-a-security-issue)
33
+ * [What makes a perfect issue ticket?](https://github.com/wp-e-commerce/wp-e-commerce/wiki/Creating-issue-tickets)
34
+ * [Issue labels and workflow](https://github.com/wp-e-commerce/wp-e-commerce/wiki/Issue-Labels-and-Workflow)
35
+
36
+ Translating WPEC
37
+ ----------------
38
+ * [How to get involved](https://github.com/wp-e-commerce/wp-e-commerce/wiki/Getting-involved-with-translation)
39
+ * [Current status](https://github.com/wp-e-commerce/wp-e-commerce/wiki/i18n-Status)
readme.txt CHANGED
@@ -3,8 +3,8 @@ Contributors: JustinSainton, mufasa
3
  Donate link: https://wpecommerce.org
4
  Tags: e-commerce, wp-e-commerce, shop, cart, paypal, authorize, stock control, ecommerce, shipping, tax
5
  Requires at least: 4.0
6
- Tested up to: 4.2
7
- Stable tag: 3.9.4
8
 
9
  WP eCommerce is a free, powerful plugin that empowers you to sell anything online, quickly and easily.
10
 
@@ -36,6 +36,10 @@ After upgrading from earlier versions look for link "Update Store". This will up
36
 
37
  == Changelog ==
38
 
 
 
 
 
39
  = 3.9.4 =
40
 
41
  * Security Fix: Harden several instances of $_POST input that were not sanitized properly. Specifically, PayPal settings and Quick Edit fields for products.
3
  Donate link: https://wpecommerce.org
4
  Tags: e-commerce, wp-e-commerce, shop, cart, paypal, authorize, stock control, ecommerce, shipping, tax
5
  Requires at least: 4.0
6
+ Tested up to: 4.3
7
+ Stable tag: 3.9.5
8
 
9
  WP eCommerce is a free, powerful plugin that empowers you to sell anything online, quickly and easily.
10
 
36
 
37
  == Changelog ==
38
 
39
+ = 3.9.5 =
40
+
41
+ * Fix: 4.3 Compatibility w/ WP_Widget constructors.
42
+
43
  = 3.9.4 =
44
 
45
  * Security Fix: Harden several instances of $_POST input that were not sanitized properly. Specifically, PayPal settings and Quick Edit fields for products.
wp-shopping-cart.php CHANGED
@@ -3,7 +3,7 @@
3
  * Plugin Name: WP eCommerce
4
  * Plugin URI: http://wpecommerce.org/
5
  * Description: A plugin that provides a WordPress Shopping Cart. See also: <a href="http://wpecommerce.org" target="_blank">WPeCommerce.org</a> | <a href="https://wordpress.org/support/plugin/wp-e-commerce/" target="_blank">Support Forum</a> | <a href="http://docs.wpecommerce.org/" target="_blank">Documentation</a>
6
- * Version: 3.9.4
7
  * Author: WP eCommerce
8
  * Author URI: http://wpecommerce.org/
9
  **/
3
  * Plugin Name: WP eCommerce
4
  * Plugin URI: http://wpecommerce.org/
5
  * Description: A plugin that provides a WordPress Shopping Cart. See also: <a href="http://wpecommerce.org" target="_blank">WPeCommerce.org</a> | <a href="https://wordpress.org/support/plugin/wp-e-commerce/" target="_blank">Support Forum</a> | <a href="http://docs.wpecommerce.org/" target="_blank">Documentation</a>
6
+ * Version: 3.9.5
7
  * Author: WP eCommerce
8
  * Author URI: http://wpecommerce.org/
9
  **/
wpsc-components/merchant-core-v3/gateways/php-merchant/gateways/paypal-express-checkout.php CHANGED
@@ -183,7 +183,7 @@ class PHP_Merchant_Paypal_Express_Checkout extends PHP_Merchant_Paypal
183
  }
184
 
185
  // BN Code
186
- $request['BUTTONSOURCE'] = 'WPECOM_ECM';
187
 
188
  return $request;
189
  }
183
  }
184
 
185
  // BN Code
186
+ $request['BUTTONSOURCE'] = 'WPeC_Cart_EC';
187
 
188
  return $request;
189
  }
wpsc-components/theme-engine-v1/widgets/admin_menu_widget.php CHANGED
@@ -1,7 +1,5 @@
1
  <?php
2
 
3
-
4
-
5
  /**
6
  * Admin Menu widget class
7
  *
@@ -12,13 +10,13 @@ class WP_Widget_Admin_Menu extends WP_Widget {
12
  /**
13
  * Widget Constuctor
14
  */
15
- function WP_Widget_Admin_Menu() {
16
  $widget_ops = array(
17
  'classname' => 'widget_wpsc_admin_menu',
18
  'description' => __( 'Admin Menu Widget', 'wpsc' )
19
  );
20
 
21
- $this->WP_Widget( 'wpsc_admin_menu', __( '(WPEC) Admin Menu', 'wpsc' ), $widget_ops );
22
 
23
  }
24
 
@@ -106,8 +104,4 @@ function admin_menu( $args = null ) {
106
  echo '</ul>';
107
  }
108
 
109
- }
110
-
111
-
112
-
113
- ?>
1
  <?php
2
 
 
 
3
  /**
4
  * Admin Menu widget class
5
  *
10
  /**
11
  * Widget Constuctor
12
  */
13
+ function __construct() {
14
  $widget_ops = array(
15
  'classname' => 'widget_wpsc_admin_menu',
16
  'description' => __( 'Admin Menu Widget', 'wpsc' )
17
  );
18
 
19
+ parent::__construct( 'wpsc_admin_menu', __( '(WPEC) Admin Menu', 'wpsc' ), $widget_ops );
20
 
21
  }
22
 
104
  echo '</ul>';
105
  }
106
 
107
+ }
 
 
 
 
wpsc-components/theme-engine-v1/widgets/category_widget.php CHANGED
@@ -11,12 +11,12 @@ class WP_Widget_Product_Categories extends WP_Widget {
11
  /**
12
  * Widget Constuctor
13
  */
14
- function WP_Widget_Product_Categories() {
15
  $widget_ops = array(
16
  'classname' => 'widget_wpsc_categorisation',
17
  'description' => __( 'Product Grouping Widget', 'wpsc' )
18
  );
19
- $this->WP_Widget( 'wpsc_categorisation', __( '(WPEC) Product Categories', 'wpsc' ), $widget_ops );
20
  }
21
 
22
  /**
11
  /**
12
  * Widget Constuctor
13
  */
14
+ function __construct() {
15
  $widget_ops = array(
16
  'classname' => 'widget_wpsc_categorisation',
17
  'description' => __( 'Product Grouping Widget', 'wpsc' )
18
  );
19
+ parent::__construct( 'wpsc_categorisation', __( '(WPEC) Product Categories', 'wpsc' ), $widget_ops );
20
  }
21
 
22
  /**
wpsc-components/theme-engine-v1/widgets/donations_widget.php CHANGED
@@ -12,14 +12,14 @@ class WP_Widget_Donations extends WP_Widget {
12
  /**
13
  * Widget Constuctor
14
  */
15
- function WP_Widget_Donations() {
16
 
17
  $widget_ops = array(
18
  'classname' => 'widget_wpsc_donations',
19
  'description' => __( 'Donations Widget', 'wpsc' )
20
  );
21
 
22
- $this->WP_Widget( 'wpsc_donations', __( '(WPEC) Product Donations', 'wpsc' ), $widget_ops );
23
 
24
  }
25
 
12
  /**
13
  * Widget Constuctor
14
  */
15
+ function __construct() {
16
 
17
  $widget_ops = array(
18
  'classname' => 'widget_wpsc_donations',
19
  'description' => __( 'Donations Widget', 'wpsc' )
20
  );
21
 
22
+ parent::__construct( 'wpsc_donations', __( '(WPEC) Product Donations', 'wpsc' ), $widget_ops );
23
 
24
  }
25
 
wpsc-components/theme-engine-v1/widgets/latest_product_widget.php CHANGED
@@ -11,9 +11,9 @@ class WP_Widget_Latest_Products extends WP_Widget {
11
  /**
12
  * Widget Constuctor
13
  */
14
- function WP_Widget_Latest_Products() {
15
  $widget_ops = array( 'classname' => 'widget_wpsc_latest_products','description' => __( 'Latest Products Widget', 'wpsc' ) );
16
- $this->WP_Widget( 'wpsc_latest_products', __( '(WPEC) Latest Products', 'wpsc' ), $widget_ops );
17
  }
18
 
19
  /**
11
  /**
12
  * Widget Constuctor
13
  */
14
+ function __construct() {
15
  $widget_ops = array( 'classname' => 'widget_wpsc_latest_products','description' => __( 'Latest Products Widget', 'wpsc' ) );
16
+ parent::__construct( 'wpsc_latest_products', __( '(WPEC) Latest Products', 'wpsc' ), $widget_ops );
17
  }
18
 
19
  /**
wpsc-components/theme-engine-v1/widgets/price_range_widget.php CHANGED
@@ -12,14 +12,14 @@ class WP_Widget_Price_Range extends WP_Widget {
12
  /**
13
  * Widget Constuctor
14
  */
15
- function WP_Widget_Price_Range() {
16
 
17
  $widget_ops = array(
18
  'classname' => 'widget_wpsc_price_range',
19
  'description' => __( 'Price Range Widget', 'wpsc' )
20
  );
21
 
22
- $this->WP_Widget( 'wpsc_price_range', __( '(WPEC) Price Range', 'wpsc' ), $widget_ops );
23
 
24
  }
25
 
12
  /**
13
  * Widget Constuctor
14
  */
15
+ function __construct() {
16
 
17
  $widget_ops = array(
18
  'classname' => 'widget_wpsc_price_range',
19
  'description' => __( 'Price Range Widget', 'wpsc' )
20
  );
21
 
22
+ parent::__construct( 'wpsc_price_range', __( '(WPEC) Price Range', 'wpsc' ), $widget_ops );
23
 
24
  }
25
 
wpsc-components/theme-engine-v1/widgets/product_tag_widget.php CHANGED
@@ -12,14 +12,14 @@ class WP_Widget_Product_Tags extends WP_Widget {
12
  /**
13
  * Widget Constuctor
14
  */
15
- function WP_Widget_Product_Tags() {
16
 
17
  $widget_ops = array(
18
  'classname' => 'widget_wpsc_product_tags',
19
  'description' => __( 'Product Tags Widget', 'wpsc' )
20
  );
21
 
22
- $this->WP_Widget( 'wpsc_product_tags', __( '(WPEC) Product Tags', 'wpsc' ), $widget_ops );
23
 
24
  }
25
 
12
  /**
13
  * Widget Constuctor
14
  */
15
+ function __construct() {
16
 
17
  $widget_ops = array(
18
  'classname' => 'widget_wpsc_product_tags',
19
  'description' => __( 'Product Tags Widget', 'wpsc' )
20
  );
21
 
22
+ parent::__construct( 'wpsc_product_tags', __( '(WPEC) Product Tags', 'wpsc' ), $widget_ops );
23
 
24
  }
25
 
wpsc-components/theme-engine-v1/widgets/shopping_cart_widget.php CHANGED
@@ -19,7 +19,7 @@ class WP_Widget_Shopping_Cart extends WP_Widget {
19
  'description' => __( 'Shopping Cart Widget', 'wpsc' )
20
  );
21
 
22
- $this->WP_Widget( 'wpsc_shopping_cart', __( '(WPEC) Shopping Cart', 'wpsc' ), $widget_ops );
23
 
24
  }
25
 
19
  'description' => __( 'Shopping Cart Widget', 'wpsc' )
20
  );
21
 
22
+ parent::__construct( 'wpsc_shopping_cart', __( '(WPEC) Shopping Cart', 'wpsc' ), $widget_ops );
23
 
24
  }
25
 
wpsc-components/theme-engine-v1/widgets/specials_widget.php CHANGED
@@ -19,7 +19,7 @@ class WP_Widget_Product_Specials extends WP_Widget {
19
  'description' => __( 'Product Specials Widget', 'wpsc' )
20
  );
21
 
22
- $this->WP_Widget( 'wpsc_product_specials', __( '(WPEC) Product Specials', 'wpsc' ), $widget_ops );
23
 
24
  }
25
 
19
  'description' => __( 'Product Specials Widget', 'wpsc' )
20
  );
21
 
22
+ parent::__construct( 'wpsc_product_specials', __( '(WPEC) Product Specials', 'wpsc' ), $widget_ops );
23
 
24
  }
25
 
wpsc-core/wpsc-constants.php CHANGED
@@ -55,15 +55,15 @@ function wpsc_core_constants() {
55
 
56
  // Define Plugin version
57
  if ( ! defined( 'WPSC_VERSION' ) ) {
58
- define( 'WPSC_VERSION' , '3.9.4' );
59
  }
60
 
61
  if ( ! defined( 'WPSC_MINOR_VERSION' ) ) {
62
- define( 'WPSC_MINOR_VERSION' , '0b2bb1c' );
63
  }
64
 
65
  if ( ! defined( 'WPSC_PRESENTABLE_VERSION' ) ) {
66
- define( 'WPSC_PRESENTABLE_VERSION', '3.9.4' );
67
  }
68
 
69
  // Define a salt to use when we hash, WPSC_SALT may be defined for us in our config file, so check first
55
 
56
  // Define Plugin version
57
  if ( ! defined( 'WPSC_VERSION' ) ) {
58
+ define( 'WPSC_VERSION' , '3.9.5' );
59
  }
60
 
61
  if ( ! defined( 'WPSC_MINOR_VERSION' ) ) {
62
+ define( 'WPSC_MINOR_VERSION' , 'c98078b' );
63
  }
64
 
65
  if ( ! defined( 'WPSC_PRESENTABLE_VERSION' ) ) {
66
+ define( 'WPSC_PRESENTABLE_VERSION', '3.9.5' );
67
  }
68
 
69
  // Define a salt to use when we hash, WPSC_SALT may be defined for us in our config file, so check first
wpsc-merchants/paypal-express.merchant.php CHANGED
@@ -988,7 +988,7 @@ function paypal_hash_call( $methodName, $nvpStr ) {
988
  $API_UserName = get_option( 'paypal_certified_apiuser' );
989
  $API_Password = get_option( 'paypal_certified_apipass' );
990
  $API_Signature = get_option( 'paypal_certified_apisign' );
991
- $sBNCode = "PP-ECWizard";
992
  //NVPRequest for submitting to server
993
  $nvpreq = "METHOD=" . urlencode( $methodName ) . "&VERSION=" . urlencode( $version ) . "&PWD=" . urlencode( $API_Password ) . "&USER=" . urlencode( $API_UserName ) . "&SIGNATURE=" . urlencode( $API_Signature ) . $nvpStr . "&BUTTONSOURCE=" . urlencode( $sBNCode );
994
 
@@ -999,6 +999,7 @@ function paypal_hash_call( $methodName, $nvpStr ) {
999
  define( 'WP_PROXY_PORT', $PROXY_PORT );
1000
  }
1001
  }
 
1002
  add_filter( 'https_ssl_verify', '__return_false' );
1003
 
1004
  $options = array(
988
  $API_UserName = get_option( 'paypal_certified_apiuser' );
989
  $API_Password = get_option( 'paypal_certified_apipass' );
990
  $API_Signature = get_option( 'paypal_certified_apisign' );
991
+ $sBNCode = "WPeC_Cart_EC";
992
  //NVPRequest for submitting to server
993
  $nvpreq = "METHOD=" . urlencode( $methodName ) . "&VERSION=" . urlencode( $version ) . "&PWD=" . urlencode( $API_Password ) . "&USER=" . urlencode( $API_UserName ) . "&SIGNATURE=" . urlencode( $API_Signature ) . $nvpStr . "&BUTTONSOURCE=" . urlencode( $sBNCode );
994
 
999
  define( 'WP_PROXY_PORT', $PROXY_PORT );
1000
  }
1001
  }
1002
+
1003
  add_filter( 'https_ssl_verify', '__return_false' );
1004
 
1005
  $options = array(
wpsc-merchants/paypal-pro.merchant.php CHANGED
@@ -115,8 +115,9 @@ class wpsc_merchant_paypal_pro extends wpsc_merchant {
115
  if ( is_numeric( $this->cart_data['shipping_address']['state'] ) )
116
  $this->cart_data['shipping_address']['state'] = wpsc_get_state_by_id( $this->cart_data['shipping_address']['state'], 'code' );
117
 
118
- if ( $this->cart_data['shipping_address']['country'] == 'UK' )
119
  $this->cart_data['shipping_address']['country'] = 'GB';
 
120
 
121
  $data['SHIPTOSTATE'] = $this->cart_data['shipping_address']['state'];
122
  $data['SHIPTOCOUNTRY'] = $this->cart_data['shipping_address']['country'];
@@ -174,7 +175,10 @@ class wpsc_merchant_paypal_pro extends wpsc_merchant {
174
  $data['SHIPPINGAMT'] = $this->format_price( $shipping_total );
175
  $data['TAXAMT'] = $this->convert( $tax_total );
176
  $data['AMT'] = $data['ITEMAMT'] + $data['SHIPPINGAMT'] + $data['TAXAMT'];
177
- $this->collected_gateway_data = apply_filters( 'wpsc_paypal_pro_gateway_data_array', $data, $this->cart_items );
 
 
 
178
  }
179
 
180
  /**
115
  if ( is_numeric( $this->cart_data['shipping_address']['state'] ) )
116
  $this->cart_data['shipping_address']['state'] = wpsc_get_state_by_id( $this->cart_data['shipping_address']['state'], 'code' );
117
 
118
+ if ( $this->cart_data['shipping_address']['country'] == 'UK' ) {
119
  $this->cart_data['shipping_address']['country'] = 'GB';
120
+ }
121
 
122
  $data['SHIPTOSTATE'] = $this->cart_data['shipping_address']['state'];
123
  $data['SHIPTOCOUNTRY'] = $this->cart_data['shipping_address']['country'];
175
  $data['SHIPPINGAMT'] = $this->format_price( $shipping_total );
176
  $data['TAXAMT'] = $this->convert( $tax_total );
177
  $data['AMT'] = $data['ITEMAMT'] + $data['SHIPPINGAMT'] + $data['TAXAMT'];
178
+ $data = apply_filters( 'wpsc_paypal_pro_gateway_data_array', $data, $this->cart_items );
179
+ $data['BUTTONSOURCE'] = 'WPeC_Cart_WPP';
180
+
181
+ $this->collected_gateway_data = $data;
182
  }
183
 
184
  /**
wpsc-merchants/paypal-standard.merchant.php CHANGED
@@ -122,7 +122,6 @@ class wpsc_merchant_paypal_standard extends wpsc_merchant {
122
  'rm' => '2',
123
  'currency_code' => $this->get_paypal_currency_code(),
124
  'lc' => $this->cart_data['store_currency'],
125
- 'bn' => $this->cart_data['software_name'],
126
  'no_note' => '1',
127
  'charset' => 'utf-8',
128
  );
@@ -342,7 +341,12 @@ class wpsc_merchant_paypal_standard extends wpsc_merchant {
342
  );
343
  }
344
  }
345
- return apply_filters( 'wpsc_paypal_standard_post_data', $paypal_vars );
 
 
 
 
 
346
  }
347
 
348
  /**
122
  'rm' => '2',
123
  'currency_code' => $this->get_paypal_currency_code(),
124
  'lc' => $this->cart_data['store_currency'],
 
125
  'no_note' => '1',
126
  'charset' => 'utf-8',
127
  );
341
  );
342
  }
343
  }
344
+
345
+ $paypal_vars = apply_filters( 'wpsc_paypal_standard_post_data', $paypal_vars );
346
+
347
+ $paypal_vars['bn'] = 'WPeC_Cart_WPS';
348
+
349
+ return $paypal_vars;
350
  }
351
 
352
  /**
wpsc-widgets/admin_menu_widget.php CHANGED
@@ -9,13 +9,13 @@ class WP_Widget_Admin_Menu extends WP_Widget {
9
  /**
10
  * Widget Constuctor
11
  */
12
- function WP_Widget_Admin_Menu() {
13
  $widget_ops = array(
14
  'classname' => 'widget_wpsc_admin_menu',
15
  'description' => __( 'Admin Menu Widget', 'wpsc' )
16
  );
17
 
18
- $this->WP_Widget( 'wpsc_admin_menu', __( 'Admin Menu', 'wpsc' ), $widget_ops );
19
 
20
  }
21
 
9
  /**
10
  * Widget Constuctor
11
  */
12
+ function __construct() {
13
  $widget_ops = array(
14
  'classname' => 'widget_wpsc_admin_menu',
15
  'description' => __( 'Admin Menu Widget', 'wpsc' )
16
  );
17
 
18
+ parent::__construct( 'wpsc_admin_menu', __( 'Admin Menu', 'wpsc' ), $widget_ops );
19
 
20
  }
21