Changeset 514461
- Timestamp:
- 03/05/2012 05:03:42 AM (14 years ago)
- Location:
- paid-downloads
- Files:
-
- 2 deleted
- 2 edited
- 8 copied
-
tags/3.14 (copied) (copied from paid-downloads/trunk)
-
tags/3.14/download.php (deleted)
-
tags/3.14/images/logo_alertpay.png (copied) (copied from paid-downloads/trunk/images/logo_alertpay.png)
-
tags/3.14/images/logo_interkassa.png (copied) (copied from paid-downloads/trunk/images/logo_interkassa.png)
-
tags/3.14/images/logo_paypal.png (copied) (copied from paid-downloads/trunk/images/logo_paypal.png)
-
tags/3.14/languages (copied) (copied from paid-downloads/trunk/languages)
-
tags/3.14/languages/default.po (copied) (copied from paid-downloads/trunk/languages/default.po)
-
tags/3.14/paid-downloads.php (copied) (copied from paid-downloads/trunk/paid-downloads.php) (5 diffs)
-
tags/3.14/paypal_ipn.php (deleted)
-
tags/3.14/readme.txt (copied) (copied from paid-downloads/trunk/readme.txt) (2 diffs)
-
trunk/paid-downloads.php (modified) (5 diffs)
-
trunk/readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
paid-downloads/tags/3.14/paid-downloads.php
r512923 r514461 4 4 Plugin URI: http://www.icprojects.net/paid-downloads-plugin.html 5 5 Description: The plugin easily allows you to sell any digital content. The only actions you have do are to upload files and insert shortcode like <em>[paiddownloads id="XXX"]</em> into your posts or pages. 6 Version: 3.1 36 Version: 3.14 7 7 Author: Ivan Churakov 8 8 Author URI: http://www.icprojects.net/about 9 9 */ 10 10 define('PD_RECORDS_PER_PAGE', '20'); 11 define('PD_VERSION', 3.1 3);11 define('PD_VERSION', 3.14); 12 12 wp_enqueue_script("jquery"); 13 13 register_activation_hook(__FILE__, array("paiddownloads_class", "install")); … … 221 221 if ($this->options['enable_alertpay'] != "on" && $this->options['enable_paypal'] != "on" && $this->options['enable_interkassa'] != "on") $errors[] = __('Select at least one payment method', 'paiddownloads'); 222 222 if ($this->options['enable_paypal'] == "on") { 223 if ((! eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$", $this->options['paypal_id']) && !eregi("^([A-Z0-9]+)$", $this->options['paypal_id'])) || strlen($this->options['paypal_id']) == 0) $errors[] = __('PayPal ID must be valid e-mail address or Merchant ID', 'paiddownloads');223 if ((!preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$/i", $this->options['paypal_id']) && !preg_match("/^([A-Z0-9]+)$/i", $this->options['paypal_id'])) || strlen($this->options['paypal_id']) == 0) $errors[] = __('PayPal ID must be valid e-mail address or Merchant ID', 'paiddownloads'); 224 224 } 225 225 if ($this->options['enable_alertpay'] == "on") { 226 if (! eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$", $this->options['alertpay_id']) || strlen($this->options['alertpay_id']) == 0) $errors[] = __('AlertPay ID must be valid e-mail address', 'paiddownloads');226 if (!preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$/i", $this->options['alertpay_id']) || strlen($this->options['alertpay_id']) == 0) $errors[] = __('AlertPay ID must be valid e-mail address', 'paiddownloads'); 227 227 } 228 228 if ($this->options['enable_interkassa'] == "on") { … … 230 230 if (strlen($this->options['interkassa_secret_key']) < 3) $errors[] = __('InterKassa Secret Key is required', 'paiddownloads'); 231 231 } 232 if (! eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$", $this->options['seller_email']) || strlen($this->options['seller_email']) == 0) $errors[] = __('E-mail for notifications must be valid e-mail address', 'paiddownloads');233 if (! eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$", $this->options['from_email']) || strlen($this->options['from_email']) == 0) $errors[] = __('Sender e-mail must be valid e-mail address', 'paiddownloads');232 if (!preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$/i", $this->options['seller_email']) || strlen($this->options['seller_email']) == 0) $errors[] = __('E-mail for notifications must be valid e-mail address', 'paiddownloads'); 233 if (!preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$/i", $this->options['from_email']) || strlen($this->options['from_email']) == 0) $errors[] = __('Sender e-mail must be valid e-mail address', 'paiddownloads'); 234 234 if (strlen($this->options['from_name']) < 3) $errors[] = __('Sender name is too short', 'paiddownloads'); 235 235 if (strlen($this->options['success_email_subject']) < 3) $errors[] = __('Successful purchasing e-mail subject must contain at least 3 characters', 'paiddownloads'); … … 1105 1105 case 'paiddownloads_update_link': 1106 1106 $link_owner = trim(stripslashes($_POST["paiddownloads_link_owner"])); 1107 if (! eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$", $link_owner) || strlen($link_owner) == 0) {1107 if (!preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$/i", $link_owner) || strlen($link_owner) == 0) { 1108 1108 setcookie("paiddownloads_error", __('Link owner must be valid e-mail address.', 'paiddownloads'), time()+30, "/", ".".str_replace("www.", "", $_SERVER["SERVER_NAME"])); 1109 1109 header('Location: '.get_bloginfo("wpurl").'/wp-admin/admin.php?page=paid-downloads-add-link'); … … 1789 1789 <input type="hidden" name="currency_code" value="'.$file_details["currency"].'"> 1790 1790 <input type="hidden" name="custom" value=""> 1791 <input type="hidden" name="charset" value="utf-8"> 1791 1792 <input type="hidden" name="bn" value="PP-BuyNowBF:btn_buynow_LG.gif:NonHostedGuest"> 1792 1793 <input type="hidden" name="return" value="'.$return_url.'"> -
paid-downloads/tags/3.14/readme.txt
r513354 r514461 9 9 Requires at least: 3.0 10 10 Tested up to: 3.3.1 11 Stable tag: 3.1 311 Stable tag: 3.14 12 12 13 13 The plugin allows to sell digital content and accept payments via PayPal, AlertPay or InterKassa. It delivers download link after completed payment. … … 47 47 48 48 == Changelog == 49 50 = 3.14 = 51 * Obsolete php function "eregi" replaced by "preg_match". 52 * Fixed problem with UTF-8 characters submitted to PayPal. 49 53 50 54 = 3.13 = -
paid-downloads/trunk/paid-downloads.php
r512923 r514461 4 4 Plugin URI: http://www.icprojects.net/paid-downloads-plugin.html 5 5 Description: The plugin easily allows you to sell any digital content. The only actions you have do are to upload files and insert shortcode like <em>[paiddownloads id="XXX"]</em> into your posts or pages. 6 Version: 3.1 36 Version: 3.14 7 7 Author: Ivan Churakov 8 8 Author URI: http://www.icprojects.net/about 9 9 */ 10 10 define('PD_RECORDS_PER_PAGE', '20'); 11 define('PD_VERSION', 3.1 3);11 define('PD_VERSION', 3.14); 12 12 wp_enqueue_script("jquery"); 13 13 register_activation_hook(__FILE__, array("paiddownloads_class", "install")); … … 221 221 if ($this->options['enable_alertpay'] != "on" && $this->options['enable_paypal'] != "on" && $this->options['enable_interkassa'] != "on") $errors[] = __('Select at least one payment method', 'paiddownloads'); 222 222 if ($this->options['enable_paypal'] == "on") { 223 if ((! eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$", $this->options['paypal_id']) && !eregi("^([A-Z0-9]+)$", $this->options['paypal_id'])) || strlen($this->options['paypal_id']) == 0) $errors[] = __('PayPal ID must be valid e-mail address or Merchant ID', 'paiddownloads');223 if ((!preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$/i", $this->options['paypal_id']) && !preg_match("/^([A-Z0-9]+)$/i", $this->options['paypal_id'])) || strlen($this->options['paypal_id']) == 0) $errors[] = __('PayPal ID must be valid e-mail address or Merchant ID', 'paiddownloads'); 224 224 } 225 225 if ($this->options['enable_alertpay'] == "on") { 226 if (! eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$", $this->options['alertpay_id']) || strlen($this->options['alertpay_id']) == 0) $errors[] = __('AlertPay ID must be valid e-mail address', 'paiddownloads');226 if (!preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$/i", $this->options['alertpay_id']) || strlen($this->options['alertpay_id']) == 0) $errors[] = __('AlertPay ID must be valid e-mail address', 'paiddownloads'); 227 227 } 228 228 if ($this->options['enable_interkassa'] == "on") { … … 230 230 if (strlen($this->options['interkassa_secret_key']) < 3) $errors[] = __('InterKassa Secret Key is required', 'paiddownloads'); 231 231 } 232 if (! eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$", $this->options['seller_email']) || strlen($this->options['seller_email']) == 0) $errors[] = __('E-mail for notifications must be valid e-mail address', 'paiddownloads');233 if (! eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$", $this->options['from_email']) || strlen($this->options['from_email']) == 0) $errors[] = __('Sender e-mail must be valid e-mail address', 'paiddownloads');232 if (!preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$/i", $this->options['seller_email']) || strlen($this->options['seller_email']) == 0) $errors[] = __('E-mail for notifications must be valid e-mail address', 'paiddownloads'); 233 if (!preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$/i", $this->options['from_email']) || strlen($this->options['from_email']) == 0) $errors[] = __('Sender e-mail must be valid e-mail address', 'paiddownloads'); 234 234 if (strlen($this->options['from_name']) < 3) $errors[] = __('Sender name is too short', 'paiddownloads'); 235 235 if (strlen($this->options['success_email_subject']) < 3) $errors[] = __('Successful purchasing e-mail subject must contain at least 3 characters', 'paiddownloads'); … … 1105 1105 case 'paiddownloads_update_link': 1106 1106 $link_owner = trim(stripslashes($_POST["paiddownloads_link_owner"])); 1107 if (! eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$", $link_owner) || strlen($link_owner) == 0) {1107 if (!preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$/i", $link_owner) || strlen($link_owner) == 0) { 1108 1108 setcookie("paiddownloads_error", __('Link owner must be valid e-mail address.', 'paiddownloads'), time()+30, "/", ".".str_replace("www.", "", $_SERVER["SERVER_NAME"])); 1109 1109 header('Location: '.get_bloginfo("wpurl").'/wp-admin/admin.php?page=paid-downloads-add-link'); … … 1789 1789 <input type="hidden" name="currency_code" value="'.$file_details["currency"].'"> 1790 1790 <input type="hidden" name="custom" value=""> 1791 <input type="hidden" name="charset" value="utf-8"> 1791 1792 <input type="hidden" name="bn" value="PP-BuyNowBF:btn_buynow_LG.gif:NonHostedGuest"> 1792 1793 <input type="hidden" name="return" value="'.$return_url.'"> -
paid-downloads/trunk/readme.txt
r513354 r514461 9 9 Requires at least: 3.0 10 10 Tested up to: 3.3.1 11 Stable tag: 3.1 311 Stable tag: 3.14 12 12 13 13 The plugin allows to sell digital content and accept payments via PayPal, AlertPay or InterKassa. It delivers download link after completed payment. … … 47 47 48 48 == Changelog == 49 50 = 3.14 = 51 * Obsolete php function "eregi" replaced by "preg_match". 52 * Fixed problem with UTF-8 characters submitted to PayPal. 49 53 50 54 = 3.13 =
Note: See TracChangeset
for help on using the changeset viewer.