Changeset 930519

Timestamp:

06/11/2014 05:54:35 PM (12 years ago)

Author:

jond

Message:

Added 1.3.4 release

Location:

shopp/trunk

Files:

• Shopp.php (modified) (1 diff)
• api/admin.php (modified) (2 diffs)
• api/cart.php (modified) (2 diffs)
• api/core.php (modified) (2 diffs)
• api/theme/cart.php (modified) (2 diffs)
• api/theme/collection.php (modified) (1 diff)
• api/theme/product.php (modified) (2 diffs)
• core/flow/Admin.php (modified) (5 diffs)
• core/flow/Categorize.php (modified) (1 diff)
• core/flow/Install.php (modified) (2 diffs)
• core/flow/Login.php (modified) (1 diff)
• core/flow/Order.php (modified) (2 diffs)
• core/flow/Pages.php (modified) (6 diffs)
• core/flow/Report.php (modified) (5 diffs)
• core/flow/Resources.php (modified) (2 diffs)
• core/flow/Scripts.php (modified) (2 diffs)
• core/flow/Service.php (modified) (5 diffs)
• core/flow/Setup.php (modified) (1 diff)
• core/flow/Storefront.php (modified) (6 diffs)
• core/flow/System.php (modified) (2 diffs)
• core/flow/Warehouse.php (modified) (16 diffs)
• core/library/Catalog.php (modified) (1 diff)
• core/library/Core.php (modified) (5 diffs)
• core/library/DB.php (modified) (1 diff)
• core/library/Error.php (modified) (8 diffs)
• core/library/Framework.php (modified) (4 diffs)
• core/library/Loader.php (modified) (1 diff)
• core/library/Session.php (modified) (7 diffs)
• core/library/Shopp.php (modified) (1 diff)
• core/library/Version.php (modified) (2 diffs)
• core/model/Asset.php (modified) (5 diffs)
• core/model/Cart.php (modified) (8 diffs)
• core/model/Collection.php (modified) (9 diffs)
• core/model/Customer.php (modified) (1 diff)
• core/model/Discounts.php (modified) (10 diffs)
• core/model/Gateway.php (modified) (3 diffs)
• core/model/Image.php (modified) (3 diffs)
• core/model/Item.php (modified) (2 diffs)
• core/model/Payments.php (modified) (3 diffs)
• core/model/Search.php (modified) (38 diffs)
• core/model/Shiprates.php (modified) (4 diffs)
• core/model/Tax.php (modified) (7 diffs)
• core/model/Totals.php (modified) (10 diffs)
• core/ui/behaviors/catalog.js (modified) (5 diffs)
• core/ui/behaviors/catalog.min.js (modified) (1 diff)
• core/ui/behaviors/checkout.js (modified) (4 diffs)
• core/ui/behaviors/checkout.min.js (modified) (1 diff)
• core/ui/behaviors/editors.js (modified) (1 diff)
• core/ui/behaviors/setup.js (modified) (1 diff)
• core/ui/behaviors/tinymce/dialog.php (modified) (1 diff)
• core/ui/categories/products.js (modified) (1 diff)
• core/ui/categories/products.min.js (modified) (1 diff)
• core/ui/orders/events.php (modified) (1 diff)
• core/ui/orders/order.php (modified) (9 diffs)
• core/ui/reports/payment-types.php (added)
• core/ui/reports/sales.php (modified) (1 diff)
• core/ui/reports/tax.php (modified) (3 diffs)
• core/ui/settings/advanced.php (modified) (1 diff)
• core/ui/settings/checkout.php (modified) (1 diff)
• core/ui/settings/downloads.php (modified) (1 diff)
• core/ui/settings/images.php (modified) (1 diff)
• core/ui/settings/log.php (modified) (1 diff)
• core/ui/settings/management.php (modified) (1 diff)
• core/ui/settings/pages.php (modified) (1 diff)
• core/ui/settings/payments.php (modified) (1 diff)
• core/ui/settings/presentation.php (modified) (1 diff)
• core/ui/settings/setup.php (modified) (1 diff)
• core/ui/settings/shipping.php (modified) (1 diff)
• core/ui/settings/shiprates.php (modified) (1 diff)
• core/ui/settings/storage.php (modified) (1 diff)
• core/ui/settings/taxes.php (modified) (1 diff)
• core/ui/settings/taxrates.php (modified) (1 diff)
• core/ui/styles/admin.css (modified) (3 diffs)
• core/ui/styles/catalog.css (modified) (3 diffs)
• gateways/2Checkout/2Checkout.php (modified) (10 diffs)
• gateways/PayPal/PayPalStandard.php (modified) (3 diffs)
• readme.md (modified) (1 diff)
• services/image.php (modified) (1 diff)
• shipping/core/ItemQuantity.php (modified) (1 diff)
• shipping/core/OrderAmount.php (modified) (1 diff)
• shipping/core/OrderWeight.php (modified) (1 diff)
• shipping/core/PercentageAmount.php (modified) (1 diff)

shopp/trunk/Shopp.php

@@ -4 +4 @@
  * Plugin URI: http://shopplugin.com
  * Description: An ecommerce framework for WordPress.
- * Version: 1.3.3
+ * Version: 1.3.4
  * Author: Ingenesis Limited
  * Author URI: http://ingenesis.net

shopp/trunk/api/admin.php

@@ -29 +29 @@
  * @return integer The position the menu was added
  **/
-function shopp_admin_add_menu ( string $label, string $page, integer $position = null, $handler = false, string $access = null, string $icon = null ) {
+function shopp_admin_add_menu ( $label, $page, $position = null, $handler = false, $access = null, $icon = null ) {
 
     global $menu;
@@ -76 +76 @@
  * @return integer The position the menu was added
  **/
-function shopp_admin_add_submenu ( string $label, string $page, string $menu = null, $handler = false, string $access = null ) {
+function shopp_admin_add_submenu ( $label, $page, $menu = null, $handler = false, $access = null ) {
 
     $Admin = ShoppAdmin();

shopp/trunk/api/cart.php

@@ -156 +156 @@
  * @return bool true for success, false on failure
  **/
-function shopp_set_cart_item_variant ( string $item = null, int $variant = null ) {
+function shopp_set_cart_item_variant ( $item = null, $variant = null ) {
 
     if ( null === $item ) {
@@ -269 +269 @@
  * @return void
  **/
-function shopp_add_cart_discount_code( string $code = null ) {
+function shopp_add_cart_discount_code( $code = null ) {
     if ( null === $code || empty($code) ) {
         shopp_debug(__FUNCTION__ . " failed: Missing code parameter.");

shopp/trunk/api/core.php

@@ -190 +190 @@
  * @return ShoppPage The requested ShoppPage if found, false otherwise
  **/
-function shopp_get_page ( string $pagename ) {
+function shopp_get_page ( $pagename ) {
     return ShoppPages()->get($pagename);
 }
@@ -202 +202 @@
  * @return void
  **/
-function shopp_register_page ( string $classname ) {
+function shopp_register_page ( $classname ) {
     ShoppPages()->register($classname);
 }

shopp/trunk/api/theme/cart.php

@@ -61 +61 @@
         'updatebutton' => 'update_button',
         'url' => 'url',
+        'hassavings' => 'has_savings',
+        'savings' => 'savings',
 
         /* Deprecated tag names - do not use */
@@ -512 +514 @@
     // Check if any of the items in the cart are on sale
     public static function has_savings ( $result, $options, $O ) {
-        // loop thru cart looking for $Item->sale == "on"
+        // loop thru cart looking for $Item->sale == "on" or "1" etc
         foreach( $O as $item ) {
-            if ( 'on' == $item->sale ) return true;
+            if ( str_true( $item->sale ) ) return true;
         }
 

shopp/trunk/api/theme/collection.php

@@ -164 +164 @@
             'collapse' => true,
             'wrap' => true,
-            'before' => '<div class="category-description">',
+            'before' => '<div class="category-description">' . "\n\n",
             'after' => '</div>'
         );

shopp/trunk/api/theme/product.php

@@ -403 +403 @@
     public static function buy_now ( $result, $options, $O ) {
         if ( ! isset($options['value']) ) $options['value'] = Shopp::__('Buy Now');
-        return self::addtocart( $result, $options, $O );
+        return self::add_to_cart( $result, $options, $O );
     }
 
@@ -1448 +1448 @@
     }
 
-    public static function _variant_formatlabel ( string $format, $var ) {
+    public static function _variant_formatlabel ( $format, $var ) {
         $data = (array)$var;
 

shopp/trunk/core/flow/Admin.php

@@ -227 +227 @@
      * @return void
      **/
-    private function addpage ( string $name, string $label, string $controller, string $parent = null) {
+    private function addpage ( $name, $label, $controller, $parent = null ) {
         $page = $this->pagename($name);
 
@@ -294 +294 @@
      * @return string The screen id of the given menu name
      **/
-    public function menu ( string $name, string $menu = null ) {
+    public function menu ( $name, $menu = null ) {
 
         if ( isset($menu) ) $this->menus[ $name ] = $menu;
@@ -791 +791 @@
     public $parent = false;
 
-    public function __construct ( string $name, string $page, string $label, string $controller, string $parent = null ) {
+    public function __construct ( $name, $page, $label, $controller, $parent = null ) {
         $this->name = $name;
         $this->page = $page;
@@ -820 +820 @@
     }
 
-    public static function button ( string $button, string $name, array $options = array() ) {
+    public static function button ( $button, $name, array $options = array() ) {
         $buttons = array(
             'add' => array('class' => 'add', 'title' => Shopp::__('Add'), 'icon' => 'shoppui-plus', 'type' => 'submit'),
@@ -1065 +1065 @@
      * @param array $args [optional]
      */
-    public static function addmetabox(string $id, string $title, $callback, string $posttype, $context = 'advanced', $priority = 'default', array $args = null) {
+    public static function addmetabox(string $id, $title, $callback, $posttype, $context = 'advanced', $priority = 'default', array $args = null) {
         self::$metaboxes[$id] = $callback;
         $args = (array) $args;

shopp/trunk/core/flow/Categorize.php

@@ -508 +508 @@
     public function products_cols () {
         register_column_headers($this->screen, array(
-            'name'      => '<div class="shoppui-spin-align"><div class="shoppui-spinner shoppui-spinfx shoppui-spinfx-steps8"></div></div>',
+            'name'      => '<div class="shoppui-spin-align"><div class="shoppui-spinner shoppui-spinfx shoppui-spinfx-steps8 hidden"></div></div>',
             'title'     => Shopp::__('Product'),
             'sold'      => Shopp::__('Sold'),

shopp/trunk/core/flow/Install.php

@@ -1037 +1037 @@
 
         if ( $db_version <= 1200 ) {
-           // All existing sessions must be cleared and restarted, 1.3 sessions are not compatible with any prior version of Shopp
-            $sessions_table = ShoppDatabaseObject::tablename('shopping');
+            // All existing sessions must be cleared and restarted, 1.3 sessions are not compatible with any prior version of Shopp
+            ShoppShopping()->reset();
+            $sessions_table = ShoppDatabaseObject::tablename('shopping');
             sDB::query("DELETE FROM $sessions_table");
-
+    
             $meta_table = ShoppDatabaseObject::tablename('meta');
             sDB::query("UPDATE $meta_table SET value='on' WHERE name='theme_templates' AND (value != '' AND value != 'off')");
             sDB::query("DELETE FROM $meta_table WHERE type='image' AND value LIKE '%O:10:\"ShoppError\"%'"); // clean up garbage from legacy bug
             sDB::query("DELETE FROM $meta_table WHERE CONCAT('', name *1) = name AND context = 'category' AND type = 'meta'"); // clean up bad category meta
-
+    
             // Update purchase gateway values to match new prefixed class names
             $gateways = array(
@@ -1053 +1054 @@
                 'TestMode' => 'ShoppTestMode',
                 'FreeOrder' => 'ShoppFreeOrder'
-
+    
             );
             foreach ($gateways as $name => $classname)
                 sDB::query("UPDATE $purchase_table SET gateway='$classname' WHERE gateway='$name'");
-
+    
             $activegateways = explode(',', shopp_setting('active_gateways'));
             foreach ($activegateways as &$setting)

shopp/trunk/core/flow/Login.php

@@ -127 +127 @@
      * @return void
      **/
-    public function auth ( string $id, string $password, $type = 'email') {
+    public function auth ( $id, $password, $type = 'email') {
 
         do_action('shopp_auth');

shopp/trunk/core/flow/Order.php

@@ -111 +111 @@
         // Initialize/reinitalize the current location
         add_action('shopp_init', array($this, 'locate'), 20);
-
 
     }
@@ -780 +779 @@
      **/
     public function securecard () {
-        if ( ! empty($this->Billing->card) && strlen($this->Billing->card) > 4 ) {
-            $this->Billing->card = substr($this->Billing->card, -4);
-
-            // Card data is truncated, switch the cart to normal mode
-            ShoppShopping()->secured(false);
-        }
+        $this->Billing->card = '';
+
+        // Card data is gone, switch the cart to normal mode
+        ShoppShopping()->secured(false);
     }
 

shopp/trunk/core/flow/Pages.php

@@ -42 +42 @@
     }
 
-    public function register ( string $StorefrontPageClass ) {
+    public function register ( $StorefrontPageClass ) {
 
         if ( ! class_exists($StorefrontPageClass) ) return false;
@@ -84 +84 @@
     }
 
-    public function slugpage ( string $slug ) {
+    public function slugpage ( $slug ) {
         if ( ! isset($this->slugs[ $slug ]) ) return false;
         return $this->get( $this->slugs[ $slug ] );
@@ -495 +495 @@
 
         $errors = array();
-        if (empty($activation) || !is_string($activation))
-            $errors[] = new ShoppError(__('Invalid key', 'Shopp'));
+        if ( empty($activation) || ! is_string($activation) )
+            $errors[] = new ShoppError(Shopp::__('Invalid key'));
 
         $RecoveryCustomer = new ShoppCustomer($activation, 'activation');
-        if (empty($RecoveryCustomer->id))
-            $errors[] = new ShoppError(__('Invalid key', 'Shopp'));
-
-        if (!empty($errors)) return false;
+        if ( empty($RecoveryCustomer->id) )
+            $errors[] = new ShoppError(Shopp::__('Invalid key'));
+
+        if ( ! empty($errors) ) return false;
 
         // Generate a new random password
         $password = wp_generate_password();
 
-        do_action_ref_array('password_reset', array(&$RecoveryCustomer, $password));
+        do_action_ref_array('password_reset', array($RecoveryCustomer, $password));
 
         $RecoveryCustomer->password = wp_hash_password($password);
@@ -518 +518 @@
         $RecoveryCustomer->save();
 
-        $subject = apply_filters('shopp_reset_password_subject', sprintf(__('[%s] New Password', 'Shopp'), get_option('blogname')));
+        $subject = apply_filters('shopp_reset_password_subject', Shopp::__('[%s] New Password', get_option('blogname')));
 
         $_ = array();
         $_[] = 'From: ' . Shopp::email_from( shopp_setting('merchant_email'), shopp_setting('business_name') );
-        $_[] = 'To: '.$RecoveryCustomer->email;
-        $_[] = 'Subject: '.$subject;
+        $_[] = 'To: ' . $RecoveryCustomer->email;
+        $_[] = 'Subject: ' . $subject;
+        $_[] = 'Content-type: text/html';
         $_[] = '';
-        $_[] = '<p>'.sprintf(__('Your new password for %s:', 'Shopp'), get_option('siteurl')).'</p>';
+        $_[] = '<p>' . Shopp::__('Your new password for %s:', get_option('siteurl')) . '</p>';
         $_[] = '';
         $_[] = '<ul>';
-        if ($user_data)
-            $_[] = '<li>'.sprintf(__('Login name: %s', 'Shopp'), $user_data->user_login).'</li>';
-        $_[] = '<li>'.sprintf(__('Password: %s'), $password).'</li>';
+        if ( $user_data )
+            $_[] = '<li>' . Shopp::__('Login name: %s', $user_data->user_login) . '</li>';
+        $_[] = '<li>' . Shopp::__('Password: %s', $password) . '</li>';
         $_[] = '</ul>';
         $_[] = '';
-        $_[] = '<p>'.__('Click here to login:').' '.Shopp::url(false, 'account').'</p>';
+        $_[] = '<p>' . Shopp::__('Click here to login: %s', Shopp::url(false, 'account')) . '</p>';
         $message = apply_filters('shopp_reset_password_message', $_);
 
-        if (!Shopp::email(join("\n", $message))) {
-            new ShoppError(__('The e-mail could not be sent.'), 'password_reset_email', SHOPP_ERR);
+        if ( ! Shopp::email(join("\n", $message)) ) {
+            shopp_add_error(Shopp::__('The e-mail could not be sent.'));
             Shopp::redirect( add_query_arg( 'acct', 'recover', Shopp::url(false, 'account') ) );
-        } else new ShoppError(__('Check your email address for your new password.', 'Shopp'), 'password_reset_email', SHOPP_ERR);
+        } else shopp_add_error(Shopp::__('Check your email address for your new password.'));
 
         unset($_GET['acct']);
     }
-
 
 }
@@ -619 +619 @@
     }
 
-    public function head () {
-        ?>
-        <script type="text/javascript">
-        //<![CDATA[
-            document.body.className += ' js-on';
-        //]]>
-        </script>
-<?php
+    public function head () {?>
+        <script type="text/javascript">//<![CDATA[ checkout JS-support detection
+            document.documentElement.className += ' js-on'; //]]></script><?php
     }
 
@@ -805 +800 @@
     }
 
-    public function wp_title ( string $title, string $sep = null, $placement = null ) {
+    public function wp_title ( $title, $sep = null, $placement = null ) {
         if ( is_null($sep) ) $sep = '&mdash;';
         if ( is_null($placement) ) $placement = '';

shopp/trunk/core/flow/Report.php

@@ -67 +67 @@
             'locations' => array( 'class' => 'LocationsReport', 'name' => __('Locations Report','Shopp'), 'label' => __('Locations','Shopp') ),
             'products' => array( 'class' => 'ProductsReport', 'name' => __('Products Report','Shopp'), 'label' => __('Products','Shopp') ),
+            'payment-types' => array( 'class' => 'PaymentTypesReport', 'name' => __('Payment Types Report','Shopp'), 'label' => __('Payment Types','Shopp') ),
         ));
     }
@@ -452 +453 @@
      * @return string Date index column SQL statement
      **/
-    public function timecolumn ( string $column ) {
+    public function timecolumn ( $column ) {
         $tzoffset = date('Z')/3600;
         $column = "CONVERT_TZ($column,'+00:00','".($tzoffset>=0?'+':'-')."$tzoffset:00')";
@@ -474 +475 @@
      * @return string The UNIX_TIMESTAMP SQL column fragment
      **/
-    static function unixtime ( string $column ) {
+    static function unixtime ( $column ) {
         $tzoffset = date('Z')/3600;
         return "UNIX_TIMESTAMP(CONVERT_TZ($column,'+00:00','".($tzoffset>=0?'+':'-')."$tzoffset:00'))";
@@ -490 +491 @@
      * @return int The number of periods
      **/
-    public function range ( integer $starts, integer $ends, $scale = 'day') {
+    public function range ( $starts, $ends, $scale = 'day') {
         $oneday = 86400;
         $years = date('Y',$ends)-date('Y',$starts);
@@ -533 +534 @@
      * @return string Formatted week range label
      **/
-    static function weekrange ( int $ts, $formats=array('F j','F j Y') ) {
+    static function weekrange ( $ts, $formats=array('F j','F j Y') ) {
         $weekday = date('w',$ts);
         $startweek = $ts-($weekday*86400);

shopp/trunk/core/flow/Resources.php

@@ -195 +195 @@
             }
 
-            if ( __('Guest','Shopp') != ShoppCustomer()->type ) {
-
-                // Account restriction checks
-                if ( $accounts && ! ShoppCustomer()->loggedin() ) {
+            // If accounts are used and this is not a guest account
+            if ( $accounts && Shopp::__('Guest') != ShoppCustomer()->type ) {
+
+                // User must be logged in when accounts are being used
+                if ( ! ShoppCustomer()->loggedin() ) {
                     shopp_add_error(Shopp::__('You must login to download purchases.'));
                     $forbidden = true;
                 }
 
-                // File owner authorization check
-                if ($accounts && ShoppCustomer()->id != $Purchase->customer) {
+                // Logged in account must be the owner of the purchase
+                if ( ShoppCustomer()->id != $Purchase->customer ) {
                     shopp_add_error(Shopp::__('You are not authorized to download the requested file.'));
                     $forbidden = true;
@@ -213 +214 @@
             // Download limit checking
             if (shopp_setting('download_limit') // Has download credits available
-                    && $Purchased->downloads+1 > shopp_setting('download_limit')) {
+                    && $Purchased->downloads + 1 > shopp_setting('download_limit')) {
                 shopp_add_error(Shopp::__('"%s" is no longer available for download because the download limit has been reached.', $name));
                 $forbidden = true;

shopp/trunk/core/flow/Scripts.php

@@ -343 +343 @@
             // Currency formatting
             'cp' => $settings['cpos'],
-            'c' =>  $settings['currency'],
-            'p' =>  (int)$settings['precision'],
-            't' =>  $settings['thousands'],
-            'd' =>  $settings['decimals']
+            'c'  => $settings['currency'],
+            'p'  => (int)$settings['precision'],
+            't'  => $settings['thousands'],
+            'd'  => $settings['decimals']
         );
-        if (isset($settings['grouping']))
+        if ( isset($settings['grouping']) )
             $currency['g'] = is_array($settings['grouping']) ? join(',',$settings['grouping']) : $settings['grouping'];
 
@@ -365 +365 @@
     // Checkout page settings & localization
     shopp_localize_script('checkout', '$co', array(
-        'ajaxurl' => admin_url('admin-ajax.php'),
-        'loginname' => __('You did not enter a login.','Shopp'),
-        'loginpwd' => __('You did not enter a password to login with.','Shopp'),
+        'ajaxurl' =>    admin_url('admin-ajax.php'),
+        'loginname' =>  Shopp::__('You did not enter a login.'),
+        'loginpwd' =>   Shopp::__('You did not enter a password to login with.'),
+        'badpan' =>     Shopp::__('Not a valid card number.'),
+        'submitting' => Shopp::__('Submitting…'),
+        'error' =>      Shopp::__('An error occurred while submitting your order. Please try submitting your order again.'),
+        'timeout' =>    (int)SHOPP_SUBMIT_TIMEOUT
     ));
 

shopp/trunk/core/flow/Service.php

@@ -25 +25 @@
     public $orders = array();
     public $ordercount = false;
+
+    protected $ui = 'orders';
 
     /**
@@ -304 +306 @@
         $Gateways = array_merge($Shopp->Gateways->modules, array('ShoppFreeOrder' => $Shopp->Gateways->freeorder));
 
-        include(SHOPP_ADMIN_PATH."/orders/orders.php");
+        include $this->ui('orders.php');
     }
 
@@ -349 +351 @@
             'total' => __('Total','Shopp')
         )));
-        include(SHOPP_ADMIN_PATH."/orders/events.php");
-        include(SHOPP_ADMIN_PATH."/orders/ui.php");
+        include $this->ui('events.php');
+        include $this->ui('ui.php');
         do_action('shopp_order_manager_layout');
     }
@@ -600 +602 @@
         foreach ($countrydata as $iso => $c) {
             if ($base['country'] == $iso) $base_region = $c['region'];
-            $countries[$iso] = $c['name'];
+            $countries[ $iso ] = $c['name'];
         }
         $Purchase->_countries = $countries;
 
         $regions = Lookup::country_zones();
-        $Purchase->_billing_states = array_merge(array(''=>' '),(array)$regions[$Purchase->country]);
-        $Purchase->_shipping_states = array_merge(array(''=>' '),(array)$regions[$Purchase->shipcountry]);
+        $Purchase->_billing_states = array_merge(array('' => ' '), (array)$regions[ $Purchase->country ]);
+        $Purchase->_shipping_states = array_merge(array('' => ' '), (array)$regions[ $Purchase->shipcountry ]);
 
         $carriers_menu = $carriers_json = array();
@@ -612 +614 @@
         $shipcarriers = Lookup::shipcarriers();
 
-        if (empty($shipping_carriers)) {
-            $serviceareas = array('*',$base['country']);
-            foreach ($shipcarriers as $code => $carrier) {
-                if (!in_array($carrier->areas,$serviceareas)) continue;
-                $carriers_menu[$code] = $carrier->name;
-                $carriers_json[$code] = array($carrier->name,$carrier->trackpattern);
+        $carriers_menu['NOTRACKING'] = Shopp::__('No Tracking');
+        $carriers_json['NOTRACKING'] = array(Shopp::__('No Tracking'), false);
+        if ( empty($shipping_carriers) ) {
+            $serviceareas = array('*', $base['country']);
+            foreach ( $shipcarriers as $code => $carrier ) {
+                if ( ! in_array($carrier->areas, $serviceareas) ) continue;
+                $carriers_menu[ $code ] = $carrier->name;
+                $carriers_json[ $code ] = array($carrier->name,$carrier->trackpattern);
             }
         } else {
             foreach ($shipping_carriers as $code) {
-                $carriers_menu[$code] = $shipcarriers[$code]->name;
-                $carriers_json[$code] = array($shipcarriers[$code]->name,$shipcarriers[$code]->trackpattern);
+                $carriers_menu[ $code ] = $shipcarriers[ $code ]->name;
+                $carriers_json[ $code ] = array($shipcarriers[ $code ]->name, $shipcarriers[ $code ]->trackpattern);
             }
         }
         unset($carrierdata);
 
-        if (empty($statusLabels)) $statusLabels = array('');
-
-        include(SHOPP_ADMIN_PATH."/orders/order.php");
+        if ( empty($statusLabels) ) $statusLabels = array('');
+
+        include $this->ui('order.php');
     }
 

shopp/trunk/core/flow/Setup.php

@@ -185 +185 @@
             $taxonomy = ProductCategory::$taxon;
             $terms = get_terms( $taxonomy, array('hide_empty' => 0,'fields'=>'ids') );
-            wp_update_term_count_now( $terms, $taxonomy );
+            if ( ! empty($terms) )
+                wp_update_term_count_now( $terms, $taxonomy );
         }
 

shopp/trunk/core/flow/Storefront.php

@@ -361 +361 @@
      * @return void
      **/
-    public function maintenance ( string $template ) {
+    public function maintenance ( $template ) {
         // Only run if in maintenance mode
         if ( ! is_shopp_page() ) return $template;
@@ -410 +410 @@
      * @return string The output of the templates
      **/
-    public function pages ( string $template ) {
+    public function pages ( $template ) {
         // Catch smart collection pages
         if ( is_shopp_collection() )
@@ -432 +432 @@
     }
 
-    public function collections ( string $template ) {
+    public function collections ( $template ) {
         if ( ! is_shopp_collection() ) return $template;
 
@@ -1018 +1018 @@
     }
 
-    public function autowrap ( string $content ) {
+    public function autowrap ( $content ) {
         if ( ! in_array(get_the_ID(), $this->shortcoded) ) return $content;
         return ShoppStorefront::wrapper($content);
@@ -1031 +1031 @@
      * @return string The template file being loaded
      **/
-    public static function intemplate ( string $template = null ) {
+    public static function intemplate ( $template = null ) {
         if ( isset($template) )
             self::$template = basename($template);
@@ -1048 +1048 @@
      * @return string The wrapped markup
      **/
-    static function wrapper ( string $string ) {
-
-        $classes = array('shopp_page');
+    static function wrapper ( $string ) {
+
+        $classes = array('shoppage', 'shopp_page');
 
         $views = array('list', 'grid');

shopp/trunk/core/flow/System.php

@@ -137 +137 @@
 
         $sub = 'settings';
+        $term_recount = false;
         if (shopp_setting_enabled('shipping')) $sub = 'rates';
         if ( isset($_GET['sub']) && in_array( $_GET['sub'],array_keys($this->subscreens) ) )
@@ -660 +661 @@
         else $gateways = explode(',', $active_gateways);
 
-        $gateways = array_filter($gateways, create_function('$g', 'return class_exists($g, false);'));
+        $gateways = array_filter($gateways, array($Gateways, 'moduleclass'));
 
         if ( ! empty($_GET['delete']) ) {

shopp/trunk/core/flow/Warehouse.php

@@ -69 +69 @@
             shopp_enqueue_script('search-select');
             shopp_enqueue_script('shopp-swfupload-queue');
+
             do_action('shopp_product_editor_scripts');
             add_action('admin_head',array(&$this,'layout'));
@@ -77 +78 @@
         }
 
-        if ('inventory' == $this->view && 'on' == shopp_setting('inventory'))
+        if ( 'inventory' == $this->view && shopp_setting_enabled('inventory') )
             do_action('shopp_inventory_manager_scripts');
 
-        add_action('load-' . $this->screen, array($this,'workflow'));
+        add_action('load-' . $this->screen, array($this, 'workflow'));
 
         do_action('shopp_product_admin_scripts');
 
-        // Load the search model for indexing
-        if (!class_exists('ContentParser'))
-            require(SHOPP_MODEL_PATH.'/Search.php');
         new ContentParser();
-        add_action('shopp_product_saved',array(&$this,'index'),99,1);
+        add_action('shopp_product_saved', array($this, 'index'), 99, 1);
     }
 
@@ -101 +99 @@
      **/
     public function admin () {
-        if (!empty($_GET['id'])) $this->editor();
-        else {
+        if ( ! empty($_GET['id']) ) {
+            $this->editor();
+        } else {
             $this->manager();
 
             global $Products;
-            if ($Products->total == 0) return;
+            if ( 0 == $Products->total ) return;
 
             // Save workflow list
@@ -134 +133 @@
             'duplicate' => false,
             'next' => false
-            );
-        $args = array_merge($defaults,$_REQUEST);
-        extract($args,EXTR_SKIP);
-
-        if (!is_array($selected)) $selected = array($selected);
-
-        if (!defined('WP_ADMIN') || !isset($page)
-            || $page != $this->Admin->pagename('products'))
+        );
+        $args = array_merge($defaults, $_REQUEST);
+        extract($args, EXTR_SKIP);
+
+        if ( ! is_array($selected) ) $selected = array($selected);
+
+        if ( ! defined('WP_ADMIN') || ! isset($page)
+            || $this->Admin->pagename('products') != $page )
                 return false;
 
         $adminurl = admin_url('admin.php');
 
-        if ($page == $this->Admin->pagename('products') && ($action !== false || isset($_GET['delete_all']))) {
+        if ( $this->Admin->pagename('products') == $page && ( false !== $action || isset($_GET['delete_all']) ) ) {
             if (isset($_GET['delete_all'])) $action = 'emptytrash';
             switch ($action) {
@@ -261 +260 @@
         );
 
-        $args = array_merge($defaults,$_GET);
+        $args = array_merge($defaults, $_GET);
         if ( false !== ( $user_per_page = get_user_option($per_page_option['option']) ) ) $args['per_page'] = $user_per_page;
-        extract($args,EXTR_SKIP);
-
-        $url = add_query_arg(array_merge($_GET,array('page'=>$this->Admin->pagename('products'))),admin_url('admin.php'));
+        extract($args, EXTR_SKIP);
+
+        $url = ShoppAdminController::url($_GET);
 
         $subs = array(
-            'all' =>        array('label' => __('All','Shopp'),         'where'=>array("p.post_status!='trash'")),
-            'published' =>  array('label' => __('Published','Shopp'),   'where'=>array("p.post_status='publish'")),
-            'drafts' =>     array('label' => __('Drafts','Shopp'),      'where'=>array("p.post_status='draft'")),
-            'onsale' =>     array('label' => __('On Sale','Shopp'),     'where'=>array("s.sale='on' AND p.post_status != 'trash'")),
-            'featured' =>   array('label' => __('Featured','Shopp'),    'where'=>array("s.featured='on' AND p.post_status != 'trash'")),
-            'bestselling'=> array('label' => __('Bestselling','Shopp'), 'where'=>array("p.post_status!='trash'",BestsellerProducts::threshold()." < s.sold"),'order' => 'bestselling'),
-            'inventory' =>  array('label' => __('Inventory','Shopp'),   'where'=>array("s.inventory='on' AND p.post_status != 'trash'")),
-            'trash' =>      array('label' => __('Trash','Shopp'),       'where'=>array("p.post_status='trash'"))
+            'all' =>        array('label' => Shopp::__('All'),         'where' => array("p.post_status!='trash'")),
+            'published' =>  array('label' => Shopp::__('Published'),   'where' => array("p.post_status='publish'")),
+            'drafts' =>     array('label' => Shopp::__('Drafts'),      'where' => array("p.post_status='draft'")),
+            'onsale' =>     array('label' => Shopp::__('On Sale'),     'where' => array("s.sale='on' AND p.post_status != 'trash'")),
+            'featured' =>   array('label' => Shopp::__('Featured'),    'where' => array("s.featured='on' AND p.post_status != 'trash'")),
+            'bestselling'=> array('label' => Shopp::__('Bestselling'), 'where' => array("p.post_status!='trash'", BestsellerProducts::threshold() . " < s.sold"),'order' => 'bestselling'),
+            'inventory' =>  array('label' => Shopp::__('Inventory'),   'where' => array("s.inventory='on' AND p.post_status != 'trash'")),
+            'trash' =>      array('label' => Shopp::__('Trash'),       'where' => array("p.post_status='trash'"))
         );
 
-        if (!shopp_setting_enabled('inventory')) unset($subs['inventory']);
-
-        switch ($view) {
+        if ( ! shopp_setting_enabled('inventory') ) unset($subs['inventory']);
+
+        switch ( $view ) {
             case 'inventory':
                 if ( shopp_setting_enabled('inventory') ) $is_inventory = true;
@@ -291 +290 @@
 
 
-        if ($is_inventory) $per_page = 50;
+        if ( $is_inventory ) $per_page = 50;
         $pagenum = absint( $paged );
-        $start = ($per_page * ($pagenum-1));
-
-        $where = $subs[$this->view]['where'];
-
-        if (!empty($s)) {
-            $SearchResults = new SearchResults(array('search'=>$s,'published'=>'off','paged'=>-1));
+        $start = ( $per_page * ( $pagenum - 1 ) );
+
+        $where = $subs[ $this->view ]['where'];
+
+        if ( ! empty($s) ) {
+            $SearchResults = new SearchResults(array('search' => $s, 'nostock' => 'on', 'published' => 'off', 'paged' => -1));
             $SearchResults->load();
             $ids = array_keys($SearchResults->products);
-            $where[] = "p.ID IN (".join(',',$ids).")";
-        }
-
-        if (!empty($cat)) {
+            $where[] = "p.ID IN (" . join(',', $ids) . ")";
+        }
+
+        if ( ! empty($cat) ) {
             global $wpdb;
-            $joins[$wpdb->term_relationships] = "INNER JOIN $wpdb->term_relationships AS tr ON (p.ID=tr.object_id)";
-            $joins[$wpdb->term_taxonomy] = "INNER JOIN $wpdb->term_taxonomy AS tt ON (tr.term_taxonomy_id=tt.term_taxonomy_id AND tt.term_id=$cat)";
+            $joins[ $wpdb->term_relationships ] = "INNER JOIN $wpdb->term_relationships AS tr ON (p.ID=tr.object_id)";
+            $joins[ $wpdb->term_taxonomy ] = "INNER JOIN $wpdb->term_taxonomy AS tt ON (tr.term_taxonomy_id=tt.term_taxonomy_id AND tt.term_id=$cat)";
             if (-1 == $cat) {
-                unset($joins[$wpdb->term_taxonomy]);
-                $joins[$wpdb->term_relationships] = "LEFT JOIN $wpdb->term_relationships AS tr ON (p.ID=tr.object_id)";
+                unset($joins[ $wpdb->term_taxonomy ]);
+                $joins[ $wpdb->term_relationships ] = "LEFT JOIN $wpdb->term_relationships AS tr ON (p.ID=tr.object_id)";
                 $where[] = 'tr.object_id IS NULL';
             }
@@ -316 +315 @@
 
         // Detect custom taxonomies
-        $taxonomies = array_intersect(get_object_taxonomies(ShoppProduct::$posttype),array_keys($_GET));
+        $taxonomies = array_intersect(get_object_taxonomies(ShoppProduct::$posttype), array_keys($_GET));
         if ( ! empty($taxonomies) ) {
             foreach ($taxonomies as $n => $taxonomy) {
                 global $wpdb;
-                $term = get_term_by('slug',$_GET[ $taxonomy ],$taxonomy);
+                $term = get_term_by('slug', $_GET[ $taxonomy ], $taxonomy);
                 if ( ! empty($term->term_id) ) {
-                    $joins[$wpdb->term_relationships.'_'.$n] = "INNER JOIN $wpdb->term_relationships AS tr$n ON (p.ID=tr$n.object_id)";
-                    $joins[$wpdb->term_taxonomy.'_'.$n] = "INNER JOIN $wpdb->term_taxonomy AS tt$n ON (tr$n.term_taxonomy_id=tt$n.term_taxonomy_id AND tt$n.term_id=$term->term_id)";
+                    $joins[ $wpdb->term_relationships . '_' . $n ] = "INNER JOIN $wpdb->term_relationships AS tr$n ON (p.ID=tr$n.object_id)";
+                    $joins[ $wpdb->term_taxonomy . '_' . $n ] = "INNER JOIN $wpdb->term_taxonomy AS tt$n ON (tr$n.term_taxonomy_id=tt$n.term_taxonomy_id AND tt$n.term_id=$term->term_id)";
                 }
             }
@@ -329 +328 @@
 
         if ( ! empty($sl) && shopp_setting_enabled('inventory') ) {
-            switch($sl) {
+            switch( $sl ) {
                 case "ns":
-                    foreach ($where as &$w) $w = str_replace("s.inventory='on'","s.inventory='off'",$w);
+                    foreach ( $where as &$w ) $w = str_replace("s.inventory='on'", "s.inventory='off'", $w);
                     $where[] = "s.inventory='off'";
                     break;
@@ -339 +338 @@
                 case "ls":
                     $ls = shopp_setting('lowstock_level');
-                    if (empty($ls)) $ls = '0';
+                    if ( empty($ls) ) $ls = '0';
                     $where[] = "(s.inventory='on' AND s.lowstock != 'none')";
                     break;
@@ -353 +352 @@
         $ps = ShoppDatabaseObject::tablename(ProductSummary::$table);
 
-        $orderdirs = array('asc','desc');
-        if (in_array($order,$orderdirs)) $orderd = strtolower($order);
+        $orderdirs = array('asc', 'desc');
+        if ( in_array($order, $orderdirs) ) $orderd = strtolower($order);
         else $orderd = 'asc';
 
-        if (isset($subs[$this->view]['order'])) $order = $subs[$this->view]['order'];
+        if ( isset($subs[ $this->view ]['order']) ) $order = $subs[ $this->view ]['order'];
 
         $ordercols = '';
-        switch ($orderby) {
+        switch ( $orderby ) {
             case 'name': $order = 'title'; if ('desc' == $orderd) $order = 'reverse'; break;
             case 'price': $order = 'lowprice'; if ('desc' == $orderd) $order = 'highprice'; break;
@@ -371 +370 @@
         }
 
-        if (in_array($this->view,array('onsale','featured','inventory')))
-            $joins[$ps] = "INNER JOIN $ps AS s ON p.ID=s.product";
+        if ( in_array($this->view, array('onsale', 'featured', 'inventory')) )
+            $joins[ $ps ] = "INNER JOIN $ps AS s ON p.ID=s.product";
 
         $loading = array(
-            'where' => $where,
-            'joins' => $joins,
-            'limit'=>"$start,$per_page",
-            'load' => array('categories','coverimages'),
+            'where'     => $where,
+            'joins'     => $joins,
+            'limit'     => "$start,$per_page",
+            'load'      => array('categories', 'coverimages'),
             'published' => false,
-            'order' => $order,
-            'nostock' => true,
-            // 'debug' => true
+            'order'     => $order,
+            'nostock'   => true,
+            // 'debug'  => true
         );
 
@@ -390 +389 @@
         }
 
-        if ($is_inventory) { // Override for inventory products
+        if ( $is_inventory ) { // Override for inventory products
             $where[] = "(pt.context='product' OR pt.context='variation') AND pt.type != 'N/A'";
             $loading = array(
-                'columns' => "pt.id AS stockid,IF(pt.context='variation',CONCAT(p.post_title,': ',pt.label),p.post_title) AS post_title,pt.sku AS sku,pt.stock AS stock",
-                'joins' => array_merge(array($pt => "LEFT JOIN $pt AS pt ON p.ID=pt.product"),$joins),
-                'where' => $where,
-                'groupby' => 'pt.id',
-                'orderby' => str_replace('s.', 'pt.', $ordercols),
-                'limit'=>"$start,$per_page",
-                'nostock' => true,
+                'columns'   => "pt.id AS stockid,IF(pt.context='variation',CONCAT(p.post_title,': ',pt.label),p.post_title) AS post_title,pt.sku AS sku,pt.stock AS stock",
+                'joins'     => array_merge(array($pt => "LEFT JOIN $pt AS pt ON p.ID=pt.product"),$joins),
+                'where'     => $where,
+                'groupby'   => 'pt.id',
+                'orderby'   => str_replace('s.', 'pt.', $ordercols),
+                'limit'     => "$start,$per_page",
+                'nostock'   => true,
                 'published' => false,
-                // 'debug' => true
+                // 'debug'  => true
             );
         }
 
         // Override loading product meta and limiting by pagination in the workflow list
-        if ($workflow) {
+        if ( $workflow ) {
             unset($loading['limit']);
             $loading['ids'] = true;
@@ -418 +417 @@
         // Overpagination protection, redirect to page 1 if the requested page doesn't exist
         $num_pages = ceil($this->products->total / $per_page);
-        if ($paged > 1 && $paged > $num_pages) Shopp::redirect( add_query_arg('paged', null, $url ) );
+        if ( $paged > 1 && $paged > $num_pages ) Shopp::redirect( add_query_arg('paged', null, $url ) );
 
         // Return a list of product keys for workflow list requests
-        if ($workflow) return $this->products->worklist();
+        if ( $workflow ) return $this->products->worklist();
 
         // Get sub-screen counts
         $subcounts = wp_cache_get('shopp_product_subcounts','shopp_admin');
-        if ($subcounts) {
+        if ( $subcounts ) {
             foreach ($subcounts as $name => $total)
-                if (isset($subs[$name])) $subs[$name]['total'] = $total;
+                if ( isset($subs[ $name ]) ) $subs[ $name ]['total'] = $total;
         } else {
             $subcounts = array();
-            foreach ($subs as $name => &$subquery) {
+            foreach ( $subs as $name => &$subquery ) {
                 $subquery['total'] = 0;
                 $query = array(
@@ -439 +438 @@
                 );
 
-                $query = array_merge($query,$subquery);
+                $query = array_merge($query, $subquery);
                 $query['where'][] = "p.post_type='shopp_product'";
 
-                if (in_array($name,array('onsale','bestselling','featured','inventory')))
-                    $query['joins'][$ps] = "INNER JOIN $ps AS s ON p.ID=s.product";
+                if ( in_array($name, array('onsale', 'bestselling', 'featured', 'inventory')) )
+                    $query['joins'][ $ps ] = "INNER JOIN $ps AS s ON p.ID=s.product";
 
                 $query = sDB::select($query);
-                $subquery['total'] = sDB::query($query,'auto','col','total');
-                $subcounts[$name] = $subquery['total'];
-            }
-            wp_cache_set('shopp_product_subcounts',$subcounts,'shopp_admin');
+                $subquery['total'] = sDB::query($query, 'auto', 'col', 'total');
+                $subcounts[ $name ] = $subquery['total'];
+            }
+            wp_cache_set('shopp_product_subcounts', $subcounts, 'shopp_admin');
         }
 
@@ -526 +525 @@
         }
 
-        if ( 'off' == shopp_setting('inventory') ) unset($subs['inventory']);
+        if ( 'off' == shopp_setting('inventory') ) unset($this->subs['inventory']);
         switch ($view) {
             case 'inventory':
@@ -686 +685 @@
         $post_type = ShoppProduct::posttype();
 
+        // Re-index menu options to maintain order in JS #2930
+        foreach ( $Product->options as &$types ) {
+            foreach ( $types as &$menu )
+                $menu['options'] = array_values($menu['options']);
+        }
+
         do_action('add_meta_boxes', ShoppProduct::$posttype, $Product);
         do_action('add_meta_boxes_' . ShoppProduct::$posttype, $Product);

shopp/trunk/core/library/Catalog.php

@@ -109 +109 @@
      * @return object The loaded Category object
      **/
-    static function load_collection ( string $slug, array $options = array() ) {
+    static function load_collection ( $slug, array $options = array() ) {
         $Shopp = Shopp::object();
 

shopp/trunk/core/library/Core.php

@@ -327 +327 @@
      * @return string The formatted localized date/time
      **/
-    public static function _d ( string $format, $timestamp = null ) {
+    public static function _d ( $format, $timestamp = null ) {
 
         $tokens = array(
@@ -373 +373 @@
      * @return void
      **/
-    public static function _jse ( string $text) {
+    public static function _jse ( $text) {
         echo json_encode(Shopp::translate($text));
     }
@@ -1538 +1538 @@
      * @return array Formatting options list
      **/
-    public static function scan_money_format ( string $format ) {
+    public static function scan_money_format ( $format ) {
         $f = array(
             'cpos' => true,
@@ -2053 +2053 @@
      * @return string Prefixed template file
      **/
-    public static function template_prefix ( string $name ) {
+    public static function template_prefix ( $name ) {
         return apply_filters('shopp_template_directory', 'shopp') . '/' . $name;
     }
@@ -2276 +2276 @@
      * @return void Description...
      **/
-    public function trim_deep ( $value ) {
+    public static function trim_deep ( $value ) {
 
         if ( is_object($value) ) {

shopp/trunk/core/library/DB.php

@@ -1333 +1333 @@
      * @return mixed
      **/
-    public function tag ( string $property, array $options = array() ) {
+    public function tag ( $property, array $options = array() ) {
         $options = array_merge( array('return' => true), shopp_parse_options($options) );
         return shopp($this, $property, $options);

shopp/trunk/core/library/Error.php

@@ -87 +87 @@
     }
 
-    public function reporting ( integer $reporting = null ) {
+    public function reporting ( $reporting = null ) {
         if ( isset($reporting) ) $this->reporting = $reporting;
         return $this->reporting;
@@ -117 +117 @@
      * @return array A list of errors
      **/
-    public function get ( integer $level = null ) {
+    public function get ( $level = null ) {
         if ( is_null($level) ) $level = SHOPP_DEBUG_ERR;
 
@@ -136 +136 @@
      * @return array A list of errors
      **/
-    public function level ( integer $level = null ) {
+    public function level ( $level = null ) {
         if ( is_null($level) ) $level = SHOPP_ALL_ERR;
 
@@ -154 +154 @@
      * @return ShoppError The error object
      **/
-    public function code ( string $code ) {
+    public function code ( $code ) {
         if ( ! empty($code) && isset($this->errors[ $code ]) )
             return $this->errors[ $code ];
@@ -168 +168 @@
      * @return array A list of errors
      **/
-    public function source ( string $source ) {
+    public function source ( $source ) {
         if ( empty($source) ) return array();
 
@@ -186 +186 @@
      * @return void
      **/
-    public function exist ( integer $level = null ) {
+    public function exist ( $level = null ) {
         if ( is_null($level) ) $level = SHOPP_DEBUG_ERR;
 
@@ -445 +445 @@
      * @return integer The logging level
      **/
-    public function loglevel ( integer $level = null ) {
+    public function loglevel ( $level = null ) {
         if ( isset($level) ) $this->loglevel = $level;
         return $this->loglevel;
@@ -607 +607 @@
         $_[] = 'To: ' . $this->recipients;
         $_[] = 'Subject: ' . __('Shopp Notification', 'Shopp');
+        $_[] = 'Content-type: text/html';
+
         $_[] = '';
         $_[] = __('This is an automated notification message generated by the Shopp installation at ' . get_bloginfo('url') . '.', 'Shopp');

shopp/trunk/core/library/Framework.php

@@ -40 +40 @@
      * @return mixed Returns the entry
      **/
-    public function &add ( string $key, $entry ) {
+    public function &add ( $key, $entry ) {
         $this->_list[$key] = $entry;
         $this->_added = $key;
@@ -55 +55 @@
      * @return The added entry or false if no added entries
      **/
-    public function added ( string $key = null ) {
+    public function added ( $key = null ) {
         if ( ! is_null($key) && $this->exists($key) )
             $this->_added = $key;
@@ -104 +104 @@
      * @return boolean True if successful, false otherwise
      **/
-    public function update ( string $key, $entry ) {
+    public function update ( $key, $entry ) {
         if ( ! $this->exists($key) ) return false;
         if ( is_array($this->_list[ $key ]) && is_array($entry) )
@@ -431 +431 @@
     protected $defaults = array();
 
-    public function form ( string $key = null, boolean $latest = null ) {
+    public function form ( $key = null, boolean $latest = null ) {
 
         if ( true === $latest ) $this->updateform();

shopp/trunk/core/library/Loader.php

@@ -444 +444 @@
     'ordertotals' => '/model/Totals.php',
     'paycard' => '/model/Gateway.php',
+    'paymenttypesreport' => '/ui/reports/payment-types.php',
     'porterstemmer' => '/model/Search.php',
     'postcodemapping' => '/model/Address.php',

shopp/trunk/core/library/Session.php

@@ -28 +28 @@
     public $secure = false;
 
+    const PHP_SESSION = '__php_session_';
+    const PHP_EXPIRES = '__php_session_expires_';
+
     /**
      * The session manager constructor
@@ -125 +128 @@
                 if ( empty($key) && ! is_ssl() ) Shopp::redirect( Shopp::force_ssl( Shopp::raw_request_url(), true ) );
 
+                $this->secured(true); // Maintain session security
+
                 $readable = sDB::query("SELECT AES_DECRYPT('" .
                                         mysql_real_escape_string(
@@ -151 +156 @@
         do_action('shopp_session_load');
 
-        // Read standard session data
-        if ( @file_exists("$this->path/sess_$id") )
-            return (string) @file_get_contents("$this->path/sess_$id");
+        // Read PHP session data from WP
+        if ( $php = get_option(self::PHP_SESSION . $id) )
+            return (string) $php;
 
         return $loaded;
@@ -173 +178 @@
             trigger_error("Could not clear session data.");
 
-        // Handle clean-up of file storage sessions
-        if ( is_writable("$this->path/sess_$id") )
-            @unlink($file);
+        // Handle clean-up of PHP sessions
+        delete_option(self::PHP_SESSION . $id);
 
         unset($this->session, $this->ip, $this->data);
@@ -217 +221 @@
 
         // Save standard session data for compatibility
-        if ( ! empty($session) )
-            return false === file_put_contents("$this->path/sess_$id",$session) ? false : true;
+        if ( ! empty($session) ) {
+            $sessionid = self::PHP_SESSION . $id;
+            $exists = get_option($sessionid);
+
+            $expiresid = self::PHP_EXPIRES . $id;
+            $lifetime = time() + (int) ini_get('session.gc_maxlifetime');
+            $expires = get_option($expiresid);
+            if ( false == $expiresid )
+                add_option($expiresid, $lifetime, '', 'no' );
+            else update_option($expiresid, $lifetime);
+
+            if ( false === $exists ) // Add new global session data, do not autoload
+                return add_option($sessionid, $session, '', 'no');
+            return update_option($sessionid, $session);
+        }
 
         return true;
@@ -244 +261 @@
             trigger_error("Could not delete cached session data.");
 
-        // Garbage collection for file-system sessions
-        if( $dh = opendir($this->path) ) {
-
-            while( ( $file = readdir($dh) ) !== false ) {
-                if ( false === strpos($file, 'sess_') ) continue;
-
-                $file = $this->path . "/$file";
-
-                if ( filemtime($file) + $lifetime < time() && is_writable($file) ) {
-                    if ( @unlink($file) === false ) {
-                        break;
-                    }
-                }
-            }
-
-            closedir($dh);
-        }
+        // Garbage collection for PHP sessions
+        global $wpdb;
+        $time = time();
+        $session = self::PHP_SESSION;
+        $expires = self::PHP_EXPIRES;
+
+        sDB::query("DELETE FROM $wpdb->options AS t1 JOIN {$wpdb->options} AS t2 ON t2.option_name = replace(t1.option_name, '_expires', '')
+                WHERE (t1.option_name LIKE '$session%' OR t1.option_name LIKE '$expires %') AND t1.option_value < '$time'");
 
         return true;
@@ -307 +315 @@
     }
 
-
 }

shopp/trunk/core/library/Shopp.php

@@ -121 +121 @@
      **/
     public function constants () {
-        if ( ! defined('SHOPP_VERSION') )               define( 'SHOPP_VERSION', ShoppVersion::release() );
-        if ( ! defined('SHOPP_GATEWAY_USERAGENT') )     define( 'SHOPP_GATEWAY_USERAGENT', ShoppVersion::agent() );
+        if ( ! defined('SHOPP_VERSION') )              define( 'SHOPP_VERSION', ShoppVersion::release() );
+        if ( ! defined('SHOPP_GATEWAY_USERAGENT') )    define( 'SHOPP_GATEWAY_USERAGENT', ShoppVersion::agent() );
 
         // @deprecated
-        if ( ! defined('SHOPP_HOME') )                  define( 'SHOPP_HOME', ShoppSupport::HOMEPAGE );
-        if ( ! defined('SHOPP_CUSTOMERS') )             define( 'SHOPP_CUSTOMERS', ShoppSupport::FORUMS);
-        if ( ! defined('SHOPP_DOCS') )                  define( 'SHOPP_DOCS', ShoppSupport::DOCS );
+        if ( ! defined('SHOPP_HOME') )                 define( 'SHOPP_HOME', ShoppSupport::HOMEPAGE );
+        if ( ! defined('SHOPP_CUSTOMERS') )            define( 'SHOPP_CUSTOMERS', ShoppSupport::FORUMS);
+        if ( ! defined('SHOPP_DOCS') )                 define( 'SHOPP_DOCS', ShoppSupport::DOCS );
 
         // Helper for line break output
-        if ( ! defined('BR') )                          define('BR', '<br />');
+        if ( ! defined('BR') )                         define('BR', '<br />');
 
         // Overrideable config macros
-        if ( ! defined('SHOPP_NOSSL') )                 define('SHOPP_NOSSL', false);                   // Require SSL to protect transactions, overrideable for development
-        if ( ! defined('SHOPP_PREPAYMENT_DOWNLOADS') )  define('SHOPP_PREPAYMENT_DOWNLOADS', false);    // Require payment capture granting access to downloads
-        if ( ! defined('SHOPP_SESSION_TIMEOUT') )       define('SHOPP_SESSION_TIMEOUT', 172800);        // Sessions live for 2 days
-        if ( ! defined('SHOPP_CART_EXPIRES') )          define('SHOPP_CART_EXPIRES', 1209600);          // Carts are stashed for up to 2 weeks
-        if ( ! defined('SHOPP_QUERY_DEBUG') )           define('SHOPP_QUERY_DEBUG', false);             // Debugging queries is disabled by default
-        if ( ! defined('SHOPP_GATEWAY_TIMEOUT') )       define('SHOPP_GATEWAY_TIMEOUT', 10);            // Gateway connections timeout after 10 seconds
-        if ( ! defined('SHOPP_SHIPPING_TIMEOUT') )      define('SHOPP_SHIPPING_TIMEOUT', 10);           // Shipping provider connections timeout after 10 seconds
-        if ( ! defined('SHOPP_TEMP_PATH') )             define('SHOPP_TEMP_PATH', sys_get_temp_dir());  // Use the system defined temporary directory
-        if ( ! defined('SHOPP_ADDONS') )                define('SHOPP_ADDONS', WP_CONTENT_DIR . '/shopp-addons');   // A configurable directory to keep Shopp addons
-        if ( ! defined('SHOPP_NAMESPACE_TAXONOMIES') )  define('SHOPP_NAMESPACE_TAXONOMIES', true);     // Add taxonomy namespacing for permalinks /shop/category/category-name, /shopp/tag/tag-name
+        if ( ! defined('SHOPP_NOSSL') )                define('SHOPP_NOSSL', false);                             // Require SSL to protect transactions, overrideable for development
+        if ( ! defined('SHOPP_PREPAYMENT_DOWNLOADS') ) define('SHOPP_PREPAYMENT_DOWNLOADS', false);              // Require payment capture granting access to downloads
+        if ( ! defined('SHOPP_SESSION_TIMEOUT') )      define('SHOPP_SESSION_TIMEOUT', 172800);                  // Sessions live for 2 days
+        if ( ! defined('SHOPP_CART_EXPIRES') )         define('SHOPP_CART_EXPIRES', 1209600);                    // Carts are stashed for up to 2 weeks
+        if ( ! defined('SHOPP_QUERY_DEBUG') )          define('SHOPP_QUERY_DEBUG', false);                       // Debugging queries is disabled by default
+        if ( ! defined('SHOPP_GATEWAY_TIMEOUT') )      define('SHOPP_GATEWAY_TIMEOUT', 10);                      // Gateway connections timeout after 10 seconds
+        if ( ! defined('SHOPP_SHIPPING_TIMEOUT') )     define('SHOPP_SHIPPING_TIMEOUT', 10);                     // Shipping provider connections timeout after 10 seconds
+        if ( ! defined('SHOPP_SUBMIT_TIMEOUT') )       define('SHOPP_SUBMIT_TIMEOUT', 20);                       // Order submission timeout
+        if ( ! defined('SHOPP_TEMP_PATH') )            define('SHOPP_TEMP_PATH', sys_get_temp_dir());            // Use the system defined temporary directory
+        if ( ! defined('SHOPP_ADDONS') )               define('SHOPP_ADDONS', WP_CONTENT_DIR . '/shopp-addons'); // A configurable directory to keep Shopp addons
+        if ( ! defined('SHOPP_NAMESPACE_TAXONOMIES') ) define('SHOPP_NAMESPACE_TAXONOMIES', true);               // Add taxonomy namespacing for permalinks /shop/category/category-name, /shopp/tag/tag-name
 
     }

shopp/trunk/core/library/Version.php

@@ -22 +22 @@
 
     /** @type int PATCH The maintenance patch version number */
-    const PATCH = 3;
+    const PATCH = 4;
 
     /** @type string PRERELEASE The prerelease designation (dev, beta, RC1) */
@@ -28 +28 @@
 
     /** @type string CODENAME The release project code name */
-    const CODENAME = 'Olympus Mons';
+    const CODENAME = 'Sojourner';
 
     /** @type int DB The database schema version */

shopp/trunk/core/model/Asset.php

@@ -227 +227 @@
         'scaling' => array('all', 'matte', 'crop', 'width', 'height'),
         'sharpen' => 0,
-        'quality' => 80
+        'quality' => 80,
+        'fill' => 16777215
     );
 
@@ -400 +401 @@
             self::SCALE => ( isset($args[ self::SCALE ]) ) ? (int) $args[ self::SCALE ] : 0,
             self::SHARPEN => ( isset($args[ self::SHARPEN ]) ) ? (int) $args[ self::SHARPEN ] : self::$defaults['sharpen'],
-            self::QUALITY => ( isset($args[ self::QUALITY ]) ) ? (int) $args[ self::QUALITY ] : self::$defaults['quality']
+            self::QUALITY => ( isset($args[ self::QUALITY ]) ) ? (int) $args[ self::QUALITY ] : self::$defaults['quality'],
+            self::FILL => ( isset($args[ self::FILL ]) ) ? (int) $args[ self::FILL ] : self::$defaults['fill']
         );
 
@@ -604 +606 @@
 
         ignore_user_abort(true);
-        ob_end_flush(); // Don't use the PHP output buffer
+        while(@ob_end_flush()); // Don't use the PHP output buffer
 
         $this->send();  // Send the file data using the storage engine
@@ -704 +706 @@
      * @return string The option name
      **/
-    public function fit ( integer $setting ) {
+    public function fit ( $setting ) {
         if ( isset(self::$fittings[ $setting ]) )
             return self::$fittings[ $setting ];
@@ -718 +720 @@
      * @return integer The option value
      **/
-    public function quality ( integer $setting ) {
+    public function quality ( $setting ) {
         if ( isset(self::$qualities[ $setting ])  )
             return self::$qualities[ $setting ];

shopp/trunk/core/model/Cart.php

@@ -209 +209 @@
                 if ( empty($prices) ) $prices[] = false; // Use default price for product if none provided
                 foreach($prices as $price)
-                    $result = $this->additem($quantity, $Product, $price, $category, $data, $addons);
+                    $result = $this->additem($quantity, $Product, $price, $category, apply_filters('shopp_cartitem_data', $data), $addons);
+
             }
         }
@@ -304 +305 @@
         }
 
+        do_action('shopp_cart_before_add_item', array($NewItem) );
+
         $id = $NewItem->fingerprint();
 
@@ -344 +347 @@
      * @return boolean
      **/
-    public function rmvitem ( string $id ) {
+    public function rmvitem ( $id ) {
         $Item = $this->get($id);
 
@@ -486 +489 @@
      * @return boolean
      **/
-    public function change ( string $item, integer $product, integer $pricing, array $addons = array() ) {
+    public function change ( $item, $product, $pricing, array $addons = array() ) {
 
         // Don't change anything if everything is the same
@@ -615 +618 @@
 
         $items = $this->keys(); // Use local array for iterating
-        foreach ( $items as $itemid ) { // Allow other code to interate the cart in this loop
+        foreach ( $items as $itemid ) { // Allow other code to iterate the cart in this loop
             $Item = $this->get($itemid);
             $Item->totals();
@@ -652 +655 @@
      * @return float The total amount for the register
      **/
-    public function total ( string $register = null, string $entry = null ) {
+    public function total ( $register = null, $entry = null ) {
 
         // Setup totals counter
@@ -715 +718 @@
      **/
     public function downloads () {
-        return $this->filteritems('download');
+        return $this->filteritems('downloads');
     }
 
@@ -739 +742 @@
      * @return boolean True if the item is of the specified type, false otherwise
      **/
-    private function filteritems ($type) {
-        $types = array('shipped','downloads','recurring');
-        if ( ! in_array($type,$types) ) return false;
+    private function filteritems ( $type ) {
+        $types = array('shipped', 'downloads', 'recurring');
+        if ( ! in_array($type, $types) ) return false;
 
         $this->$type = array();
         foreach ($this as $key => $item) {
-            if ( ! $item->$type ) continue;
-            $this->{$type}[$key] = $item;
+            $prop = rtrim($type, 's'); // No plural properties
+            if ( ! $item->$prop ) continue;
+            $this->{$type}[ $key ] = $item;
         }
 

shopp/trunk/core/model/Collection.php

@@ -1497 +1497 @@
     }
 
-    public static function slugs ( string $class ) {
+    public static function slugs ( $class ) {
         return apply_filters( 'shopp_' . strtolower($class) . '_collection_slugs', get_class_property($class, 'slugs') );
     }
@@ -1504 +1504 @@
         $this->loading = array_merge( $this->_options, $options );
 
-        if ( isset($options['show']) )
-            $this->loading['limit'] = $options['show'];
+        if ( isset($this->loading['show']) ) {
+            $this->loading['limit'] = $this->loading['show'];
+            unset($this->loading['show']);
+        }
 
         if ( isset($options['pagination']) )
             $this->loading['pagination'] = $options['pagination'];
-            
+
         if ( isset($options['exclude']) ) {
-            $exclude = $options['exclude']; 
+            $exclude = $options['exclude'];
 
             if ( is_numeric(str_replace(',','',$exclude)) ) {
@@ -1519 +1521 @@
                 $this->loading['where'][] = "tr.term_taxonomy_id NOT IN ($exclude)";
                 $this->loading['where'][] = "tt.taxonomy = 'shopp_category'";
-            } 
+            }
         }
 
@@ -1901 +1903 @@
         $terms = array();
 
-        $term = get_term_by('name',$this->tag,ProductTag::$taxon);
+        $term = get_term_by('name', $this->tag, ProductTag::$taxon);
 
         if ( false !== strpos($options['tag'], ',') ) {
@@ -1911 +1913 @@
         } else $terms[] = $term->term_id;
 
+        if ( empty($terms) ) return;
+
         $this->name = isset($options['title']) ? $options['title'] : Shopp::__('Products tagged "%s"', $this->tag);
         $this->uri = urlencode($this->tag);
@@ -1921 +1925 @@
         $columns = 'COUNT(p.ID) AS score';
         $groupby = 'p.ID';
-        $order = 'score DESC';
-        $loading = compact('columns', 'joins', 'where', 'groupby', 'order');
+        $orderby = 'score DESC';
+        $loading = compact('columns', 'joins', 'where', 'groupby', 'orderby');
         $this->loading = array_merge($options, $loading);
+
     }
 
@@ -1973 +1978 @@
 
         // Use the current product is available
-        if (!empty($Product->id))
+        if ( ! empty($Product->id) )
             $this->product = ShoppProduct();
 
@@ -1999 +2004 @@
             $where = array("p.id != {$this->product->id}");
             // Load the product's tags if they are not available
-            if (empty($this->product->tags))
+            if ( empty($this->product->tags) )
                 $this->product->load_data(array('tags'));
 
-            if (!$scope) $scope = array_keys($this->product->tags);
-        }
-        if (empty($scope)) return false;
+            if ( empty($scope) ) $scope = array_keys($this->product->tags);
+        }
+
+        if ( empty($scope) ) return false;
 
         $this->name = __("Products related to","Shopp")." "".stripslashes($name).""";
@@ -2011 +2017 @@
 
         global $wpdb;
-        $joins[$wpdb->term_relationships] = "INNER JOIN $wpdb->term_relationships AS tr ON (p.ID=tr.object_id)";
-        $joins[$wpdb->term_taxonomy] = "INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id=tt.term_taxonomy_id";
-        $where[] = "tt.term_id IN (".join(',',$scope).")";
+        $joins[ $wpdb->term_relationships ] = "INNER JOIN $wpdb->term_relationships AS tr ON (p.ID=tr.object_id)";
+        $joins[ $wpdb->term_taxonomy ] = "INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id=tt.term_taxonomy_id";
+        $where[] = "tt.term_id IN (" . join(',', $scope) . ")";
         $columns = 'COUNT(p.ID) AS score';
         $groupby = 'p.ID';
-        $order = 'score DESC';
-        $loading = compact('columns','joins','where','groupby','order');
-        $this->loading = array_merge($options, $this->loading);
-
-        if (isset($options['order'])) $this->loading['order'] = $options['order'];
-        if (isset($options['controls']) && Shopp::str_true($options['controls']))
+        $orderby = 'score DESC';
+        $loading = compact('columns', 'joins', 'where', 'groupby', 'orderby');
+
+        $this->loading = array_merge($options, $loading);
+
+        if ( isset($options['order']) ) $this->loading['order'] = $options['order'];
+        if ( isset($options['controls']) && Shopp::str_true($options['controls']) )
             unset($this->controls);
+
     }
 

shopp/trunk/core/model/Customer.php

@@ -597 +597 @@
             $prefix.'phone' => __('Customer\'s Phone Number','Shopp'),
             $prefix.'company' => __('Customer\'s Company','Shopp'),
+            $prefix.'type' => __('Customer Type','Shopp'),
             $prefix.'marketing' => __('Customer\'s Marketing Preference','Shopp'),
             // $prefix.'info' => __('Customer\'s Custom Information','Shopp'), @todo Re-enable by switching to customer meta data in 1.2

shopp/trunk/core/model/Discounts.php

@@ -291 +291 @@
      * @return void
      **/
-    private function undiscount ( integer $id ) {
+    private function undiscount ( $id ) {
 
         if ( ! $this->exists($id) ) return false;
@@ -357 +357 @@
      * @return string The current request
      **/
-    public function request ( string $request = null ) {
+    public function request ( $request = null ) {
 
         if ( isset($request) ) $this->request = $request;
@@ -364 +364 @@
     }
 
-    public function credit ( string $request = null ) {
+    public function credit ( $request = null ) {
 
         if ( isset($request) ) $this->credit = $request;
@@ -476 +476 @@
      * @return boolean True if the code is applied, false otherwise
      **/
-    public function codeapplied ( string $code ) {
+    public function codeapplied ( $code ) {
         return isset( $this->codes[ strtolower($code) ]);
     }
@@ -912 +912 @@
      * @return integer The id of the discount
      **/
-    public function id ( integer $id = null ) {
+    public function id ( $id = null ) {
         if ( isset($id) ) $this->id = $id;
         return $this->id;
@@ -928 +928 @@
      * @return string The name of the discount
      **/
-    public function name ( string $name = null ) {
+    public function name ( $name = null ) {
         if ( isset($name) ) $this->name = $name;
 
@@ -1020 +1020 @@
      * @return string The code for the discount
      **/
-    public function code ( string $code = null ) {
+    public function code ( $code = null ) {
         if ( isset($code) ) $this->code = $code;
         return $this->code;
@@ -1051 +1051 @@
      * @return integer The ShoppOrderDiscount type
      **/
-    public function type ( string $type = null ) {
+    public function type ( $type = null ) {
         if ( isset($type) ) {
             switch ( strtolower($type) ) {
@@ -1074 +1074 @@
      * @return integer the ShoppOrderDiscount target
      **/
-    public function target ( string $target = null ) {
+    public function target ( $target = null ) {
         if ( isset($target) ) {
             switch ( strtolower($target) ) {
@@ -1167 +1167 @@
      * @return boolean True if it exists, false otherwise
      **/
-    public function hasitem ( string $key ) {
+    public function hasitem ( $key ) {
         return isset($this->items[ $key ]);
     }

shopp/trunk/core/model/Gateway.php

@@ -518 +518 @@
 
         foreach ( $gateways as $gateway ) {
-            if ( false !== strpos($gateway, '-') ) list($gateway, $id) = explode('-', $gateway);
-            $upgraded = 'Shopp' . $gateway;
-            if ( in_array($gateway, $modules) && !in_array($gateway, $this->activated) )
-                $this->activated[] = $this->modules[ $gateway ]->classname;
-            // @todo Remove legacy gateway settings migrations
-            elseif ( false === strpos($gateway, 'Shopp') && in_array($upgraded, $modules) && ! in_array($upgraded, $this->activated) )
-                $this->activated[] = $this->modules[ $upgraded ]->classname;
+            $moduleclass = $this->moduleclass($gateway);
+            if ( ! empty($moduleclass) )
+                $this->activated[] = $moduleclass;
         }
 
@@ -618 +614 @@
         return sanitize_key($classname);
     }
+
+    /**
+     * Returns the classname of a valid module
+     *
+     * @since 1.3.4
+     *
+     * @return string|bool Class name of the module, or false if not a valid module
+     **/
+    public function moduleclass ( $gateway ) {
+
+        // Handled suffixed multi-instance gateways names (e.g. OfflinePayments-0)
+        if ( false !== strpos($gateway, '-') )
+            list($gateway, $id) = explode('-', $gateway);
+
+        // Check for namespaced and non-namespaced derivitives
+        $namespaced = 'Shopp' . $gateway;
+
+        $module = false;
+        if ( isset($this->modules[ $namespaced ]) ) $module = $this->modules[ $namespaced ];
+        elseif ( isset($this->modules[ $gateway ]) ) $module = $this->modules[ $gateway ];
+
+        // If no valid module exists return false, otherwise provide the class name
+        if ( empty($module) ) return false;
+        else return $module->classname;
+
+    }
+
 
 } // END class GatewayModules
@@ -870 +893 @@
      * @return string The masked PAN value
      **/
-    public static function mask ( $value, string $mask = null ) {
+    public static function mask ( $value, $mask = null ) {
         if ( empty($value) ) return $value;
+
+        if ( ! self::checksum($value) ) return $value;
 
         if ( ! isset($mask) ) $mask = 'X';

shopp/trunk/core/model/Image.php

@@ -30 +30 @@
     private $dy = 0;
     private $alpha = false;
+    private $complexity = false;
 
     public function __construct ( $data, $width, $height ) {
@@ -200 +201 @@
 
     /**
-     * Performs an unsharp mask on the processed image
-     *
-     * Photoshop-like unsharp mask processing using image convolution.
-     * Original algorithm by Torstein Hansi
-     *
-     * @author Jonathan Davis
-     * @since 1.0
-     * @version 2.1.1
-     * @copyright Torstein Hansi <thoensi_at_netcom_dot_no>, July 2003
-     *
+     * Calculate the visual complexity of the image
+     *
+     * Provides a fast method for determining visual complexity of
+     * an image by comparing a raw image size to jpeg image file size.
+     * The JPEG compression algorithm is really good at compressing
+     * repetitive areas (low detail) areas of an image and gives us
+     * a good enough indicator for the complexity in an image.
+     *
+     * @author Jonathan Davis
+     * @since 1.3.4
+     *
+     * @return float A complexity amount (jpeg size to raw gd size)
+     **/
+    public function complexity () {
+
+        $image =& $this->src->image;
+
+        if ( false !== $this->complexity ) return $this->complexity;
+
+        ob_start(); imagegd($image);
+        $source = strlen(ob_get_clean());
+
+        ob_start(); imagejpeg($image);
+        $jpeg = strlen(ob_get_clean());
+
+        $this->complexity = 0.7 - ( $jpeg / $source );
+        error_log("Complexity: $this->complexity");
+
+        return $this->complexity;
+
+    }
+
+    /**
+     * Performs an unsharp mask on the image
+     *
+     * Smart unsharp masking looks at the visual complexity
+     * of the image to determine how to vary the strength of
+     * the sharpening and the narrowness of the edge threshold.
+     *
+     * @author Jonathan Davis
+     * @since 1.3.4
+     * @version 1.0
+     *
+     * @param int $amount Strength of the sharpening (0-100)
+     * @param int $threshold The narrowness of the sharpening filter (0-255)
      * @return void
      **/
-    public function UnsharpMask ( $amount = 50, $radius = 0.5, $threshold = 3 ) {
+    public function sharpen ( $amount = 100, $threshold = null ) {
+
         if ( ! isset($this->processed) ) $image =& $this->src->image;
         else $image = &$this->processed;
 
-        // Attempt to calibrate the parameters to Photoshop
-        if ( $amount > 500 ) $amount = 500;
-        $amount = $amount * 0.016;
-        if ( $radius > 50 ) $radius = 50;
-        $radius = $radius * 2;
+        // Don't unsharp mask if we have a very low detail image
+        $complexity = $this->complexity();
+        if ( $complexity < 0.15 ) return;
+
+        if ( $amount > 100 ) $amount = 100;
+
+        // Calibration to a reasonable strength
+        $amount = ( $amount * (1 + $complexity) ) * 0.01618;
+
+        // Calibrate the threshold to the image complexity
+        if ( empty($threshold) ) $threshold = 10 - ( $complexity * 13 );
         if ( $threshold > 255 ) $threshold = 255;
 
-        $radius = abs( round($radius) );
-        if ( 0 == $radius ) return $image;
+        // Create a gausian blur for edge detection
         $w = imagesx($image); $h = imagesy($image);
-        $canvas = imagecreatetruecolor($w, $h);
         $blur = imagecreatetruecolor($w, $h);
-
-        /**
-         * Gaussian blur matrix:
-         *  1    2    1
-         *  2    4    2
-         *  1    2    1
-         **/
-
-        if ( function_exists('imageconvolution') ) { // PHP >= 5.1
-            $matrix = array(
-                array( 1, 2, 1 ),
-                array( 2, 4, 2 ),
-                array( 1, 2, 1 )
-            );
-            imagecopy ($blur, $image, 0, 0, 0, 0, $w, $h);
-            imageconvolution($blur, $matrix, 16, 0);
-        } else {
-
-            // Move copies of the image around one pixel at the time and merge them with weight
-            // according to the matrix. The same matrix is simply repeated for higher radii.
-            for ($i = 0; $i < $radius; $i++)    {
-                imagecopy ($blur, $image, 0, 0, 1, 0, $w - 1, $h); // left
-                imagecopymerge ($blur, $image, 1, 0, 0, 0, $w, $h, 50); // right
-                imagecopymerge ($blur, $image, 0, 0, 0, 0, $w, $h, 50); // center
-                imagecopy ($canvas, $blur, 0, 0, 0, 0, $w, $h);
-
-                imagecopymerge ($blur, $canvas, 0, 0, 0, 1, $w, $h - 1, 33.33333 ); // up
-                imagecopymerge ($blur, $canvas, 0, 1, 0, 0, $w, $h, 25); // down
-            }
-        }
-
-        if ( $threshold > 0 ){
-            // Calculate the difference between the blurred pixels and the original
-            // and set the pixels
-            for ( $x = 0; $x < $w-1; $x++ ) { // each row
-                for ( $y = 0; $y < $h; $y++ ) { // each pixel
-
-                    $rgbOrig = ImageColorAt($image, $x, $y);
-                    $rOrig = ( ($rgbOrig >> 16) & 0xFF );
-                    $gOrig = ( ($rgbOrig >> 8) & 0xFF );
-                    $bOrig = ( $rgbOrig & 0xFF );
-
-                    $rgbBlur = ImageColorAt($blur, $x, $y);
-
-                    $rBlur = ( ($rgbBlur >> 16) & 0xFF );
-                    $gBlur = ( ($rgbBlur >> 8) & 0xFF );
-                    $bBlur = ( $rgbBlur & 0xFF );
-
-                    // When the masked pixels differ less from the original
-                    // than the threshold specifies, they are set to their original value.
-                    $rNew = ( abs($rOrig - $rBlur) >= $threshold)
-                        ? max(0, min(255, ($amount * ($rOrig - $rBlur)) + $rOrig))
-                        : $rOrig;
-                    $gNew = ( abs($gOrig - $gBlur) >= $threshold)
-                        ? max(0, min(255, ($amount * ($gOrig - $gBlur)) + $gOrig))
-                        : $gOrig;
-                    $bNew = ( abs($bOrig - $bBlur) >= $threshold)
-                        ? max(0, min(255, ($amount * ($bOrig - $bBlur)) + $bOrig))
-                        : $bOrig;
-
-
-
-                    if ( ($rOrig != $rNew) || ($gOrig != $gNew) || ($bOrig != $bNew) ) {
-                            $pixCol = ImageColorAllocate($image, $rNew, $gNew, $bNew);
-                            ImageSetPixel($image, $x, $y, $pixCol);
-                        }
-                }
-            }
-        } else {
-            for ( $x = 0; $x < $w; $x++ ) { // each row
-                for ( $y = 0; $y < $h; $y++ ) { // each pixel
-                    $rgbOrig = ImageColorAt($image, $x, $y);
-                    $rOrig = ( ($rgbOrig >> 16) & 0xFF );
-                    $gOrig = ( ($rgbOrig >> 8) & 0xFF );
-                    $bOrig = ( $rgbOrig & 0xFF );
-
-                    $rgbBlur = ImageColorAt($blur, $x, $y);
-
-                    $rBlur = ( ($rgbBlur >> 16) & 0xFF );
-                    $gBlur = ( ($rgbBlur >> 8) & 0xFF );
-                    $bBlur = ( $rgbBlur & 0xFF );
-
-                    $rNew = ( $amount * ($rOrig - $rBlur) ) + $rOrig;
-                        if ( $rNew > 255 ) $rNew = 255;
-                        elseif ( $rNew < 0 ) $rNew = 0;
-                    $gNew = ( $amount * ($gOrig - $gBlur) ) + $gOrig;
-                        if ( $gNew > 255 ) $gNew = 255;
-                        elseif ($gNew < 0 ) $gNew = 0;
-                    $bNew = ( $amount * ($bOrig - $bBlur) ) + $bOrig;
-                        if ( $bNew > 255 ) $bNew = 255;
-                        elseif ( $bNew < 0 ) $bNew = 0;
-                    $rgbNew = ( $rNew << 16 ) + ( $gNew << 8 ) + $bNew;
-                        ImageSetPixel($image, $x, $y, $rgbNew);
-                }
-            }
-        }
-
-        imagedestroy($canvas);
+        imagecopy ($blur, $image, 0, 0, 0, 0, $w, $h);
+        imagefilter($blur, IMG_FILTER_GAUSSIAN_BLUR);
+
+        // Walk through each pixel of the image
+        for ( $x = 0; $x < $w - 1 ; $x++ ) { // each row
+            for ( $y = 0; $y < $h - 1 ; $y++ ) { // each pixel
+
+                $changed = false;
+                $pixel = array(
+                    'src' => imagecolorsforindex($image, imagecolorat($image, $x, $y) ),
+                    'blur' => imagecolorsforindex($blur, imagecolorat($blur, $x, $y) )
+                );
+                $channels = array_keys($pixel['src']);
+
+                // If masked pixel channel value differs enough ($threshold) from the original,
+                // we found an edge. Boost the edge contrast by a strength ($amount) of the
+                // color channel difference between the blurred mask pixel and the source image pixel.
+                // Otherwise leave the pixel alone to preserve smooth surfaces/gradients.
+                foreach ( $channels as $channel ) {
+
+                    $src = $pixel['src'][ $channel ];
+                    $mask = $pixel['blur'][ $channel ];
+
+                    // Calculate the difference
+                    $diff = $src - $mask;
+
+                    // If the difference is more than the threshold, we're near an edge
+                    if ( abs($diff) >= $threshold ) {
+                        // Change the pixel channel with the difference factored by the strength amount
+                        $value = ( $amount * $diff ) + $src;
+
+                        // Ceiling/floor values (if is faster than min/max)
+                        if ( $value > 255 ) $value = 255;
+                        elseif ( $value < 0 ) $value = 0;
+
+                        // Save the channel value
+                        $$channel = $value;
+                        $changed = true;
+                    } else $$channel = $src;
+                }
+
+                if ( $changed ) { // Update the pixel in the image with the new color
+                    $color = imagecolorallocatealpha($image, $red, $green, $blue, $alpha);
+                    imagesetpixel($image, $x, $y, $color);
+                }
+            }
+        }
+
         imagedestroy($blur);
+        imagefilter($image, IMG_FILTER_SMOOTH, 16); // Just enough to anti-alias edges
 
     }
@@ -333 +325 @@
      * Convert a decimal-encoded hexadecimal color to RGB color values
      *
-     * Uses bit-shifty voodoo magic to pick the color spectrum apart.
+     * Uses bit-shifty voodoo to pick the color channels apart.
      *
      * @author Jonathan Davis

shopp/trunk/core/model/Item.php

@@ -169 +169 @@
 
         if ( shopp_setting_enabled('taxes') ) {
+            $this->taxable = array(); // Re-init during ShoppCart::change() loads #2922
             if ( Shopp::str_true($Price->tax) ) $this->taxable[] = $baseprice;
             $this->istaxed =  array_sum($this->taxable) > 0 ;
@@ -930 +931 @@
         $taxableqty = ( $this->bogof && $this->bogof != $this->quantity ) ? $this->quantity - $this->bogof : $this->quantity;
 
-
         $Tax->rates($this->taxes, $Tax->item($this));
 

shopp/trunk/core/model/Payments.php

@@ -150 +150 @@
      * @return ShoppPaymentOption The selected payment option (or false)
      **/
-    public function selected ( string $selection = null ) {
+    public function selected ( $selection = null ) {
 
         if ( isset($selection) ) {
@@ -181 +181 @@
      * @return string The payment processor class name
      **/
-    public function processor ( string $processor = null ) {
+    public function processor ( $processor = null ) {
 
         $selected = $this->selected();
@@ -265 +265 @@
      * @return GatewayFramework A payment gateway class (or boolean false if not valid)
      **/
-    private function modules ( string $module = null ) {
+    private function modules ( $module = null ) {
         $Shopp = Shopp::object();
 

shopp/trunk/core/model/Search.php

@@ -30 +30 @@
     public $Product = false;
     public $properties = array(
-        'name','prices','summary','description','specs','categories','tags'
+        'name', 'prices', 'summary', 'description', 'specs', 'categories', 'tags'
     );
 
@@ -43 +43 @@
     function __construct ($id) {
         $this->Product = new ShoppProduct($id);
-        $this->Product->load_data(array('prices','specs','categories','tags'));
+        $this->Product->load_data(array('prices', 'specs', 'categories', 'tags'));
     }
 
@@ -55 +55 @@
      **/
     function index () {
-        $properties = apply_filters('shopp_index_product_properties',$this->properties);
-        foreach ($properties as $property) {
-            switch ($property) {
+        $properties = apply_filters('shopp_index_product_properties', $this->properties);
+        foreach ( $properties as $property ) {
+            switch ( $property ) {
                 case "prices":
                     $prices = array();
-                    foreach ($this->Product->prices as $price) {
+                    foreach ( $this->Product->prices as $price ) {
                         if ($price->type == "N/A") continue; // Skip disabled pricelines
                         $prices[] = "$price->label $price->sku";
                     }
-                    $content = join(' ',$prices);
+                    $content = join(' ', $prices);
                     break;
                 case "specs":
                     $specs = array();
-                    foreach ($this->Product->specs as $Spec)
+                    foreach ( $this->Product->specs as $Spec )
                         $specs[] = "$Spec->name $Spec->value";
-                    $content = join(' ',$specs);
+                    $content = join(' ', $specs);
                     break;
                 case "categories":
                     $categories = array();
-                    foreach ($this->Product->categories as $Category)
+                    foreach ( $this->Product->categories as $Category )
                         $categories[] = $Category->name;
-                    $content = join(' ',$categories);
+                    $content = join(' ', $categories);
                     break;
                 case "tags":
                     $tags = array();
-                    foreach ($this->Product->tags as $Tag)
+                    foreach ( $this->Product->tags as $Tag )
                         $tags[] = $Tag->name;
-                    $content = join(' ',$tags);
+                    $content = join(' ', $tags);
                     break;
                 default: $content = $this->Product->{$property}; break;
             }
-            $Indexer = new ContentIndex($this->Product->id,$property);
+            $Indexer = new ContentIndex($this->Product->id, $property);
             $Indexer->save($content);
         }
@@ -113 +113 @@
      * @author Jonathan Davis
      *
+     * @param int $product The ID of the indexed product
+     * @param string $type The type of index to load
      * @return void
      **/
-    function __construct ($product,$type) {
+    function __construct ( $product, $type ) {
         $this->init(self::$table);
-        $this->load($product,$type);
+        $this->load($product, $type);
     }
 
@@ -130 +132 @@
      * @return void
      **/
-    function load ($product=false,$type=false) {
+    function load ( $product = false, $type = false ) {
         $this->product = $product;
         $this->type = $type;
-        if (empty($product) || empty($type)) return false; // Nothing to load
+        if ( empty($product) || empty($type) ) return false; // Nothing to load
 
         $r = sDB::query("SELECT id,created FROM $this->_table WHERE product='$product' AND type='$type' LIMIT 1");
-        if (!empty($r->id)) {
+        if ( ! empty($r->id) ) {
             $this->id = $r->id;
             $this->created = mktimestamp($r->created);
@@ -153 +155 @@
      **/
     function save () {
+
         list($content,) = func_get_args();
-        if (empty($this->product) || empty($this->type) || empty($content))
+        $content = apply_filters('shopp_index_content', $content, $this);
+        if ( empty($this->product) || empty($this->type) || empty($content) )
             return false;
 
         $factoring = Lookup::index_factors();
-        if (isset($factoring[$this->type])) $this->factor = $factoring[$this->type];
+        if ( isset($factoring[ $this->type ])) $this->factor = $factoring[ $this->type ];
         else $this->factor = 1;
 
-        $this->terms = apply_filters('shopp_index_content',$content);
+        $this->terms = $content;
 
         parent::save();
+
     }
 
 } // END class ContentIndex
 
-if ( ! class_exists('SearchParser',false) ):
+if ( ! class_exists('SearchParser', false) ):
 /**
  * SearchParser class
@@ -190 +195 @@
      **/
     function __construct () {
-        add_filter('shopp_search_query',array('SearchParser','MarkupFilter'));
-        add_filter('shopp_search_query',array('SearchParser','CurrencyFilter'));
-        add_filter('shopp_search_query',array('SearchParser','StopFilter'));
-        add_filter('shopp_search_query',array('SearchParser','AccentFilter'));
-        add_filter('shopp_search_query',array('SearchParser','LowercaseFilter'));
-        add_filter('shopp_search_query',array('SearchParser','NormalizeFilter'));
+        add_filter('shopp_search_query', array('SearchParser', 'MarkupFilter'));
+        add_filter('shopp_search_query', array('SearchParser', 'CurrencyFilter'));
+        add_filter('shopp_search_query', array('SearchParser', 'StopFilter'));
+        add_filter('shopp_search_query', array('SearchParser', 'AccentFilter'));
+        add_filter('shopp_search_query', array('SearchParser', 'LowercaseFilter'));
+        add_filter('shopp_search_query', array('SearchParser', 'NormalizeFilter'));
     }
 
@@ -207 +212 @@
      * @return object The price matching object
      **/
-    static function PriceMatching ($query) {
+    static function PriceMatching ( $query ) {
         $pricematch = self::_pricematch_regex();
-        preg_match_all("/$pricematch/",$query,$matches,PREG_SET_ORDER);
-        if (empty($matches)) return false;
+        preg_match_all("/$pricematch/", $query, $matches, PREG_SET_ORDER);
+        if ( empty($matches) ) return false;
         $_->op = $matches[0][0][0];
-        $_->op = (in_array($_->op,array("<",">")))?$_->op:'';
+        $_->op = ( in_array($_->op, array("<", ">")) ) ? $_->op : '';
         $_->min = Shopp::floatval($matches[0][1]);
         $_->max = Shopp::floatval($matches[0][4]);
         $_->target = $_->min;
-        if ($_->max > 0) $_->op = "-"; // Range matching
+        if ( $_->max > 0 ) $_->op = "-"; // Range matching
 
         // Roundabout price match
-        if (empty($_->op) && empty($_->max)) {
-            $_->min = $_->target-($_->target/2);
-            $_->max = $_->target+($_->target/2);
+        if ( empty($_->op) && empty($_->max) ) {
+            $_->min = $_->target - ( $_->target / 2 );
+            $_->max = $_->target + ( $_->target / 2 );
         }
 
@@ -230 +235 @@
 endif;
 
-if ( ! class_exists('BooleanParser',false) ):
+if ( ! class_exists('BooleanParser', false) ):
 /**
  * BooleanParser class
@@ -252 +257 @@
      **/
     function __construct () {
-        add_filter('shopp_boolean_search',array('BooleanParser','MarkupFilter'));
-        add_filter('shopp_boolean_search',array('BooleanParser','CurrencyFilter'));
-        add_filter('shopp_boolean_search',array('BooleanParser','AccentFilter'));
-        add_filter('shopp_boolean_search',array('BooleanParser','StopFilter'));
-        add_filter('shopp_boolean_search',array('BooleanParser','LowercaseFilter'));
-        add_filter('shopp_boolean_search',array('BooleanParser','NormalizeFilter'));
-        add_filter('shopp_boolean_search',array('BooleanParser','StemFilter'));
-        add_filter('shopp_boolean_search',array('BooleanParser','KeywordFilter'));
+        add_filter('shopp_boolean_search', array('BooleanParser', 'MarkupFilter'));
+        add_filter('shopp_boolean_search', array('BooleanParser', 'CurrencyFilter'));
+        add_filter('shopp_boolean_search', array('BooleanParser', 'AccentFilter'));
+        add_filter('shopp_boolean_search', array('BooleanParser', 'StopFilter'));
+        add_filter('shopp_boolean_search', array('BooleanParser', 'LowercaseFilter'));
+        add_filter('shopp_boolean_search', array('BooleanParser', 'NormalizeFilter'));
+        add_filter('shopp_boolean_search', array('BooleanParser', 'StemFilter'));
+        add_filter('shopp_boolean_search', array('BooleanParser', 'KeywordFilter'));
     }
 
@@ -265 +270 @@
 endif;
 
-if ( ! class_exists('ShortwordParser',false) ):
+if ( ! class_exists('ShortwordParser', false) ):
 /**
  * ShortwordParser class
@@ -287 +292 @@
      **/
     function __construct () {
-        add_filter('shopp_shortword_search',array('ShortwordParser','MarkupFilter'));
-        add_filter('shopp_shortword_search',array('ShortwordParser','CurrencyFilter'));
-        add_filter('shopp_shortword_search',array('ShortwordParser','AccentFilter'));
-        add_filter('shopp_shortword_search',array('ShortwordParser','LowercaseFilter'));
-        add_filter('shopp_shortword_search',array('ShortwordParser','ShortwordFilter'));
-        add_filter('shopp_shortword_search',array('ShortwordParser','StopFilter'));
-        add_filter('shopp_shortword_search',array('ShortwordParser','NormalizeFilter'));
+        add_filter('shopp_shortword_search', array('ShortwordParser', 'MarkupFilter'));
+        add_filter('shopp_shortword_search', array('ShortwordParser', 'CurrencyFilter'));
+        add_filter('shopp_shortword_search', array('ShortwordParser', 'AccentFilter'));
+        add_filter('shopp_shortword_search', array('ShortwordParser', 'LowercaseFilter'));
+        add_filter('shopp_shortword_search', array('ShortwordParser', 'ShortwordFilter'));
+        add_filter('shopp_shortword_search', array('ShortwordParser', 'StopFilter'));
+        add_filter('shopp_shortword_search', array('ShortwordParser', 'NormalizeFilter'));
     }
 
@@ -299 +304 @@
 endif;
 
-if ( ! class_exists('ContentParser',false) ):
+if ( ! class_exists('ContentParser', false) ):
 class ContentParser extends SearchTextFilters {
 
@@ -311 +316 @@
      **/
     function __construct () {
-        add_filter('shopp_index_content',array('ContentParser','MarkupFilter'));
-        add_filter('shopp_index_content',array('ContentParser','AccentFilter'));
-        add_filter('shopp_index_content',array('ContentParser','LowercaseFilter'));
-        add_filter('shopp_index_content',array('ContentParser','NormalizeFilter'));
-        add_filter('shopp_index_content',array('ContentParser','StemFilter'));
+        add_filter('shopp_index_content', array('ContentParser', 'MarkupFilter'));
+        add_filter('shopp_index_content', array('ContentParser', 'AccentFilter'));
+        add_filter('shopp_index_content', array('ContentParser', 'LowercaseFilter'));
+        add_filter('shopp_index_content', array('ContentParser', 'NormalizeFilter'));
+        add_filter('shopp_index_content', array('ContentParser', 'StemFilter'));
     }
 
@@ -346 +351 @@
         extract($format);
 
-        $pre = ($cpos?''.preg_quote($currency).($symbol?'':'?'):'');
-        $amount = '[\d'.preg_quote($thousands).']+';
-        $fractional = '('.preg_quote($decimals).'\d{'.$precision.'}?)?';
-        $post = (!$cpos?''.preg_quote($currency).($symbol?'':'?'):'');
-        return $pre.$amount.$fractional.$post;
+        $pre = ( $cpos ? '' . preg_quote($currency) . ( $symbol ? '' : '?' ) : '' );
+        $amount = '[\d' . preg_quote($thousands) . ']+';
+        $fractional = '(' . preg_quote($decimals) . '\d{' . $precision . '}?)?';
+        $post = ( ! $cpos ? '' . preg_quote($currency) . ( $symbol ? '' : '?' ) : '' );
+        return $pre . $amount . $fractional . $post;
     }
 
@@ -379 +384 @@
      * @return string text with markup tags removed
      **/
-    static function MarkupFilter ($text) {
+    static function MarkupFilter ( $text ) {
         return strip_tags($text);
     }
@@ -392 +397 @@
      * @return string Transposed text
      **/
-    static function LowercaseFilter ($text) {
+    static function LowercaseFilter ( $text ) {
         return strtolower($text);
     }
@@ -408 +413 @@
      * @return string The cleaned text
      **/
-    static function StopFilter ($text) {
+    static function StopFilter ( $text ) {
         $stopwords = Lookup::stopwords();
-        $replacements = implode('|',$stopwords);
-        return preg_replace("/\b($replacements)\b/",'',$text);
+        $replacements = implode('|', $stopwords);
+        return preg_replace("/\b($replacements)\b/", '', $text);
     }
 
@@ -429 +434 @@
 
         // Collapse hyphenated prefix words
-        $text = preg_replace("/(\s?\w{1,3})\-(\w+)\b/","$1$2",$text);
+        $text = preg_replace("/(\s?\w{1,3})\-(\w+)\b/", "$1$2", $text);
 
         // Collapse words with periods and commas
-        $text = preg_replace("/[\.\']/",'',$text);
+        $text = preg_replace("/[\.\']/", '', $text);
 
         // Translate any other non-word characters to spaces
-        $text = preg_replace("/[^\w\d\s\p{L}\_\"]/u",' ',$text);
+        $text = preg_replace("/[^\w\d\s\p{L}\_\"]/u", ' ', $text);
 
         // Collapse the spaces
-        $text = preg_replace("/\s+/m",' ',$text);
+        $text = preg_replace("/\s+/m", ' ', $text);
 
         return trim($text);
@@ -452 +457 @@
      * @return string Converted text
      **/
-    static function AccentFilter ($text) {
-        if (!function_exists('remove_accents'))
+    static function AccentFilter ( $text ) {
+        if ( ! function_exists('remove_accents') )
             require( ABSPATH . WPINC . '/formatting.php' );
         return remove_accents($text);
@@ -467 +472 @@
      * @return string The boolean search string
      **/
-    static function KeywordFilter ($text) {
-        if (!defined('SHOPP_SEARCH_LOGIC')) define('SHOPP_SEARCH_LOGIC','OR');
-        $logic = (strtoupper(SHOPP_SEARCH_LOGIC) == "AND")?"+":"";
+    static function KeywordFilter ( $text ) {
+        if ( ! defined('SHOPP_SEARCH_LOGIC') ) define('SHOPP_SEARCH_LOGIC', 'OR');
+        $logic = strtoupper(SHOPP_SEARCH_LOGIC) == 'AND' ? '+' : '';
 
         $tokens = array();
-        $token = strtok($text,' ');
-        while ($token) {
+        $token = strtok($text, ' ');
+        while ( $token ) {
             // find double quoted tokens
-            if ($token{0} == '"') {
-                $token .= ' '.strtok('"').'"';
+            if ( '"' == $token{0} ) {
+                $token .= ' ' . strtok('"') . '"';
                 $tokens[] = $token;
             } else {
@@ -483 +488 @@
             $token = strtok(' ');
         }
-        return implode(' ',$tokens);
+        return implode(' ', $tokens);
     }
 
@@ -495 +500 @@
      * @return string The shortword search string
      **/
-    static function ShortwordFilter ($text) {
-        $text = preg_replace('/\b\w{4,}\b/','',$text);
-        $text = preg_replace('/ +/','|',$text);
+    static function ShortwordFilter ( $text ) {
+        $text = preg_replace('/\b\w{4,}\b/', '', $text);
+        $text = preg_replace('/ +/', '|', $text);
         return $text;
     }
@@ -510 +515 @@
      * @return string search query without price search
      **/
-    static function CurrencyFilter ($text) {
+    static function CurrencyFilter ( $text ) {
         $pricematch = self::_pricematch_regex();
-        $text = preg_replace("/$pricematch/",'',$text);
+        $text = preg_replace("/$pricematch/", '', $text);
         return $text;
     }
@@ -525 +530 @@
      * @return string The text plus the generated word stems
      **/
-    static function StemFilter ($text) {
+    static function StemFilter ( $text ) {
         // Filter out short words for stemming
-        $source = preg_replace("/\b\w{1,3}\b/",'',$text);
+        $source = preg_replace("/\b\w{1,3}\b/", '', $text);
         $_ = array();
-        $token = strtok($source,' ');
+        $token = strtok($source, ' ');
         while ($token) {
             $stem = PorterStemmer::Stem($token);
-            if ($stem != $token) $_[] = $stem;
+            if ( $stem != $token ) $_[] = $stem;
             $token = strtok(' ');
         }
 
-        return !empty($_)?"$text ".join(' ',$_):$text;
+        return ! empty($_) ? "$text " . join(' ', $_) : $text;
     }
 
@@ -563 +568 @@
      * @package shopp
      *
-     * @param  string $word Word to stem
+     * @param  $word Word to stem
      * @return string Stemmed word
      **/
-    public static function Stem ($word) {
-        if (strlen($word) <= 2)
+    public static function Stem ( $word ) {
+        if ( strlen($word) <= 2 )
             return $word;
 
@@ -583 +588 @@
      * Step 1
      **/
-    private static function step1ab ($word) {
+    private static function step1ab ( $word ) {
         // Part a
-        if (substr($word, -1) == 's') {
+        if ( substr($word, -1) == 's') {
                self::replace($word, 'sses', 'ss')
             OR self::replace($word, 'ies', 'i')
@@ -593 +598 @@
 
         // Part b
-        if (substr($word, -2, 1) != 'e' OR !self::replace($word, 'eed', 'ee', 0)) { // First rule
+        if ( substr($word, -2, 1) != 'e' OR !self::replace($word, 'eed', 'ee', 0) ) { // First rule
             $v = self::$regex_vowel;
 
             // ing and ed
-            if (   preg_match("#$v+#", substr($word, 0, -3)) && self::replace($word, 'ing', '')
-                OR preg_match("#$v+#", substr($word, 0, -2)) && self::replace($word, 'ed', '')) { // Note use of && and OR, for precedence reasons
+            if ( preg_match("#$v+#", substr($word, 0, -3)) && self::replace($word, 'ing', '')
+                OR preg_match("#$v+#", substr($word, 0, -2)) && self::replace($word, 'ed', '') ) { // Note use of && and OR, for precedence reasons
 
                 // If one of above two test successful
@@ -629 +634 @@
      * @param string $word Word to stem
      **/
-    private static function step1c($word) {
+    private static function step1c ( $word ) {
         $v = self::$regex_vowel;
 
-        if (substr($word, -1) == 'y' && preg_match("#$v+#", substr($word, 0, -1))) {
+        if ( substr($word, -1) == 'y' && preg_match("#$v+#", substr($word, 0, -1)) ) {
             self::replace($word, 'y', 'i');
         }
@@ -645 +650 @@
      * @param string $word Word to stem
      **/
-    private static function step2($word) {
+    private static function step2 ( $word ) {
         switch (substr($word, -2, 1)) {
             case 'a':
@@ -702 +707 @@
      * @param string $word String to stem
      **/
-    private static function step3 ($word) {
-        switch (substr($word, -2, 1)) {
+    private static function step3 ( $word ) {
+        switch ( substr($word, -2, 1) ) {
             case 'a':
                 self::replace($word, 'ical', 'ic', 0);
@@ -739 +744 @@
      * @param string $word Word to stem
      **/
-    private static function step4 ($word) {
-        switch (substr($word, -2, 1)) {
+    private static function step4 ( $word ) {
+        switch ( substr($word, -2, 1) ) {
             case 'a':
                 self::replace($word, 'al', '', 1);
@@ -808 +813 @@
      * @param string $word Word to stem
      **/
-    private static function step5 ($word) {
+    private static function step5 ( $word ) {
         // Part a
         if (substr($word, -1) == 'e') {
@@ -833 +838 @@
      * arg is given, then the preceding string must match that m count at least.
      *
-     * @param  string $str   String to check
-     * @param  string $check Ending to check for
-     * @param  string $repl  Replacement string
+     * @param  $str   String to check
+     * @param  $check Ending to check for
+     * @param  $repl  Replacement string
      * @param  int    $m     Optional minimum number of m() to meet
      * @return bool          Whether the $check string was at the end
@@ -841 +846 @@
      *                       that it was replaced.
      **/
-    private static function replace (&$str, $check, $repl, $m = null) {
+    private static function replace ( &$str, $check, $repl, $m = null ) {
         $len = 0 - strlen($check);
 
-        if (substr($str, $len) == $check) {
+        if ( substr($str, $len) == $check ) {
             $substr = substr($str, 0, $len);
-            if (is_null($m) OR self::m($substr) > $m)
+            if ( is_null($m) OR self::m($substr) > $m )
                 $str = $substr . $repl;
             return true;
@@ -867 +872 @@
      * <c>vcvcvc<v> gives 3
      *
-     * @param  string $str The string to return the m count for
+     * @param  $str The string to return the m count for
      * @return int         The m count
      **/
-    private static function m ($str) {
+    private static function m ( $str ) {
         $c = self::$regex_consonant;
         $v = self::$regex_vowel;
@@ -887 +892 @@
      * of the same consonant next to each other at the end of the string.
      *
-     * @param  string $str String to check
+     * @param  $str String to check
      * @return bool        Result
      **/
-    private static function doubleConsonant ($str) {
+    private static function doubleConsonant ( $str ) {
         $c = self::$regex_consonant;
 
@@ -899 +904 @@
      * Checks for ending CVC sequence where second C is not W, X or Y
      *
-     * @param  string $str String to check
+     * @param  $str String to check
      * @return bool        Result
      **/
-    private static function cvc ($str) {
+    private static function cvc ( $str ) {
         $c = self::$regex_consonant;
         $v = self::$regex_vowel;

shopp/trunk/core/model/Shiprates.php

@@ -58 +58 @@
      * @return ShoppShiprateService The currently selected shiprate service
      **/
-    public function selected ( string $selected = null ) {
+    public function selected ( $selected = null ) {
 
         if ( is_null($selected) ) {
@@ -99 +99 @@
      * @return void
      **/
-    public function takeoff ( string $id ) {
+    public function takeoff ( $id ) {
 
         if ( isset($this->shippable[ $id ]) )
@@ -173 +173 @@
      * @return void
      **/
-    public function track ( string $name, &$value ) {
+    public function track ( $name, &$value ) {
         $this->track[ $name ] = &$value;
     }
@@ -219 +219 @@
         do_action('shopp_calculate_shipping_init');     // Initialize shipping modules
 
+        parent::clear();                                    // clear existing rates before we pull new ones
+        
         $this->items();                                 // Send items to shipping modules that package them
 

shopp/trunk/core/model/Tax.php

@@ -163 +163 @@
      * @return boolean True if the country matches or false
      **/
-    protected function taxcountry ( string $country ) {
+    protected function taxcountry ( $country ) {
         if ( empty($country) ) return false;
         $EU = self::EUVAT == $country && in_array($this->address['country'], Lookup::country_euvat());
@@ -178 +178 @@
      * @return boolean True if the zone matches or false
      **/
-    protected function taxzone ( string $zone ) {
+    protected function taxzone ( $zone ) {
         if ( empty($zone) ) return true;
         return ($this->address['zone'] == $zone);
@@ -192 +192 @@
      * @return boolean True if the rules match enough to apply, false otherwise
      **/
-    protected function taxrules ( array $rules, string $logic ) {
+    protected function taxrules ( array $rules, $logic ) {
         if ( empty($rules) ) return true;
 
@@ -301 +301 @@
         if ( ! shopp_setting_enabled('tax_inclusive') ) return 1;
 
-        $baserates = ShoppTax::baserates($this);
+        $baserates = ShoppTax::baserates();
         $baserate = reset($baserates);
         $appliedrate = reset($rates);
@@ -400 +400 @@
      * @return float $total
      **/
-    public function total ( array &$taxes, integer $quantity ) {
+    public function total ( array &$taxes, $quantity ) {
 
         $total = 0;
@@ -471 +471 @@
      * @return boolean True if matched or false
      **/
-    private function ShoppCartItem ( string $property, string $value ) {
+    private function ShoppCartItem ( $property, $value ) {
         $CartItem = $this->Object;
         switch ( $property ) {
@@ -491 +491 @@
      * @return boolean True if matched or false
      **/
-    private function ShoppProduct ( string $property, string $value ) {
+    private function ShoppProduct ( $property, $value ) {
         $Product = $this->Object;
         switch ( $property ) {

shopp/trunk/core/model/Totals.php

@@ -64 +64 @@
      * @return OrderAmount The order amount entry
      **/
-    public function &entry ( string $register, string $id = null ) {
+    public function &entry ( $register, $id = null ) {
         $false = false;
         if ( ! isset($this->register[ $register ]) ) return $false;
@@ -86 +86 @@
      * @return boolean True if succesful, false otherwise
      **/
-    public function takeoff ( string $register, string $id ) {
+    public function takeoff ( $register, $id ) {
 
         if ( ! isset($this->register[ $register ]) ) return false;
@@ -106 +106 @@
      * @return boolean True if successful
      **/
-    public function reset ( string $register ) {
+    public function reset ( $register ) {
 
         if ( ! isset($this->register[ $register ]) ) return false;
@@ -126 +126 @@
      * @return boolean True for success, false otherwise
      **/
-    public function update ( string $register, $entry ) {
+    public function update ( $register, $entry ) {
         if ( ! isset($this->register[ $register ]) ) return false;
 
@@ -210 +210 @@
      * @return boolean True when the register has changed
      **/
-    public function haschanged ( string $register ) {
+    public function haschanged ( $register ) {
         $check = isset($this->checks[ $register ]) ? $this->checks[$register] : 0;
         $this->checks[$register] = hash('crc32b', serialize($this->register[$register]) );
@@ -271 +271 @@
      * @return void
      **/
-    static public function register ( string $class ) {
+    static public function register ( $class ) {
         $register = get_class_property($class, 'register');
         self::$handlers[ $register ] = $class;
@@ -285 +285 @@
      * @return string The class name of the handler
      **/
-    static private function handler ( string $register ) {
+    static private function handler ( $register ) {
         if ( isset(self::$handlers[ $register ]) )
             return self::$handlers[ $register ];
@@ -301 +301 @@
      * @return OrderTotalAmount An constructed OrderTotalAmount object
      **/
-    static public function add ( OrderTotals $Totals, string $register, array $options = array() ) {
+    static public function add ( OrderTotals $Totals, $register, array $options = array() ) {
         $RegisterClass = self::handler($register);
 
@@ -700 +700 @@
     protected $label = '';
 
-    public function __construct ( ShoppItemTax &$Tax, string $itemid ) {
+    public function __construct ( ShoppItemTax &$Tax, $itemid ) {
 
         $this->items[ $itemid ] = &$Tax->total;
@@ -709 +709 @@
     }
 
-    public function unapply ( string $itemid ) {
+    public function unapply ( $itemid ) {
         if ( isset($this->items[ $itemid ]) );
             unset($this->items[ $itemid ]);

shopp/trunk/core/ui/behaviors/catalog.js

@@ -217 +217 @@
     _.order = ($.inArray(order,ordering) != -1)?order:'normal';
 
-    _.slides = $(_.element).find('li:not(li.clear)').hide().css('visibility','visible');;
+    _.slides = $(_.element).find('li:not(li.clear)').hide().css('visibility','visible');
     _.total = _.slides.length;
     _.slide = 0;
@@ -373 +373 @@
     if (!form) return false;
     var $ = jqnc(),
+        $form = $(form),
         passed = true,
         passwords = [],
@@ -416 +417 @@
     });
 
-    form.shopp_validation = false;
-    $(form).trigger('shopp_validate',[error]);
-    if (form.shopp_validation) {
-        error = form.shopp_validation;
+    $form.data('error', error).trigger('shopp_validate');
+
+    if ( 'undefined' != form.shopp_validation )
+        $form.data('error', form.shopp_validation);
+
+    if ( $form.data('error') ) {
+        error = $form.data('error');
         if (error[1] && $('#'+error[1].id).length > 0) {
             $('#'+error[1].id).addClass('error');
@@ -427 +431 @@
 
     if (error.length > 0) {
-        error[1].focus();
+        if ( error[1] instanceof jQuery )
+            error[1].focus();
         if ($(form).hasClass('validation-alerts')) alert(error[0]);
         passed = false;
@@ -439 +444 @@
  **/
 function validateForms () {
-    jQuery('form.validate').bind('submit.validate',function (e) {
+    jQuery('form.validate').on('submit.validate',function (e) {
         return validate(this);
     });

shopp/trunk/core/ui/behaviors/catalog.min.js

@@ -1 @@
-/*
+/*!
  * catalog.js - Shopp catalog behaviors library
  * Copyright © 2008-2010 by Ingenesis Limited
  * Licensed under the GPLv3 {@see license.txt}
  */
-function ProductOptionsMenus(target,settings){var $=jqnc(),i=0,previous=false,current=false,menucache=new Array(),menus=$(target),disabled="disabled",defaults={disabled:true,pricetags:true,format:"%l (%p)",taxrate:0,prices:{}},settings=$.extend(defaults,settings);menus.each(function(id,menu){current=menu;menucache[id]=$(menu).children();if($.ua.msie){disabledHandler(menu)}if(id>0){previous=menus[id-1]}if(menus.length==1){optionPriceTags()}else{if(previous){$(previous).change(function(){if(menus.index(current)==menus.length-1){optionPriceTags()}if(this.selectedIndex==0&&this.options[0].value==""){$(menu).attr(disabled,true)}else{$(menu).removeAttr(disabled)}}).change()}}i++});function optionPriceTags(){var selected=new Array(),currentSelection=$(current).val();menus.not(current).each(function(){if($(this).val()!=""){selected.push($(this).val())}});$(current).empty();menucache[menus.index(current)].each(function(id,option){$(option).appendTo($(current))});$(current).val(currentSelection);$(current).children("option").each(function(){var tax,optiontext,previoustag,pricetag,f=false,option=$(this),o={l:f,p:f,s:f,d:f,r:f,u:f},keys=selected.slice(),price;if(option.val()!=""){if(!this._label){this._label=option.text()}o.l=this._label;keys.push(option.val());price=settings.prices[xorkey(keys)]||settings.prices[xorkey(keys,"deprecated")];if(price){if(price.p&&settings.pricetags){pricetag=new Number(price.p);tax=price.tax?new Number(pricetag*settings.taxrate):0;o.p=asMoney(new Number(pricetag+tax))}if($.ua.msie){option.css("color","#373737")}if((price.i&&price.s<1)||price.t=="N/A"){if(option.attr("selected")){option.parent().attr("selectedIndex",0)}if(!settings.disabled){option.remove()}else{optionDisable(option)}}else{option.removeAttr(disabled).show()}if(price.i){o.s=price.s;o.u=price.u}if(price.t=="N/A"&&!settings.disabled){option.remove()}option.text(formatlabel(settings.format,o))}else{if(!settings.disabled){option.remove()}else{optionDisable(option)}}}})}function xorkey(ids,deprecated){if(!(ids instanceof Array)){ids=[ids]}for(var key=0,i=0,mod=deprecated?101:7001;i<ids.length;i++){key=key^(ids[i]*mod)}return key}function optionDisable(option){option.attr(disabled,true);if(!$.browser.msie){return}option.css("color","#ccc")}function disabledHandler(menu){$(menu).change(function(){var _=this,firstEnabled;if(!_.options[_.selectedIndex].disabled){_.lastSelected=_.selectedIndex;return true}if(_.lastSelected){_.selectedIndex=_.lastSelected}else{firstEnabled=$(_).children("option:not(:disabled)").get(0);_.selectedIndex=firstEnabled?firstEnabled.index:0}})}function formatlabel(f,v){var m="([^ ]*)",rescape=function(t){return t.toString().replace(/[$]/g,"$$$$")};$.each(v,function(p){if(v&&v[p]!=undefined){var pattern=new RegExp("("+m+"%"+p+m+")");label="$2"+rescape(v[p])+"$3";if(v[p]===false){label=""}if(v[p]===""){label=""}f=f.replace(pattern,label)}});return f}}function catalogViewHandler(){var $=jqnc(),display=$("#shopp"),expires=new Date(),toggles={list:"grid",grid:"list"};expires.setTime(expires.getTime()+(30*86400000));$.each(toggles,function(view,lastview){display.find("ul.views li button."+view).click(function(){display.removeClass(lastview).addClass(view);document.cookie="shopp_catalog_view="+view+"; expires="+expires+"; path=/"}).hover(function(){$(this).toggleClass("hover")})})}function ShoppGallery(id,evt,tw){var $=jqnc(),gallery=$(id),previews=gallery.find("ul.previews"),thumbnails=gallery.find("ul.thumbnails li");if(!evt){evt="click"}if(tw){gallery.find("ul.thumbnails").css("width",tw+"px")}thumbnails.bind(evt,function(){var previous,target=$("#"+$(this).attr("class").split(" ")[0]);if(!target.hasClass("active")){previous=gallery.find("ul.previews li.active");target.addClass("active").hide();if(previous.length){previous.fadeOut(800,function(){previous.removeClass("active")})}target.appendTo(previews).fadeIn(500)}})}function ShoppSlideshow(element,duration,delay,fx,order){var $=jqnc(),_=this,effects;_.element=$(element);var effects={fade:[{display:"none"},{opacity:"show"}],"slide-down":[{display:"block",top:_.element.height()*-1},{top:0}],"slide-up":[{display:"block",top:_.element.height()},{top:0}],"slide-left":[{display:"block",left:_.element.width()*-1},{left:0}],"slide-right":[{display:"block",left:_.element.width()},{left:0}],wipe:[{display:"block",height:0},{height:_.element.height()}]},ordering=["normal","reverse","shuffle"];_.duration=(!duration)?800:duration;_.delay=(!delay)?7000:delay;fx=(!fx)?"fade":fx;_.effect=(!effects[fx])?effects.fade:effects[fx];order=(!order)?"normal":order;_.order=($.inArray(order,ordering)!=-1)?order:"normal";_.slides=$(_.element).find("li:not(li.clear)").hide().css("visibility","visible");_.total=_.slides.length;_.slide=0;_.shuffling=new Array();_.startTransition=function(){var index,selected,prev=$(_.slides[_.slide-1]).removeClass("active");$(_.slides[_.slide]).css(_.effect[0]).appendTo(_.element).animate(_.effect[1],_.duration,function(){prev.css(_.effect[0])}).addClass("active");switch(_.order){case"shuffle":if(_.shuffling.length==0){_.shuffleList();index=$.inArray(_.slide,_.shuffling);if(index!=-1){_.shuffling.splice(index,1)}}selected=Math.floor(Math.random()*_.shuffling.length);_.slide=_.shuffling[selected];_.shuffling.splice(selected,1);break;case"reverse":_.slide=(_.slide-1<0)?_.slides.length-1:_.slide-1;break;default:_.slide=(_.slide+1==_.total)?0:_.slide+1}if(_.slides.length==1){return}setTimeout(_.startTransition,_.delay)};_.transitionTo=function(slide){_.slide=slide;_.startTransition()};_.shuffleList=function(){for(var i=0;i<_.total;i++){_.shuffling.push(i)}};_.startTransition()}function slideshows(){var $=jqnc(),classes,options,map;$("ul.slideshow").each(function(){classes=$(this).attr("class");options={};map={fx:new RegExp(/([\w_-]+?)\-fx/),order:new RegExp(/([\w_-]+?)\-order/),duration:new RegExp(/duration\-(\d+)/),delay:new RegExp(/delay\-(\d+)/)};$.each(map,function(name,pattern){if(option=classes.match(pattern)){options[name]=option[1]}});new ShoppSlideshow(this,options.duration,options.delay,options.fx,options.order)})}function ShoppCarousel(element,duration){var $=jqnc(),spacing,_=this,visible=1,carousel=$(element),list=carousel.find("ul"),items=list.find("> li");_.duration=(!duration)?800:duration;_.cframe=carousel.find("div.frame");visible=Math.round(_.cframe.innerWidth()/items.outerWidth());if(visible<1){visible=1}spacing=Math.round(((_.cframe.innerWidth()%items.outerWidth())/items.length)/2);items.css("margin","0 "+spacing+"px");_.pageWidth=(items.outerWidth()+(spacing*2))*visible;_.page=1;_.pages=Math.ceil(items.length/visible);if((items.length%visible)!=0){list.append(new Array(visible-(items.length%visible)+1).join('<li class="empty" style="width: '+items.outerWidth()+"px; height: 1px; margin: 0 "+spacing+'px"/>'));items=list.find("> li")}items.filter(":first").before(items.slice(-visible).clone().addClass("cloned"));items.filter(":last").after(items.slice(0,visible).clone().addClass("cloned"));items=list.find("> li");_.cframe.scrollLeft(_.pageWidth);_.scrollLeft=carousel.find("button.left");_.scrollRight=carousel.find("button.right");_.scrolltoPage=function(page){var dir=page<_.page?-1:1,delta=Math.abs(_.page-page),scrollby=_.pageWidth*dir*delta;_.cframe.filter(":not(:animated)").animate({scrollLeft:"+="+scrollby},_.duration,function(){if(page==0){_.cframe.scrollLeft(_.pageWidth*_.pages);page=_.pages}else{if(page>_.pages){_.cframe.scrollLeft(_.pageWidth);page=1}}_.page=page})};_.scrollLeft.click(function(){return _.scrolltoPage(_.page-1)});_.scrollRight.click(function(){return _.scrolltoPage(_.page+1)})}function carousels(){var $=jqnc(),classes,options,map;$("div.carousel").each(function(){classes=$(this).attr("class");options={};map={duration:new RegExp(/duration\-(\d+)/)};$.each(map,function(name,pattern){if(option=classes.match(pattern)){options[name]=option[1]}});new ShoppCarousel(this,options.duration)})}function validate(form){if(!form){return false}var $=jqnc(),passed=true,passwords=[],error=[],inputs=$(form).find("input,select,textarea").not(":hidden"),required="required",title="title";$.fn.reverse=(typeof[]._reverse=="undefined")?[].reverse:[]._reverse;$.each(inputs.reverse(),function(id,field){input=$(field).removeClass("error");label=$("label[for="+input.attr("id")+"]").removeClass("error");if(true===input.attr("disabled")||"disabled"==input.attr("disabled")){return}if(input.hasClass(required)&&input.val()==""){error=new Array($cv.field.replace(/%s/,input.attr(title)),field)}if(input.hasClass(required)&&input.attr("type")=="checkbox"&&!input.attr("checked")){error=new Array($cv.chkbox.replace(/%s/,input.attr(title)),field)}if(input.hasClass("email")&&!input.val().match(new RegExp(/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i))){error=new Array($cv.email,field)}if(input.attr("class")&&(chars=input.attr("class").match(new RegExp("min(\\d+)")))){if(input.val()!=""&&input.val().length<chars[1]){error=new Array($cv.minlen.replace(/%s/,input.attr(title)).replace(/%d/,chars[1]),field)}}if(input.hasClass("passwords")){passwords.push(field);if(passwords.length==2&&passwords[0].value!=passwords[1].value){error=new Array($cv.pwdmm,passwords[1])}}if(error[1]&&error[1].id==input.attr("id")){input.addClass("error");label.addClass("error")}});form.shopp_validation=false;$(form).trigger("shopp_validate",[error]);if(form.shopp_validation){error=form.shopp_validation;if(error[1]&&$("#"+error[1].id).length>0){$("#"+error[1].id).addClass("error");$("label[for="+error[1].id+"]").addClass("error")}}if(error.length>0){error[1].focus();if($(form).hasClass("validation-alerts")){alert(error[0])}passed=false}return passed}function validateForms(){jQuery("form.validate").bind("submit.validate",function(e){return validate(this)})}jQuery(document).ready(function($){validateForms();catalogViewHandler();slideshows();carousels();if($.fn.colorbox){$("a.shopp-zoom").colorbox({photo:true});$("a.shopp-zoom.gallery").each(function(){var id=$(this).attr("class").match(/product\_(\d+)/)[1];if(typeof(cbo)!="undefined"){$(this).attr("rel","gallery-"+id).colorbox(cbo)}else{$(this).attr("rel","gallery-"+id).colorbox({slideshow:true,slideshowSpeed:3500})}})}$("select.shopp-orderby-menu").change(function(){this.form.submit()});$("select.shopp-categories-menu").change(function(){document.location.href=$(this).val()});if($s.nocache){$(window).unload(function(){return})}});
+function ProductOptionsMenus(m,c){var g=jqnc(),h=0,k=false,n=false,o=new Array(),f=g(m),e="disabled",d={disabled:true,pricetags:true,format:"%l (%p)",taxrate:0,prices:{}},c=g.extend(d,c);f.each(function(q,i){n=i;o[q]=g(i).children();if(g.ua.msie){a(i)}if(q>0){k=f[q-1]}if(f.length==1){p()}else{if(k){g(k).change(function(){if(f.index(n)==f.length-1){p()}if(this.selectedIndex==0&&this.options[0].value==""){g(i).attr(e,true)}else{g(i).removeAttr(e)}}).change()}}h++});function p(){var q=new Array(),i=g(n).val();f.not(n).each(function(){if(g(this).val()!=""){q.push(g(this).val())}});g(n).empty();o[f.index(n)].each(function(s,r){g(r).appendTo(g(n))});g(n).val(i);g(n).children("option").each(function(){var s,w,x,z,v=false,t=g(this),r={l:v,p:v,s:v,d:v,r:v,u:v},y=q.slice(),u;if(t.val()!=""){if(!this._label){this._label=t.text()}r.l=this._label;y.push(t.val());u=c.prices[b(y)]||c.prices[b(y,"deprecated")];if(u){if(u.p&&c.pricetags){z=new Number(u.p);s=u.tax?new Number(z*c.taxrate):0;r.p=asMoney(new Number(z+s))}if(g.ua.msie){t.css("color","#373737")}if((u.i&&u.s<1)||u.t=="N/A"){if(t.attr("selected")){t.parent().attr("selectedIndex",0)}if(!c.disabled){t.remove()}else{j(t)}}else{t.removeAttr(e).show()}if(u.i){r.s=u.s;r.u=u.u}if(u.t=="N/A"&&!c.disabled){t.remove()}t.text(l(c.format,r))}else{if(!c.disabled){t.remove()}else{j(t)}}}})}function b(u,q){if(!(u instanceof Array)){u=[u]}for(var t=0,s=0,r=q?101:7001;s<u.length;s++){t=t^(u[s]*r)}return t}function j(i){i.attr(e,true);if(!g.browser.msie){return}i.css("color","#ccc")}function a(i){g(i).change(function(){var q=this,r;if(!q.options[q.selectedIndex].disabled){q.lastSelected=q.selectedIndex;return true}if(q.lastSelected){q.selectedIndex=q.lastSelected}else{r=g(q).children("option:not(:disabled)").get(0);q.selectedIndex=r?r.index:0}})}function l(r,q){var i="([^ ]*)",s=function(u){return u.toString().replace(/[$]/g,"$$$$")};g.each(q,function(u){if(q&&q[u]!=undefined){var t=new RegExp("("+i+"%"+u+i+")");label="$2"+s(q[u])+"$3";if(q[u]===false){label=""}if(q[u]===""){label=""}r=r.replace(t,label)}});return r}}function catalogViewHandler(){var c=jqnc(),d=c("#shopp"),a=new Date(),b={list:"grid",grid:"list"};a.setTime(a.getTime()+(30*86400000));c.each(b,function(e,f){d.find("ul.views li button."+e).click(function(){d.removeClass(f).addClass(e);document.cookie="shopp_catalog_view="+e+"; expires="+a+"; path=/"}).hover(function(){c(this).toggleClass("hover")})})}function ShoppGallery(g,b,c){var e=jqnc(),a=e(g),d=a.find("ul.previews"),f=a.find("ul.thumbnails li");if(!b){b="click"}if(c){a.find("ul.thumbnails").css("width",c+"px")}f.bind(b,function(){var h,i=e("#"+e(this).attr("class").split(" ")[0]);if(!i.hasClass("active")){h=a.find("ul.previews li.active");i.addClass("active").hide();if(h.length){h.fadeOut(800,function(){h.removeClass("active")})}i.appendTo(d).fadeIn(500)}})}function ShoppSlideshow(g,e,h,d,c){var f=jqnc(),i=this,b;i.element=f(g);var b={fade:[{display:"none"},{opacity:"show"}],"slide-down":[{display:"block",top:i.element.height()*-1},{top:0}],"slide-up":[{display:"block",top:i.element.height()},{top:0}],"slide-left":[{display:"block",left:i.element.width()*-1},{left:0}],"slide-right":[{display:"block",left:i.element.width()},{left:0}],wipe:[{display:"block",height:0},{height:i.element.height()}]},a=["normal","reverse","shuffle"];i.duration=(!e)?800:e;i.delay=(!h)?7000:h;d=(!d)?"fade":d;i.effect=(!b[d])?b.fade:b[d];c=(!c)?"normal":c;i.order=(f.inArray(c,a)!=-1)?c:"normal";i.slides=f(i.element).find("li:not(li.clear)").hide().css("visibility","visible");i.total=i.slides.length;i.slide=0;i.shuffling=new Array();i.startTransition=function(){var j,k,l=f(i.slides[i.slide-1]).removeClass("active");f(i.slides[i.slide]).css(i.effect[0]).appendTo(i.element).animate(i.effect[1],i.duration,function(){l.css(i.effect[0])}).addClass("active");switch(i.order){case"shuffle":if(i.shuffling.length==0){i.shuffleList();j=f.inArray(i.slide,i.shuffling);if(j!=-1){i.shuffling.splice(j,1)}}k=Math.floor(Math.random()*i.shuffling.length);i.slide=i.shuffling[k];i.shuffling.splice(k,1);break;case"reverse":i.slide=(i.slide-1<0)?i.slides.length-1:i.slide-1;break;default:i.slide=(i.slide+1==i.total)?0:i.slide+1}if(i.slides.length==1){return}setTimeout(i.startTransition,i.delay)};i.transitionTo=function(j){i.slide=j;i.startTransition()};i.shuffleList=function(){for(var j=0;j<i.total;j++){i.shuffling.push(j)}};i.startTransition()}function slideshows(){var c=jqnc(),b,a,d;c("ul.slideshow").each(function(){b=c(this).attr("class");a={};d={fx:new RegExp(/([\w_-]+?)\-fx/),order:new RegExp(/([\w_-]+?)\-order/),duration:new RegExp(/duration\-(\d+)/),delay:new RegExp(/delay\-(\d+)/)};c.each(d,function(e,f){if(option=b.match(f)){a[e]=option[1]}});new ShoppSlideshow(this,a.duration,a.delay,a.fx,a.order)})}function ShoppCarousel(d,b){var c=jqnc(),g,h=this,a=1,i=c(d),e=i.find("ul"),f=e.find("> li");h.duration=(!b)?800:b;h.cframe=i.find("div.frame");a=Math.round(h.cframe.innerWidth()/f.outerWidth());if(a<1){a=1}g=Math.round(((h.cframe.innerWidth()%f.outerWidth())/f.length)/2);f.css("margin","0 "+g+"px");h.pageWidth=(f.outerWidth()+(g*2))*a;h.page=1;h.pages=Math.ceil(f.length/a);if((f.length%a)!=0){e.append(new Array(a-(f.length%a)+1).join('<li class="empty" style="width: '+f.outerWidth()+"px; height: 1px; margin: 0 "+g+'px"/>'));f=e.find("> li")}f.filter(":first").before(f.slice(-a).clone().addClass("cloned"));f.filter(":last").after(f.slice(0,a).clone().addClass("cloned"));f=e.find("> li");h.cframe.scrollLeft(h.pageWidth);h.scrollLeft=i.find("button.left");h.scrollRight=i.find("button.right");h.scrolltoPage=function(k){var j=k<h.page?-1:1,m=Math.abs(h.page-k),l=h.pageWidth*j*m;h.cframe.filter(":not(:animated)").animate({scrollLeft:"+="+l},h.duration,function(){if(k==0){h.cframe.scrollLeft(h.pageWidth*h.pages);k=h.pages}else{if(k>h.pages){h.cframe.scrollLeft(h.pageWidth);k=1}}h.page=k})};h.scrollLeft.click(function(){return h.scrolltoPage(h.page-1)});h.scrollRight.click(function(){return h.scrolltoPage(h.page+1)})}function carousels(){var c=jqnc(),b,a,d;c("div.carousel").each(function(){b=c(this).attr("class");a={};d={duration:new RegExp(/duration\-(\d+)/)};c.each(d,function(e,f){if(option=b.match(f)){a[e]=option[1]}});new ShoppCarousel(this,a.duration)})}function validate(a){if(!a){return false}var d=jqnc(),i=d(a),c=true,b=[],g=[],e=d(a).find("input,select,textarea").not(":hidden"),f="required",h="title";d.fn.reverse=(typeof[]._reverse=="undefined")?[].reverse:[]._reverse;d.each(e.reverse(),function(k,j){input=d(j).removeClass("error");label=d("label[for="+input.attr("id")+"]").removeClass("error");if(true===input.attr("disabled")||"disabled"==input.attr("disabled")){return}if(input.hasClass(f)&&input.val()==""){g=new Array($cv.field.replace(/%s/,input.attr(h)),j)}if(input.hasClass(f)&&input.attr("type")=="checkbox"&&!input.attr("checked")){g=new Array($cv.chkbox.replace(/%s/,input.attr(h)),j)}if(input.hasClass("email")&&!input.val().match(new RegExp(/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.([a-z][a-z0-9]+)|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i))){g=new Array($cv.email,j)}if(input.attr("class")&&(chars=input.attr("class").match(new RegExp("min(\\d+)")))){if(input.val()!=""&&input.val().length<chars[1]){g=new Array($cv.minlen.replace(/%s/,input.attr(h)).replace(/%d/,chars[1]),j)}}if(input.hasClass("passwords")){b.push(j);if(b.length==2&&b[0].value!=b[1].value){g=new Array($cv.pwdmm,b[1])}}if(g[1]&&g[1].id==input.attr("id")){input.addClass("error");label.addClass("error")}});i.data("error",g).trigger("shopp_validate");if("undefined"!=a.shopp_validation){i.data("error",a.shopp_validation)}if(i.data("error")){g=i.data("error");if(g[1]&&d("#"+g[1].id).length>0){d("#"+g[1].id).addClass("error");d("label[for="+g[1].id+"]").addClass("error")}}if(g.length>0){if(g[1] instanceof jQuery){g[1].focus()}if(d(a).hasClass("validation-alerts")){alert(g[0])}c=false}return c}function validateForms(){jQuery("form.validate").on("submit.validate",function(a){return validate(this)})}jQuery(document).ready(function(a){validateForms();catalogViewHandler();slideshows();carousels();if(a.fn.colorbox){a("a.shopp-zoom").colorbox({photo:true});a("a.shopp-zoom.gallery").each(function(){var b=a(this).attr("class").match(/product\_(\d+)/)[1];if(typeof(cbo)!="undefined"){a(this).attr("rel","gallery-"+b).colorbox(cbo)}else{a(this).attr("rel","gallery-"+b).colorbox({slideshow:true,slideshowSpeed:3500})}})}a("select.shopp-orderby-menu").change(function(){this.form.submit()});a("select.shopp-categories-menu").change(function(){document.location.href=a(this).val()});if($s.nocache){a(window).unload(function(){return})}});

shopp/trunk/core/ui/behaviors/checkout.js

@@ -19 +19 @@
         checkoutButtons = $('.payoption-button'),
         checkoutButton = $('.payoption-' + decodeURIComponent(d_pm)),
+        submitButtons = checkoutButtons.find('input'),
         checkoutProcess = $('#shopp-checkout-function'),
         localeFields = $('#checkout.shopp li.locale');
@@ -30 +31 @@
     }
 
+    $.fn.extend({
+        disableSubmit: function () {
+            var $this = $(this);
+            $this.data('timeout',
+                setTimeout(function () { $this.enableSubmit(); alert($co.error); }, $co.timeout * 1000)
+            );
+            return $this.data('label',$this.val()).prop('disabled',true).addClass('disabled').val($co.submitting);
+        },
+        enableSubmit: function () {
+            var $this = $(this);
+            clearTimeout($this.data('timeout'));
+            return $this.prop('disabled', false).removeClass('disabled').val($this.data('label'));
+        },
+    });
+
+    submitButtons.on('click', function () {
+        $(this).disableSubmit();
+        setTimeout(function () { checkoutForm.submit(); }, 1);
+    });
+
     // Validate paycard number before submit
-    checkoutForm.bind('shopp_validate',function () {
-        if (!validcard()) this.shopp_validation = ["Not a valid card number.",billCard.get(0)];
+    checkoutForm.on('shopp_validate', function () {
+        if ( ! validcard() ) checkoutForm.data('error', [$co.badpan, billCard.get(0)]);
+        if ( checkoutForm.data('error').length > 0 ) submitButtons.enableSubmit();
     });
 
@@ -45 +67 @@
 
         $('.paycard.xcsc').attr('disabled',true).addClass('disabled');
-        if (!card || !card['inputs']) return;
-
-        $.each(card['inputs'],function (input,inputlen) {
-            $('#billing-xcsc-'+input).attr('disabled',false).removeClass('disabled');
+        if ( ! card || ! card['inputs'] ) return;
+
+        $.each(card['inputs'], function (input,inputlen) {
+            $('#billing-xcsc-'+input).attr('disabled', false).removeClass('disabled');
         });
 
@@ -68 +90 @@
 
     submitLogin.click(function (e) {
-        checkoutForm.unbind('submit.validate').bind('submit.validlogin',function (e) {
+        checkoutForm.unbind('submit.validate').bind('submit.validlogin', function (e) {
             var error = false;
-            if ('' == passwordLogin.val()) error = [$co.loginpwd,passwordLogin];
-            if ('' == accountLogin.val()) error = [$co.loginname,accountLogin];
+            if ( '' == passwordLogin.val() ) error = [$co.loginpwd, passwordLogin];
+            if ( '' == accountLogin.val() ) error = [$co.loginname, accountLogin];
             if (error) {
                 e.preventDefault();

shopp/trunk/core/ui/behaviors/checkout.min.js

@@ -1 @@
-/*
+/*!
  * checkout.js - Shopp catalog behaviors library
  * Copyright © 2008-2010 by Ingenesis Limited
  * Licensed under the GPLv3 {@see license.txt}
  */
-jQuery(document).ready(function(){var $=jqnc(),login=false,sameaddr=$(".sameaddress"),submitLogin=$("#submit-login-checkout"),accountLogin=$("#account-login-checkout"),passwordLogin=$("#password-login-checkout"),guest=$("#guest-checkout"),checkoutForm=$("#checkout.shopp"),paymethods=$("#checkout.shopp [name=paymethod]"),localeMenu=$("#billing-locale"),billCard=$("#billing-card"),billCardtype=$("#billing-cardtype"),checkoutButtons=$(".payoption-button"),checkoutButton=$(".payoption-"+decodeURIComponent(d_pm)),checkoutProcess=$("#shopp-checkout-function"),localeFields=$("#checkout.shopp li.locale");if(checkoutForm.find("input[name=checkout]").val()=="process"){checkoutButtons.hide();if(checkoutButton.length==0){checkoutButton=$(".payoption-0")}checkoutButton.show();paymethods.change(paymethod_select).change()}checkoutForm.bind("shopp_validate",function(){if(!validcard()){this.shopp_validation=["Not a valid card number.",billCard.get(0)]}});billCard.change(validcard);billCardtype.change(function(){var cardtype=new String(billCardtype.val()).toLowerCase(),card=paycards[cardtype];$(".paycard.xcsc").attr("disabled",true).addClass("disabled");if(!card||!card.inputs){return}$.each(card.inputs,function(input,inputlen){$("#billing-xcsc-"+input).attr("disabled",false).removeClass("disabled")})}).change();billCardtype.change(function(){var cardtype=new String(billCardtype.val()).toLowerCase();for(var key in paycards){if(checkoutForm.hasClass("cardtype-"+key)){checkoutForm.removeClass("cardtype-"+key)}}checkoutForm.addClass("cardtype-"+cardtype)}).change();if(localeMenu.children().size()==0){localeFields.hide()}submitLogin.click(function(e){checkoutForm.unbind("submit.validate").bind("submit.validlogin",function(e){var error=false;if(""==passwordLogin.val()){error=[$co.loginpwd,passwordLogin]}if(""==accountLogin.val()){error=[$co.loginname,accountLogin]}if(error){e.preventDefault();checkoutForm.unbind("submit.validlogin").bind("submit.validate",function(e){return validate(this)});alert(error[0]);error[1].focus().addClass("error");return false}checkoutProcess.val("login")})});$("#billing-country, .billing-state, #shipping-country, .shipping-state").bind("change.localemenu",function(e,init){var sameaddress=sameaddr.is(":checked")?sameaddr.val():false,country="shipping"==sameaddress?$("#billing-country").val():$("#shipping-country").val(),state="shipping"==sameaddress?$('.billing-state[disabled!="true"]').val():$('.shipping-state[disabled!="true"]').val(),id=country+state,options,locale;if(init||!localeMenu.get(0)||(!sameaddress&&($(this).is("#billing-country")||$(this).is(".billing-state")))){return}localeMenu.empty().attr("disabled",true);if(locales&&(locale=locales[id])||(locale=locales[country])){options+="<option></option>";$.each(locale,function(index,label){options+='<option value="'+label+'">'+label+"</option>"});$(options).appendTo(localeMenu);localeMenu.removeAttr("disabled");localeFields.show()}});guest.change(function(e){var passwords=checkoutForm.find("input.passwords"),labels=[];$.each(passwords,function(){labels.push("label[for="+$(this).attr("id")+"]")});labels=checkoutForm.find(labels.join(","));if(guest.is(":checked")){passwords.setDisabled(true).hide();labels.hide()}else{passwords.setDisabled(false).show();labels.show()}}).trigger("change");$("#shopp form").on("change",".shipmethod",function(){if($.inArray($("#checkout #shopp-checkout-function").val(),["process","confirmed"])!=-1){var prefix=".shopp-cart.cart-",spans="span"+prefix,inputs="input"+prefix,fields=["shipping","tax","total"],selectors=[],values={},retry=0,disableset=".shopp .shipmethod, .payoption-button input",$this=$(this),send=function(){$(disableset).attr("disabled",true);$.getJSON($co.ajaxurl+"?action=shopp_ship_costs&method="+$this.val(),function(r){if(!r&&retry++<2){return setTimeout(send,1000)}$(disableset).attr("disabled",false);$.each(fields,function(i,name){if(!r||undefined==r[name]){$(spans+name).html(values[name]);return}$(spans+name).html(asMoney(new Number(r[name])));$(inputs+name).val(new Number(r[name]))})})};$.each(fields,function(i,name){selectors.push(spans+name);values[name]=$(spans+name).html()});if(!c_upd){c_upd="?"}$(selectors.join(",")).html(c_upd);send()}else{$(this).parents("form").submit()}});$(window).load(function(){$(document).trigger("shopp_paymethod",[paymethods.val()])});function paymethod_select(e){var $this=$(this),paymethod=decodeURIComponent($(this).val()),checkoutButton=$(".payoption-"+paymethod),options="",pc=false;if(this!=window&&$this.attr&&"radio"==$this.attr("type")&&!$this.is(":checked")){return}$(document).trigger("shopp_paymethod",[paymethod]);checkoutButtons.hide();if(checkoutButton.length==0){checkoutButton=$(".payoption-0")}if(pm_cards[paymethod]&&pm_cards[paymethod].length>0){checkoutForm.find(".payment,.paycard").show();checkoutForm.find(".paycard.disabled").attr("disabled",false).removeClass("disabled");if(typeof(paycards)!=="undefined"){$.each(pm_cards[paymethod],function(a,s){if(!paycards[s]){return}pc=paycards[s];options+='<option value="'+pc.symbol+'">'+pc.name+"</option>"});billCardtype.html(options).change()}}else{checkoutForm.find(".payment,.paycard").hide();checkoutForm.find(".paycard").attr("disabled",true).addClass("disabled")}checkoutButton.show()}function validcard(){if(billCard.length==0){return true}if(billCard.attr("disabled")){return true}var v=billCard.val().replace(/\D/g,""),paymethod=paymethods.filter(":checked").val()?paymethods.filter(":checked").val():paymethods.val(),card=false;if(!paymethod){paymethod=decodeURIComponent(d_pm)}if(billCard.val().match(/(X)+\d{4}/)){return true}if(!pm_cards[paymethod]){return true}$.each(pm_cards[paymethod],function(a,s){var pc=paycards[s],pattern=new RegExp(pc.pattern.substr(1,pc.pattern.length-2));if(v.match(pattern)){card=pc.symbol;return billCardtype.val(card).change()}});if(!luhn(v)){return false}return card}function luhn(n){n=n.toString().replace(/\D/g,"").split("").reverse();if(!n.length){return false}var total=0;for(i=0;i<n.length;i++){n[i]=parseInt(n[i],10);total+=i%2?2*n[i]-(n[i]>4?9:0):n[i]}return(total%10)==0}});if(!locales){var locales=false};
+jQuery(document).ready(function(){var d=jqnc(),m=false,e=d(".sameaddress"),c=d("#submit-login-checkout"),n=d("#account-login-checkout"),j=d("#password-login-checkout"),l=d("#guest-checkout"),k=d("#checkout.shopp"),q=d("#checkout.shopp [name=paymethod]"),a=d("#billing-locale"),s=d("#billing-card"),o=d("#billing-cardtype"),u=d(".payoption-button"),b=d(".payoption-"+decodeURIComponent(d_pm)),r=u.find("input"),p=d("#shopp-checkout-function"),h=d("#checkout.shopp li.locale");if(k.find("input[name=checkout]").val()=="process"){u.hide();if(b.length==0){b=d(".payoption-0")}b.show();q.change(g).change()}d.fn.extend({disableSubmit:function(){var v=d(this);v.data("timeout",setTimeout(function(){v.enableSubmit();alert($co.error)},$co.timeout*1000));return v.data("label",v.val()).prop("disabled",true).addClass("disabled").val($co.submitting)},enableSubmit:function(){var v=d(this);clearTimeout(v.data("timeout"));return v.prop("disabled",false).removeClass("disabled").val(v.data("label"))}});r.on("click",function(){d(this).disableSubmit();setTimeout(function(){k.submit()},1)});k.on("shopp_validate",function(){if(!f()){k.data("error",[$co.badpan,s.get(0)])}if(k.data("error").length>0){r.enableSubmit()}});s.change(f);o.change(function(){var w=new String(o.val()).toLowerCase(),v=paycards[w];d(".paycard.xcsc").attr("disabled",true).addClass("disabled");if(!v||!v.inputs){return}d.each(v.inputs,function(x,y){d("#billing-xcsc-"+x).attr("disabled",false).removeClass("disabled")})}).change();o.change(function(){var v=new String(o.val()).toLowerCase();for(var w in paycards){if(k.hasClass("cardtype-"+w)){k.removeClass("cardtype-"+w)}}k.addClass("cardtype-"+v)}).change();if(a.children().size()==0){h.hide()}c.click(function(v){k.unbind("submit.validate").bind("submit.validlogin",function(x){var w=false;if(""==j.val()){w=[$co.loginpwd,j]}if(""==n.val()){w=[$co.loginname,n]}if(w){x.preventDefault();k.unbind("submit.validlogin").bind("submit.validate",function(y){return validate(this)});alert(w[0]);w[1].focus().addClass("error");return false}p.val("login")})});d("#billing-country, .billing-state, #shipping-country, .shipping-state").bind("change.localemenu",function(y,B){var A=e.is(":checked")?e.val():false,z="shipping"==A?d("#billing-country").val():d("#shipping-country").val(),x="shipping"==A?d('.billing-state[disabled!="true"]').val():d('.shipping-state[disabled!="true"]').val(),C=z+x,w,v;if(B||!a.get(0)||(!A&&(d(this).is("#billing-country")||d(this).is(".billing-state")))){return}a.empty().attr("disabled",true);if(locales&&(v=locales[C])||(v=locales[z])){w+="<option></option>";d.each(v,function(E,D){w+='<option value="'+D+'">'+D+"</option>"});d(w).appendTo(a);a.removeAttr("disabled");h.show()}});l.change(function(v){var w=k.find("input.passwords"),x=[];d.each(w,function(){x.push("label[for="+d(this).attr("id")+"]")});x=k.find(x.join(","));if(l.is(":checked")){w.setDisabled(true).hide();x.hide()}else{w.setDisabled(false).show();x.show()}}).trigger("change");d("#shopp form").on("change",".shipmethod",function(){if(d.inArray(d("#checkout #shopp-checkout-function").val(),["process","confirmed"])!=-1){var x=".shopp-cart.cart-",A="span"+x,y="input"+x,z=["shipping","tax","total"],D=[],E={},v=0,C=".shopp .shipmethod, .payoption-button input",B=d(this),w=function(){d(C).attr("disabled",true);d.getJSON($co.ajaxurl+"?action=shopp_ship_costs&method="+B.val(),function(F){if(!F&&v++<2){return setTimeout(w,1000)}d(C).attr("disabled",false);d.each(z,function(H,G){if(!F||undefined==F[G]){d(A+G).html(E[G]);return}d(A+G).html(asMoney(new Number(F[G])));d(y+G).val(new Number(F[G]))})})};d.each(z,function(G,F){D.push(A+F);E[F]=d(A+F).html()});if(!c_upd){c_upd="?"}d(D.join(",")).html(c_upd);w()}else{d(this).parents("form").submit()}});d(window).load(function(){d(document).trigger("shopp_paymethod",[q.val()])});function g(A){var z=d(this),y=decodeURIComponent(d(this).val()),v=d(".payoption-"+y),x="",w=false;if(this!=window&&z.attr&&"radio"==z.attr("type")&&!z.is(":checked")){return}d(document).trigger("shopp_paymethod",[y]);u.hide();if(v.length==0){v=d(".payoption-0")}if(pm_cards[y]&&pm_cards[y].length>0){k.find(".payment,.paycard").show();k.find(".paycard.disabled").attr("disabled",false).removeClass("disabled");if(typeof(paycards)!=="undefined"){d.each(pm_cards[y],function(B,C){if(!paycards[C]){return}w=paycards[C];x+='<option value="'+w.symbol+'">'+w.name+"</option>"});o.html(x).change()}}else{k.find(".payment,.paycard").hide();k.find(".paycard").attr("disabled",true).addClass("disabled")}v.show()}function f(){if(s.length==0){return true}if(s.attr("disabled")){return true}var w=s.val().replace(/\D/g,""),y=q.filter(":checked").val()?q.filter(":checked").val():q.val(),x=false;if(!y){y=decodeURIComponent(d_pm)}if(s.val().match(/(X)+\d{4}/)){return true}if(!pm_cards[y]){return true}d.each(pm_cards[y],function(v,A){var z=paycards[A],B=new RegExp(z.pattern.substr(1,z.pattern.length-2));if(w.match(B)){x=z.symbol;return o.val(x).change()}});if(!t(w)){return false}return x}function t(w){w=w.toString().replace(/\D/g,"").split("").reverse();if(!w.length){return false}var v=0;for(i=0;i<w.length;i++){w[i]=parseInt(w[i],10);v+=i%2?2*w[i]-(w[i]>4?9:0):w[i]}return(v%10)==0}});if(!locales){var locales=false};

shopp/trunk/core/ui/behaviors/editors.js

@@ -618 +618 @@
             .find('input.id')
             .each(function (id,option) {
-                var optionid = $(option).val(),dbPriceid, dP=$('#deletePrices');;
+                var optionid = $(option).val(),dbPriceid, dP=$('#deletePrices');
                 if (Pricelines.row[optionid]) {
                     dbPriceid = Pricelines.row[optionid].data.id;

shopp/trunk/core/ui/behaviors/setup.js

@@ -20 +20 @@
         $.getJSON(zones_url+'&action=shopp_country_zones&country='+baseop.val(),
             function(data) {
-                baseopZone.hide().empty().attr('disabled',true);;
+                baseopZone.hide().empty().attr('disabled',true);
                 if (!data) return true;
 

shopp/trunk/core/ui/behaviors/tinymce/dialog.php

@@ -80 +80 @@
 
                 if (window.tinyMCE) {
-                    window.tinyMCE.execInstanceCommand('content', 'mceInsertContent', false, tag);
+                    var tmce_ver = window.tinyMCE.majorVersion;
+                    if ( tmce_ver >= "4" ) {
+                        window.tinyMCE.execCommand('mceInsertContent', false, tag);
+                    } else {
+                        window.tinyMCE.execInstanceCommand('content', 'mceInsertContent', false, tag);
+                    }
                     tinyMCEPopup.editor.execCommand('mceRepaint');
                     tinyMCEPopup.close();

shopp/trunk/core/ui/categories/products.js

@@ -76 +76 @@
             $.ajax({
                 url:updates_url+"&action=shopp_category_products_order",
-                timeout:3000,
+                timeout:5000,
                 type: "POST",
                 datatype:'text',
                 data:updates.serialize(),
-                success:function (result) {
+                success:function (r) {
+                    updating.hide();
+                },
+                error:function (r, e) {
                     updating.hide();
                 }
             });
-
-
         }
-
 
     };

shopp/trunk/core/ui/categories/products.min.js

@@ -1 @@
-jQuery(document).ready(function(){var a=jqnc();a.fn.dragrow=function(b){var e=a(this),c=e.find("tbody > tr"),f=typeof a(document).attr("onselectstart")!="undefined",d={onDrop:function(){}},b=a.extend(d,b);return c.bind("mousedown.dragrow",function(h){var g=a(this).fadeTo("fast",0.4);lastY=h.pageY;a("tr",g.parent()).not(g).bind("mouseenter.dragrow",function(){var i=a(this);if(h.pageY>lastY){i.after(g)}else{i.before(g)}lastY=h.pageY});a("body").bind("mouseup.dragrow",function(){g.fadeTo("fast",1);a("tr",g.parent()).unbind("mouseenter.dragrow");a("body").unbind("mouseup.dragrow");if(f){a(document).unbind("selectstart")}b.onDrop(g)});h.preventDefault();if(f){a(document).bind("selectstart",function(){return false})}return false}).css("cursor","move")};a.fn.arrangeRows=function(c){var d=a(this);d.dragrow({onDrop:b});b();d.find("button[name=top]").hover(function(){a(this).toggleClass("hover")}).click(function(){var f=a(this).parent().parent(),e=f.find("input[name^=position]");if(e.val()==0){return false}f.insertBefore(f.parent().find("tr:first"));b()});d.find("button[name=bottom]").hover(function(){a(this).toggleClass("hover")}).click(function(){var f=a(this).parent().parent(),e=f.find("input[name^=position]");f.insertAfter(f.parent().find("tr:last"));b()});function b(){var f=a("#category-id"),e=d.find("th.column-move img");d.find("tbody tr input[name^=position]").each(function(j,i){var h=a(i),g=j+1;if((h.attr("alt")!=""&&g!=h.attr("alt"))||h.val()=="0"){h.val(g).attr("alt",g);f=f.add(h)}else{if(h.attr("alt")==""){h.val(g).attr("alt",g)}else{h.val(g)}}});if(f.size()==1){return}e.hide().show();a.ajax({url:updates_url+"&action=shopp_category_products_order",timeout:3000,type:"POST",datatype:"text",data:f.serialize(),success:function(g){e.hide()}})}};a("#arrange-products").arrangeRows()});
+jQuery(document).ready(function(){var a=jqnc();a.fn.dragrow=function(b){var e=a(this),c=e.find("tbody > tr"),f=typeof a(document).attr("onselectstart")!="undefined",d={onDrop:function(){}},b=a.extend(d,b);return c.bind("mousedown.dragrow",function(h){var g=a(this).fadeTo("fast",0.4);lastY=h.pageY;a("tr",g.parent()).not(g).bind("mouseenter.dragrow",function(){var i=a(this);if(h.pageY>lastY){i.after(g)}else{i.before(g)}lastY=h.pageY});a("body").bind("mouseup.dragrow",function(){g.fadeTo("fast",1);a("tr",g.parent()).unbind("mouseenter.dragrow");a("body").unbind("mouseup.dragrow");if(f){a(document).unbind("selectstart")}b.onDrop(g)});h.preventDefault();if(f){a(document).bind("selectstart",function(){return false})}return false}).css("cursor","move")};a.fn.arrangeRows=function(c){var d=a(this);d.dragrow({onDrop:b});b();d.find("button[name=top]").hover(function(){a(this).toggleClass("hover")}).click(function(){var f=a(this).parent().parent(),e=f.find("input[name^=position]");if(e.val()==0){return false}f.insertBefore(f.parent().find("tr:first"));b()});d.find("button[name=bottom]").hover(function(){a(this).toggleClass("hover")}).click(function(){var f=a(this).parent().parent(),e=f.find("input[name^=position]");f.insertAfter(f.parent().find("tr:last"));b()});function b(){var f=a("#category-id"),e=d.find("th.column-name .shoppui-spinner");d.find("tbody tr input[name^=position]").each(function(j,i){var h=a(i),g=j+1;if((h.attr("alt")!=""&&g!=h.attr("alt"))||h.val()=="0"){h.val(g).attr("alt",g);f=f.add(h)}else{if(h.attr("alt")==""){h.val(g).attr("alt",g)}else{h.val(g)}}});if(f.size()==1){return}e.hide().show();a.ajax({url:updates_url+"&action=shopp_category_products_order",timeout:5000,type:"POST",datatype:"text",data:f.serialize(),success:function(g){e.hide()},error:function(g,h){e.hide()}})}};a("#arrange-products").arrangeRows()});

shopp/trunk/core/ui/orders/events.php

@@ -424 +424 @@
 
     function details () {
+        if ( 'NOTRACKING' == $this->carrier_name() )
+            return Shopp::__('No Tracking');
         return sprintf('%s: %s',$this->carrier_name(),$this->tracklink());
     }

shopp/trunk/core/ui/orders/order.php

@@ -43 +43 @@
                 foreach ($columns as $column => $column_title) {
                     $classes = array($column,"column-$column");
-                    if ( in_array($column,$hidden) ) $classes[] = 'hidden';
+                    if ( in_array($column, $hidden) ) $classes[] = 'hidden';
 
                     switch ($column) {
@@ -157 +157 @@
                         <tr class="<?php echo esc_attr(join(' ',$rowclasses)); ?>">
                     <?php
-
                         if ( isset($_GET['editline']) && (int)$_GET['editline'] == $id ) {
                             $data = array(
-                                '${lineid}' => (int)$_GET['editline'],
-                                '${itemname}' => $itemname,
-                                '${quantity}' => $Item->quantity,
-                                '${unitprice}'     => money($Item->unitprice),
-                                '${total}'    => money( $Item->total+($Purchase->taxing != 'inclusive'?$Item->unittax*$Item->quantity:0) )
+                                '${lineid}'    => (int)$_GET['editline'],
+                                '${itemname}'  => $itemname,
+                                '${quantity}'  => $Item->quantity,
+                                '${unitprice}' => money($Item->unitprice),
+                                '${total}'     => money($Item->total)
                             );
-                            echo ShoppUI::template($itemeditor,$data);
+                            echo ShoppUI::template($itemeditor, $data);
                         } else {
 
                             foreach ($columns as $column => $column_title) {
-                                $classes = array($column,"column-$column");
-                                if ( in_array($column,$hidden) ) $classes[] = 'hidden';
+                                $classes = array($column, "column-$column");
+                                if ( in_array($column, $hidden) ) $classes[] = 'hidden';
 
                                 ob_start();
-                                switch ($column) {
+                                switch ( $column ) {
                                     case 'items':
                                     ShoppProduct( new ShoppProduct($Item->product) ); // @todo Find a way to make this more efficient by loading product slugs with load_purchased()?
                                     $viewurl = shopp('product.get-url');
-                                    $editurl = ShoppAdminController::url( array('id' => $Purchase->id, 'editline'=>$id) );
-                                    $rmvurl = ShoppAdminController::url( array('id' => $Purchase->id, 'rmvline'=>$id) );
+                                    $editurl = ShoppAdminController::url( array('id' => $Purchase->id, 'editline'=> $id) );
+                                    $rmvurl = ShoppAdminController::url( array('id' => $Purchase->id, 'rmvline'=> $id) );
+                                    $producturl = add_query_arg( array('page' => 'shopp-products', 'id' => $Item->product), admin_url('admin.php') );
                                         ?>
                                             <td class="<?php echo esc_attr(join(' ',$classes)); ?>">
-                                                <a href="<?php echo add_query_arg(array('page' => 'shopp-products','id' => $Item->product),admin_url('admin.php')); ?>">
+                                                <a href="<?php echo $producturl; ?>">
                                                     <?php
                                                     $Product = new ShoppProduct($Item->product);
@@ -193 +193 @@
                                                     <?php
                                                     }
-                                                    echo $Item->name;
-                                                    if (!empty($Item->optionlabel)) echo "({$Item->optionlabel})"; ?>
+                                                    echo apply_filters('shopp_purchased_item_name', $itemname); ?>
                                                 </a>
                                                 <div class="row-actions">
@@ -206 +205 @@
                                                 <?php if (!empty($Item->sku)): ?><li><small><?php _e('SKU','Shopp'); ?>: <strong><?php echo $Item->sku; ?></strong></small></li><?php endif; ?>
 
-                                                <?php if (isset($Item->addons) && isset($Item->addons->meta)): ?>
-                                                    <?php foreach ((array)$Item->addons->meta as $id => $addon):
-                                                        if ( $Purchase->taxing != "inclusive" )
-                                                            $addonprice = $addon->value->unitprice+($addon->value->unitprice*$taxrate);
+                                                <?php if ( isset($Item->addons) && isset($Item->addons->meta) ): ?>
+                                                    <?php foreach ( (array)$Item->addons->meta as $id => $addon ):
+                                                        if ( "inclusive" != $Purchase->taxing )
+                                                            $addonprice = $addon->value->unitprice + ( $addon->value->unitprice * $taxrate );
                                                         else $addonprice = $addon->value->unitprice;
 
                                                         ?>
-                                                        <li><small><?php echo apply_filters('shopp_purchased_addon_name',$addon->name); ?><?php if (!empty($addon->value->sku)) echo apply_filters('shopp_purchased_addon_sku',' [SKU: '.$addon->value->sku.']'); ?>: <strong><?php echo apply_filters('shopp_purchased_addon_unitprice',money($addonprice)); ?></strong></small></li>
+                                                        <li><small><?php echo apply_filters('shopp_purchased_addon_name', $addon->name); ?><?php if ( ! empty($addon->value->sku) ) echo apply_filters('shopp_purchased_addon_sku',' [SKU: ' . $addon->value->sku . ']'); ?>: <strong><?php echo apply_filters('shopp_purchased_addon_unitprice', money($addonprice)); ?></strong></small></li>
                                                     <?php endforeach; ?>
                                                 <?php endif; ?>
-                                                <?php foreach ($Item->data as $name => $value): ?>
-                                                    <li><small><?php echo apply_filters('shopp_purchased_data_name',$name); ?>: <strong><?php echo apply_filters('shopp_purchased_data_value',$value); ?></strong></small></li>
+                                                <?php foreach ( (array)$Item->data as $name => $value ): ?>
+                                                    <li><small><?php echo apply_filters('shopp_purchased_data_name', $name); ?>: <strong><?php echo apply_filters('shopp_purchased_data_value', $value); ?></strong></small></li>
                                                 <?php endforeach; ?>
                                                 <?php endif; ?>
-                                                <?php do_action_ref_array('shopp_after_purchased_data',array(&$Item,&$Purchase)); ?>
+                                                <?php do_action_ref_array('shopp_after_purchased_data', array($Item, $Purchase)); ?>
                                                 </ul>
                                             </td>
@@ -229 +228 @@
                                         $classes[] = 'num';
                                         ?>
-                                            <td class="<?php echo esc_attr(join(' ',$classes)); ?>"><?php echo $Item->quantity; ?></td>
+                                            <td class="<?php echo esc_attr(join(' ', $classes)); ?>"><?php echo $Item->quantity; ?></td>
                                         <?php
                                         break;
@@ -236 +235 @@
                                     $classes[] = 'money';
                                         ?>
-                                            <td class="<?php echo esc_attr(join(' ',$classes)); ?>"><?php $amount = $Item->unitprice+($Purchase->taxing != 'inclusive'?$Item->unittax:0);
-                                                echo money($amount); ?></td>
+                                            <td class="<?php echo esc_attr(join(' ', $classes)); ?>"><?php echo money($Item->unitprice); ?></td>
                                         <?php
                                         break;
@@ -244 +242 @@
                                         $classes[] = 'money';
                                         ?>
-                                            <td class="<?php echo esc_attr(join(' ',$classes)); ?>"><?php $amount = $Item->total+($Purchase->taxing != 'inclusive'?$Item->unittax*$Item->quantity:0);
-                                                echo money($amount); ?></td>
+                                            <td class="<?php echo esc_attr(join(' ', $classes)); ?>"><?php echo money($Item->total); ?></td>
                                         <?php
                                         break;
@@ -251 +248 @@
                                     default:
                                         ?>
-                                            <td class="<?php echo esc_attr(join(' ',$classes)); ?>">
+                                            <td class="<?php echo esc_attr(join(' ', $classes)); ?>">
                                             <?php do_action( 'shopp_manage_order_' . sanitize_key($column) .'_column_data', $column, $Product, $Item, $Purchase ); ?>
                                             </td>
@@ -259 +256 @@
                                 $output = ob_get_contents();
                                 ob_end_clean();
-                                echo apply_filters('shopp_manage_order_'.$column.'_column',$output);
+                                echo apply_filters('shopp_manage_order_' . $column . '_column', $output);
                             }
                         }

shopp/trunk/core/ui/reports/sales.php

@@ -32 +32 @@
         $where[] = "$starts < " . self::unixtime('o.created');
         $where[] = "$ends > " . self::unixtime('o.created');
-        $where[] = "o.txnstatus IN ('authed', 'captured', 'CHARGED')";;
+        $where[] = "o.txnstatus IN ('authed', 'captured', 'CHARGED')";
 
         $where = join(" AND ",$where);

shopp/trunk/core/ui/reports/tax.php

@@ -21 +21 @@
         $where[] = "$starts < " . self::unixtime('o.created');
         $where[] = "$ends > " . self::unixtime('o.created');
+        $where[] = "o.txnstatus IN ('authed', 'captured', 'CHARGED')";
 
         $where = join(" AND ",$where);
@@ -26 +27 @@
         $orders_table = ShoppDatabaseObject::tablename('purchase');
         $purchased_table = ShoppDatabaseObject::tablename('purchased');
+
         $query = "SELECT CONCAT($id) AS id,
                             UNIX_TIMESTAMP(o.created) as period,
                             COUNT(DISTINCT o.id) AS orders,
                             SUM(o.subtotal) as subtotal,
-                            SUM(IF(p.unittax > 0,p.total,0)) AS taxable,
-                            AVG(p.unittax/p.unitprice) AS rate,
+                            ( SELECT SUM(IF(p.unittax > 0,p.total,0)) FROM $purchased_table AS p WHERE o.id = p.purchase ) AS taxable,
+                            ( SELECT AVG(p.unittax/p.unitprice) FROM $purchased_table AS p WHERE o.id = p.purchase ) AS rate,
                             SUM(o.tax) as tax
-                    FROM $purchased_table AS p
-                    JOIN $orders_table AS o ON p.purchase=o.id
+                    FROM $orders_table AS o
                     WHERE $where
                     GROUP BY CONCAT($id)";
@@ -43 +44 @@
     function columns () {
         return array(
-            'period'=>__('Period','Shopp'),
-            'orders'=>__('Orders','Shopp'),
-            'subtotal'=>__('Subtotal','Shopp'),
-            'taxable'=>__('Taxable Amount','Shopp'),
-            'rate'=>__('Tax Rate','Shopp'),
-            'tax'=>__('Total Tax','Shopp')
+            'period'   => Shopp::__('Period'),
+            'orders'   => Shopp::__('Orders'),
+            'subtotal' => Shopp::__('Subtotal'),
+            'taxable'  => Shopp::__('Taxable Amount'),
+            'rate'     => Shopp::__('Tax Rate'),
+            'tax'      => Shopp::__('Total Tax')
         );
     }
 
-    static function orders ($data) { return intval($data->orders); }
+    static function orders ( $data ) { return intval($data->orders); }
 
-    static function subtotal ($data) { return money($data->subtotal); }
+    static function subtotal ( $data ) { return money($data->subtotal); }
 
-    static function taxable ($data) { return money($data->taxable); }
+    static function taxable ( $data ) { return money($data->taxable); }
 
-    static function tax ($data) { return money($data->tax); }
+    static function tax ( $data ) { return money($data->tax); }
 
-    static function rate ($data) { return percentage($data->rate*100); }
+    static function rate ( $data ) { return percentage($data->rate * 100); }
 
 }

shopp/trunk/core/ui/settings/advanced.php

@@ -4 +4 @@
     <?php
 
-        shopp_admin_screen_tabs();;
+        shopp_admin_screen_tabs();
         do_action('shopp_admin_notices');
 

shopp/trunk/core/ui/settings/checkout.php

@@ -3 +3 @@
     <?php
 
-        shopp_admin_screen_tabs();;
+        shopp_admin_screen_tabs();
         do_action('shopp_admin_notices');
 

shopp/trunk/core/ui/settings/downloads.php

@@ -3 +3 @@
     <?php
 
-        shopp_admin_screen_tabs();;
+        shopp_admin_screen_tabs();
         do_action('shopp_admin_notices');
 

shopp/trunk/core/ui/settings/images.php

@@ -4 +4 @@
     <?php
 
-        shopp_admin_screen_tabs();;
+        shopp_admin_screen_tabs();
         do_action('shopp_admin_notices');
 

shopp/trunk/core/ui/settings/log.php

@@ -4 +4 @@
     <?php
 
-        shopp_admin_screen_tabs();;
+        shopp_admin_screen_tabs();
         do_action('shopp_admin_notices');
 

shopp/trunk/core/ui/settings/management.php

@@ -4 +4 @@
     <?php
 
-        shopp_admin_screen_tabs();;
+        shopp_admin_screen_tabs();
         do_action('shopp_admin_notices');
 

shopp/trunk/core/ui/settings/pages.php

@@ -4 +4 @@
     <?php
 
-        shopp_admin_screen_tabs();;
+        shopp_admin_screen_tabs();
         do_action('shopp_admin_notices');
 

shopp/trunk/core/ui/settings/payments.php

@@ -4 +4 @@
     <?php
 
-        shopp_admin_screen_tabs();;
+        shopp_admin_screen_tabs();
         do_action('shopp_admin_notices');
 

shopp/trunk/core/ui/settings/presentation.php

@@ -4 +4 @@
     <?php
 
-        shopp_admin_screen_tabs();;
+        shopp_admin_screen_tabs();
         do_action('shopp_admin_notices');
 

shopp/trunk/core/ui/settings/setup.php

@@ -5 +5 @@
     <?php
 
-        shopp_admin_screen_tabs();;
+        shopp_admin_screen_tabs();
         do_action('shopp_admin_notices');
 

shopp/trunk/core/ui/settings/shipping.php

@@ -4 +4 @@
     <?php
 
-        shopp_admin_screen_tabs();;
+        shopp_admin_screen_tabs();
         do_action('shopp_admin_notices');
 

shopp/trunk/core/ui/settings/shiprates.php

@@ -3 +3 @@
     <?php
 
-        shopp_admin_screen_tabs();;
+        shopp_admin_screen_tabs();
         do_action('shopp_admin_notices');
 

shopp/trunk/core/ui/settings/storage.php

@@ -4 +4 @@
     <?php
 
-        shopp_admin_screen_tabs();;
+        shopp_admin_screen_tabs();
         do_action('shopp_admin_notices');
 

shopp/trunk/core/ui/settings/taxes.php

@@ -3 +3 @@
     <?php
 
-        shopp_admin_screen_tabs();;
+        shopp_admin_screen_tabs();
         do_action('shopp_admin_notices');
 

shopp/trunk/core/ui/settings/taxrates.php

@@ -3 +3 @@
     <?php
 
-        shopp_admin_screen_tabs();;
+        shopp_admin_screen_tabs();
         do_action('shopp_admin_notices');
 

shopp/trunk/core/ui/styles/admin.css

@@ -40 +40 @@
 #products-manager .column-name img { margin-right: 3px; }
 
-.column-featured .feature { font-size: 16px; display: block; border: none; padding: 0; margin: 0 auto; }
+.column-featured .feature { font-size: 16px; display: inline-block; border: none; padding: 0; margin: 0 auto; }
 .column-featured .shoppui-star { font-family: 'shopp-icons'; color: #B1B1B1; background: -webkit-linear-gradient(top, #fff, #E8E8E8 50%, #CDCDCD 60%, #BDBDBD); -webkit-background-clip: text; -webkit-text-fill-color: transparent; position: relative; }
 .column-featured .shoppui-star:hover { font-family: 'shopp-icons'; color: #B1B1B1; background: -webkit-linear-gradient(top, #fff, #E8E8E8 50%, #CDCDCD 60%, #BDBDBD); -webkit-background-clip: text; -webkit-text-fill-color: transparent; position: relative; }
@@ -557 +557 @@
 #order .right-column { width:100%;display: inline;}
 #order #main-column { margin-left:280px; }
+#order .column-qty { text-align: center; }
 
 #order .meta-boxes .inside { line-height:1.3em; }
@@ -760 +761 @@
 tr.inline-edit-row td  { padding: 10px; border-bottom: 1px solid #e1e1e1; border-top: 1px solid #e1e1e1; }
 .inline-edit-row label { line-height: 20px; font-size: 11px; }
-
 .inline-edit-row span { display: inline-block; }
+.shopp-settings td > div { padding-bottom: 8px; }
 
 #order-contact iframe { width: 100%; }

shopp/trunk/core/ui/styles/catalog.css

@@ -18 +18 @@
 
 .shopp_page div.description,
-.shopp_page .products,
-.shopp_page .products ul,
-.shopp_page .products li.row,
-.shopp_page .category,
 .shopp_page .cart,
 .shopp_page .cart table {overflow:hidden;}
@@ -60 +56 @@
 
 /* Category Products */
-.shopp_page .products {text-indent:0;text-align:left;padding:0;margin:0;}
-.shopp_page .products li {background:none;padding:0;margin:0;list-style:none;}
+.shopp_page .products {text-indent:0;text-align:left;padding:0;margin:0;list-style:none;zoom:1;}
+.shopp_page .products:before,
+.shopp_page .products:after {content:"";display: table;}
+.shopp_page .products:after {clear:both;}
+
+.shopp_page .products .product {background:none;padding:0;margin:0;list-style:none;}
 
 .shopp_page  .frame { border: none; }
-.shopp_page .products, .shopp_page .products ul { position: relative; width: 100%; margin: 0; padding: 0; overflow: hidden; }
-.shopp_page .products li.product { float: left; position: relative; }
-.shopp_page .products li.product.first { clear: both; }
+.shopp_page .products, .shopp_page .products ul { position: relative; width: 100%; margin: 0; padding: 0; }
+.shopp_page .products > .product { float: left; position: relative; }
+.shopp_page .products > .product.first { clear: both; margin-left: 0; }
+.shopp-product ul,
+.shopp-product ol { display: inline-block; }
+.shopp-product ul.breadcrumb,
+.shopp-product ul.variations { padding-left: 0; }
 
 /* Deprecated row class support */
@@ -81 +85 @@
 .shopp_page .tagcloud li,
 .shopp.tagcloud li {display:inline;margin-right:10px;line-height:1.2;padding:0;background-image:none;}
-.shopp.tagcloud li.level-1 {font-size: 2em;}
-.shopp.tagcloud li.level-2 {font-size: 1.5em;}
-.shopp.tagcloud li.level-3 {font-size: 1.25em;}
-.shopp.tagcloud li.level-4 {font-size: 1em;}
-.shopp.tagcloud li.level-5 {font-size: 0.875em;}
-.shopp.tagcloud li.level-6 {font-size: 0.75em;}
-.shopp.tagcloud li.level-7 {font-size: 0.688em;}
+.shopp.tagcloud .level-1 {font-size: 2em;}
+.shopp.tagcloud .level-2 {font-size: 1.5em;}
+.shopp.tagcloud .level-3 {font-size: 1.25em;}
+.shopp.tagcloud .level-4 {font-size: 1em;}
+.shopp.tagcloud .level-5 {font-size: 0.875em;}
+.shopp.tagcloud .level-6 {font-size: 0.75em;}
+.shopp.tagcloud .level-7 {font-size: 0.688em;}
 
 

shopp/trunk/gateways/2Checkout/2Checkout.php

@@ -4 +4 @@
  *
  * @author Jonathan Davis
- * @copyright Ingenesis Limited, 27 May, 2009
+ * @copyright Ingenesis Limited, May 2009-2014
  * @package shopp
- * @version 1.3
+ * @version 1.3.4
  * @since 1.1
  **/
@@ -17 +17 @@
     public $secure = false;
     public $saleonly = true;
-    public $precision = 2;
-    public $decimals = '.';
-    public $thousands = '';
 
     // URLs
-    public $url = 'https://www.2checkout.com/checkout/purchase';    // Multi-page checkout
-    public $surl = 'https://www.2checkout.com/checkout/spurchase'; // Single-page, CC-only checkout
+    const LIVEURL = 'https://www.2checkout.com/checkout/purchase';
+    const SANDBOX = 'https://sandbox.2checkout.com/checkout/purchase';
 
     public function __construct () {
         parent::__construct();
 
-        $this->setup('sid','verify','secret','returnurl','testmode','singlepage');
-
-        $this->settings['returnurl'] = add_query_arg('rmtpay','process',Shopp::url(false,'thanks',false));
-
-        // add_action('shopp_txn_update',array(&$this,'notifications'));
-        add_action('shopp__2checkout_sale', array($this,'sale'));
-
-    }
-
-    public function actions () {
-        add_action('shopp_process_checkout', array(&$this,'checkout'),9);
-        add_action('shopp_init_checkout',array(&$this,'init'));
-
-        add_action('shopp_init_confirmation',array(&$this,'confirmation'));
-        add_action('shopp_remote_payment',array(&$this,'returned'));
-    }
-
-    public function confirmation () {
-        add_filter('shopp_confirm_url',array(&$this,'url'));
-        add_filter('shopp_confirm_form',array(&$this,'form'));
-    }
-
-    public function checkout () {
-        $this->Order->confirm = true;
-    }
-
-    public function url ($url) {
-        if ($this->settings['singlepage'] == "on") return $this->surl;
-        return $this->url;
-    }
-
-    public function form ($form) {
+        $this->setup('sid', 'verify', 'secret', 'testmode');
+
+        add_filter('shopp_purchase_order_2checkout_processing', array($this, 'processing'));
+        add_action('shopp_remote_payment', array($this, 'returned'));
+
+    }
+
+    public function actions () { /* Not implemented */ }
+
+    public function processing () {
+        return array($this, 'submit');
+    }
+
+    public function form ( ShoppPurchase $Purchase ) {
 
         $purchasetable = ShoppDatabaseObject::tablename(ShoppPurchase::$table);
-        $next = sDB::query("SELECT IF ((MAX(id)) > 0,(MAX(id)+1),1) AS id FROM $purchasetable LIMIT 1");
 
         $Order = $this->Order;
@@ -68 +46 @@
         $Billing = $Order->Billing;
         $Shipping = $Order->Shipping;
-        $Order->_2COcart_order_id = date('mdy').'-'.date('His').'-'.$next->id;
 
         // Build the transaction
@@ -74 +51 @@
 
         // Required
-        $_['sid']               = $this->settings['sid'];
-        $_['total']             = $this->amount('total');
-        $_['cart_order_id']     = $Order->_2COcart_order_id;
-        $_['vendor_order_id']   = $this->session;
-        $_['id_type']           = 1;
+        $_['sid']               = $this->settings['sid'];
+        $_['mode']              = '2CO';
+        $_['total']             = $this->amount('total');
+        $_['merchant_order_id'] = $Purchase->id;
+        $_['id_type']           = 1;
 
         // Extras
-        if ($this->settings['testmode'] == "on")
-            $_['demo']          = "Y";
-
-        $_['fixed']             = "Y";
-        $_['skip_landing']      = "1";
-
-        $_['x_Receipt_Link_URL'] = $this->settings['returnurl'];
+        if ( Shopp::str_true($this->settings['testmode']) )
+            $_['demo']          = "Y";
+
+        $_['fixed']             = "Y";
+        $_['skip_landing']      = "1";
+        $_['currency_code']     = $this->currency();
+
+        $_['x_receipt_link_url'] = $this->settings['returnurl'];
 
         // Line Items
-        foreach($this->Order->Cart->contents as $i => $Item) {
-            $id = $i+1;
-            $_['c_prod_'.$id]           = 'shopp_pid-'.$Item->product.','.$Item->quantity;
-            $_['c_name_'.$id]           = $Item->name;
-            $_['c_description_'.$id]    = !empty($Item->option->label)?$Item->option->label:'';
-            $_['c_price_'.$id]          = $this->amount($Item->unitprice);
-
-        }
+        $i = 0;
+        foreach ( $Order->Cart as $id => $Item ) {
+            $_['li_' . $i . '_product_id'] = 'shopp_pid-'.$Item->product.','.$Item->quantity;
+            $_['li_' . $i . '_type']       = 'product';
+            $_['li_' . $i . '_name']       = $this->itemname($Item);
+            $_['li_' . $i . '_quantity']   = $Item->quantity;
+            $_['li_' . $i . '_price']      = $this->amount($Item->unitprice);
+            $_['li_' . $i . '_tangible']   = $Item->shipped ? 'Y' : 'N';
+            $i++;
+        }
+
+        // Shipping
+        $_['li_' . $i . '_type']     = 'shipping';
+        $_['li_' . $i . '_name']     = Shopp::__('Shipping');
+        $_['li_' . $i . '_quantity'] = 1;
+        $_['li_' . $i . '_price']    = $this->amount('shipping');
+        $_['li_' . $i . '_tangible'] = 'N';
+
+        $i++;
+
+        // Taxes
+        $_['li_' . $i . '_type']     = 'tax';
+        $_['li_' . $i . '_name']     = Shopp::__('Taxes');
+        $_['li_' . $i . '_quantity'] = 1;
+        $_['li_' . $i . '_price']    = $this->amount('tax');
+        $_['li_' . $i . '_tangible'] = 'N';
+
 
         $_['card_holder_name']      = $Billing->name;
@@ -117 +114 @@
         $_['ship_country']          = $Shipping->country;
 
-        return $form.$this->format($_);
-    }
+        return $this->format($_);
+    }
+
+    /**
+     * Builds a form to send the order to PayPal for processing
+     *
+     * @author Jonathan Davis
+     * @since 1.3
+     *
+     * @return string PayPal cart form
+     **/
+    public function submit ( ShoppPurchase $Purchase ) {
+        $id = sanitize_key( $this->module );
+        $title = Shopp::__( 'Sending order to 2Checkout…' );
+        $message = '<form id="' . $id . '" action="' . self::LIVEURL . '" method="POST">' .
+                    $this->form( $Purchase ) .
+                    '<h1>' . $title . '</h1>' .
+                    '<noscript>' .
+                    '<p>' . Shopp::__( 'Click the &quot;Submit Order to 2Checkout&quot; button below to submit your order to 2Checkout for payment processing:' ) . '</p>' .
+                    '<p><input type="submit" name="submit" value="' . Shopp::__('Submit Order to 2Checkout'). '" id="' . $id . '" /></p>' .
+                    '</noscript>' .
+                    '</form>' .
+                    '<script type="text/javascript">document.getElementById("' . $id . '").submit();</script></body></html>';
+
+        wp_die( $message, $title, array( 'response' => 200 ) );
+    }
+
 
     public function returned () {
 
-        if (Shopp::str_true($this->settings['verify']) && !$this->verify($_POST['key'])) {
-            new ShoppError(__('The order submitted to 2Checkout could not be verified.','Shopp'),'2co_validation_error',SHOPP_TRXN_ERR);
-            Shopp::redirect( Shopp::url( false, 'checkout' ) );
-
-        }
-
-        if (empty($_POST['order_number'])) {
-            new ShoppError(__('The order submitted by 2Checkout did not specify a transaction ID.','Shopp'),'2co_validation_error',SHOPP_TRXN_ERR);
-            Shopp::redirect( Shopp::url( false, 'checkout' ) );
-        }
-
-        // Create the order and begin processing it
-        shopp_add_order_event(false, 'purchase', array(
-            'gateway' => $this->module,
-            'txnid' => $_POST['order_number']
+        if ( $this->id() != $_GET['rmtpay'] ) return; // Not our offsite payment
+
+        $request = array_merge(array(
+            'merchant_order_id' => false,
+            'key' => false,
+            'order_number' => false,
+            'total' => false,
+            'credit_card_processed' => false,
+            'invoice_id' => false,
+            'pay_method' => false
+        ), $_GET);
+        extract($request, EXTR_SKIP);
+
+        if ( Shopp::str_true($this->settings['verify']) && ! $this->verify($key) ) {
+            shopp_add_error(Shopp::__('The order submitted to 2Checkout could not be verified.'), SHOPP_TRXN_ERR);
+            Shopp::redirect(Shopp::url(false, 'checkout'));
+        }
+
+        if ( empty($merchant_order_id) ) {
+            shopp_add_error(Shopp::__('The order submitted by 2Checkout did not specify a transaction ID.'), SHOPP_TRXN_ERR);
+            Shopp::redirect(Shopp::url(false, 'checkout'));
+        }
+
+        $Purchase = ShoppPurchase(new ShoppPurchase((int)$merchant_order_id));
+        if ( ! $Purchase->exists() ) {
+            shopp_add_error(Shopp::__('The order submitted by 2Checkout did not match any submitted orders.'), SHOPP_TRXN_ERR);
+            Shopp::redirect(Shopp::url(false, 'checkout'));
+        }
+
+        if ( 'Y' != $credit_card_processed ) {
+            shopp_add_order_event($Purchase->id, 'auth-fail', array(
+                'amount' => $total, // Amount to be authorized
+                'error' => 'Declined', // Error code (if provided)
+                'message' => Shopp::__('The payment was not completed succesfully'), // Error message reported by the gateway
+                'gateway' => $this->module, // The gateway module name
+            ));
+            shopp_add_error(Shopp::__('The order submitted by 2Checkout did not match any submitted orders.'), SHOPP_TRXN_ERR);
+            Shopp::redirect(Shopp::url(false, 'checkout'));
+        }
+
+        add_action( 'shopp_authed_order_event', array( ShoppOrder(), 'notify' ) );
+        add_action( 'shopp_authed_order_event', array( ShoppOrder(), 'accounts' ) );
+        add_action( 'shopp_authed_order_event', array( ShoppOrder(), 'success' ) );
+
+        shopp_add_order_event($Purchase->id, 'authed', array(
+            'txnid' => $order_number,   // Transaction ID
+            'amount' => (float)$total,  // Gross amount authorized
+            'fees' => false,            // Fees associated with transaction
+            'gateway' => $this->module, // The gateway module name
+            'paymethod' => '2Checkout', // Payment method (payment method label from payment settings)
+            'paytype' => $pay_method,   // Type of payment (check, MasterCard, etc)
+            'payid' => $invoice_id,     // Payment ID (last 4 of card or check number or other payment id)
+            'capture' => true           // Capture flag
         ));
 
@@ -144 +204 @@
     }
 
-    public function sale ($Event) {
+    public function authed ( ShoppPurchase $Order ) {
 
         $Paymethod = $this->Order->paymethod();
         $Billing = $this->Order->Billing;
 
-        shopp_add_order_event($Event->order, 'authed', array(
+        shopp_add_order_event($Order->id, 'authed', array(
             'txnid' => $_POST['order_number'],                      // Transaction ID
             'amount' => $_POST['total'],                            // Gross amount authorized
@@ -161 +221 @@
     }
 
-    public function notification () {
-        // INS updates not implemented
-    }
-
-    public function verify ($key) {
+    protected function verify ( $key ) {
         if ( Shopp::str_true($this->settings['testmode']) ) return true;
-        $order = $_POST['order_number'];
+        $order = $_GET['order_number'];
+        $total = $_GET['total'];
 
         $verification = strtoupper(md5($this->settings['secret'] .
                             $this->settings['sid'] .
                             $order .
-                            $this->amount('total')
+                            $total
                         ));
 
         return ( $verification == $key );
+    }
+
+    protected function returnurl () {
+        return add_query_arg('rmtpay', $this->id(), Shopp::url(false, 'thanks'));
+    }
+
+    protected function itemname ( $Item ) {
+        $name = $Item->name . ( empty($Item->option->label) ? '' : ' ' . $Item->option->label );
+        $name = str_replace(array('<', '>'), '', $name);
+        return substr($name, 0, 128);
     }
 
@@ -187 +254 @@
         ));
 
-        $this->ui->text(0,array(
-            'name' => 'returnurl',
-            'size' => 40,
-            'value' => $this->settings['returnurl'],
-            'readonly' => 'readonly',
-            'classes' => 'selectall',
-            'label' => __('Copy as the <strong>Approved URL</strong> & <strong>Pending URL</strong> in your 2Checkout Vendor Area under the <strong>Account &rarr; Site Management</strong> settings page.','Shopp')
-        ));
-
-        $this->ui->checkbox(1,array(
-            'name' => 'testmode',
-            'checked' => $this->settings['testmode'],
-            'label' => __('Enable test mode','Shopp')
-        ));
-
-        $this->ui->checkbox(1,array(
-            'name' => 'singlepage',
-            'checked' => $this->settings['singlepage'],
-            'label' => __('Single-page, credit card only checkout','Shopp')
-        ));
-
-        $this->ui->checkbox(1,array(
+
+        $this->ui->checkbox(0,array(
             'name' => 'verify',
             'checked' => $this->settings['verify'],
@@ -214 +261 @@
         ));
 
-        $this->ui->text(1,array(
+        $this->ui->text(0,array(
             'name' => 'secret',
             'size' => 10,
@@ -221 +268 @@
         ));
 
-        $this->ui->p(1,array(
+        $this->ui->checkbox(0,array(
+            'name' => 'testmode',
+            'checked' => $this->settings['testmode'],
+            'label' => __('Enable test mode','Shopp')
+        ));
+
+        $this->ui->text(1, array(
             'name' => 'returnurl',
-            'size' => 40,
-            'value' => $this->settings['returnurl'],
+            'size' => 64,
+            'value' => $this->returnurl(),
             'readonly' => 'readonly',
-            'classes' => 'selectall',
-            'content' => '<span style="width: 300px;">&nbsp;</span>'
-        ));
-
-        $this->ui->behaviors( $this->secretjs() );
-    }
-
-    public function secretjs () {
-        ob_start(); ?>
-jQuery(document).bind('_2checkoutSettings',function () {
-    var $=jqnc(),p='#_2checkout-',v=$(p+'verify'),s=$(p+'secret');
-    v.change(function () { v.attr('checked') ? s.parent().fadeIn('fast') : s.parent().hide(); }).change();
-});
-<?php
-        $script = ob_get_contents(); ob_end_clean();
-        return $script;
+            'class' => 'selectall',
+            'label' => __('Copy as the <strong>Approved URL</strong> & <strong>Pending URL</strong> in your 2Checkout Vendor Area under the <strong>Account &rarr; Site Management</strong> settings page.','Shopp')
+        ));
+
+        $script = "var tc ='shopp2checkout';jQuery(document).bind(tc+'Settings',function(){var $=jqnc(),p='#'+tc+'-',v=$(p+'verify'),t=$(p+'secret');v.change(function(){v.prop('checked')?t.parent().fadeIn('fast'):t.parent().hide();}).change();});";
+        $this->ui->behaviors( $script );
     }
 

shopp/trunk/gateways/PayPal/PayPalStandard.php

@@ -464 +464 @@
             $_['item_name'] = $Subscription->name . ( ( ! empty( $Subscription->option->label ) ) ? ' (' . $Subscription->option->label . ')' : '' );
 
+            $trial_discounts = apply_filters('shopp_paypalstandard_discount_trials', false);
+
             // Trial pricing
             if ( $Subscription->has_trial() ) {
                 $trial = $Subscription->trial();
                 $trial['period'] = strtoupper($trial['period']);
+                $trialprice = $this->amount( $trial['price'] );
+
+                if ( $this->amount('discount') > 0 && $trial_discounts )
+                    $trialprice -= $this->amount('discount');
 
                 // normalize trial interval
@@ -475 +481 @@
                 $_['p1']    = $trial['interval'];
                 $_['t1']    = $trial['period'];
+            } elseif ( $this->amount('discount') > 0 && $trial_discounts ) {
+                // When no trial discounts are created, add a discount to a trial offer using
+                // the interval and period of the normal subscription, but at a discounted price
+                $_['a1']    = $this->amount( $Subscription->subprice ) - $this->amount('discount');
+                $_['p1']    = $recurring['interval'];
+                $_['t1']    = $recurring['period'];
             }
-            $_['a3']    = $this->amount( $Subscription->subprice );
+
+            $subprice = $this->amount( $Subscription->subprice );
+
+            if ( $this->amount('discount') > 0 && ! $trial_discounts )
+                $subprice -= $this->amount('discount');
+            $_['a3']    = $subprice;
             $_['p3']    = $recurring['interval'];
             $_['t3']    = $recurring['period'];
@@ -852 +869 @@
     }
 
-    public static function currencies ( string $currency ) {
+    public static function currencies ( $currency ) {
 
         if ( in_array($currency, self::$currencies) )

shopp/trunk/readme.md

@@ -16 +16 @@
 - [Knowledge Base](https://shopplugin.com/kb/) - Troubleshooting articles for the most common problems and error messages
 - [Support Help Desk](https://shopplugin.com/support/forum/help-desk) - Open a ticket with the Shopp support team
-- [WorkShopp](http:///workshopp.com/) - Tutorials and screencasts for Shopp
+- [WorkShopp](http://workshopp.com/) - Tutorials and screencasts for Shopp
 - [API Reference](https://shopplugin.com/api/) - Online developer's reference guide
 - [Professionals](https://shopplugin.com/professionals/) - Shopp developers available for consulting work

shopp/trunk/services/image.php

@@ -197 +197 @@
         // Post sharpen
         if ( ! $alpha && $this->sharpen > 0 )
-            $Resized->UnsharpMask($this->sharpen);
+            $Resized->sharpen($this->sharpen);
 
         $ResizedImage = new ImageAsset();

shopp/trunk/shipping/core/ItemQuantity.php

@@ -39 +39 @@
 
             $amount = 0;
+            $matched = false;
             $tiers = array_reverse($tiers);
+            
             foreach ( $tiers as $tier ) {
                 extract($tier);
                 $amount = Shopp::floatval($rate);           // Capture the rate amount
-                if ( (int)$this->items >= (int)$threshold ) break;
+                
+                if ( (int)$this->items >= (int)$threshold ) {
+                    $matched = true;
+                    break;  
+                }
             }
+            
+            if ( ! $matched ) return $options;
 
             $rate = array(

shopp/trunk/shipping/core/OrderAmount.php

@@ -36 +36 @@
 
             $amount = 0;
+            $matched = false;
             $tiers = array_reverse($tiers);
+            
             foreach ( $tiers as $tier ) {
                 extract($tier);
                 $amount = Shopp::floatval($rate);           // Capture the rate amount
-                if ( $Order->Cart->total('order') >= Shopp::floatval($threshold) ) break;
+                
+                if ( $Order->Cart->total('order') >= Shopp::floatval($threshold) ) {
+                    $matched = true;
+                    break;
+                }
             }
+            
+            if ( ! $matched ) return $options;
 
             $rate = array(

shopp/trunk/shipping/core/OrderWeight.php

@@ -39 +39 @@
 
             $amount = 0;
+            $matched = false;
             $tiers = array_reverse($tiers);
+            
             foreach ( $tiers as $tier ) {
                 extract($tier);
                 $amount = Shopp::floatval($rate);           // Capture the rate amount
-                if ( $this->weight >= $threshold ) break;
+                
+                if ( $this->weight >= $threshold ) {
+                    $matched = true;
+                    break;  
+                } 
             }
+            
+            if ( ! $matched ) return $options;
 
             $rate = array(

shopp/trunk/shipping/core/PercentageAmount.php

@@ -32 +32 @@
 
             $amount = 0;
+            $matched = false;
             $tiers = array_reverse($tiers);
+            
             foreach ( $tiers as $tier ) {
                 extract($tier);
                 $amount = (Shopp::floatval($rate) / 100) * $Order->Cart->total('order');
-                if ( $Order->Cart->total('order') >= Shopp::floatval($threshold) ) break;
+                
+                if ( $Order->Cart->total('order') >= Shopp::floatval($threshold) ) {
+                    $matched = true;
+                    break;
+                } 
             }
+            
+            if ( ! $matched ) return $options;
 
             $rate = array(