Changeset 1122729

Timestamp:

03/28/2015 02:47:50 PM (11 years ago)

Author:

jond

Message:

Added 1.3.9 release

Location:

shopp/trunk

Files:

• Shopp.php (modified) (1 diff)
• api/product.php (modified) (1 diff)
• api/theme/cart.php (modified) (1 diff)
• api/theme/cartitem.php (modified) (2 diffs)
• api/theme/customer.php (modified) (2 diffs)
• api/theme/product.php (modified) (5 diffs)
• api/theme/purchase.php (modified) (7 diffs)
• api/theme/storefront.php (modified) (1 diff)
• core/flow/Categorize.php (modified) (1 diff)
• core/flow/Checkout.php (modified) (15 diffs)
• core/flow/Dashboard.php (modified) (2 diffs)
• core/flow/Order.php (modified) (3 diffs)
• core/flow/Pages.php (modified) (3 diffs)
• core/flow/Scripts.php (modified) (1 diff)
• core/flow/Service.php (modified) (3 diffs)
• core/flow/Warehouse.php (modified) (6 diffs)
• core/library/Core.php (modified) (1 diff)
• core/library/Error.php (modified) (3 diffs)
• core/library/Modules.php (modified) (1 diff)
• core/library/Session.php (modified) (1 diff)
• core/library/Version.php (modified) (2 diffs)
• core/model/Cart.php (modified) (1 diff)
• core/model/Collection.php (modified) (3 diffs)
• core/model/Customer.php (modified) (2 diffs)
• core/model/Discounts.php (modified) (4 diffs)
• core/model/Gateway.php (modified) (1 diff)
• core/model/Item.php (modified) (3 diffs)
• core/model/Product.php (modified) (1 diff)
• core/model/Promotion.php (modified) (4 diffs)
• core/model/Purchase.php (modified) (3 diffs)
• core/model/Shiprates.php (modified) (2 diffs)
• core/ui/behaviors/address.js (modified) (1 diff)
• core/ui/behaviors/address.min.js (modified) (1 diff)
• core/ui/behaviors/cart.js (modified) (1 diff)
• core/ui/behaviors/cart.min.js (modified) (1 diff)
• core/ui/behaviors/editors.js (modified) (2 diffs)
• core/ui/behaviors/editors.min.js (modified) (1 diff)
• core/ui/behaviors/swfupload.swf (added)
• core/ui/orders/order.php (modified) (1 diff)
• core/ui/orders/orders.php (modified) (1 diff)
• core/ui/reports/discounts.php (modified) (2 diffs)
• core/ui/settings/downloads.php (modified) (1 diff)
• core/ui/settings/management.php (modified) (1 diff)
• readme.txt (modified) (1 diff)
• storage/core/FSStorage.php (modified) (3 diffs)
• templates/login.php (modified) (1 diff)
• templates/receipt.php (modified) (1 diff)

shopp/trunk/Shopp.php

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

shopp/trunk/api/product.php

@@ -61 +61 @@
     // Set Product slug
     if ( ! empty($data['slug'])) $Product->slug = $data['slug'];
-    if (empty($Product->slug)) $Product->slug = sanitize_title_with_dashes($Product->name);
+    if (empty($Product->slug)) $Product->slug = sanitize_title($Product->name);
     $Product->slug = wp_unique_post_slug($Product->slug, $Product->id, $Product->status, ShoppProduct::posttype(), 0);
 

shopp/trunk/api/theme/cart.php

@@ -304 +304 @@
         switch ( $Discount->type() ) {
             case ShoppOrderDiscount::SHIP_FREE:     $string .= Shopp::esc_html__( 'Free Shipping!' ); break;
-            case ShoppOrderDiscount::PERCENT_OFF:   $string .= sprintf(esc_html($label), percentage($Discount->discount(), array('precision' => 0))); break;
+            case ShoppOrderDiscount::PERCENT_OFF:   $string .= sprintf(esc_html($label), percentage((float)$Discount->discount(), array('precision' => 0))); break;
             case ShoppOrderDiscount::AMOUNT_OFF:    $string .= sprintf(esc_html($label), money($Discount->discount())); break;
             case ShoppOrderDiscount::CREDIT:        $string .= sprintf(esc_html($creditlabel), money($Discount->amount())); break;

shopp/trunk/api/theme/cartitem.php

@@ -747 +747 @@
 
     /**
-     * Helper function that maps the current cart item's addons to the cart item's configured product menu options
-     *
-     * @internal
-     * @since 1.3
-     *
-     * @return array A combined list of the menu labels list and addons menu map
-     **/
-    private static function _addon_menus () {
-        $menus = shopp_meta(shopp('cartitem.get-product'), 'product', 'options');
-        $addonmenus = array();
-        $menulabels = array();
-        if ( isset($menus['a']) ) {
-            foreach ( $menus['a'] as $addonmenu ) {
-                $menulabels[ $addonmenu['id'] ] = $addonmenu['name'];
-                foreach ( $addonmenu['options'] as $menuoption )
-                    $addonmenus[ $menuoption['id'] ] = $addonmenu['id'];
-            }
-        }
-        return array($menulabels, $addonmenus);
-    }
-
-    /**
      * Checks if the cart item has any custom product input data assigned to it
      *
@@ -1041 +1019 @@
     }
 
+    /**
+     * Helper function that maps the current cart item's addons to the cart item's configured product menu options
+     *
+     * @internal
+     * @since 1.3
+     *
+     * @param int $id The product ID to retrieve addon menus from
+     * @return array A combined list of the menu labels list and addons menu map
+     **/
+    private static function _addon_menus () {
+        return ShoppProductThemeAPI::_addon_menus(shopp('cartitem.get-product'));
+    }
+
 }

shopp/trunk/api/theme/customer.php

@@ -1389 +1389 @@
         if ( ! isset($options['label']) ) $options['label'] = Shopp::__('Save');
         $result = '<input type="hidden" name="customer" value="true" />';
+        $result .= wp_nonce_field('shopp_profile_update', '_wpnonce', true, false);
         $result .= '<input type="submit" name="save" id="save-button"' . inputattrs($options) . ' />';
         return $result;
@@ -1612 +1613 @@
      * - **tabindex**: Specifies the tabbing order of an element
      * - **title**: Specifies extra information about an element
-     * - **label**: Specifies the value of the button element
+     * - **label**: Specifies the value of the button element. Defaults to `Login`
+     * - **redirect**: Specifies the URL the customer is redirected to after login. Defaults to `$_REQUEST['redirect']`.
      * @param ShoppCustomer $O       The working object
      * @return string The button markup
      **/
     public static function submit_login ( $result, $options, $O ) {
-        if ( ! isset($options['label']) ) $options['label'] = Shopp::__('Login');
+        $request = $_GET;
+        $defaults = array(
+            'label' => Shopp::__('Login'),
+            'redirect' => isset($_REQUEST['redirect']) ?
+                $_REQUEST['redirect'] : Shopp::url($request, 'account', ShoppOrder()->security())
+        );
+        $options = array_merge($defaults, $options);
+        extract($options, EXTR_SKIP);
+
         $string = '';
         $id = 'submit-login';
-
-        $request = $_GET;
-        if ( isset($request['acct']) && 'logout' == $request['acct'] ) unset($request['acct']);
-
         $context = ShoppStorefront::intemplate();
+
+        if ( isset($request['acct']) && 'logout' == $request['acct'] )
+            unset($request['acct']);
+
         if ( 'checkout.php' == $context ) {
-            $id .= '-checkout';
-            $string .= '<input type="hidden" name="redirect" value="checkout" />';
-        } else $string .= '<input type="hidden" name="redirect" value="' . esc_attr(Shopp::url($request, 'account', ShoppOrder()->security())) . '" />';
-        $string .= '<input type="submit" name="submit-login" id="' . $id . '"' . inputattrs($options) . ' />';
-        return $string;
+            $redirect = 'checkout';
+            $id .= '-' . $redirect;
+        }
+
+        return '<input type="hidden" name="redirect" value="' . esc_attr($redirect) . '" />'
+             . '<input type="submit" name="submit-login" id="' . $id . '"' . inputattrs($options) . ' />';
+
     }
 

shopp/trunk/api/theme/product.php

@@ -2128 +2128 @@
 
         $taxes = isset($taxes) ? Shopp::str_true($taxes) : null;
+        $taxrates = self::_taxes($O, 'price');
         $collection_class = ShoppCollection() && isset(ShoppCollection()->slug) ? 'category-' . ShoppCollection()->slug : '';
 
@@ -2141 +2142 @@
 
                 $currently = Shopp::str_true($pricing->sale) ? $pricing->promoprice : $pricing->price;
-                $disable = ( $pricetag->type == 'N/A' || ( Shopp::str_true($pricing->inventory) && $pricing->stock == 0 ) );
-
+                $disable = ( $pricing->type == 'N/A' || ( Shopp::str_true($pricing->inventory) && $pricing->stock == 0 ) );
                 $currently = self::_taxed((float)$currently, $O, $pricing->tax, $taxes);
 
@@ -2157 +2157 @@
                 $_->d = $discount > 0 ? $discount : false;
 
-                if ( $disable && 'show' == $disabled )
+                if ( ! $disable || 'show' == $disabled )
                     $string .= '<option value="' . $pricing->id . '"' . ( $disable ? ' disabled="disabled"' : '' ) . '>' . esc_html(self::_variant_formatlabel($format, $_)) . '</option>' . "\n";
             }
@@ -2174 +2174 @@
             $pricekeys = array();
             foreach ($O->pricekey as $key => $pricing) {
+
+                $currently = Shopp::str_true($pricing->sale) ? $pricing->promoprice : $pricing->price;
+                $disable = ( $pricing->type == 'N/A' || ( Shopp::str_true($pricing->inventory) && $pricing->stock == 0 ) );
+                $currently = self::_taxed((float)$currently, $O, $pricing->tax, $taxes);
+
                 $discount = 100-round($pricing->promoprice * 100 / $pricing->price);
                 $_ = new StdClass();
-                $_->p = 'Donation' != $pricing->type ? (float)apply_filters('shopp_product_variant_price', (Shopp::str_true($pricing->sale) ? $pricing->promoprice : $pricing->price) ) : false;
+                $_->p = 'Donation' != $pricing->type && ! $disable ? (float)apply_filters('shopp_product_variant_price', (Shopp::str_true($pricing->sale) ? $pricing->promoprice : $currently) ) : false;
                 $_->i = Shopp::str_true($pricing->inventory);
                 $_->s = $_->i ? (int)$pricing->stock : false;
@@ -2383 +2388 @@
     }
 
+    /**
+     * Helper function that maps the current cart item's addons to the cart item's configured product menu options
+     *
+     * @internal
+     * @since 1.3
+     *
+     * @return array A combined list of the menu labels list and addons menu map
+     **/
+    public static function _addon_menus ( $productid ) {
+        $menus = shopp_meta($productid, 'product', 'options');
+        $addonmenus = array();
+        $menulabels = array();
+        if ( isset($menus['a']) ) {
+            foreach ( $menus['a'] as $addonmenu ) {
+                $menulabels[ $addonmenu['id'] ] = $addonmenu['name'];
+                foreach ( $addonmenu['options'] as $menuoption )
+                    $addonmenus[ $menuoption['id'] ] = $addonmenu['id'];
+            }
+        }
+        return array($menulabels, $addonmenus);
+    }
+
+
 }

shopp/trunk/api/theme/purchase.php

@@ -228 +228 @@
      **/
     public static function card ( $result, $options, $O ) {
-        return ( ! empty($O->card) ) ? sprintf("%'X16d", $O->card) : '';
+        return ( ! empty($O->card) ) ? sprintf("%'X16s", $O->card) : '';
     }
 
@@ -677 +677 @@
     public static function item_addon ( $result, $options, $O ) {
         $item = current($O->purchased);
-        $addon = current($item->addons->meta);
+        $addon = current($item->addons->meta)->value;
         if ( false === $item || false === $addon ) return '';
 
-        if ( isset($options['id']) ) return esc_html($addon->id);
-        if ( isset($options['name']) ) return esc_html($addon->name);
-        if ( isset($options['label']) ) return esc_html($addon->name);
-        if ( isset($options['type']) ) return esc_html($addon->value->type);
-        if ( isset($options['onsale']) ) return $addon->value->sale;
-        if ( isset($options['inventory']) ) return $addon->value->inventory;
-        if ( isset($options['sku']) ) return esc_html($addon->value->sku);
-        if ( isset($options['unitprice']) ) return (float) $addon->value->unitprice;
-
-        if ( isset($options['download']) ) {
-            $link = false;
-            if ( isset($addon->value->download) && isset($addon->value->dkey) ) {
-                $label = __('Download', 'Shopp');
-                if ( isset($options['linktext']) && $options['linktext'] != '' ) $label = $options['linktext'];
-
-                $dkey = $addon->value->dkey;
-                $request = '' == get_option('permalink_structure') ? "download/$dkey" : array('shopp_download' => $dkey);
-                $url = Shopp::url($request, 'catalog');
-
-                $link = '<a href="' . $url . '">' . $label . '</a>';
-                return esc_html($link);
+        $defaults = array(
+            'separator' => ' '
+        );
+        $options = array_merge($defaults, $options);
+
+        $fields = array('id', 'type', 'menu', 'label', 'sale', 'saleprice', 'price', 'inventory', 'stock', 'sku', 'weight', 'shipfee', 'unitprice');
+
+        $fieldset = array_intersect($fields, array_keys($options));
+        if ( empty($fieldset) ) $fieldset = array('label');
+
+        $_ = array();
+        foreach ( $fieldset as $field ) {
+            switch ( $field ) {
+                case 'menu':
+                    list($menus, $menumap) = self::_addon_menus();
+                    $_[] = isset( $menumap[ $addon->options ]) ? $menus[ $menumap[ $addon->options ] ] : '';
+                    break;
+                case 'weight': $_[] = $addon->dimensions['weight'];
+                case 'saleprice':
+                case 'price':
+                case 'shipfee':
+                case 'unitprice':
+                    if ( $field === 'saleprice' ) $field = 'promoprice';
+                    if ( isset($addon->$field) ) {
+                        $_[] = ( isset($options['currency']) && Shopp::str_true($options['currency']) ) ?
+                             money($addon->$field) : $addon->$field;
+                    }
+                    break;
+                case 'download':
+                    $link = false;
+                    if ( isset($addon->download) && isset($addon->dkey) ) {
+                        $label = __('Download', 'Shopp');
+                        if ( isset($options['linktext']) && $options['linktext'] != '' ) $label = $options['linktext'];
+
+                        $dkey = $addon->dkey;
+                        $request = '' == get_option('permalink_structure') ? "download/$dkey" : array('shopp_download' => $dkey);
+                        $url = Shopp::url($request, 'catalog');
+
+                        $link = '<a href="' . $url . '">' . $label . '</a>';
+                        return esc_html($link);
+                    }
+                    break;
+                default:
+                    if ( isset($addon->$field) )
+                        $_[] = $addon->$field;
             }
-            return '';
+
         }
 
-        return (float) $addon->value->unitprice;
+        return join($options['separator'], $_);
     }
 
@@ -729 +753 @@
         if ( empty($item->addons) || ( is_string($item->addons) && ! Shopp::str_true($item->addons) ) ) return false;
         $defaults = array(
-            'prices' => 'on',
+            'after' => '',
+            'before' => '',
+            'class' => '',
             'download' => Shopp::__('Download'),
-            'before' => '',
-            'after' => '',
-            'class' => '',
-            'excludes' => ''
+            'excludes' => '',
+            'prices' => true,
+            'separator' => ': '
         );
         $options = array_merge($defaults, $options);
@@ -746 +771 @@
 
         $result = $before.'<ul' . $class . '>';
+        list($menus, $menumap) = self::_addon_menus();
+
+        if ( false !== strpos($excludes, ',') )
+            $excludes = explode(',', $excludes);
+
         foreach ( $item->addons->meta as $id => $addon ) {
-            if ( in_array($addon->name, $excludes) ) continue;
+            if ( in_array($addon->name, (array)$excludes) ) continue;
             if ( 'inclusive' == $O->taxing )
                 $price = $addon->value->unitprice + ( $addon->value->unitprice * $taxrate );
@@ -760 +790 @@
             }
 
+            $menu = isset( $menumap[ $addon->value->options ]) ? $menus[ $menumap[ $addon->value->options ] ] : '';
+
             $pricing = Shopp::str_true($prices) ? " (" . money($price) . ")" : '';
-            $result .= '<li>' . esc_html($addon->name . $pricing) . $link . '</li>';
+            $result .= '<li>' . esc_html($menu . $separator . $addon->name . $pricing) . $link . '</li>';
         }
         $result .= '</ul>' . $after;
@@ -835 +867 @@
     public static function item_has_addons ( $result, $options, $O ) {
         $item = current($O->purchased);
-        reset($item->addons);
-        return ( count($item->addons) > 0 );
+        reset($item->addons->meta);
+        return ( count($item->addons->meta) > 0 );
     }
 
@@ -1626 +1658 @@
     }
 
+    /**
+     * Helper function that maps the current cart item's addons to the cart item's configured product menu options
+     *
+     * @internal
+     * @since 1.3
+     *
+     * @param int $id The product ID to retrieve addon menus from
+     * @return array A combined list of the menu labels list and addons menu map
+     **/
+    private static function _addon_menus () {
+        return ShoppProductThemeAPI::_addon_menus(shopp('purchase.get-item-product'));
+    }
+
 }

shopp/trunk/api/theme/storefront.php

@@ -1812 +1812 @@
         $output .= '>';
         $output .= $pad.$cat_name;
-        if ( $args['products'] && isset($category->count) )
+
+        if ( Shopp::str_true($args['products']) && isset($category->count) )
             $output .= '  ('. $category->count .')';
         $output .= "</option>\n";

shopp/trunk/core/flow/Categorize.php

@@ -38 +38 @@
 
             wp_enqueue_script('postbox');
+            wp_enqueue_script('swfupload-all');
+
             if ( user_can_richedit() ) {
                 wp_enqueue_script('editor');

shopp/trunk/core/flow/Checkout.php

@@ -5 +5 @@
  * Handles checkout form processing
  *
- * @author Jonathan Davis
- * @version 1.3
  * @copyright Ingenesis Limited, April 2013
  * @license GNU GPL version 3 (or later) {@see license.txt}
- * @package shopp
- * @subpackage order
+ * @version 1.3
+ * @package Shopp/Flow/Checkout
  **/
 
@@ -18 +16 @@
  * Checkout manager
  *
- * @author Jonathan Davis
  * @since 1.1
  * @version 1.2
- * @package order
  **/
 class ShoppCheckout extends FormPostFramework {
 
-    private $confirmed = false;     // Flag to indicate
-    private $Register = false;      // The ShoppRegistration manager
-
+    /** @var boolean $confirmed Flag to indicate confirmed orders. */
+    private $confirmed = false;
+
+    /** @var ShoppRegistration $Register The ShoppRegistration manager. */
+    private $Register = false;
+
+    /** @var array $defaults The default inputs of the checkout form. */
     protected $defaults = array(
-        'guest' => false,
+        'guest'       => false,
         'sameaddress' => 'off',
-        'firstname' => '',
-        'lastname' => '',
-        'phone' => '',
-        'company' => '',
-        'shipmethod' => false,
-        'billing' => array(),
-        'shipping' => array(),
-        'info' => array(),
-        'data' => array()
+        'firstname'   => '',
+        'lastname'    => '',
+        'phone'       => '',
+        'company'     => '',
+        'shipmethod'  => false,
+        'billing'     => array(),
+        'shipping'    => array(),
+        'info'        => array(),
+        'data'        => array()
     );
 
-    public function __construct () {
-
-        Shopping::restore('confirmed',$this->confirmed);
+    /**
+     * Constructor.
+     *
+     * @since 1.1
+     *
+     * @return void
+     **/
+    public function __construct() {
+
+        Shopping::restore('confirmed', $this->confirmed);
 
         if ( empty($_POST) ) return;
@@ -76 +83 @@
     }
 
-    public function data () {
+    /**
+     * Adds custom order data to the order data registry.
+     *
+     * @since 1.3
+     *
+     * @return void
+     **/
+    public function data() {
 
         if ( $this->form('data') )
@@ -83 +97 @@
     }
 
-    public function customer () {
+    /**
+     * Processes customer account fields.
+     *
+     * @since 1.3
+     *
+     * @return void
+     **/
+    public function customer() {
 
         $Customer = ShoppOrder()->Customer;
@@ -97 +118 @@
     }
 
-    public function shipaddress () {
+    /**
+     * Processes changes to the shipping address.
+     *
+     * @since 1.3
+     *
+     * @return void
+     **/
+    public function shipaddress() {
 
         $Cart = ShoppOrder()->Cart;
@@ -113 +141 @@
 
     /**
-     * Processes changes to the shipping method
+     * Processes changes to the shipping method.
      *
      * Handles changes to the shipping method outside of other
-     * checkout processes
-     *
-     * @author Jonathan Davis
-     * @since 1.1
-     *
-     * @return void
-     **/
-    public function shipmethod () {
+     * checkout processes.
+     *
+     * @since 1.1
+     *
+     * @return void
+     **/
+    public function shipmethod() {
         $Shiprates = ShoppOrder()->Shiprates;
         $ShippingAddress = ShoppOrder()->Shipping;
@@ -146 +173 @@
 
 
-    public function billaddress () {
+    /**
+     * Processes changes to the billing address.
+     *
+     * @since 1.3
+     *
+     * @return void
+     **/
+    public function billaddress() {
         $Cart = ShoppOrder()->Cart;
         $BillingAddress = ShoppOrder()->Billing;
@@ -162 +196 @@
     }
 
-    public function payment () {
+    /**
+     * Processes payment information changes.
+     *
+     * @since 1.3
+     *
+     * @return void
+     **/
+    public function payment() {
+        if ( ! $this->paycard() ) return;
+
+        add_filter('shopp_validate_checkout', array('ShoppFormValidation', 'paycard'));
+
         $Billing = ShoppOrder()->Billing;
         $Payments = ShoppOrder()->Payments;
-
-        // Change the cardtype to the selected payment service option label
-        $Billing->cardtype = $Payments->selected()->label;
-
-        if ( ! $this->paycard() ) return;
-
-        add_filter('shopp_validate_checkout', array('ShoppFormValidation', 'paycard'));
-
         $form = $this->form('billing');
+
+        // Change the default cardtype to the selected payment service option label
+        $Billing->cardtype = empty($form['cardtype']) ? $Payments->selected()->label : $form['cardtype'];
 
         // If the card number is provided over a secure connection
@@ -181 +221 @@
 
         // Sanitize the card number to ensure it only contains numbers
-        if ( ! empty($form['card']) )
-            $Billing->card = preg_replace('/[^\d]/', '', $form['card']);
-
-        $form['cardexpires'] = sprintf('%02d%02d', $form['cardexpires-mm'], $form['cardexpires-yy']);
-
-        if ( ! empty($form['cardexpires-mm']) && ! empty($form['cardexpires-yy'])) {
-            $exmm = preg_replace('/[^\d]/', '', $form['cardexpires-mm']);
-            $exyy = preg_replace('/[^\d]/', '', $form['cardexpires-yy']);
-            $Billing->cardexpires = mktime(0,0,0,$exmm,1,($exyy)+2000);
+        if ( strlen( $PAN = self::digitsonly($form['card']) ) > 4 )
+            $Billing->card = $PAN;
+
+        if ( ! empty($form['cardexpires-mm']) && ! empty($form['cardexpires-yy']) ) {
+            $exmm = self::digitsonly($form['cardexpires-mm']);
+            $exyy = self::digitsonly($form['cardexpires-yy']);
+            $Billing->cardexpires = mktime(0, 0, 0, $exmm, 1, $exyy + 2000);
         } else $Billing->cardexpires = 0;
 
-        $Billing->cvv = preg_replace('/[^\d]/', '', $form['cvv']);
+        $Billing->cvv = self::digitsonly($form['cvv']);
 
         // Extra card security check fields
         if ( ! empty($form['xcsc']) ) {
             $Billing->xcsc = array();
-            foreach ( (array)$form['xcsc'] as $field => $value ) {
+            foreach ( (array) $form['xcsc'] as $field => $value ) {
                 $Billing->Billing->xcsc[] = $field; // Add to the XCSC registry of fields
                 $Billing->$field = $value;          // Add the property
@@ -206 +244 @@
 
     /**
-     * Determine if payment card data has been submitted
-     *
-     * @author Jonathan Davis
-     * @since 1.1
-     *
-     * @return boolean
-     **/
-    public function paycard () {
-        $fields = array('card','cardexpires-mm','cardexpires-yy','cvv');
+     * Determine if payment card data has been submitted.
+     *
+     * @since 1.1
+     *
+     * @return boolean True if payment card information was submitted, false otherwise.
+     **/
+    public function paycard() {
+        $fields = array('card', 'cardexpires-mm', 'cardexpires-yy', 'cvv');
         $billing = $this->form('billing');
         foreach ( $fields as $field )
@@ -223 +260 @@
 
     /*
-     * Checkout form processing
+     * Checkout form processing.
      *
      * Handles taking user input from the checkout form and
-     * processing the information into useable order data
-     *
-     * @author Jonathan Davis
-     * @since 1.1
-     *
-     * @return void
-     **/
-    public function process () {
+     * processing the information into useable order data.
+     *
+     * @since 1.1
+     *
+     * @return void
+     **/
+    public function process() {
+
+        $action = $this->form('checkout');
+        if ( 'process' != $action ) return;
+
         $Payments = ShoppOrder()->Payments;
         $Cart = ShoppOrder()->Cart;
 
         $forcedconfirm = 'always' == shopp_setting('order_confirmation');
-
-        $action = $this->form('checkout');
-
-        if ( ! $action || 'process' != $action) return;
-
         $wasfree = $Cart->orderisfree(); // Get current free status
         $estimated = $Cart->total();     // Get current total
@@ -254 +289 @@
         // Catch originally free orders that get extra (shipping) costs added to them
         if ( $wasfree && $Payments->count() > 1 && ! $Cart->orderisfree() && empty($Payments->selected()->cards) ) {
-            shopp_add_error( __('The order amount changed and requires that you select a payment method.','Shopp') );
-            Shopp::redirect( Shopp::url(false,'checkout', ShoppOrder()->security()) );
+            shopp_add_error( Shopp::__('The order amount changed and requires that you select a payment method.') );
+            Shopp::redirect( Shopp::url(false, 'checkout', ShoppOrder()->security()) );
         }
 
@@ -272 +307 @@
 
     /**
-     * Account registration processing
-     *
-     * @author Jonathan Davis
-     * @since 1.3
-     **/
-    public function registration () {
+     * Account registration processing.
+     *
+     * @since 1.3
+     **/
+    public function registration() {
 
         // Validation already conducted during the checkout process
@@ -290 +324 @@
 
     /**
-     * Confirms the order and starts order processing
-     *
-     * @author Jonathan Davis
-     * @since 1.1
-     *
-     * @return void
-     **/
-    public function confirmed () {
+     * Confirms the order and starts order processing.
+     *
+     * @since 1.1
+     *
+     * @return void
+     **/
+    public function confirmed() {
 
         if ( 'confirmed' == $this->form('checkout') ) {
@@ -306 +339 @@
     }
 
+    /**
+     * Filters a string to provide only the digits found in the string.
+     *
+     * @since 1.3.9
+     *
+     * @param string $string The string to filter
+     * @return string The string of digits
+     **/
+    protected static function digitsonly( $string ) {
+        $filtered = filter_var($string, FILTER_SANITIZE_NUMBER_INT);
+        return str_replace(array('+', '-'), '', $filtered);
+    }
+
 }

shopp/trunk/core/flow/Dashboard.php

@@ -266 +266 @@
         $purchasetable = ShoppDatabaseObject::tablename(ShoppPurchase::$table);
         $purchasedtable = ShoppDatabaseObject::tablename(Purchased::$table);
-        $txnstatus_labels = Lookup::txnstatus_labels();
+        $txnlabels = Lookup::txnstatus_labels();
 
         if ( ! ( $Orders = get_transient('shopp_dashboard_orders') ) ) {
@@ -274 +274 @@
 
         if ( ! empty($Orders) ) {
-            echo '<table class="widefat">';
-            echo '<tr><th scope="col">'.__('Name','Shopp').'</th><th scope="col">'.__('Date','Shopp').'</th><th scope="col" class="num">'.__('Items','Shopp').'</th><th scope="col" class="num">'.__('Total','Shopp').'</th><th scope="col" class="num">'.__('Status','Shopp').'</th></tr>';
-            echo '<tbody id="orders" class="list orders">';
+
+            echo  '<table class="widefat">'
+                . '<thead>'
+                . ' <tr>'
+                . '     <th scope="col">' . __('Name','Shopp') . '</th>'
+                . '     <th scope="col">' . __('Date','Shopp') . '</th>'
+                . '     <th scope="col" class="num">' . Shopp::__('Items') . '</th>'
+                . '     <th scope="col" class="num">' . Shopp::__('Total') . '</th>'
+                . '     <th scope="col" class="num">' . Shopp::__('Status') . '</th>'
+                . ' </tr>'
+                . '</thead>'
+                . ' <tbody id="orders" class="list orders">';
+
             $even = false;
             foreach ( $Orders as $Order ) {
                 $classes = array();
                 if ( $even = !$even ) $classes[] = 'alternate';
-                $txnstatus = isset($txnstatus_labels[ $Order->txnstatus ]) ? $txnstatus_labels[$Order->txnstatus] : $Order->txnstatus;
+                $txnstatus = isset($txnlabels[ $Order->txnstatus ]) ?
+                    $txnlabels[$Order->txnstatus] : $Order->txnstatus;
+                $status = isset($statusLabels[ $Order->status ]) ?
+                    $statusLabels[ $Order->status ] : $Order->status;
+                $contact = '' == $Order->firstname . $Order->lastname ?
+                    '(no contact name)' : $Order->firstname . ' ' . $Order->lastname;
+                $url = add_query_arg(array('page' => ShoppAdmin()->pagename('orders'), 'id' => $Order->id), admin_url('admin.php'));
                 $classes[] = strtolower(preg_replace('/[^\w]/', '_', $Order->txnstatus));
 
-                echo '<tr class="' . join(' ',$classes) . '">';
-                echo '<td><a class="row-title" href="'.add_query_arg(array('page'=>ShoppAdmin()->pagename('orders'),'id'=>$Order->id),admin_url('admin.php')).'" title="View &quot;Order '.$Order->id.'&quot;">'.((empty($Order->firstname) && empty($Order->lastname))?'(no contact name)':$Order->firstname.' '.$Order->lastname).'</a></td>';
-                echo '<td>'.date("Y/m/d",mktimestamp($Order->created)).'</td>';
-                echo '<td class="num items">'.$Order->items.'</td>';
-                echo '<td class="num total">'.money($Order->total).'</td>';
-                echo '<td class="num status">'.$statusLabels[ $Order->status ].'</td>';
-                echo '</tr>';
+                echo  '<tr class="' . join(' ',$classes) . '">'
+                    . ' <td><a class="row-title" href="' . $url . '" title="View &quot;Order '.$Order->id.'&quot;">'.((empty($Order->firstname) && empty($Order->lastname))?'(no contact name)':$Order->firstname.' '.$Order->lastname).'</a></td>'
+                    . ' <td>'.date("Y/m/d",mktimestamp($Order->created)).'</td>'
+                    . ' <td class="num items">'.$Order->items.'</td>'
+                    . ' <td class="num total">'.money($Order->total).'</td>'
+                    . ' <td class="num status">'.$statusLabels[ $Order->status ].'</td>'
+                    . '</tr>';
             }
+
             echo '</tbody></table>';
+
         } else {
-            echo '<p>'.__('No orders, yet.','Shopp').'</p>';
+            echo '<p>' . Shopp::__('No orders, yet.') . '</p>';
         }
 

shopp/trunk/core/flow/Order.php

@@ -258 +258 @@
 
         // Duplicate purchase prevention #3142
+        $timeout = SHOPP_GATEWAY_TIMEOUT + 5;
         $lockid = 'shopp_order_' . ShoppShopping()->session();
         if ( get_transient($lockid) ) {
@@ -263 +264 @@
 
             // Wait until the lock is cleared
-            $waited = 0; $timeout = SHOPP_GATEWAY_TIMEOUT + 5;
+            $waited = 0;
             while ( get_transient($lockid) && $waited++ < $timeout )
                 sleep(1);
@@ -273 +274 @@
             return;
 
-        } else set_transient($lockid, true, $timeout);
+        } else {
+            set_transient($lockid, true, $timeout);
+            add_action('shutdown', create_function('', 'delete_transient("' . $lockid . '");'));
+        }
 
         shopp_add_order_event(false, 'purchase', array(

shopp/trunk/core/flow/Pages.php

@@ -251 +251 @@
         add_filter('comments_array', array($this, 'nocomment'));
         add_filter('wpseo_replacements', array($this, 'wpseo')); // compatibility helper for WPSEO
+        add_filter('get_the_excerpt', create_function('$c', 'remove_filter("get_the_excerpt", "wp_trim_excerpt"); return $c;'), 5);
+
     }
 
@@ -1003 +1005 @@
             locate_shopp_template($templates, true);
         }
-        $content = ob_get_contents();
-        ob_end_clean();
+        $content = ob_get_clean();
 
         return apply_filters('shopp_category_template', $content);
@@ -1049 +1050 @@
         $atts['template'] = array('product-shortcode.php', 'product.php');
         ShoppStorefront()->shortcoded[] = get_the_ID();
-        return apply_filters('shopp_product_shortcode', shopp('catalog.get-product', $atts));
+        return apply_filters('shopp_product_shortcode', shopp('storefront.get-product', $atts));
     }
 

shopp/trunk/core/flow/Scripts.php

@@ -288 +288 @@
     $scripts->add_data('system', 'group', 1);
 
-    $scripts->add('shopp-swfobject', '/ui/behaviors/swfupload/plugins/swfupload.swfobject.min.js', array(), $version);
-    $scripts->add_data('shopp-swfobject', 'group', 1);
-
-    $scripts->add('shopp-swfupload-queue', '/ui/behaviors/swfupload/plugins/swfupload.queue.min.js', array(), $version);
-    $scripts->add_data('shopp-swfupload-queue', 'group', 1);
-
     $scripts->add('spin', '/ui/behaviors/spin.js', array('jquery'), $version);
     $scripts->add_data('spin', 'group', 1);
-
-    $scripts->add('swfupload', '/ui/behaviors/swfupload/swfupload.min.js', array('jquery','shopp-swfobject'), $version);
-    $scripts->add_data('swfupload', 'group', 1);
 
     $scripts->add('suggest', '/ui/behaviors/suggest.js', array('jquery'), $version);

shopp/trunk/core/flow/Service.php

@@ -303 +303 @@
         $selected = shopp_setting('purchaselog_columns');
         if ( empty($selected) ) $selected = array_keys($exportcolumns);
-
-        $Gateways = array_merge($Shopp->Gateways->modules, array('ShoppFreeOrder' => $Shopp->Gateways->freeorder));
-
+        
+        $Gateways = $Shopp->Gateways;
+        
         include $this->ui('orders.php');
     }
@@ -429 +429 @@
             $reason = (int)$_POST['reason'];
             $amount = Shopp::floatval($_POST['amount']);
+            $Purchase->load_events();
 
             if (!empty($_POST['message'])) {
@@ -435 +436 @@
             }
 
-            if (!Shopp::str_true($_POST['send'])) { // Force the order status
-                shopp_add_order_event($Purchase->id,'notice',array(
-                    'user' => $user->ID,
-                    'kind' => 'refunded',
-                    'notice' => __('Marked Refunded','Shopp')
-                ));
-                shopp_add_order_event($Purchase->id,'refunded',array(
-                    'txnid' => $Purchase->txnid,
-                    'gateway' => $Gateway->module,
-                    'amount' => $amount
-                ));
-                shopp_add_order_event($Purchase->id,'voided',array(
-                    'txnorigin' => $Purchase->txnid,    // Original transaction ID (txnid of original Purchase record)
-                    'txnid' => time(),                  // Transaction ID for the VOID event
-                    'gateway' => $Gateway->module       // Gateway handler name (module name from @subpackage)
-                ));
-            } else {
-                shopp_add_order_event($Purchase->id,'refund',array(
-                    'txnid' => $Purchase->txnid,
-                    'gateway' => $Gateway->module,
-                    'amount' => $amount,
-                    'reason' => $reason,
-                    'user' => $user->ID
-                ));
-            }
-
-            if (!empty($_POST['message']))
-                $this->addnote($Purchase->id,$_POST['message']);
-
-            $Purchase->load_events();
+            if ( $amount <= $Purchase->captured - $Purchase->refunded ) {
+
+                if ( ! Shopp::str_true($_POST['send']) ) { // Force the order status
+                    shopp_add_order_event($Purchase->id,'notice',array(
+                        'user' => $user->ID,
+                        'kind' => 'refunded',
+                        'notice' => __('Marked Refunded','Shopp')
+                    ));
+                    shopp_add_order_event($Purchase->id,'refunded',array(
+                        'txnid' => $Purchase->txnid,
+                        'gateway' => $Gateway->module,
+                        'amount' => $amount
+                    ));
+                    shopp_add_order_event($Purchase->id,'voided',array(
+                        'txnorigin' => $Purchase->txnid,    // Original transaction ID (txnid of original Purchase record)
+                        'txnid' => time(),                  // Transaction ID for the VOID event
+                        'gateway' => $Gateway->module       // Gateway handler name (module name from @subpackage)
+                    ));
+                } else {
+                    shopp_add_order_event($Purchase->id,'refund',array(
+                        'txnid' => $Purchase->txnid,
+                        'gateway' => $Gateway->module,
+                        'amount' => $amount,
+                        'reason' => $reason,
+                        'user' => $user->ID
+                    ));
+                }
+
+                if ( ! empty($_POST['message']) )
+                    $this->addnote($Purchase->id, $_POST['message']);
+
+                $Purchase->load_events();
+
+            } else $this->notice(Shopp::__('Refund failed. Cannot refund more than the current balance.'), 'error');
+
         }
 

shopp/trunk/core/flow/Warehouse.php

@@ -51 +51 @@
             wp_enqueue_script('postbox');
             wp_enqueue_script('wp-lists');
+            wp_enqueue_script('swfupload-all');
+
             if ( user_can_richedit() ) {
                 wp_enqueue_script('editor');
@@ -64 +66 @@
             shopp_enqueue_script('priceline');
             shopp_enqueue_script('ocupload');
-            shopp_enqueue_script('swfupload');
             shopp_enqueue_script('jquery-tmpl');
             shopp_enqueue_script('suggest');
             shopp_enqueue_script('search-select');
-            shopp_enqueue_script('shopp-swfupload-queue');
 
             do_action('shopp_product_editor_scripts');
@@ -982 +982 @@
         $error = false;
         if ( isset($_FILES['Filedata']['error']) ) $error = $_FILES['Filedata']['error'];
-        if ( $error ) die( json_encode(array("error" => Lookup::errors('uploads', $error))) );
-
-        if (!is_uploaded_file($_FILES['Filedata']['tmp_name']))
-            die(json_encode(array("error" => __('The file could not be saved because the upload was not found on the server.','Shopp'))));
-
-        if (!is_readable($_FILES['Filedata']['tmp_name']))
-            die(json_encode(array("error" => __('The file could not be saved because the web server does not have permission to read the upload.','Shopp'))));
-
-        if ($_FILES['Filedata']['size'] == 0)
-            die(json_encode(array("error" => __('The file could not be saved because the uploaded file is empty.','Shopp'))));
+        if ( $error ) die( json_encode(array('error' => Lookup::errors('uploads', $error))) );
+
+        if ( ! @is_uploaded_file($_FILES['Filedata']['tmp_name']) )
+            die(json_encode(array('error' => Shopp::__('The file could not be saved because the upload was not found on the server.'))));
+
+        if ( 0 == $_FILES['Filedata']['size'] )
+            die(json_encode(array('error' => Shopp::__('The file could not be saved because the uploaded file is empty.'))));
 
         FileAsset::mimetypes();
@@ -1003 +1000 @@
         $File->filename = $File->name;
 
-        list($extension, $mimetype, $properfile) = wp_check_filetype_and_ext($_FILES['Filedata']['tmp_name'],$File->name);
+        list($extension, $mimetype, $properfile) = wp_check_filetype_and_ext($_FILES['Filedata']['tmp_name'], $File->name);
         if ( empty($mimetype) ) $mimetype = 'application/octet-stream';
         $File->mime = $mimetype;
 
-        if ( ! empty($properfile))
+        if ( ! empty($properfile) )
             $File->name = $File->filename = $properfile;
 
         $File->size = filesize($_FILES['Filedata']['tmp_name']);
-        $File->store($_FILES['Filedata']['tmp_name'],'upload');
+        $File->store($_FILES['Filedata']['tmp_name'], 'upload');
 
         $Error = ShoppErrors()->code('storage_engine_save');
-        if (!empty($Error)) die( json_encode( array('error' => $Error->message(true)) ) );
+        if ( ! empty($Error) )
+            die( json_encode( array('error' => $Error->message(true)) ) );
 
         $File->save();
@@ -1020 +1018 @@
         do_action('add_product_download', $File,$_FILES['Filedata']);
 
-        echo json_encode(array('id' => $File->id, 'name' => stripslashes($File->name), 'type' => $File->mime, 'size' => $File->size));
+        echo json_encode(array(
+            'id' => $File->id,
+            'name' => stripslashes($File->name),
+            'type' => $File->mime,
+            'size' => $File->size
+        ));
     }
 
@@ -1031 +1034 @@
     public static function images () {
         $context = false;
-
         $error = false;
-        if (isset($_FILES['Filedata']['error'])) $error = $_FILES['Filedata']['error'];
-        if ( $error ) die( json_encode(array("error" => Lookup::errors('uploads', $error))) );
-
-        $valid_contexts = array('product','category');
-
-        if (isset($_REQUEST['type']) && in_array(strtolower($_REQUEST['type']),$valid_contexts) ) {
+        $valid_contexts = array('product', 'category');
+
+        if ( isset($_FILES['Filedata']['error']) )
+            $error = $_FILES['Filedata']['error'];
+        if ( $error ) die( json_encode(array('error' => Lookup::errors('uploads', $error))) );
+
+        if ( isset($_REQUEST['type']) && in_array(strtolower($_REQUEST['type']), $valid_contexts ) ) {
             $parent = $_REQUEST['parent'];
             $context = strtolower($_REQUEST['type']);
         }
 
-        if (!$context)
-            die(json_encode(array("error" => __('The file could not be saved because the server cannot tell whether to attach the asset to a product or a category.','Shopp'))));
-
-        if (!is_uploaded_file($_FILES['Filedata']['tmp_name']))
-            die(json_encode(array("error" => __('The file could not be saved because the upload was not found on the server.','Shopp'))));
-
-        if (!is_readable($_FILES['Filedata']['tmp_name']))
-            die(json_encode(array("error" => __('The file could not be saved because the web server does not have permission to read the upload from the server\'s temporary directory.','Shopp'))));
-
-        if ($_FILES['Filedata']['size'] == 0)
-            die(json_encode(array("error" => __('The file could not be saved because the uploaded file is empty.','Shopp'))));
+        if ( ! $context )
+            die(json_encode(array('error' => Shopp::__('The file could not be saved because the server cannot tell whether to attach the asset to a product or a category.'))));
+
+        if ( ! @is_uploaded_file($_FILES['Filedata']['tmp_name']) )
+            die(json_encode(array('error' => Shopp::__('The file could not be saved because the upload was not found on the server.'))));
+
+        if ( 0 == $_FILES['Filedata']['size'] )
+            die(json_encode(array('error' => Shopp::__('The file could not be saved because the uploaded file is empty.'))));
 
         // Save the source image
-        if ($context == "category") $Image = new CategoryImage();
+        if ( 'category' == $context )
+            $Image = new CategoryImage();
         else $Image = new ProductImage();
 
         $Image->parent = $parent;
-        $Image->type = "image";
-        $Image->name = "original";
+        $Image->type = 'image';
+        $Image->name = 'original';
         $Image->filename = $_FILES['Filedata']['name'];
-        list($Image->width, $Image->height, $Image->mime, $Image->attr) = getimagesize($_FILES['Filedata']['tmp_name']);
+
+        $context = 'upload';
+        $tempfile = $_FILES['Filedata']['tmp_name'];
+
+        if ( ! @is_readable($tempfile) ) {
+
+            $context = 'file';
+            $tempfile = get_temp_dir() . $Image->filename;
+
+            if ( ! @move_uploaded_file($_FILES['Filedata']['tmp_name'], $tempfile) )
+                die(json_encode(array('error' => Shopp::__('The file could not be saved because the web server does not have permission to read the upload.'))));
+
+        }
+
+        list($Image->width, $Image->height, $Image->mime, $Image->attr) = getimagesize($tempfile);
         $Image->mime = image_type_to_mime_type($Image->mime);
-        $Image->size = filesize($_FILES['Filedata']['tmp_name']);
-
-        if ( ! $Image->unique() ) die(json_encode(array("error" => __('The image already exists, but a new filename could not be generated.','Shopp'))));
-
-        $Image->store($_FILES['Filedata']['tmp_name'],'upload');
+        $Image->size = filesize($tempfile);
+
+        if ( ! $Image->unique() ) die(json_encode(array('error' => Shopp::__('The image already exists, but a new filename could not be generated.'))));
+
+        $Image->store($tempfile, $context);
+
+        if( 'file' == $context )
+            unlink($tempfile);
+
         $Error = ShoppErrors()->code('storage_engine_save');
-        if (!empty($Error)) die( json_encode( array('error' => $Error->message(true)) ) );
+        if ( ! empty($Error) ) die( json_encode( array('error' => $Error->message(true)) ) );
 
         $Image->save();
 
-        if (empty($Image->id))
-            die(json_encode(array("error" => __('The image reference was not saved to the database.','Shopp'))));
-
-        echo json_encode(array("id"=>$Image->id));
+        if ( empty($Image->id) )
+            die(json_encode(array('error' => Shopp::__('The image reference was not saved to the database.'))));
+
+        echo json_encode(array('id' => $Image->id));
         exit;
     }

shopp/trunk/core/library/Core.php

@@ -803 +803 @@
         return join( ', ', $stack );
 
+    }
+
+    /**
+     * Outputs debug structures to the browser console.
+     *
+     * @since 1.3.9
+     *
+     * @param mixed $data The data to display in the console.
+     * @return void
+     **/
+    public static function debug ( $data ) {
+
+        $backtrace  = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+
+        list($debugcall, $callby, ) = $backtrace;
+
+        $stack = array();
+        foreach ( $backtrace as $id => $call ) {
+            if ( 'debug' == $caller['function'] ) continue;
+            $ref = empty($call['file']) ? 'Call #' . $id : basename($call['file']) . ' @ '. $call['line'];
+
+            $stack[ $ref ] = isset( $call['class'] ) ?
+                $call['class'] . $call['type'] . $call['function'] . "()"
+                : $call['function'];
+        }
+        $callstack = (object) $stack;
+
+        $caller = ( empty($callby['class']) ? '' : $callby['class'] . $callby['type'] ) . $callby['function'] . '() from ' . $debugcall['file'] . ' @ ' . $debugcall['line'];
+
+        shopp_custom_script('shopp', "
+            console.group('Debug " . $caller . "');
+            console.debug(" . json_encode($data) . ");
+            console.log('Call stack: %O', " . json_encode($stack) . ");
+            console.groupEnd();
+        ");
     }
 

shopp/trunk/core/library/Error.php

@@ -413 +413 @@
         $this->loglevel = shopp_setting('error_logging');
 
-        $this->dir = defined('SHOPP_LOG_PATH') ? SHOPP_LOG_PATH : sys_get_temp_dir();
+        $this->dir = defined('SHOPP_LOG_PATH') ? SHOPP_LOG_PATH : get_temp_dir();
         $this->dir = sanitize_path($this->dir); // Windows path sanitiation
 
@@ -467 +467 @@
         }
         $message = date("Y-m-d H:i:s", time())." - ".$error->message(false, true)."$debug\n";
-        error_log($message, 3, $this->logfile);     // Log to Shopp error log file
+        @error_log($message, 3, $this->logfile);        // Log to Shopp error log file
         error_log($error->message(false, true));    // Log to PHP error log file
     }
@@ -480 +480 @@
      **/
     public function reset () {
-        $this->log = fopen($this->logfile, 'w');
+        $this->log = @fopen($this->logfile, 'w');
         fwrite($this->log, '');
-        fclose($this->log);
+        @fclose($this->log);
     }
 

shopp/trunk/core/library/Modules.php

@@ -397 +397 @@
     }
 
+    /**
+     * Parse the base version number from the module.
+     *
+     * This method just grabs the numbers out of version
+     * and avoids version tags like 'dev' or 'beta'.
+     *
+     * @since 1.2
+     *
+     * @return string|bool The version number string, or false otherwise
+     **/
     public static function baseversion ( $version ) {
         preg_match('/^[\d\.]+/', $version, $baseversion);
-        return $baseversion[0];
+        return isset($baseversion[0]) ? $baseversion[0] : false;
     }
 

shopp/trunk/core/library/Session.php

@@ -448 +448 @@
         $entropy .= uniqid(mt_rand(), true);
 
+        // Check for open_basedir restrictions
+        $openbasedir = false === strpos(ini_get('open_basedir'), DIRECTORY_SEPARATOR);
+
         // Try adding entropy from the Unix random number generator
-        if ( is_readable('/dev/urandom') && $h = fopen('/dev/urandom', 'rb') ) {
+        if ( $openbasedir && @is_readable('/dev/urandom') && $h = fopen('/dev/urandom', 'rb') ) {
             if ( function_exists('stream_set_read_buffer') )
                 stream_set_read_buffer($h, 0);

shopp/trunk/core/library/Version.php

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

shopp/trunk/core/model/Cart.php

@@ -88 +88 @@
 
         add_action('shopp_cart_item_retotal', array($this, 'processtime') );
-        add_action('shopp_cart_item_retotal', array($this, 'itemtaxes') );
+        add_action('shopp_cart_item_taxes', array($this, 'itemtaxes') );
 
         add_action('shopp_init', array($this, 'tracking'));

shopp/trunk/core/model/Collection.php

@@ -520 +520 @@
 
     static function register ( $class ) {
-        global $Shopp,$ShoppTaxonomies;
+        global $ShoppTaxonomies;
 
         $namespace = get_class_property($class, 'namespace');
         $taxonomy = get_class_property($class, 'taxon');
         $hierarchical = get_class_property($class, 'hierarchical');
-        $slug = SHOPP_NAMESPACE_TAXONOMIES ? ShoppPages()->baseslug() . '/' . $namespace : $namespace;
-        register_taxonomy($taxonomy, array(ShoppProduct::$posttype), array(
-            'hierarchical' => $hierarchical,
-            'labels' => call_user_func(array($class,'labels'),$class),
-            'show_ui' => true,
-            'query_var' => true,
-            'rewrite' => array( 'slug' => $slug, 'with_front' => false ),
-            'update_count_callback' => array('ProductTaxonomy', 'recount'),
-            'capabilities' => array(
-                'manage_terms' => 'shopp_categories',
-                'edit_terms'   => 'shopp_categories',
-                'delete_terms' => 'shopp_categories',
-                'assign_terms' => 'shopp_categories',
-            )
-        ));
-
-        add_filter($taxonomy.'_rewrite_rules',array('ProductCollection','pagerewrites'));
-
-        $ShoppTaxonomies[$taxonomy] = $class;
+
+        $slug = SHOPP_NAMESPACE_TAXONOMIES ?
+            ShoppPages()->baseslug() . '/' . $namespace : $namespace;
+
+        register_taxonomy($taxonomy,
+            array(ShoppProduct::$posttype),
+            apply_filters('shopp_register_taxonomy_' . $taxonomy, array(
+                'hierarchical' => $hierarchical,
+                'labels' => call_user_func(array($class, 'labels'), $class),
+                'show_ui' => true,
+                'query_var' => true,
+                'rewrite' => array('slug' => $slug, 'with_front' => false),
+                'update_count_callback' => array('ProductTaxonomy', 'recount'),
+                'capabilities' => array(
+                    'manage_terms' => 'shopp_categories',
+                    'edit_terms'   => 'shopp_categories',
+                    'delete_terms' => 'shopp_categories',
+                    'assign_terms' => 'shopp_categories',
+                )
+        )));
+
+        add_filter($taxonomy . '_rewrite_rules', array('ProductCollection', 'pagerewrites'));
+
+        $ShoppTaxonomies[ $taxonomy ] = $class;
     }
 
     static function labels () {
         return array(
-            'name' => __('Catalog Groups','Shopp'),
-            'singular_name' => __('Catalog Group','Shopp'),
-            'search_items' => __('Search Catalog Group','Shopp'),
-            'popular_items' => __('Popular','Shopp'),
-            'all_items' => __('Show All','Shopp'),
-            'parent_item' => __('Parent Catalog Group','Shopp'),
-            'parent_item_colon' => __('Parent Catalog Group:','Shopp'),
-            'edit_item' => __('Edit Catalog Group','Shopp'),
-            'update_item' => __('Update Catalog Group','Shopp'),
-            'add_new_item' => __('New Catalog Group','Shopp'),
-            'new_item_name' => __('New Catalog Group Name','Shopp'),
-            'separate_items_with_commas' => __('Separate catalog groups with commas','Shopp'),
-            'add_or_remove_items' => __('Add or remove catalog groups','Shopp'),
-            'choose_from_most_used' => __('Choose from the most used catalog groups','Shopp')
+            'name'                       => Shopp::__('Catalog Groups'),
+            'singular_name'              => Shopp::__('Catalog Group'),
+            'search_items'               => Shopp::__('Search Catalog Group'),
+            'popular_items'              => Shopp::__('Popular'),
+            'all_items'                  => Shopp::__('Show All'),
+            'parent_item'                => Shopp::__('Parent Catalog Group'),
+            'parent_item_colon'          => Shopp::__('Parent Catalog Group:'),
+            'edit_item'                  => Shopp::__('Edit Catalog Group'),
+            'update_item'                => Shopp::__('Update Catalog Group'),
+            'add_new_item'               => Shopp::__('New Catalog Group'),
+            'new_item_name'              => Shopp::__('New Catalog Group Name'),
+            'separate_items_with_commas' => Shopp::__('Separate catalog groups with commas'),
+            'add_or_remove_items'        => Shopp::__('Add or remove catalog groups'),
+            'choose_from_most_used'      => Shopp::__('Choose from the most used catalog groups')
         );
     }
@@ -1490 +1495 @@
 
     public function load ( array $options = array() ) {
-        $this->loading = array_merge( $this->_options, $options );
+        $this->loading = $options = array_merge( $this->_options, $options );
 
         if ( isset($this->loading['show']) ) {
@@ -1610 +1615 @@
     public function smart ( array $options = array() ) {
         $this->loading['where'] = array("s.featured='on'");
-        $this->loading['order'] = 'newest';
+        $this->loading['order'] = empty($options['order']) ? 'newest' : $options['order']; // Default order to newest
     }
 

shopp/trunk/core/model/Customer.php

@@ -423 +423 @@
         if ( empty($_POST['customer']) ) return; // Not a valid customer profile update request
 
+        check_admin_referer('shopp_profile_update');
+
         $defaults = array(
             'phone' => '',
@@ -474 +476 @@
 
         $this->updated(self::PROFILE, true);
+
+        if ( $this->_password_change )
+            Shopp::redirect(Shopp::url(false, 'account'));
 
     }

shopp/trunk/core/model/Discounts.php

@@ -133 +133 @@
         // Check for failed promo codes
         if ( empty($this->request) || $this->codeapplied( $this->request ) ) return;
-        
+
         if( $this->validcode($this->request) ) {
             shopp_add_error( Shopp::__('"%s" does not apply to the current order.', $this->request) );
-            $this->request = false; 
+            $this->request = false;
         } else {
             shopp_add_error( Shopp::__('"%s" is not a valid code.', $this->request) );
@@ -484 +484 @@
         return isset( $this->codes[ strtolower($code) ]);
     }
-    
+
     /**
      * Checks if a given code is attached to a valid rule
@@ -496 +496 @@
     public function validcode( $code ) {
         $Promotions = ShoppOrder()->Promotions;
-        
+
         foreach($Promotions as $promo) {
             if( empty($promo->code) ) continue;
@@ -858 +858 @@
 
     }
-    
+
     public function get_property() {
-        return $this->property; 
+        return $this->property;
     }
 

shopp/trunk/core/model/Gateway.php

@@ -551 +551 @@
      * @since 1.2
      *
-     * @return void
+     * @param string $gateway The gateway hook name
+     * @return GatewayFramework The activated gateway object.
      **/
     public function &get ( $gateway ) {
-        if ( empty($this->active) ) $this->settings();
-        if ( ! isset($this->active[ $gateway ]) ) return false;
-        return $this->active[ $gateway ];
+
+        if ( empty($this->active) )
+            $this->settings(); // Reload settings
+
+        if ( 'ShoppFreeOrder' == $gateway )
+            return $this->freeorder;
+        elseif ( isset($this->active[ $gateway ]) )
+            return $this->active[ $gateway ];
+        elseif ( isset($this->active[ "Shopp$gateway" ]) ) // @see #3256
+            return $Gateways->active[ "Shopp$gateway" ];
+
+        $false = false;
+        return $false;
+
     }
 

shopp/trunk/core/model/Item.php

@@ -215 +215 @@
         if ( ! empty($Price->download) ) $this->download = $Price->download;
 
-        if ( 'Shipped' == $Price->type ) $this->shipped = true;
+        $this->shipped = ( 'Shipped' == $Price->type );
 
         if ( $this->shipped ) {
@@ -917 +917 @@
      **/
     public function taxes ( $quantity = 1 ) {
-        if ( ! $this->istaxed ) return;
+        if ( ! $this->istaxed ) return do_action('shopp_cart_item_taxes', $this);
 
         $Tax = ShoppOrder()->Tax;
@@ -955 +955 @@
         }
 
+        do_action('shopp_cart_item_taxes', $this);
     }
 

shopp/trunk/core/model/Product.php

@@ -1221 +1221 @@
 
         foreach ( $ids as $id ) { // Recount taxonomy counts #2968
+            $laststatus = get_post_status($id);
             $Post = new StdClass;
             $Post->ID = $id;
             $Post->post_type = ShoppProduct::$posttype;
-            wp_transition_post_status($status, $Product->status, $Post);
+            wp_transition_post_status($status, $laststatus, $Post);
         }
 

shopp/trunk/core/model/Promotion.php

@@ -46 +46 @@
         $price_table = ShoppDatabaseObject::tablename(ShoppPrice::$table);
 
-        $where_notdiscounted = array("0 = FIND_IN_SET($this->id,discounts)");
+        // $where_notdiscounted = array("0 = FIND_IN_SET($this->id,discounts)");
         $where = array();
+        $excludes = array();
+
         // Go through each rule to construct an SQL query
         // that gets all applicable product & price ids
-        if (!empty($this->rules) && is_array($this->rules)) {
-            foreach ($this->rules as $rule) {
-
-                if (ShoppPromo::$values[$rule['property']] == "price")
-                    $value = Shopp::floatval($rule['value']);
-                else $value = $rule['value'];
-
-                switch($rule['logic']) {
-                    case "Is equal to": $match = "='$value'"; break;
-                    case "Is not equal to": $match = "!='$value'"; break;
-                    case "Contains": $match = " LIKE '%$value%'"; break;
-                    case "Does not contain": $match = " NOT LIKE '%$value%'"; break;
-                    case "Begins with": $match = " LIKE '$value%'"; break;
-                    case "Ends with": $match = " LIKE '%$value'"; break;
-                    case "Is greater than": $match = "> $value"; break;
-                    case "Is greater than or equal to": $match = ">= $value"; break;
-                    case "Is less than": $match = "< $value"; break;
-                    case "Is less than or equal to": $match = "<= $value"; break;
-                }
-
-                switch($rule['property']) {
-                    case "Name":
-                        $where[] = "p.post_title$match";
-                        $joins[$product_table] = "INNER JOIN $product_table as p ON prc.product=p.id";
-                        break;
-                    case "Category":
-                        $where[] = "tm.name$match";
-                        global $wpdb;
-                        $joins[$wpdb->term_relationships] = "INNER JOIN $wpdb->term_relationships AS tr ON (prc.product=tr.object_id)";
-                        $joins[$wpdb->term_taxonomy] = "INNER JOIN $wpdb->term_taxonomy AS tt ON (tr.term_taxonomy_id=tt.term_taxonomy_id)";
-                        $joins[$wpdb->terms] = "INNER JOIN $wpdb->terms AS tm ON (tm.term_id=tt.term_id)";
-                        break;
-                    case "Variation": $where[] = "prc.label$match"; break;
-                    case "Price": $where[] = "prc.price$match"; break;
-                    case "Sale price": $where[] = "(prc.onsale='on' AND prc.saleprice$match)"; break;
-                    case "Type": $where[] = "prc.type$match"; break;
-                    case "In stock": $where[] = "(prc.inventory='on' AND prc.stock$match)"; break;
-                }
-
+        foreach ( (array) $this->rules as $rule ) {
+
+            if ( 'price' == ShoppPromo::$values[ $rule['property'] ] )
+                $value = Shopp::floatval($rule['value']);
+            else $value = $rule['value'];
+
+            switch( $rule['logic'] ) {
+                case "Is equal to": $match = "='$value'"; break;
+                case "Is not equal to": $match = "!='$value'"; break;
+                case "Contains": $match = " LIKE '%$value%'"; break;
+                case "Does not contain": $match = " NOT LIKE '%$value%'"; break;
+                case "Begins with": $match = " LIKE '$value%'"; break;
+                case "Ends with": $match = " LIKE '%$value'"; break;
+                case "Is greater than": $match = "> $value"; break;
+                case "Is greater than or equal to": $match = ">= $value"; break;
+                case "Is less than": $match = "< $value"; break;
+                case "Is less than or equal to": $match = "<= $value"; break;
             }
 
-        }
-
-        $operator = 'all' == strtolower($this->search)?' AND ': ' OR ';
-        if (!empty($where)) $where = "WHERE ".join($operator,$where);
+            switch( $rule['property'] ) {
+                case "Name":
+                    $where[] = "p.post_title$match";
+                    $joins[ $product_table ] = "INNER JOIN $product_table as p ON prc.product=p.id";
+                    break;
+                case "Category":
+                    $where[] = "tm.name$match";
+                    if ( '!' == $match{0} )
+                        $excludes[] = "tm.name" . ltrim($match, '!');
+                    global $wpdb;
+                    $joins[ $wpdb->term_relationships ] = "INNER JOIN $wpdb->term_relationships AS tr ON (prc.product=tr.object_id)";
+                    $joins[ $wpdb->term_taxonomy ] = "INNER JOIN $wpdb->term_taxonomy AS tt ON (tr.term_taxonomy_id=tt.term_taxonomy_id)";
+                    $joins[ $wpdb->terms ] = "INNER JOIN $wpdb->terms AS tm ON (tm.term_id=tt.term_id)";
+                    break;
+                case "Variation": $where[] = "prc.label$match"; break;
+                case "Price": $where[] = "prc.price$match"; break;
+                case "Sale price": $where[] = "(prc.onsale='on' AND prc.saleprice$match)"; break;
+                case "Type": $where[] = "prc.type$match"; break;
+                case "In stock": $where[] = "(prc.inventory='on' AND prc.stock$match)"; break;
+            }
+
+        }
+
+
+        $operator = 'all' == strtolower($this->search) ? ' AND ' : ' OR ';
+
+        if ( ! empty($where) ) $where = "WHERE " . join($operator, $where);
         else $where = false;
 
-        if (!empty($joins)) $joins = join(' ',$joins);
+        if ( ! empty($joins) ) $joins = join(' ', $joins);
         else $joins = false;
 
         // Find all the pricetags the promotion is *currently assigned* to
         $query = "SELECT id FROM $price_table WHERE 0 < FIND_IN_SET($this->id,discounts)";
-        $current = sDB::query($query,'array','col','id');
+        $current = sDB::query($query, 'array', 'col', 'id');
+
+        $exclude = '';
+        if ( ! empty($excludes) ) {
+            // Find all the pricetags the promotion should exclude
+            $subquery = "SELECT prc.id FROM $price_table AS prc $joins WHERE " . join( ' OR ', $excludes);
+            $exclude = " AND prc.id NOT IN ($subquery)";
+        }
 
         // Find all the pricetags the promotion is *going to apply* to
         $query = "SELECT prc.id,prc.product,prc.discounts FROM $price_table AS prc
                     $joins
-                    $where";
-        $updates = sDB::query($query,'array','col','id');
+                    $where $exclude";
+        $updates = sDB::query($query, 'array', 'col', 'id');
 
         // Determine which records need promo added to and removed from
-        $added = array_diff($updates,$current);
-        $removed = array_diff($current,$updates);
+        $added = array_diff($updates, $current);
+        $removed = array_diff($current, $updates);
 
         // Add discounts to specific rows
         $query = "UPDATE $price_table
                     SET discounts=CONCAT(discounts,IF(discounts='','$this->id',',$this->id'))
-                    WHERE id IN (".join(',',$added).")";
-        if (!empty($added)) sDB::query($query);
+                    WHERE id IN (" . join(',', $added) . ")";
+        if ( ! empty($added) ) sDB::query($query);
 
         // Remove discounts from pricetags that now don't match the conditions
-        if (!empty($removed)) $this->uncatalog($removed);
+        if ( ! empty($removed) ) $this->uncatalog($removed);
 
         // Recalculate product stats for products with pricetags that have changed
         $Collection = new PromoProducts(array('id' => $this->id));
-        $Collection->load( array('load'=>array('prices'),'pagination' => false) );
+        $Collection->load( array('load' => array('prices'), 'pagination' => false) );
     }
 
@@ -132 +142 @@
 
         $table = ShoppDatabaseObject::tablename(ShoppPrice::$table);
-        echo "SELECT id,product,discounts,FIND_IN_SET($this->id,discounts) AS offset FROM $table WHERE id IN ('" . join(',', $pricetags) . "')";
+        //echo "SELECT id,product,discounts,FIND_IN_SET($this->id,discounts) AS offset FROM $table WHERE id IN ('" . join(',', $pricetags) . "')";
         $discounted = sDB::query("SELECT id,product,discounts,FIND_IN_SET($this->id,discounts) AS offset FROM $table WHERE id IN ('" . join(',', $pricetags) . "')", 'array');
 
@@ -140 +150 @@
             $promos = explode(',', $pricetag->discounts);
             array_splice($promos, ($pricetag->offset - 1), 1); // Remove the located promotion ID from the discounts list
-            echo "UPDATE $table SET discounts='" . join(',', $promos) . "' WHERE id=$pricetag->id";
+            //echo "UPDATE $table SET discounts='" . join(',', $promos) . "' WHERE id=$pricetag->id";
             sDB::query("UPDATE $table SET discounts='" . join(',', $promos) . "' WHERE id=$pricetag->id");
         }
@@ -146 +156 @@
         // Force resum on products next load
         $summary = ShoppDatabaseObject::tablename('summary');
-        echo "UPDATE $summary SET modified='" . ProductSummary::RECALCULATE . "' WHERE product IN (" . join(',', $products). ")";
+        //echo "UPDATE $summary SET modified='" . ProductSummary::RECALCULATE . "' WHERE product IN (" . join(',', $products). ")";
         sDB::query("UPDATE $summary SET modified='" . ProductSummary::RECALCULATE . "' WHERE product IN (" . join(',', $products). ")");
     }

shopp/trunk/core/model/Purchase.php

@@ -286 +286 @@
 
     public function capturable () {
+        if ( empty($this->events) ) $this->load_events();
         if ( ! $this->authorized ) return 0.0;
         return ($this->authorized - (float)$this->captured);
@@ -291 +292 @@
 
     public function refundable () {
+        if ( empty($this->events) ) $this->load_events();
         if (!$this->captured) return 0.0;
         return ($this->captured - (float)$this->refunded);
@@ -296 +298 @@
 
     public function gateway () {
-        $Shopp = Shopp::object();
-        $Gateways = $Shopp->Gateways;
+        $Gateways = Shopp::object()->Gateways;
 
         $processor = $this->gateway;
         if ( 'ShoppFreeOrder' == $processor ) return $Gateways->freeorder;
-        if ( isset($Gateways->active[ $processor ]) ) return $Gateways->active[ $processor ];
-        else {
-            foreach ( $Gateways->active as $Gateway ) {
-                if ($processor != $Gateway->name) continue;
-                return $Gateway;
-                break;
-            }
-        }
+
+        $Gateway = $Gateways->get($processor);
+
+        if ( ! $Gateway ) {
+            foreach ( $Gateways->active as $Gateway )
+                if ( $processor == $Gateway->name )
+                    return $Gateway;
+        } else return $Gateway;
+
         return false;
     }

shopp/trunk/core/model/Shiprates.php

@@ -83 +83 @@
     public function item ( ShoppShippableItem $Item ) {
 
-        if ( ! $Item->shippable ) return; // Don't track the item
+        if ( ! $Item->shippable ) {
+            $this->takeoff($Item->id);
+            return; // Don't track the item
+        }
 
         $this->shippable[ $Item->id ] = $Item->shipsfree;
@@ -434 +437 @@
 
 /**
- * Converts a line item object to on that is compatible with the ShoppShiprates system
+ * Converts a line item object to one that is compatible with the ShoppShiprates system
  *
  * @author Jonathan Davis

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

@@ -52 +52 @@
     var sameaddr = $('.sameaddress'),
         shipFields = $('#shipping-address-fields'),
-        billFields = $('#billing-address-fields');
+        billFields = $('#billing-address-fields'),
+        keepLastValue = function () { // Save the current value of the field
+            $(this).attr('data-last', $(this).val());
+        };
 
-    // Update name fields
-    $('#firstname,#lastname').change(function () {
-        $('#billing-name,#shipping-name').filter(function() {
-            return ( this.value === '' );
-        }).val(new String($('#firstname').val()+" "+$('#lastname').val()).trim());
-    });
+    // Handle changes to the firstname and lastname fields
+    $('#firstname,#lastname').each(keepLastValue).change(function () {
+        var namefield = $(this); // Reference to the modified field
+            lastfirstname = $('#firstname').attr('data-last'),
+            lastlastname = $('#lastname').attr('data-last'),
+            firstlast = ( ( $('#firstname').val() ).trim() + " " + ( $('#lastname').val() ).trim() ).trim();
+
+            namefield.val( (namefield.val()).trim() );
+
+        // Update the billing name and shipping name
+        $('#billing-name,#shipping-name').each(function() {
+            var value = $(this).val();
+
+            if ( value.trim().length == 0 ) {
+                // Empty billing or shipping name
+                $('#billing-name,#shipping-name').val(firstlast);
+            } else if ( '' != value && ( $('#firstname').val() == value || $('#lastname').val() == value ) ) {
+                // Only one name entered (so far), add the other name
+                $(this).val(firstlast);
+            } else if ( 'firstname' == namefield.attr('id') && value.indexOf(lastlastname) != -1 ) {
+                // firstname changed & last lastname matched
+                $(this).val( value.replace(lastfirstname, namefield.val()).trim() );
+            } else if ( 'lastname' == namefield.attr('id') && value.indexOf(lastfirstname) != -1 ) {
+                // lastname changed & last firstname matched
+                $(this).val( value.replace(lastlastname, namefield.val()).trim() );
+            }
+
+        });
+
+    }).change(keepLastValue);
 
     // Update state/province

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

@@ -4 +4 @@
  * Licensed under the GPLv3 {@see license.txt}
  */
-(function($){jQuery.fn.upstate=function(){if(typeof regions==="undefined"){return}$(this).change(function(e,init){var $this=$(this),prefix=$this.attr("id").split("-")[0],country=$this.val(),state=$this.parents().find("#"+prefix+"-state"),menu=$this.parents().find("#"+prefix+"-state-menu"),options='<option value=""></option>';if(menu.length==0){return true}if(menu.hasClass("hidden")){menu.removeClass("hidden").hide()}if(regions[country]||(init&&menu.find("option").length>1)){state.setDisabled(true).addClass("_important").hide();if(regions[country]){$.each(regions[country],function(value,label){options+='<option value="'+value+'">'+label+"</option>"});if(!init){menu.empty().append(options).setDisabled(false).show().focus()}if(menu.hasClass("auto-required")){menu.addClass("required")}}else{if(menu.hasClass("auto-required")){menu.removeClass("required")}}menu.setDisabled(false).show();$("label[for="+state.attr("id")+"]").attr("for",menu.attr("id"))}else{menu.empty().setDisabled(true).hide();state.setDisabled(false).show().removeClass("_important");$("label[for="+menu.attr("id")+"]").attr("for",state.attr("id"));if(!init){state.val("").focus()}}}).trigger("change",[true]);return $(this)}})(jQuery);jQuery(document).ready(function($){var sameaddr=$(".sameaddress"),shipFields=$("#shipping-address-fields"),billFields=$("#billing-address-fields");$("#firstname,#lastname").change(function(){$("#billing-name,#shipping-name").filter(function(){return(this.value==="")}).val(new String($("#firstname").val()+" "+$("#lastname").val()).trim())});$("#billing-country,#shipping-country").upstate();sameaddr.change(function(e,init){var refocus=false,bc=$("#billing-country"),sc=$("#shipping-country"),prime="billing"==sameaddr.val()?shipFields:billFields,alt="shipping"==sameaddr.val()?shipFields:billFields;if(sameaddr.is(":checked")){prime.removeClass("half");alt.hide().find(".required").setDisabled(true)}else{prime.addClass("half");alt.show().find(".disabled:not(._important)").setDisabled(false);if(!init){refocus=true}}if(bc.is(":visible")){bc.trigger("change.localemenu",[init])}if(sc.is(":visible")){sc.trigger("change.localemenu",[init])}if(refocus){alt.find("input:first").focus()}}).trigger("change",[true]).click(function(){$(this).change()})});
+(function($){jQuery.fn.upstate=function(){if(typeof regions==="undefined"){return}$(this).change(function(e,init){var $this=$(this),prefix=$this.attr("id").split("-")[0],country=$this.val(),state=$this.parents().find("#"+prefix+"-state"),menu=$this.parents().find("#"+prefix+"-state-menu"),options='<option value=""></option>';if(menu.length==0){return true}if(menu.hasClass("hidden")){menu.removeClass("hidden").hide()}if(regions[country]||(init&&menu.find("option").length>1)){state.setDisabled(true).addClass("_important").hide();if(regions[country]){$.each(regions[country],function(value,label){options+='<option value="'+value+'">'+label+"</option>"});if(!init){menu.empty().append(options).setDisabled(false).show().focus()}if(menu.hasClass("auto-required")){menu.addClass("required")}}else{if(menu.hasClass("auto-required")){menu.removeClass("required")}}menu.setDisabled(false).show();$("label[for="+state.attr("id")+"]").attr("for",menu.attr("id"))}else{menu.empty().setDisabled(true).hide();state.setDisabled(false).show().removeClass("_important");$("label[for="+menu.attr("id")+"]").attr("for",state.attr("id"));if(!init){state.val("").focus()}}}).trigger("change",[true]);return $(this)}})(jQuery);jQuery(document).ready(function($){var sameaddr=$(".sameaddress"),shipFields=$("#shipping-address-fields"),billFields=$("#billing-address-fields"),keepLastValue=function(){$(this).attr("data-last",$(this).val())};$("#firstname,#lastname").each(keepLastValue).change(function(){var namefield=$(this);lastfirstname=$("#firstname").attr("data-last"),lastlastname=$("#lastname").attr("data-last"),firstlast=(($("#firstname").val()).trim()+" "+($("#lastname").val()).trim()).trim();namefield.val((namefield.val()).trim());$("#billing-name,#shipping-name").each(function(){var value=$(this).val();if(value.trim().length==0){$("#billing-name,#shipping-name").val(firstlast)}else{if(""!=value&&($("#firstname").val()==value||$("#lastname").val()==value)){$(this).val(firstlast)}else{if("firstname"==namefield.attr("id")&&value.indexOf(lastlastname)!=-1){$(this).val(value.replace(lastfirstname,namefield.val()).trim())}else{if("lastname"==namefield.attr("id")&&value.indexOf(lastfirstname)!=-1){$(this).val(value.replace(lastlastname,namefield.val()).trim())}}}}})}).change(keepLastValue);$("#billing-country,#shipping-country").upstate();sameaddr.change(function(e,init){var refocus=false,bc=$("#billing-country"),sc=$("#shipping-country"),prime="billing"==sameaddr.val()?shipFields:billFields,alt="shipping"==sameaddr.val()?shipFields:billFields;if(sameaddr.is(":checked")){prime.removeClass("half");alt.hide().find(".required").setDisabled(true)}else{prime.addClass("half");alt.show().find(".disabled:not(._important)").setDisabled(false);if(!init){refocus=true}}if(bc.is(":visible")){bc.trigger("change.localemenu",[init])}if(sc.is(":visible")){sc.trigger("change.localemenu",[init])}if(refocus){alt.find("input:first").focus()}}).trigger("change",[true]).click(function(){$(this).change()})});

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

@@ -117 +117 @@
     });
 
-    $('input[type=image]').click(function () { $(this.form).submit(); });
+    $('#cart input[type=image]').click(function () { $(this.form).submit(); });
 
     // "Add to cart" button behaviors

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

@@ -4 +4 @@
  * Licensed under the GPLv3 {@see license.txt}
  */
-;function addtocart(form){var $=jQuery,options=$(form).find("select.options"),selections=true;if(options){options.each(function(i,menu){if($(menu).val()==""){return(selections=false)}});if(!selections){if(!$s.opreq){$s.opreq="You must select the options for this item before you can add it to your shopping cart."}alert($s.opreq);return false}}if($(form).find("input.addtocart").hasClass("ajax-html")){ShoppCartAjaxRequest(form,"html")}else{if($(form).find("input.addtocart").hasClass("ajax")){ShoppCartAjaxRequest(form)}else{form.submit()}}return false}function ShoppCartAjaxRequest(form,response){if(!response){response="json"}var $=jQuery,url=form.action,$form=$(form),data=$form.serialize(),datatype=(response=="json"?"json":"html");$form.trigger("shopp_cart_ajax_request",data);$.ajax({type:"POST",url:url,data:data+"&response="+response,timeout:10000,dataType:datatype,success:function(cart){$form.trigger("shopp_cart_ajax_success",cart,response);ShoppCartAjaxHandler(cart,response);$form.trigger("shopp_cart_ajax_successful",cart,response)},error:function(){}})}function ShoppCartAjaxHandler(cart,response){var $=jQuery,label="",Item=false,Totals=false,widget=$(".widget_shoppcartwidget div.widget-all"),wrapper=$("#shopp-cart-ajax"),ui=widget.length>0?widget:wrapper,actions=ui.find("ul"),status=ui.find("p.status"),added=ui.find("div.added").empty().hide(),item=$('<div class="added"></div>');if(response=="html"){$(wrapper).trigger("shopp_cart_ajax_html",ui,cart);return ui.html(cart)}if(cart.Item){Item=cart.Item}if(cart.Totals){Totals=cart.Totals}if(added.length==1){item=added}else{item.prependTo(ui).hide()}if(Item.option&&Item.option.label&&Item.option.label!=""){label=" ("+Item.option.label+")"}if(Item.image){$('<p><img src="'+cart.imguri+cart.Item.image.id+'" alt="" width="96"  height="96" /></p>').appendTo(item)}$("<p />").html("<strong>"+Item.name+"</strong>"+label).appendTo(item);$("<p />").html(asMoney(new Number(Item.unitprice))).appendTo(item);status.html('<a href="'+cart.url+'"><span id="shopp-sidecart-items">'+Totals.quantity+"</span> <strong>"+$ct.items+"</strong> &mdash; <strong>"+$ct.total+'</strong> <span id="shopp-sidecart-total">'+asMoney(new Number(Totals.total))+"</span></a>");if(actions.size()!=1){actions=$("<ul />").appendTo(ui)}actions.html('<li><a href="'+cart.url+'">'+cart.label+'</a></li><li><a href="'+cart.checkouturl+'">'+cart.checkoutLabel+"</a></li>");$(wrapper).trigger("shopp_cart_ajax_item",item,cart);item.slideDown()}jQuery(document).ready(function($){$("#cart #shipping-country").change(function(){this.form.submit()});$("input[type=image]").click(function(){$(this.form).submit()});$("input.addtocart").each(function(){var button=$(this),form=button.closest("form");if(!form){return false}form.unbind("submit.validate").bind("submit.addtocart",function(e){e.preventDefault();if(form.hasClass("validate")){if(!validate(this)){return false}}addtocart(this)});if(button.attr("type")=="button"){button.click(function(){form.submit()})}})});
+;function addtocart(form){var $=jQuery,options=$(form).find("select.options"),selections=true;if(options){options.each(function(i,menu){if($(menu).val()==""){return(selections=false)}});if(!selections){if(!$s.opreq){$s.opreq="You must select the options for this item before you can add it to your shopping cart."}alert($s.opreq);return false}}if($(form).find("input.addtocart").hasClass("ajax-html")){ShoppCartAjaxRequest(form,"html")}else{if($(form).find("input.addtocart").hasClass("ajax")){ShoppCartAjaxRequest(form)}else{form.submit()}}return false}function ShoppCartAjaxRequest(form,response){if(!response){response="json"}var $=jQuery,url=form.action,$form=$(form),data=$form.serialize(),datatype=(response=="json"?"json":"html");$form.trigger("shopp_cart_ajax_request",data);$.ajax({type:"POST",url:url,data:data+"&response="+response,timeout:10000,dataType:datatype,success:function(cart){$form.trigger("shopp_cart_ajax_success",cart,response);ShoppCartAjaxHandler(cart,response);$form.trigger("shopp_cart_ajax_successful",cart,response)},error:function(){}})}function ShoppCartAjaxHandler(cart,response){var $=jQuery,label="",Item=false,Totals=false,widget=$(".widget_shoppcartwidget div.widget-all"),wrapper=$("#shopp-cart-ajax"),ui=widget.length>0?widget:wrapper,actions=ui.find("ul"),status=ui.find("p.status"),added=ui.find("div.added").empty().hide(),item=$('<div class="added"></div>');if(response=="html"){$(wrapper).trigger("shopp_cart_ajax_html",ui,cart);return ui.html(cart)}if(cart.Item){Item=cart.Item}if(cart.Totals){Totals=cart.Totals}if(added.length==1){item=added}else{item.prependTo(ui).hide()}if(Item.option&&Item.option.label&&Item.option.label!=""){label=" ("+Item.option.label+")"}if(Item.image){$('<p><img src="'+cart.imguri+cart.Item.image.id+'" alt="" width="96"  height="96" /></p>').appendTo(item)}$("<p />").html("<strong>"+Item.name+"</strong>"+label).appendTo(item);$("<p />").html(asMoney(new Number(Item.unitprice))).appendTo(item);status.html('<a href="'+cart.url+'"><span id="shopp-sidecart-items">'+Totals.quantity+"</span> <strong>"+$ct.items+"</strong> &mdash; <strong>"+$ct.total+'</strong> <span id="shopp-sidecart-total">'+asMoney(new Number(Totals.total))+"</span></a>");if(actions.size()!=1){actions=$("<ul />").appendTo(ui)}actions.html('<li><a href="'+cart.url+'">'+cart.label+'</a></li><li><a href="'+cart.checkouturl+'">'+cart.checkoutLabel+"</a></li>");$(wrapper).trigger("shopp_cart_ajax_item",item,cart);item.slideDown()}jQuery(document).ready(function($){$("#cart #shipping-country").change(function(){this.form.submit()});$("#cart input[type=image]").click(function(){$(this.form).submit()});$("input.addtocart").each(function(){var button=$(this),form=button.closest("form");if(!form){return false}form.unbind("submit.validate").bind("submit.addtocart",function(e){e.preventDefault();if(form.hasClass("validate")){if(!validate(this)){return false}}addtocart(this)});if(button.attr("type")=="button"){button.click(function(){form.submit()})}})});

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

@@ -714 +714 @@
     swfu,
     settings = {
-        button_text: '<span class="button">'+ADD_IMAGE_BUTTON_TEXT+'</span>',
-        button_text_style: '.button { text-align: center; font-family:"Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana,sans-serif; font-size: 9px; color: #333333; }',
+        button_text: ADD_IMAGE_BUTTON_TEXT,
+        button_text_style: '.buttonText{text-align:center;font-family:"Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana,_sans;font-size:9px;color:#333333;}',
         button_text_top_padding: 3,
         button_height: "22",
@@ -722 +722 @@
         button_placeholder_id: "swf-uploader-button",
         upload_url : ajaxurl,
-        flash_url : uidir+'/behaviors/swfupload/swfupload.swf',
+        flash_url : uidir+'/behaviors/swfupload.swf',
         file_queue_limit : 0,
         file_size_limit : filesizeLimit+'b',

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

@@ -4 +4 @@
  * Licensed under the GPLv3 {@see license.txt}
  */
-;function NestedMenu(i,target,dataname,defaultlabel,data,items,sortoptions){var $=jQuery,_=this;if(!sortoptions){sortoptions={axis:"y"}}_.items=items;_.dataname=dataname;_.index=i;_.element=$('<li><div class="move"></div><input type="hidden" name="'+dataname.replace("[","-").replace("]","-")+'-sortorder[]" value="'+i+'" class="sortorder" /><input type="hidden" name="'+dataname+"["+i+'][id]" class="id" /><input type="text" name="'+dataname+"["+i+'][name]" class="label" /><button type="button" class="delete"><span class="shoppui-minus"></span></button></li>').appendTo($(target).children("ul"));_.moveHandle=_.element.find("div.move");_.sortorder=_.element.find("input.sortorder");_.id=_.element.find("input.id");_.label=_.element.find("input.label");_.deleteButton=_.element.find("button.delete").bind("delete",function(){var deletes=$(target).find("input.deletes");if($(_.id).val()!=""){deletes.val((deletes.val()=="")?$(_.id).val():deletes.val()+","+$(_.id).val())}if(items){_.itemsElement.remove()}_.element.remove()}).click(function(){$(this).trigger("delete")});if(_.items){if(items.type=="list"){_.itemsElement=$("<ul></ul>").appendTo(items.target).hide()}else{_.itemsElement=$("<li></li>").appendTo(items.target).hide()}}_.selected=function(){$(target).find("ul li").removeClass("selected");$(_.element).addClass("selected");if(items){$(items.target).children().hide();$(_.itemsElement).show()}};_.element.click(this.selected).hover(function(){$(this).addClass("hover")},function(){$(this).removeClass("hover")});_.label.mouseup(function(e){this.select()}).focus(function(){$(this).keydown(function(e){e.stopPropagation();if(e.keyCode==13){$(this).blur().unbind("keydown")}})});_.id.val(_.index);if(data&&data.id){_.id.val(data.id)}if(data&&data.name){_.label.val(htmlentities(data.name))}else{_.label.val(defaultlabel+" "+_.index)}if(!$(target).children("ul").hasClass("ui-sortable")){$(target).children("ul").sortable(sortoptions)}else{$(target).children("ul").sortable("refresh")}}function NestedMenuContent(i,target,dataname,data){var $=jQuery;this.contents=$('<textarea name="'+dataname+"["+i+'][value]" cols="40" rows="7"></textarea>').appendTo(target);if(data&&data.value){this.contents.val(htmlentities(data.value))}}function NestedMenuOption(i,target,dataname,defaultlabel,data){var $=jQuery,_=this;_.index=$(target).contents().length;_.element=$('<li class="option"><div class="move"></div><input type="hidden" name="'+dataname+"["+i+"][options]["+this.index+'][id]" class="id" /><input type="text" name="'+dataname+"["+i+"][options]["+this.index+'][name]" class="label" /><button type="button" class="delete"><span class="shoppui-minus"></span></button></li>').appendTo(target);_.moveHandle=_.element.find("div.move");_.id=_.element.find("input.id");_.label=_.element.find("input.label");_.deleteButton=_.element.find("button.delete").click(function(){$(_.element).remove()});_.element.hover(function(){$(this).addClass("hover")},function(){$(this).removeClass("hover")});_.label.click(function(){this.select()}).focus(function(){$(this).keydown(function(e){e.stopPropagation();if(e.keyCode==13){$(this).blur().unbind("keydown")}})});_.id.val(_.index);if(data.id){_.id.val(data.id)}if(data.name){_.label.val(htmlentities(data.name))}if(!data.name){_.label.val(defaultlabel+" "+(_.index+1))}}function loadVariations(options,prices){if(!options){return}var $=jQuery;$.each(options,function(key,option){if(option&&option.id){addVariationOptionsMenu(option)}});$.each(prices,function(k,p){if(p.context=="variation"){Pricelines.add(p.options.split(","),p,"#variations-pricing")}});Pricelines.updateVariationsUI();$.each(options,function(key,option){if(!(option&&option.options)){return}$.each(option.options,function(i,data){if(data&&data.id&&data.linked=="on"){Pricelines.linkVariations(data.id)}})})}function addVariationOptionsMenu(data){var $=jQuery,menus=$("#variations-menu"),entries=$("#variations-list"),addMenuButton=$("#addVariationMenu"),addOptionButton=$("#addVariationOption"),linkOptionVariations=$("#linkOptionVariations"),id=variationsidx,menu=new NestedMenu(id,menus,"meta[options][v]",OPTION_MENU_DEFAULT,data,{target:entries,type:"list"},{axis:"y",update:function(){orderOptions(menus,entries)}});menu.addOption=function(data){var init=false,option,optionid;if(!data){data=new Object()}if(!data.id){init=true;data.id=optionsidx}else{if(data.id>optionsidx){optionsidx=data.id}}option=new NestedMenuOption(menu.index,menu.itemsElement,"meta[options][v]",NEW_OPTION_DEFAULT,data);optionsidx++;optionid=option.id.val();option.linkIcon=$('<span class="shoppui-link"></span>').appendTo(option.moveHandle);option.linked=$('<input type="hidden" name="meta[options][v]['+menu.index+"][options]["+option.index+'][linked]" class="linked" />').val(data.linked?data.linked:"off").appendTo(option.element).change(function(){if($(this).val()=="on"){option.linkIcon.removeClass("hidden")}else{option.linkIcon.addClass("hidden")}}).change();option.selected=function(){if(option.element.hasClass("selected")){entries.find("ul li").removeClass("selected");selectedMenuOption=false}else{entries.find("ul li").removeClass("selected");$(option.element).addClass("selected");selectedMenuOption=option}linkOptionVariations.change()};option.element.click(option.selected);productOptions[optionid]=option.label;option.label.blur(function(){updateVariationLabels()});option.deleteButton.unbind("click");option.deleteButton.click(function(){if(menu.itemsElement.children().length==1){deleteVariationPrices([optionid],true)}else{deleteVariationPrices([optionid])}option.element.remove()});if(!init){addVariationPrices(optionid)}else{addVariationPrices()}entries.dequeue().animate({scrollTop:entries.prop("scrollHeight")-entries.height()},200);option.label.click().focus().select().keydown(function(e){var key=e.keyCode||e.which;if(key!=9){return}e.preventDefault();option.label.blur();addOptionButton.focus()});menu.items.push(option)};menu.items=new Array();if(data&&data.options){$.each(data.options,function(){menu.addOption(this)})}else{menu.addOption();menu.addOption()}menu.itemsElement.sortable({axis:"y",update:function(){orderVariationPrices()}});menu.element.unbind("click",menu.click).click(function(){menu.selected();$(addOptionButton).unbind("click").click(menu.addOption)});optionMenus[variationsidx++]=menu;menu.deleteButton.unbind("click").click(function(){var deletedOptions=new Array();$(menu.itemsElement).find("li").not(".ui-sortable-helper").find("input.id").each(function(i,id){deletedOptions.push($(id).val())});deleteVariationPrices(deletedOptions,true);$(this).trigger("delete")});if(!data){entries.dequeue().animate({scrollTop:entries.attr("scrollHeight")-entries.height()},200);menu.label.click().focus().select().keydown(function(e){var key=e.keyCode||e.which;if(key!=9){return}e.preventDefault();addOptionButton.focus()})}}function buildVariations(){var $=jQuery,i,setid,fields,index,combos=new Array(),optionSets=$("#variations-list ul"),totalSets=optionSets.length,lastOptionSet=totalSets-1,address=new Array(optionSets.length),totalOptions=new Array(optionSets.length),totalVariations=0;optionSets.each(function(id,set){totalOptions[id]=$(set).children().length;if(totalVariations==0){totalVariations=$(set).children().length}else{totalVariations=totalVariations*$(set).children().length}address[id]=0});for(i=0;i<totalVariations;i++){for(setid=0;setid<optionSets.length;setid++){fields=$(optionSets[setid]).children("li").not(".ui-sortable-helper").children("input.id");if(!combos[i]){combos[i]=[$(fields[address[setid]]).val()]}else{combos[i].push($(fields[address[setid]]).val())}}if(++address[lastOptionSet]>=totalOptions[lastOptionSet]){for(index=lastOptionSet;index>-1;index--){if(address[index]<totalOptions[index]){continue}address[index]=0;if(index-1>-1){address[(index-1)]++}}}}return combos}function addVariationPrices(data){if(data){return}var $=jQuery,key,preKey,updated=buildVariations(),variationPricing=$("#variations-pricing"),variationPricelines=$(variationPricing).children(),added=false;$(updated).each(function(id,options){key=xorkey(options);preKey=xorkey(options.slice(0,options.length-1));if(preKey==""){preKey=-1}if(!Pricelines.row[key]){if(Pricelines.row[preKey]){Pricelines.row[key]=Pricelines.row[preKey];delete Pricelines.row[preKey];Pricelines.row[key].setOptions(options)}else{if(variationPricelines.length==0){Pricelines.add(options,{context:"variation"},"#variations-pricing")}else{Pricelines.add(options,{context:"variation"},Pricelines.row[xorkey(updated[(id-1)])].row,"after")}added=true}}});if(added){Pricelines.updateVariationsUI()}}function deleteVariationPrices(optionids,reduce){var $=jQuery,updated=buildVariations(),reduced=false,i,key,modOptions,newkey,dbPriceId;$(updated).each(function(id,options){key=xorkey(options);for(i=0;i<optionids.length;i++){if(options.indexOf(optionids[i])!=-1){modOptions=new Array();$(options).each(function(index,option){if(option!=optionids[i]){modOptions.push(option)}});newkey=xorkey(modOptions);if(reduce&&!Pricelines.row[newkey]){if(newkey!=0){Pricelines.row[newkey]=Pricelines.row[key]}else{Pricelines.row[key].row.remove()}delete Pricelines.row[key];if(Pricelines.row[newkey]){Pricelines.row[newkey].setOptions(modOptions);reduced=true}}else{if(Pricelines.row[key]){dbPriceId=$("#priceid-"+Pricelines.row[key].id).val();if($("#deletePrices").val()==""){$("#deletePrices").val(dbPriceId)}else{$("#deletePrices").val($("#deletePrices").val()+","+dbPriceId)}Pricelines.remove(key)}}}}});if(reduced){Pricelines.updateVariationsUI()}}function optionMenuExists(label){if(!label){return false}var $=jQuery,found=false;$.each(optionMenus,function(id,menu){if(menu&&$(menu.label).val()==label){return(found=id)}});if(optionMenus[found]){return optionMenus[found]}return found}function optionMenuItemExists(menu,label){if(!menu||!menu.items||!label){return false}var $=jQuery,found=false;$.each(menu.items,function(id,item){if(item&&$(item.label).val()==label){return(found=true)}});return found}function updateVariationLabels(){var $=jQuery,updated=buildVariations();$(updated).each(function(id,options){var key=xorkey(options);if(Pricelines.row[key]){Pricelines.row[key].updateLabel()}})}function orderOptions(menus,options){var $=jQuery;$(menus).find("ul li").not(".ui-sortable-helper").find("input.id").each(function(i,menuid){if(menuid){$(optionMenus[$(menuid).val()].itemsElement).appendTo(options)}});orderVariationPrices()}function orderVariationPrices(){var $=jQuery,key,updated=buildVariations();$(updated).each(function(id,options){key=xorkey(options);if(key>0&&Pricelines.row[key]){Pricelines.reorderVariation(key,options)}});Pricelines.updateVariationsUI("tabs")}function xorkey(ids){if(!(ids instanceof Array)){ids=[ids]}for(var key=0,i=0;i<ids.length;i++){key=key^(ids[i]*7001)}return key}function variationsToggle(){var $=jQuery,toggle=$(this),ui=$("#variations"),baseprice=$("#product-pricing");if(toggle.prop("checked")){if(Pricelines.row[0]){Pricelines.row[0].disable()}baseprice.hide();ui.show()}else{ui.hide();baseprice.show();if(Pricelines.row[0]){Pricelines.row[0].enable()}}}function addonsToggle(){var $=jQuery,toggle=$(this),ui=$("#addons");if(toggle.prop("checked")){ui.show()}else{ui.hide()}}function clearLinkedIcons(){jQuery("#variations-list input.linked").val("off").change()}function linkVariationsButton(){var $=jQuery;if(selectedMenuOption){if(selectedMenuOption.linked.val()=="off"){if(Pricelines.allLinked()){clearLinkedIcons();Pricelines.unlinkAll()}selectedMenuOption.linked.val("on").change();Pricelines.linkVariations(selectedMenuOption.id.val())}else{selectedMenuOption.linked.val("off").change();Pricelines.unlinkVariations(selectedMenuOption.id.val())}}else{clearLinkedIcons();if(Pricelines.allLinked()){Pricelines.unlinkAll()}else{Pricelines.linkAll()}}$(this).change()}function linkVariationsButtonLabel(){var $=jQuery;if(selectedMenuOption){if(selectedMenuOption.linked.val()=="on"){$(this).find("small").html(" "+UNLINK_VARIATIONS)}else{$(this).find("small").html(" "+LINK_VARIATIONS)}}else{if(Pricelines.allLinked()){$(this).find("small").html(" "+UNLINK_ALL_VARIATIONS)}else{$(this).find("small").html(" "+LINK_ALL_VARIATIONS)}}}function loadAddons(addons,prices){var $=jQuery;if(!addons){return}$.each(addons,function(key,addon){newAddonGroup(addon)});$.each(prices,function(key,price){if(price.context=="addon"){var group=addonOptionsGroup[price.options];Pricelines.add(price.options,this,"#addon-pricegroup-"+group)}});Pricelines.updateVariationsUI()}function newAddonGroup(data){var $=jQuery,menus=$("#addon-menu"),entries=$("#addon-list"),addMenuButton=$("#newAddonGroup"),addOptionButton=$("#addAddonOption"),id=addon_group_idx,menu=new NestedMenu(id,menus,"meta[options][a]",ADDON_GROUP_DEFAULT,data,{target:entries,type:"list"},{axis:"y",update:function(){orderAddonGroups()}});menu.itemsElement.attr("id","addon-group-"+id);menu.pricegroup=$('<div id="addon-pricegroup-'+id+'" />').appendTo("#addon-pricing");menu.pricegroupLabel=$("<label />").html("<h4>"+menu.label.val()+"</h4>").prependTo(menu.pricegroup);menu.updatePriceLabel=function(){menu.pricegroupLabel.html("<h4>"+menu.label.val()+"</h4>")};menu.label.blur(menu.updatePriceLabel);menu.addOption=function(data){var init=false,option,optionid;if(!data){data=new Object()}if(!data.id){init=true;data.id=addonsidx}else{if(data.id>addonsidx){addonsidx=data.id}}option=new NestedMenuOption(menu.index,menu.itemsElement,"meta[options][a]",NEW_OPTION_DEFAULT,data);addonsidx++;optionid=option.id.val();option.selected=function(){if(option.element.hasClass("selected")){entries.find("ul li").removeClass("selected");selectedMenuOption=false}else{entries.find("ul li").removeClass("selected");$(option.element).addClass("selected");selectedMenuOption=option}};option.element.click(option.selected);productAddons[optionid]=option.label;option.label.blur(function(){Pricelines.row[optionid].updateLabel()});option.deleteButton.unbind("click");option.deleteButton.click(function(){var dbPriceid=Pricelines.row[optionid].data.id,dP=$("#deletePrices");if(dbPriceid){if(dP.val()==""){dP.val(dbPriceid)}else{dP.val(dP.val()+","+dbPriceid)}}Pricelines.row[optionid].row.remove();option.element.remove()});if(init){Pricelines.add(optionid,{context:"addon"},menu.pricegroup)}addonOptionsGroup[optionid]=menu.index;menu.items.push(option);entries.dequeue().animate({scrollTop:entries.attr("scrollHeight")-entries.height()},200);option.label.click().focus().select().keydown(function(e){var key=e.keyCode||e.which;if(key!=9){return}e.preventDefault();option.label.blur();addOptionButton.focus()})};menu.items=new Array();if(data&&data.options){$.each(data.options,function(){menu.addOption(this)})}else{menu.addOption();menu.addOption()}menu.itemsElement.sortable({axis:"y",update:function(){orderAddonPrices(menu.index)}});menu.element.unbind("click",menu.click);menu.element.click(function(){menu.selected();$(addOptionButton).unbind("click").click(menu.addOption)});addonGroups[addon_group_idx++]=menu;menu.deleteButton.unbind("click").click(function(){$("#addon-list #addon-group-"+menu.index+" li").not(".ui-sortable-helper").find("input.id").each(function(id,option){var optionid=$(option).val(),dbPriceid,dP=$("#deletePrices");if(Pricelines.row[optionid]){dbPriceid=Pricelines.row[optionid].data.id;if(dbPriceid){if(dP.val()==""){dP.val(dbPriceid)}else{dP.val(dP.val()+","+dbPriceid)}}Pricelines.row[optionid].row.remove()}});menu.deleteButton.trigger("delete");menu.pricegroup.remove();menu.element.remove()});if(!data){menus.dequeue().animate({scrollTop:menus.attr("scrollHeight")-menus.height()},200);menu.label.click().focus().select().keydown(function(e){var key=e.keyCode||e.which;if(key!=9){return}e.preventDefault();menu.label.blur();addMenuButton.focus()})}}function orderAddonGroups(){var $=jQuery,menu;$("#addon-menu ul li").not(".ui-sortable-helper").find("input.id").each(function(i,menuid){menu=addonGroups[$(menuid).val()];menu.pricegroup.appendTo("#addon-pricing")})}function orderAddonPrices(index){var $=jQuery,menu=addonGroups[index];$("#addon-list #addon-group-"+menu.index+" li").not(".ui-sortable-helper").find("input.id").each(function(id,option){Pricelines.reorderAddon($(option).val(),menu.pricegroup)})}function readableFileSize(size){var units=new Array("bytes","KB","MB","GB"),sized=size*1,unit=0;if(sized==0){return sized}while(sized>1000){sized=sized/1024;unit++}return sized.toFixed(2)+" "+units[unit]}function addDetail(data){var $=jQuery,i,optionsmenu,menus=$("#details-menu"),entries=$("#details-list"),id=detailsidx++,menu=new NestedMenu(id,menus,"details","Detail Name",data,{target:entries});if(data&&data.options){optionsmenu=$('<select name="details['+menu.index+'][value]"></select>').appendTo(menu.itemsElement);$("<option></option>").appendTo(optionsmenu);for(i in data.options){$("<option>"+data.options[i]["name"]+"</option>").appendTo(optionsmenu)}if(data&&data.value){optionsmenu.val(htmlentities(data.value))}}else{menu.item=new NestedMenuContent(menu.index,menu.itemsElement,"details",data)}if(!data||data.add){menu.add=$('<input type="hidden" name="details['+menu.index+'][new]" value="true" />').appendTo(menu.element);menus.dequeue().animate({scrollTop:menus.attr("scrollHeight")-menus.height()},200);menu.label.click().focus().select();if(menu.item){menu.item.contents.keydown(function(e){var key=e.keyCode||e.which;if(key!=9){return}e.preventDefault();$("#addDetail").focus()})}}}function ImageUploads(id,type){var $=jQuery,swfu,settings={button_text:'<span class="button">'+ADD_IMAGE_BUTTON_TEXT+"</span>",button_text_style:'.button { text-align: center; font-family:"Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana,sans-serif; font-size: 9px; color: #333333; }',button_text_top_padding:3,button_height:"22",button_width:"100",button_image_url:uidir+"/icons/buttons.png",button_placeholder_id:"swf-uploader-button",upload_url:ajaxurl,flash_url:uidir+"/behaviors/swfupload/swfupload.swf",file_queue_limit:0,file_size_limit:filesizeLimit+"b",file_types:"*.jpg;*.jpeg;*.png;*.gif",file_types_description:"Web-compatible Image Files",file_upload_limit:filesizeLimit,post_params:{action:"shopp_upload_image",parent:id,type:type},swfupload_loaded_handler:swfuLoaded,file_queue_error_handler:imageFileQueueError,file_dialog_complete_handler:imageFileDialogComplete,upload_start_handler:startImageUpload,upload_progress_handler:imageUploadProgress,upload_error_handler:imageUploadError,upload_success_handler:imageUploadSuccess,custom_settings:{loaded:false,targetHolder:false,progressBar:false,sorting:false},prevent_swf_caching:$.ua.msie,debug:imageupload_debug};if(flashuploader){swfu=new SWFUpload(settings)}$("#image-upload").upload({name:"Filedata",action:ajaxurl,params:{action:"shopp_upload_image",type:type},onSubmit:function(){this.targetHolder=$('<li id="image-uploading"><input type="hidden" name="images[]" value="" /><div class="progress"><div class="bar"></div><div class="gloss"></div></div></li>').appendTo("#lightbox");this.progressBar=this.targetHolder.find("div.bar");this.sorting=this.targetHolder.find("input")},onComplete:function(results){var image=false,img,deleteButton,targetHolder=this.targetHolder;try{image=$.parseJSON(results)}catch(ex){image.error=results}if(!image||!image.id){targetHolder.remove();if(image.error){alert(image.error)}else{alert(UNKNOWN_UPLOAD_ERROR)}return false}targetHolder.attr({id:"image-"+image.id});this.sorting.val(image.id);img=$('<img src="?siid='+image.id+'" width="96" height="96" class="handle" />').appendTo(targetHolder).hide();deleteButton=$('<button type="button" name="deleteImage" value="'+image.src+'" class="delete"><span class="shoppui-minus"></span></button>').appendTo($(targetHolder)).hide();$(this.progressBar).animate({width:"76px"},250,function(){$(this).parent().fadeOut(500,function(){$(this).remove();$(img).fadeIn("500");enableDeleteButton(deleteButton)})})}});$(document).load(function(){if(!swfu.loaded){$("#product-images .swfupload").remove()}});sorting();$("#lightbox li").each(function(){$(this).dblclick(function(){var id=$(this).attr("id")+"-details",src=$("#"+id),srcid=src.find("input[type=hidden]").val(),srcthumb=src.find("img"),srctitle=src.find("input.imagetitle"),srcalt=src.find("input.imagealt"),srcCropped=src.find("input.imagecropped"),ui=$('<div class="image-details-editor"><div class="details-editor"><img class="thumb" width="96" height="96" /><div class="details"><p><label>'+IMAGE_DETAILS_TITLE_LABEL+': </label><input type="text" name="title" /></p><p><label>'+IMAGE_DETAILS_ALT_LABEL+': </label><input type="text" name="alt" /></p></div></div><div class="cropping"><p class="clear">'+IMAGE_DETAILS_CROP_LABEL+': <select name="cropimage"><option></option></select></p><div class="cropui"></div><br class="clear"/></div><input type="button" class="button-primary alignright" value="&nbsp;&nbsp;'+IMAGE_DETAILS_DONE+'&nbsp;&nbsp;" /></div>'),thumb=ui.find("img").attr("src",srcthumb.attr("src")),titlefield=ui.find("input[name=title]").val(srctitle.val()).change(function(){srctitle.val(titlefield.val())}),altfield=ui.find("input[name=alt]").val(srcalt.val()).change(function(){srcalt.val(altfield.val())}),doneButton=ui.find("input[type=button]").click(function(){$.colorbox.close()}),cropping=ui.find("div.cropping").hide(),croptool=ui.find("div.cropui"),cropselect=ui.find("select[name=cropimage]").change(function(){if(cropselect.val()==""){croptool.empty();$.colorbox.resize();return}var d=cropselect.val().split(":"),init=srcCropped.filter("input[alt="+cropselect.val()+"]").val().split(",");croptool.empty().scaleCrop({imgsrc:"?siid="+srcid,target:{width:parseInt(d[0],10),height:parseInt(d[1],10)},init:{x:parseInt(init[0],10),y:parseInt(init[1],10),s:new Number(init[2])}}).ready(function(){var padding=125;$.colorbox.resize({innerWidth:(parseInt(d[0],10))+padding})}).bind("change.scalecrop",function(e,c){if(!c.s){c.s=1}if(c){srcCropped.filter("input[alt="+cropselect.val()+"]").val(c.x+","+c.y+","+c.s)}})});if(srcCropped.size()>0){srcCropped.each(function(i,e){var d=$(e).attr("alt");$('<option value="'+d+'">'+(i+1)+": "+d.replace(":","&times;")+"</option>").appendTo(cropselect)});cropping.show()}$.colorbox({title:IMAGE_DETAILS_TEXT,html:ui})});enableDeleteButton($(this).find("button.delete"))});function swfuLoaded(){$("#browser-uploader").hide();swfu.loaded=true}function sorting(){if($("#lightbox li").size()>0){$("#lightbox").sortable({opacity:0.8})}}function imageFileQueueError(file,error,message){if(error==SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED){alert("You selected too many files to upload at one time. "+(message===0?"You have reached the upload limit.":"You may upload "+(message>1?"up to "+message+" files.":"only one file.")));return}else{alert(message)}}function imageFileDialogComplete(selected,queued){try{this.startUpload()}catch(ex){this.debug(ex)}}function startImageUpload(file){this.targetHolder=$('<li class="image uploading"><input type="hidden" name="images[]" /><div class="progress"><div class="bar"></div><div class="gloss"></div></div></li>').appendTo($("#lightbox"));this.progressBar=this.targetHolder.find("div.bar");this.sorting=this.targetHolder.find("input")}function imageUploadProgress(file,loaded,total){this.progressBar.animate({width:Math.ceil((loaded/total)*76)+"px"},100)}function imageUploadError(file,error,message){}function imageUploadSuccess(file,results){var image=false,img,deleteButton,targetHolder=this.targetHolder;try{image=$.parseJSON(results)}catch(ex){targetHolder.remove();alert(results);return false}if(!image.id){targetHolder.remove();if(image.error){alert(image.error)}else{alert(UNKNOWN_UPLOAD_ERROR)}return true}targetHolder.attr({id:"image-"+image.id});this.sorting.val(image.id);img=$('<img src="?siid='+image.id+'" width="96" height="96" class="handle" />').appendTo(targetHolder).hide();deleteButton=$('<button type="button" name="deleteImage" value="'+image.id+'" class="delete"><span class="shoppui-minus"></span></button>').appendTo(targetHolder).hide();sorting();this.progressBar.animate({width:"76px"},250,function(){$(this).parent().fadeOut(500,function(){$(this).remove();$(img).fadeIn("500");enableDeleteButton(deleteButton)})})}function enableDeleteButton(button){button.hide();button.parent().hover(function(){button.show()},function(){button.hide()});button.click(function(){if(confirm(DELETE_IMAGE_WARNING)){var imgid=(button.val().substr(0,1)=="<")?button.find("input[name=ieisstupid]").val():button.val(),deleteImages=$("#deleteImages"),deleting=deleteImages.val();deleteImages.val(deleting==""?imgid:deleting+","+imgid);$("#confirm-delete-images").show();button.parent().fadeOut(500,function(){$(this).remove()})}})}}jQuery.fn.FileChooser=function(line,status){var $=jQuery,_=this,chooser=$("#chooser"),importurl=chooser.find(".fileimport"),importstatus=chooser.find(".status"),attach=$("#attach-file"),dlpath=$("#download_path-"+line),dlname=$("#download_file-"+line),file=$("#file-"+line),stored=false,nostatus=0,progressbar=false;_.line=line;_.status=status;chooser.unbind("change").on("change",".fileimport",function(e){importstatus.attr("class","status").addClass("shoppui-spinner shoppui-spinfx shoppui-spinfx-steps8");$.ajax({url:fileverify_url+"&action=shopp_verify_file&t=download",type:"POST",data:"url="+importurl.val(),timeout:10000,dataType:"text",success:function(results){importstatus.attr("class","status");if(results=="OK"){return importstatus.addClass("shoppui-ok-sign")}if(results=="NULL"){importstatus.attr("title",FILE_NOT_FOUND_TEXT)}if(results=="ISDIR"){importstatus.attr("title",FILE_ISDIR_TEXT)}if(results=="READ"){importstatus.attr("title",FILE_NOT_READ_TEXT)}importstatus.addClass("shoppui-warning-sign")}})});importurl.unbind("keydown").unbind("keypress").suggest(sugg_url+"&action=shopp_storage_suggestions&t=download",{delay:500,minchars:3,multiple:false,onSelect:function(){importurl.trigger("change")}});$(this).click(function(){fileUploads.updateLine(line,status);importstatus.attr("class","status");attach.unbind("click").click(function(){$.colorbox.hide();if(stored){dlpath.val(importurl.val());importurl.val("").attr("class","fileimport");return true}var importid=false,importdata=false,importfile=importurl.val(),completed=function(f){if(!f.name){return $this.attr("class","")}file.attr("class","file").html('<span class="icon shoppui-file '+f.mime.replace("/"," ")+'"></span>'+f.name+"<br /><small>"+readableFileSize(f.size)+"</small>");dlpath.val(f.path);dlname.val(f.name);importurl.val("").attr("class","fileimport")},importing=function(){var ui=file.find("div.progress"),progressbar=ui.find("div.bar"),scale=ui.outerWidth(),dataframe=$("#import-file-"+line).get(0).contentWindow,p=dataframe.importProgress,f=dataframe.importFile;if(f!==undefined){if(f.error){return file.attr("class","error").html("<small>"+f.error+"</small>")}if(!f.path){return file.attr("class","error").html("<small>"+FILE_UNKNOWN_IMPORT_ERROR+"</small>")}if(f.stored){return completed(f)}else{savepath=f.path.split("/");importid=savepath[savepath.length-1]}}if(!p){p=0}if(p===0&&nostatus++>60){return file.attr("class","error").html("<small>"+FILE_UNKNOWN_IMPORT_ERROR+"</small>")}progressbar.animate({width:Math.ceil(p*scale)+"px"},100);if(p==1){if(progressbar){progressbar.css({width:"100%"}).fadeOut(500,function(){completed(f)})}return}setTimeout(importing,100)};setTimeout(importing,100);file.attr("class","").html('<div class="progress"><div class="bar"></div><div class="gloss"></div></div><iframe id="import-file-'+line+'" width="0" height="0" src="'+fileimport_url+"&action=shopp_import_file&url="+importfile+'"></iframe>')})});$(this).colorbox({title:"File Selector",innerWidth:"360",innerHeight:"140",inline:true,href:chooser})};function FileUploader(button,defaultButton){var $=jQuery,_=this;_.swfu=false;_.settings={button_text:'<span class="button">'+UPLOAD_FILE_BUTTON_TEXT+"</span>",button_text_style:'.button { text-align: center; font-family:"Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana,sans-serif; font-size: 9px; color: #333333; }',button_text_top_padding:3,button_height:"22",button_width:"100",button_image_url:uidir+"/icons/buttons.png",button_placeholder_id:button,button_action:SWFUpload.BUTTON_ACTION.SELECT_FILE,flash_url:uidir+"/behaviors/swfupload/swfupload.swf",upload_url:ajaxurl,file_queue_limit:1,file_size_limit:filesizeLimit+"b",file_types:"*.*",file_types_description:"All Files",file_upload_limit:filesizeLimit,post_params:{action:"shopp_upload_file"},swfupload_loaded_handler:swfuLoaded,file_queue_error_handler:fileQueueError,file_dialog_complete_handler:fileDialogComplete,upload_start_handler:startUpload,upload_progress_handler:uploadProgress,upload_success_handler:uploadSuccess,custom_settings:{loaded:false,targetCell:false,targetLine:false,progressBar:false},prevent_swf_caching:$.ua.msie,debug:fileupload_debug};if(flashuploader){_.swfu=new SWFUpload(_.settings)}defaultButton.upload({name:"Filedata",action:ajaxurl,params:{action:"shopp_upload_file"},onSubmit:function(){$.colorbox.hide();_.targetCell.attr("class","").html("");$('<div class="progress"><div class="bar"></div><div class="gloss"></div></div>').appendTo(_.targetCell);_.progressBar=_.targetCell.find("div.bar")},onComplete:function(results){$.colorbox.close();var filedata=false,targetHolder=_.targetCell;try{filedata=$.parseJSON(results)}catch(ex){filedata.error=results}if(!filedata.id&&!filedata.name){targetHolder.html(NO_DOWNLOAD);if(filedata.error){alert(filedata.error)}else{alert(UNKNOWN_UPLOAD_ERROR)}return false}filedata.type=filedata.type.replace(/\//gi," ");$(_.progressBar).animate({width:"76px"},250,function(){$(this).parent().fadeOut(500,function(){targetHolder.attr("class","file").html('<div class="icon shoppui-file '+filedata.type+'"></div>'+filedata.name+"<br /><small>"+readableFileSize(filedata.size)+'</small><input type="hidden" name="price['+_.targetLine+'][download]" value="'+filedata.id+'" />');$(this).remove()})})}});$(_).load(function(){if(!_.swfu||!_.swfu.loaded){$(defaultButton).parent().parent().find(".swfupload").remove()}});function swfuLoaded(){$(defaultButton).hide();this.loaded=true}_.updateLine=function(line,status){if(!_.swfu){_.targetLine=line;_.targetCell=status}else{_.swfu.targetLine=line;_.swfu.targetCell=status}};function fileQueueError(file,error,message){if(error==SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED){alert("You selected too many files to upload at one time. "+(message===0?"You have reached the upload limit.":"You may upload "+(message>1?"up to "+message+" files.":"only one file.")));return}else{alert(message)}}function fileDialogComplete(selected,queued){$.colorbox.hide();if(!selected){return}try{this.startUpload()}catch(ex){this.debug(ex)}}function startUpload(file){this.targetCell.attr("class","").html("");$('<div class="progress"><div class="bar"></div><div class="gloss"></div></div>').appendTo(this.targetCell);this.progressBar=this.targetCell.find("div.bar")}function uploadProgress(file,loaded,total){this.progressBar.animate({width:Math.ceil((loaded/total)*76)+"px"},100)}function uploadSuccess(file,results){var filedata=false,targetCell=this.targetCell,i=this.targetLine;$.colorbox.close();try{filedata=$.parseJSON(results)}catch(ex){filedata.error=results}if(!filedata.id&&!filedata.name){targetCell.html(NO_DOWNLOAD);if(filedata.error){alert(filedata.error)}else{alert(UNKNOWN_UPLOAD_ERROR)}return false}filedata.type=filedata.type.replace(/\//gi," ");$(this.progressBar).animate({width:"76px"},250,function(){$(this).parent().fadeOut(500,function(){$(this).remove();$(targetCell).attr("class","file").html('<div class="icon shoppui-file '+filedata.type+'"></div>'+filedata.name+"<br /><small>"+readableFileSize(filedata.size)+'</small><input type="hidden" name="price['+i+'][download]" value="'+filedata.id+'" />')})})}}function SlugEditor(id,type){var $=jQuery,_=this,editbs=$("#edit-slug-buttons"),edit=editbs.find(".edit"),view=editbs.find(".view"),editorbs=$("#editor-slug-buttons"),save=editorbs.find(".save"),cancel=editorbs.find(".cancel"),full=$("#editable-slug-full");_.permalink=function(){var i,c=0,editor=$("#editable-slug"),revert_editor=editor.html(),real_slug=$("#slug_input"),revert_slug=real_slug.html(),slug=full.html();editbs.hide();editorbs.show();save.unbind("click").click(function(){var slug=editor.children("input").val(),title=$("#title").val();$.post(editslug_url+"&action=shopp_edit_slug",{id:id,type:type,slug:slug,title:title},function(data){editor.html(revert_editor);if(data!=-1){editor.html(data);full.html(data);real_slug.val(data)}view.attr("href",canonurl+full.html());editorbs.hide();editbs.show()},"text")});cancel.unbind("click").click(function(){editor.html(revert_editor);editorbs.hide();editbs.show();real_slug.attr("value",revert_slug)});for(i=0;i<slug.length;++i){if("%"==slug.charAt(i)){c++}}slug_value=(c>slug.length/4)?"":slug;editor.html('<input type="text" id="new-post-slug" value="'+slug_value+'" />').children("input").keypress(function(e){var key=e.which;if(key==13||key==27){e.preventDefault()}if(13==key){save.click()}if(27==key){cancel.click()}real_slug.val(this.value)}).focus()};edit.click(_.permalink)};
+;function NestedMenu(i,target,dataname,defaultlabel,data,items,sortoptions){var $=jQuery,_=this;if(!sortoptions){sortoptions={axis:"y"}}_.items=items;_.dataname=dataname;_.index=i;_.element=$('<li><div class="move"></div><input type="hidden" name="'+dataname.replace("[","-").replace("]","-")+'-sortorder[]" value="'+i+'" class="sortorder" /><input type="hidden" name="'+dataname+"["+i+'][id]" class="id" /><input type="text" name="'+dataname+"["+i+'][name]" class="label" /><button type="button" class="delete"><span class="shoppui-minus"></span></button></li>').appendTo($(target).children("ul"));_.moveHandle=_.element.find("div.move");_.sortorder=_.element.find("input.sortorder");_.id=_.element.find("input.id");_.label=_.element.find("input.label");_.deleteButton=_.element.find("button.delete").bind("delete",function(){var deletes=$(target).find("input.deletes");if($(_.id).val()!=""){deletes.val((deletes.val()=="")?$(_.id).val():deletes.val()+","+$(_.id).val())}if(items){_.itemsElement.remove()}_.element.remove()}).click(function(){$(this).trigger("delete")});if(_.items){if(items.type=="list"){_.itemsElement=$("<ul></ul>").appendTo(items.target).hide()}else{_.itemsElement=$("<li></li>").appendTo(items.target).hide()}}_.selected=function(){$(target).find("ul li").removeClass("selected");$(_.element).addClass("selected");if(items){$(items.target).children().hide();$(_.itemsElement).show()}};_.element.click(this.selected).hover(function(){$(this).addClass("hover")},function(){$(this).removeClass("hover")});_.label.mouseup(function(e){this.select()}).focus(function(){$(this).keydown(function(e){e.stopPropagation();if(e.keyCode==13){$(this).blur().unbind("keydown")}})});_.id.val(_.index);if(data&&data.id){_.id.val(data.id)}if(data&&data.name){_.label.val(htmlentities(data.name))}else{_.label.val(defaultlabel+" "+_.index)}if(!$(target).children("ul").hasClass("ui-sortable")){$(target).children("ul").sortable(sortoptions)}else{$(target).children("ul").sortable("refresh")}}function NestedMenuContent(i,target,dataname,data){var $=jQuery;this.contents=$('<textarea name="'+dataname+"["+i+'][value]" cols="40" rows="7"></textarea>').appendTo(target);if(data&&data.value){this.contents.val(htmlentities(data.value))}}function NestedMenuOption(i,target,dataname,defaultlabel,data){var $=jQuery,_=this;_.index=$(target).contents().length;_.element=$('<li class="option"><div class="move"></div><input type="hidden" name="'+dataname+"["+i+"][options]["+this.index+'][id]" class="id" /><input type="text" name="'+dataname+"["+i+"][options]["+this.index+'][name]" class="label" /><button type="button" class="delete"><span class="shoppui-minus"></span></button></li>').appendTo(target);_.moveHandle=_.element.find("div.move");_.id=_.element.find("input.id");_.label=_.element.find("input.label");_.deleteButton=_.element.find("button.delete").click(function(){$(_.element).remove()});_.element.hover(function(){$(this).addClass("hover")},function(){$(this).removeClass("hover")});_.label.click(function(){this.select()}).focus(function(){$(this).keydown(function(e){e.stopPropagation();if(e.keyCode==13){$(this).blur().unbind("keydown")}})});_.id.val(_.index);if(data.id){_.id.val(data.id)}if(data.name){_.label.val(htmlentities(data.name))}if(!data.name){_.label.val(defaultlabel+" "+(_.index+1))}}function loadVariations(options,prices){if(!options){return}var $=jQuery;$.each(options,function(key,option){if(option&&option.id){addVariationOptionsMenu(option)}});$.each(prices,function(k,p){if(p.context=="variation"){Pricelines.add(p.options.split(","),p,"#variations-pricing")}});Pricelines.updateVariationsUI();$.each(options,function(key,option){if(!(option&&option.options)){return}$.each(option.options,function(i,data){if(data&&data.id&&data.linked=="on"){Pricelines.linkVariations(data.id)}})})}function addVariationOptionsMenu(data){var $=jQuery,menus=$("#variations-menu"),entries=$("#variations-list"),addMenuButton=$("#addVariationMenu"),addOptionButton=$("#addVariationOption"),linkOptionVariations=$("#linkOptionVariations"),id=variationsidx,menu=new NestedMenu(id,menus,"meta[options][v]",OPTION_MENU_DEFAULT,data,{target:entries,type:"list"},{axis:"y",update:function(){orderOptions(menus,entries)}});menu.addOption=function(data){var init=false,option,optionid;if(!data){data=new Object()}if(!data.id){init=true;data.id=optionsidx}else{if(data.id>optionsidx){optionsidx=data.id}}option=new NestedMenuOption(menu.index,menu.itemsElement,"meta[options][v]",NEW_OPTION_DEFAULT,data);optionsidx++;optionid=option.id.val();option.linkIcon=$('<span class="shoppui-link"></span>').appendTo(option.moveHandle);option.linked=$('<input type="hidden" name="meta[options][v]['+menu.index+"][options]["+option.index+'][linked]" class="linked" />').val(data.linked?data.linked:"off").appendTo(option.element).change(function(){if($(this).val()=="on"){option.linkIcon.removeClass("hidden")}else{option.linkIcon.addClass("hidden")}}).change();option.selected=function(){if(option.element.hasClass("selected")){entries.find("ul li").removeClass("selected");selectedMenuOption=false}else{entries.find("ul li").removeClass("selected");$(option.element).addClass("selected");selectedMenuOption=option}linkOptionVariations.change()};option.element.click(option.selected);productOptions[optionid]=option.label;option.label.blur(function(){updateVariationLabels()});option.deleteButton.unbind("click");option.deleteButton.click(function(){if(menu.itemsElement.children().length==1){deleteVariationPrices([optionid],true)}else{deleteVariationPrices([optionid])}option.element.remove()});if(!init){addVariationPrices(optionid)}else{addVariationPrices()}entries.dequeue().animate({scrollTop:entries.prop("scrollHeight")-entries.height()},200);option.label.click().focus().select().keydown(function(e){var key=e.keyCode||e.which;if(key!=9){return}e.preventDefault();option.label.blur();addOptionButton.focus()});menu.items.push(option)};menu.items=new Array();if(data&&data.options){$.each(data.options,function(){menu.addOption(this)})}else{menu.addOption();menu.addOption()}menu.itemsElement.sortable({axis:"y",update:function(){orderVariationPrices()}});menu.element.unbind("click",menu.click).click(function(){menu.selected();$(addOptionButton).unbind("click").click(menu.addOption)});optionMenus[variationsidx++]=menu;menu.deleteButton.unbind("click").click(function(){var deletedOptions=new Array();$(menu.itemsElement).find("li").not(".ui-sortable-helper").find("input.id").each(function(i,id){deletedOptions.push($(id).val())});deleteVariationPrices(deletedOptions,true);$(this).trigger("delete")});if(!data){entries.dequeue().animate({scrollTop:entries.attr("scrollHeight")-entries.height()},200);menu.label.click().focus().select().keydown(function(e){var key=e.keyCode||e.which;if(key!=9){return}e.preventDefault();addOptionButton.focus()})}}function buildVariations(){var $=jQuery,i,setid,fields,index,combos=new Array(),optionSets=$("#variations-list ul"),totalSets=optionSets.length,lastOptionSet=totalSets-1,address=new Array(optionSets.length),totalOptions=new Array(optionSets.length),totalVariations=0;optionSets.each(function(id,set){totalOptions[id]=$(set).children().length;if(totalVariations==0){totalVariations=$(set).children().length}else{totalVariations=totalVariations*$(set).children().length}address[id]=0});for(i=0;i<totalVariations;i++){for(setid=0;setid<optionSets.length;setid++){fields=$(optionSets[setid]).children("li").not(".ui-sortable-helper").children("input.id");if(!combos[i]){combos[i]=[$(fields[address[setid]]).val()]}else{combos[i].push($(fields[address[setid]]).val())}}if(++address[lastOptionSet]>=totalOptions[lastOptionSet]){for(index=lastOptionSet;index>-1;index--){if(address[index]<totalOptions[index]){continue}address[index]=0;if(index-1>-1){address[(index-1)]++}}}}return combos}function addVariationPrices(data){if(data){return}var $=jQuery,key,preKey,updated=buildVariations(),variationPricing=$("#variations-pricing"),variationPricelines=$(variationPricing).children(),added=false;$(updated).each(function(id,options){key=xorkey(options);preKey=xorkey(options.slice(0,options.length-1));if(preKey==""){preKey=-1}if(!Pricelines.row[key]){if(Pricelines.row[preKey]){Pricelines.row[key]=Pricelines.row[preKey];delete Pricelines.row[preKey];Pricelines.row[key].setOptions(options)}else{if(variationPricelines.length==0){Pricelines.add(options,{context:"variation"},"#variations-pricing")}else{Pricelines.add(options,{context:"variation"},Pricelines.row[xorkey(updated[(id-1)])].row,"after")}added=true}}});if(added){Pricelines.updateVariationsUI()}}function deleteVariationPrices(optionids,reduce){var $=jQuery,updated=buildVariations(),reduced=false,i,key,modOptions,newkey,dbPriceId;$(updated).each(function(id,options){key=xorkey(options);for(i=0;i<optionids.length;i++){if(options.indexOf(optionids[i])!=-1){modOptions=new Array();$(options).each(function(index,option){if(option!=optionids[i]){modOptions.push(option)}});newkey=xorkey(modOptions);if(reduce&&!Pricelines.row[newkey]){if(newkey!=0){Pricelines.row[newkey]=Pricelines.row[key]}else{Pricelines.row[key].row.remove()}delete Pricelines.row[key];if(Pricelines.row[newkey]){Pricelines.row[newkey].setOptions(modOptions);reduced=true}}else{if(Pricelines.row[key]){dbPriceId=$("#priceid-"+Pricelines.row[key].id).val();if($("#deletePrices").val()==""){$("#deletePrices").val(dbPriceId)}else{$("#deletePrices").val($("#deletePrices").val()+","+dbPriceId)}Pricelines.remove(key)}}}}});if(reduced){Pricelines.updateVariationsUI()}}function optionMenuExists(label){if(!label){return false}var $=jQuery,found=false;$.each(optionMenus,function(id,menu){if(menu&&$(menu.label).val()==label){return(found=id)}});if(optionMenus[found]){return optionMenus[found]}return found}function optionMenuItemExists(menu,label){if(!menu||!menu.items||!label){return false}var $=jQuery,found=false;$.each(menu.items,function(id,item){if(item&&$(item.label).val()==label){return(found=true)}});return found}function updateVariationLabels(){var $=jQuery,updated=buildVariations();$(updated).each(function(id,options){var key=xorkey(options);if(Pricelines.row[key]){Pricelines.row[key].updateLabel()}})}function orderOptions(menus,options){var $=jQuery;$(menus).find("ul li").not(".ui-sortable-helper").find("input.id").each(function(i,menuid){if(menuid){$(optionMenus[$(menuid).val()].itemsElement).appendTo(options)}});orderVariationPrices()}function orderVariationPrices(){var $=jQuery,key,updated=buildVariations();$(updated).each(function(id,options){key=xorkey(options);if(key>0&&Pricelines.row[key]){Pricelines.reorderVariation(key,options)}});Pricelines.updateVariationsUI("tabs")}function xorkey(ids){if(!(ids instanceof Array)){ids=[ids]}for(var key=0,i=0;i<ids.length;i++){key=key^(ids[i]*7001)}return key}function variationsToggle(){var $=jQuery,toggle=$(this),ui=$("#variations"),baseprice=$("#product-pricing");if(toggle.prop("checked")){if(Pricelines.row[0]){Pricelines.row[0].disable()}baseprice.hide();ui.show()}else{ui.hide();baseprice.show();if(Pricelines.row[0]){Pricelines.row[0].enable()}}}function addonsToggle(){var $=jQuery,toggle=$(this),ui=$("#addons");if(toggle.prop("checked")){ui.show()}else{ui.hide()}}function clearLinkedIcons(){jQuery("#variations-list input.linked").val("off").change()}function linkVariationsButton(){var $=jQuery;if(selectedMenuOption){if(selectedMenuOption.linked.val()=="off"){if(Pricelines.allLinked()){clearLinkedIcons();Pricelines.unlinkAll()}selectedMenuOption.linked.val("on").change();Pricelines.linkVariations(selectedMenuOption.id.val())}else{selectedMenuOption.linked.val("off").change();Pricelines.unlinkVariations(selectedMenuOption.id.val())}}else{clearLinkedIcons();if(Pricelines.allLinked()){Pricelines.unlinkAll()}else{Pricelines.linkAll()}}$(this).change()}function linkVariationsButtonLabel(){var $=jQuery;if(selectedMenuOption){if(selectedMenuOption.linked.val()=="on"){$(this).find("small").html(" "+UNLINK_VARIATIONS)}else{$(this).find("small").html(" "+LINK_VARIATIONS)}}else{if(Pricelines.allLinked()){$(this).find("small").html(" "+UNLINK_ALL_VARIATIONS)}else{$(this).find("small").html(" "+LINK_ALL_VARIATIONS)}}}function loadAddons(addons,prices){var $=jQuery;if(!addons){return}$.each(addons,function(key,addon){newAddonGroup(addon)});$.each(prices,function(key,price){if(price.context=="addon"){var group=addonOptionsGroup[price.options];Pricelines.add(price.options,this,"#addon-pricegroup-"+group)}});Pricelines.updateVariationsUI()}function newAddonGroup(data){var $=jQuery,menus=$("#addon-menu"),entries=$("#addon-list"),addMenuButton=$("#newAddonGroup"),addOptionButton=$("#addAddonOption"),id=addon_group_idx,menu=new NestedMenu(id,menus,"meta[options][a]",ADDON_GROUP_DEFAULT,data,{target:entries,type:"list"},{axis:"y",update:function(){orderAddonGroups()}});menu.itemsElement.attr("id","addon-group-"+id);menu.pricegroup=$('<div id="addon-pricegroup-'+id+'" />').appendTo("#addon-pricing");menu.pricegroupLabel=$("<label />").html("<h4>"+menu.label.val()+"</h4>").prependTo(menu.pricegroup);menu.updatePriceLabel=function(){menu.pricegroupLabel.html("<h4>"+menu.label.val()+"</h4>")};menu.label.blur(menu.updatePriceLabel);menu.addOption=function(data){var init=false,option,optionid;if(!data){data=new Object()}if(!data.id){init=true;data.id=addonsidx}else{if(data.id>addonsidx){addonsidx=data.id}}option=new NestedMenuOption(menu.index,menu.itemsElement,"meta[options][a]",NEW_OPTION_DEFAULT,data);addonsidx++;optionid=option.id.val();option.selected=function(){if(option.element.hasClass("selected")){entries.find("ul li").removeClass("selected");selectedMenuOption=false}else{entries.find("ul li").removeClass("selected");$(option.element).addClass("selected");selectedMenuOption=option}};option.element.click(option.selected);productAddons[optionid]=option.label;option.label.blur(function(){Pricelines.row[optionid].updateLabel()});option.deleteButton.unbind("click");option.deleteButton.click(function(){var dbPriceid=Pricelines.row[optionid].data.id,dP=$("#deletePrices");if(dbPriceid){if(dP.val()==""){dP.val(dbPriceid)}else{dP.val(dP.val()+","+dbPriceid)}}Pricelines.row[optionid].row.remove();option.element.remove()});if(init){Pricelines.add(optionid,{context:"addon"},menu.pricegroup)}addonOptionsGroup[optionid]=menu.index;menu.items.push(option);entries.dequeue().animate({scrollTop:entries.attr("scrollHeight")-entries.height()},200);option.label.click().focus().select().keydown(function(e){var key=e.keyCode||e.which;if(key!=9){return}e.preventDefault();option.label.blur();addOptionButton.focus()})};menu.items=new Array();if(data&&data.options){$.each(data.options,function(){menu.addOption(this)})}else{menu.addOption();menu.addOption()}menu.itemsElement.sortable({axis:"y",update:function(){orderAddonPrices(menu.index)}});menu.element.unbind("click",menu.click);menu.element.click(function(){menu.selected();$(addOptionButton).unbind("click").click(menu.addOption)});addonGroups[addon_group_idx++]=menu;menu.deleteButton.unbind("click").click(function(){$("#addon-list #addon-group-"+menu.index+" li").not(".ui-sortable-helper").find("input.id").each(function(id,option){var optionid=$(option).val(),dbPriceid,dP=$("#deletePrices");if(Pricelines.row[optionid]){dbPriceid=Pricelines.row[optionid].data.id;if(dbPriceid){if(dP.val()==""){dP.val(dbPriceid)}else{dP.val(dP.val()+","+dbPriceid)}}Pricelines.row[optionid].row.remove()}});menu.deleteButton.trigger("delete");menu.pricegroup.remove();menu.element.remove()});if(!data){menus.dequeue().animate({scrollTop:menus.attr("scrollHeight")-menus.height()},200);menu.label.click().focus().select().keydown(function(e){var key=e.keyCode||e.which;if(key!=9){return}e.preventDefault();menu.label.blur();addMenuButton.focus()})}}function orderAddonGroups(){var $=jQuery,menu;$("#addon-menu ul li").not(".ui-sortable-helper").find("input.id").each(function(i,menuid){menu=addonGroups[$(menuid).val()];menu.pricegroup.appendTo("#addon-pricing")})}function orderAddonPrices(index){var $=jQuery,menu=addonGroups[index];$("#addon-list #addon-group-"+menu.index+" li").not(".ui-sortable-helper").find("input.id").each(function(id,option){Pricelines.reorderAddon($(option).val(),menu.pricegroup)})}function readableFileSize(size){var units=new Array("bytes","KB","MB","GB"),sized=size*1,unit=0;if(sized==0){return sized}while(sized>1000){sized=sized/1024;unit++}return sized.toFixed(2)+" "+units[unit]}function addDetail(data){var $=jQuery,i,optionsmenu,menus=$("#details-menu"),entries=$("#details-list"),id=detailsidx++,menu=new NestedMenu(id,menus,"details","Detail Name",data,{target:entries});if(data&&data.options){optionsmenu=$('<select name="details['+menu.index+'][value]"></select>').appendTo(menu.itemsElement);$("<option></option>").appendTo(optionsmenu);for(i in data.options){$("<option>"+data.options[i]["name"]+"</option>").appendTo(optionsmenu)}if(data&&data.value){optionsmenu.val(htmlentities(data.value))}}else{menu.item=new NestedMenuContent(menu.index,menu.itemsElement,"details",data)}if(!data||data.add){menu.add=$('<input type="hidden" name="details['+menu.index+'][new]" value="true" />').appendTo(menu.element);menus.dequeue().animate({scrollTop:menus.attr("scrollHeight")-menus.height()},200);menu.label.click().focus().select();if(menu.item){menu.item.contents.keydown(function(e){var key=e.keyCode||e.which;if(key!=9){return}e.preventDefault();$("#addDetail").focus()})}}}function ImageUploads(id,type){var $=jQuery,swfu,settings={button_text:ADD_IMAGE_BUTTON_TEXT,button_text_style:'.buttonText{text-align:center;font-family:"Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana,_sans;font-size:9px;color:#333333;}',button_text_top_padding:3,button_height:"22",button_width:"100",button_image_url:uidir+"/icons/buttons.png",button_placeholder_id:"swf-uploader-button",upload_url:ajaxurl,flash_url:uidir+"/behaviors/swfupload.swf",file_queue_limit:0,file_size_limit:filesizeLimit+"b",file_types:"*.jpg;*.jpeg;*.png;*.gif",file_types_description:"Web-compatible Image Files",file_upload_limit:filesizeLimit,post_params:{action:"shopp_upload_image",parent:id,type:type},swfupload_loaded_handler:swfuLoaded,file_queue_error_handler:imageFileQueueError,file_dialog_complete_handler:imageFileDialogComplete,upload_start_handler:startImageUpload,upload_progress_handler:imageUploadProgress,upload_error_handler:imageUploadError,upload_success_handler:imageUploadSuccess,custom_settings:{loaded:false,targetHolder:false,progressBar:false,sorting:false},prevent_swf_caching:$.ua.msie,debug:imageupload_debug};if(flashuploader){swfu=new SWFUpload(settings)}$("#image-upload").upload({name:"Filedata",action:ajaxurl,params:{action:"shopp_upload_image",type:type},onSubmit:function(){this.targetHolder=$('<li id="image-uploading"><input type="hidden" name="images[]" value="" /><div class="progress"><div class="bar"></div><div class="gloss"></div></div></li>').appendTo("#lightbox");this.progressBar=this.targetHolder.find("div.bar");this.sorting=this.targetHolder.find("input")},onComplete:function(results){var image=false,img,deleteButton,targetHolder=this.targetHolder;try{image=$.parseJSON(results)}catch(ex){image.error=results}if(!image||!image.id){targetHolder.remove();if(image.error){alert(image.error)}else{alert(UNKNOWN_UPLOAD_ERROR)}return false}targetHolder.attr({id:"image-"+image.id});this.sorting.val(image.id);img=$('<img src="?siid='+image.id+'" width="96" height="96" class="handle" />').appendTo(targetHolder).hide();deleteButton=$('<button type="button" name="deleteImage" value="'+image.src+'" class="delete"><span class="shoppui-minus"></span></button>').appendTo($(targetHolder)).hide();$(this.progressBar).animate({width:"76px"},250,function(){$(this).parent().fadeOut(500,function(){$(this).remove();$(img).fadeIn("500");enableDeleteButton(deleteButton)})})}});$(document).load(function(){if(!swfu.loaded){$("#product-images .swfupload").remove()}});sorting();$("#lightbox li").each(function(){$(this).dblclick(function(){var id=$(this).attr("id")+"-details",src=$("#"+id),srcid=src.find("input[type=hidden]").val(),srcthumb=src.find("img"),srctitle=src.find("input.imagetitle"),srcalt=src.find("input.imagealt"),srcCropped=src.find("input.imagecropped"),ui=$('<div class="image-details-editor"><div class="details-editor"><img class="thumb" width="96" height="96" /><div class="details"><p><label>'+IMAGE_DETAILS_TITLE_LABEL+': </label><input type="text" name="title" /></p><p><label>'+IMAGE_DETAILS_ALT_LABEL+': </label><input type="text" name="alt" /></p></div></div><div class="cropping"><p class="clear">'+IMAGE_DETAILS_CROP_LABEL+': <select name="cropimage"><option></option></select></p><div class="cropui"></div><br class="clear"/></div><input type="button" class="button-primary alignright" value="&nbsp;&nbsp;'+IMAGE_DETAILS_DONE+'&nbsp;&nbsp;" /></div>'),thumb=ui.find("img").attr("src",srcthumb.attr("src")),titlefield=ui.find("input[name=title]").val(srctitle.val()).change(function(){srctitle.val(titlefield.val())}),altfield=ui.find("input[name=alt]").val(srcalt.val()).change(function(){srcalt.val(altfield.val())}),doneButton=ui.find("input[type=button]").click(function(){$.colorbox.close()}),cropping=ui.find("div.cropping").hide(),croptool=ui.find("div.cropui"),cropselect=ui.find("select[name=cropimage]").change(function(){if(cropselect.val()==""){croptool.empty();$.colorbox.resize();return}var d=cropselect.val().split(":"),init=srcCropped.filter("input[alt="+cropselect.val()+"]").val().split(",");croptool.empty().scaleCrop({imgsrc:"?siid="+srcid,target:{width:parseInt(d[0],10),height:parseInt(d[1],10)},init:{x:parseInt(init[0],10),y:parseInt(init[1],10),s:new Number(init[2])}}).ready(function(){var padding=125;$.colorbox.resize({innerWidth:(parseInt(d[0],10))+padding})}).bind("change.scalecrop",function(e,c){if(!c.s){c.s=1}if(c){srcCropped.filter("input[alt="+cropselect.val()+"]").val(c.x+","+c.y+","+c.s)}})});if(srcCropped.size()>0){srcCropped.each(function(i,e){var d=$(e).attr("alt");$('<option value="'+d+'">'+(i+1)+": "+d.replace(":","&times;")+"</option>").appendTo(cropselect)});cropping.show()}$.colorbox({title:IMAGE_DETAILS_TEXT,html:ui})});enableDeleteButton($(this).find("button.delete"))});function swfuLoaded(){$("#browser-uploader").hide();swfu.loaded=true}function sorting(){if($("#lightbox li").size()>0){$("#lightbox").sortable({opacity:0.8})}}function imageFileQueueError(file,error,message){if(error==SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED){alert("You selected too many files to upload at one time. "+(message===0?"You have reached the upload limit.":"You may upload "+(message>1?"up to "+message+" files.":"only one file.")));return}else{alert(message)}}function imageFileDialogComplete(selected,queued){try{this.startUpload()}catch(ex){this.debug(ex)}}function startImageUpload(file){this.targetHolder=$('<li class="image uploading"><input type="hidden" name="images[]" /><div class="progress"><div class="bar"></div><div class="gloss"></div></div></li>').appendTo($("#lightbox"));this.progressBar=this.targetHolder.find("div.bar");this.sorting=this.targetHolder.find("input")}function imageUploadProgress(file,loaded,total){this.progressBar.animate({width:Math.ceil((loaded/total)*76)+"px"},100)}function imageUploadError(file,error,message){}function imageUploadSuccess(file,results){var image=false,img,deleteButton,targetHolder=this.targetHolder;try{image=$.parseJSON(results)}catch(ex){targetHolder.remove();alert(results);return false}if(!image.id){targetHolder.remove();if(image.error){alert(image.error)}else{alert(UNKNOWN_UPLOAD_ERROR)}return true}targetHolder.attr({id:"image-"+image.id});this.sorting.val(image.id);img=$('<img src="?siid='+image.id+'" width="96" height="96" class="handle" />').appendTo(targetHolder).hide();deleteButton=$('<button type="button" name="deleteImage" value="'+image.id+'" class="delete"><span class="shoppui-minus"></span></button>').appendTo(targetHolder).hide();sorting();this.progressBar.animate({width:"76px"},250,function(){$(this).parent().fadeOut(500,function(){$(this).remove();$(img).fadeIn("500");enableDeleteButton(deleteButton)})})}function enableDeleteButton(button){button.hide();button.parent().hover(function(){button.show()},function(){button.hide()});button.click(function(){if(confirm(DELETE_IMAGE_WARNING)){var imgid=(button.val().substr(0,1)=="<")?button.find("input[name=ieisstupid]").val():button.val(),deleteImages=$("#deleteImages"),deleting=deleteImages.val();deleteImages.val(deleting==""?imgid:deleting+","+imgid);$("#confirm-delete-images").show();button.parent().fadeOut(500,function(){$(this).remove()})}})}}jQuery.fn.FileChooser=function(line,status){var $=jQuery,_=this,chooser=$("#chooser"),importurl=chooser.find(".fileimport"),importstatus=chooser.find(".status"),attach=$("#attach-file"),dlpath=$("#download_path-"+line),dlname=$("#download_file-"+line),file=$("#file-"+line),stored=false,nostatus=0,progressbar=false;_.line=line;_.status=status;chooser.unbind("change").on("change",".fileimport",function(e){importstatus.attr("class","status").addClass("shoppui-spinner shoppui-spinfx shoppui-spinfx-steps8");$.ajax({url:fileverify_url+"&action=shopp_verify_file&t=download",type:"POST",data:"url="+importurl.val(),timeout:10000,dataType:"text",success:function(results){importstatus.attr("class","status");if(results=="OK"){return importstatus.addClass("shoppui-ok-sign")}if(results=="NULL"){importstatus.attr("title",FILE_NOT_FOUND_TEXT)}if(results=="ISDIR"){importstatus.attr("title",FILE_ISDIR_TEXT)}if(results=="READ"){importstatus.attr("title",FILE_NOT_READ_TEXT)}importstatus.addClass("shoppui-warning-sign")}})});importurl.unbind("keydown").unbind("keypress").suggest(sugg_url+"&action=shopp_storage_suggestions&t=download",{delay:500,minchars:3,multiple:false,onSelect:function(){importurl.trigger("change")}});$(this).click(function(){fileUploads.updateLine(line,status);importstatus.attr("class","status");attach.unbind("click").click(function(){$.colorbox.hide();if(stored){dlpath.val(importurl.val());importurl.val("").attr("class","fileimport");return true}var importid=false,importdata=false,importfile=importurl.val(),completed=function(f){if(!f.name){return $this.attr("class","")}file.attr("class","file").html('<span class="icon shoppui-file '+f.mime.replace("/"," ")+'"></span>'+f.name+"<br /><small>"+readableFileSize(f.size)+"</small>");dlpath.val(f.path);dlname.val(f.name);importurl.val("").attr("class","fileimport")},importing=function(){var ui=file.find("div.progress"),progressbar=ui.find("div.bar"),scale=ui.outerWidth(),dataframe=$("#import-file-"+line).get(0).contentWindow,p=dataframe.importProgress,f=dataframe.importFile;if(f!==undefined){if(f.error){return file.attr("class","error").html("<small>"+f.error+"</small>")}if(!f.path){return file.attr("class","error").html("<small>"+FILE_UNKNOWN_IMPORT_ERROR+"</small>")}if(f.stored){return completed(f)}else{savepath=f.path.split("/");importid=savepath[savepath.length-1]}}if(!p){p=0}if(p===0&&nostatus++>60){return file.attr("class","error").html("<small>"+FILE_UNKNOWN_IMPORT_ERROR+"</small>")}progressbar.animate({width:Math.ceil(p*scale)+"px"},100);if(p==1){if(progressbar){progressbar.css({width:"100%"}).fadeOut(500,function(){completed(f)})}return}setTimeout(importing,100)};setTimeout(importing,100);file.attr("class","").html('<div class="progress"><div class="bar"></div><div class="gloss"></div></div><iframe id="import-file-'+line+'" width="0" height="0" src="'+fileimport_url+"&action=shopp_import_file&url="+importfile+'"></iframe>')})});$(this).colorbox({title:"File Selector",innerWidth:"360",innerHeight:"140",inline:true,href:chooser})};function FileUploader(button,defaultButton){var $=jQuery,_=this;_.swfu=false;_.settings={button_text:'<span class="button">'+UPLOAD_FILE_BUTTON_TEXT+"</span>",button_text_style:'.button { text-align: center; font-family:"Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana,sans-serif; font-size: 9px; color: #333333; }',button_text_top_padding:3,button_height:"22",button_width:"100",button_image_url:uidir+"/icons/buttons.png",button_placeholder_id:button,button_action:SWFUpload.BUTTON_ACTION.SELECT_FILE,flash_url:uidir+"/behaviors/swfupload/swfupload.swf",upload_url:ajaxurl,file_queue_limit:1,file_size_limit:filesizeLimit+"b",file_types:"*.*",file_types_description:"All Files",file_upload_limit:filesizeLimit,post_params:{action:"shopp_upload_file"},swfupload_loaded_handler:swfuLoaded,file_queue_error_handler:fileQueueError,file_dialog_complete_handler:fileDialogComplete,upload_start_handler:startUpload,upload_progress_handler:uploadProgress,upload_success_handler:uploadSuccess,custom_settings:{loaded:false,targetCell:false,targetLine:false,progressBar:false},prevent_swf_caching:$.ua.msie,debug:fileupload_debug};if(flashuploader){_.swfu=new SWFUpload(_.settings)}defaultButton.upload({name:"Filedata",action:ajaxurl,params:{action:"shopp_upload_file"},onSubmit:function(){$.colorbox.hide();_.targetCell.attr("class","").html("");$('<div class="progress"><div class="bar"></div><div class="gloss"></div></div>').appendTo(_.targetCell);_.progressBar=_.targetCell.find("div.bar")},onComplete:function(results){$.colorbox.close();var filedata=false,targetHolder=_.targetCell;try{filedata=$.parseJSON(results)}catch(ex){filedata.error=results}if(!filedata.id&&!filedata.name){targetHolder.html(NO_DOWNLOAD);if(filedata.error){alert(filedata.error)}else{alert(UNKNOWN_UPLOAD_ERROR)}return false}filedata.type=filedata.type.replace(/\//gi," ");$(_.progressBar).animate({width:"76px"},250,function(){$(this).parent().fadeOut(500,function(){targetHolder.attr("class","file").html('<div class="icon shoppui-file '+filedata.type+'"></div>'+filedata.name+"<br /><small>"+readableFileSize(filedata.size)+'</small><input type="hidden" name="price['+_.targetLine+'][download]" value="'+filedata.id+'" />');$(this).remove()})})}});$(_).load(function(){if(!_.swfu||!_.swfu.loaded){$(defaultButton).parent().parent().find(".swfupload").remove()}});function swfuLoaded(){$(defaultButton).hide();this.loaded=true}_.updateLine=function(line,status){if(!_.swfu){_.targetLine=line;_.targetCell=status}else{_.swfu.targetLine=line;_.swfu.targetCell=status}};function fileQueueError(file,error,message){if(error==SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED){alert("You selected too many files to upload at one time. "+(message===0?"You have reached the upload limit.":"You may upload "+(message>1?"up to "+message+" files.":"only one file.")));return}else{alert(message)}}function fileDialogComplete(selected,queued){$.colorbox.hide();if(!selected){return}try{this.startUpload()}catch(ex){this.debug(ex)}}function startUpload(file){this.targetCell.attr("class","").html("");$('<div class="progress"><div class="bar"></div><div class="gloss"></div></div>').appendTo(this.targetCell);this.progressBar=this.targetCell.find("div.bar")}function uploadProgress(file,loaded,total){this.progressBar.animate({width:Math.ceil((loaded/total)*76)+"px"},100)}function uploadSuccess(file,results){var filedata=false,targetCell=this.targetCell,i=this.targetLine;$.colorbox.close();try{filedata=$.parseJSON(results)}catch(ex){filedata.error=results}if(!filedata.id&&!filedata.name){targetCell.html(NO_DOWNLOAD);if(filedata.error){alert(filedata.error)}else{alert(UNKNOWN_UPLOAD_ERROR)}return false}filedata.type=filedata.type.replace(/\//gi," ");$(this.progressBar).animate({width:"76px"},250,function(){$(this).parent().fadeOut(500,function(){$(this).remove();$(targetCell).attr("class","file").html('<div class="icon shoppui-file '+filedata.type+'"></div>'+filedata.name+"<br /><small>"+readableFileSize(filedata.size)+'</small><input type="hidden" name="price['+i+'][download]" value="'+filedata.id+'" />')})})}}function SlugEditor(id,type){var $=jQuery,_=this,editbs=$("#edit-slug-buttons"),edit=editbs.find(".edit"),view=editbs.find(".view"),editorbs=$("#editor-slug-buttons"),save=editorbs.find(".save"),cancel=editorbs.find(".cancel"),full=$("#editable-slug-full");_.permalink=function(){var i,c=0,editor=$("#editable-slug"),revert_editor=editor.html(),real_slug=$("#slug_input"),revert_slug=real_slug.html(),slug=full.html();editbs.hide();editorbs.show();save.unbind("click").click(function(){var slug=editor.children("input").val(),title=$("#title").val();$.post(editslug_url+"&action=shopp_edit_slug",{id:id,type:type,slug:slug,title:title},function(data){editor.html(revert_editor);if(data!=-1){editor.html(data);full.html(data);real_slug.val(data)}view.attr("href",canonurl+full.html());editorbs.hide();editbs.show()},"text")});cancel.unbind("click").click(function(){editor.html(revert_editor);editorbs.hide();editbs.show();real_slug.attr("value",revert_slug)});for(i=0;i<slug.length;++i){if("%"==slug.charAt(i)){c++}}slug_value=(c>slug.length/4)?"":slug;editor.html('<input type="text" id="new-post-slug" value="'+slug_value+'" />').children("input").keypress(function(e){var key=e.which;if(key==13||key==27){e.preventDefault()}if(13==key){save.click()}if(27==key){cancel.click()}real_slug.val(this.value)}).focus()};edit.click(_.permalink)};

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

@@ -216 +216 @@
                                                 <?php endif; ?>
                                                 <?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>
+                                                    <li><small><?php echo apply_filters('shopp_purchased_data_name', $name); ?>: <strong><?php echo apply_filters('shopp_purchased_data_value', $value, $name); ?></strong></small></li>
                                                 <?php endforeach; ?>
                                                 <?php endif; ?>

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

@@ -78 +78 @@
             $txnstatus = isset($txnstatus_labels[$Order->txnstatus]) ? $txnstatus_labels[$Order->txnstatus] : $Order->txnstatus;
             $classes[] = strtolower(preg_replace('/[^\w]/','_',$Order->txnstatus));
-            $gateway = $Gateways[$Order->gateway]->name;
-
+
+            $Gateway = $Gateways->get($Order->gateway);
+            if ( $Gateway ) $gateway = $Gateway->name;
 
             $addrfields = array('city','state','country');

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

@@ -36 +36 @@
     }
 
-    function columns () {
+    function columns() {
         return array(
             'period'    => __('Period', 'Shopp'),
@@ -46 +46 @@
     }
 
-    static function orders ( $data ) { return intval($data->orders); }
+    static function orders( $data ) {
+        return intval( isset($data->orders) ? $data->orders : 0);
+    }
 
-    static function items ( $data ) { return intval($data->items); }
+    static function items( $data ) {
+        return intval( isset($data->items) ? $data->items : 0);
+    }
 
-    static function subtotal ( $data ) { return money($data->subtotal); }
+    static function subtotal( $data ) {
+        return money( isset($data->subtotal) ? $data->subtotal : 0 );
+    }
 
-    static function discounts ( $data ) { return money($data->discounts); }
+    static function discounts( $data ) {
+        return money( isset($data->discounts) ? $data->discounts : 0 );
+    }
 
 }

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

@@ -8 +8 @@
     ?>
 
-    <form name="settings" id="checkout" action="<?php echo add_query_arg('tab', $this->tab, esc_url($this->url)); ?>" method="post">
+    <form name="settings" id="checkout" action="<?php echo esc_url($this->url); ?>" method="post">
         <?php wp_nonce_field('shopp-settings-downloads'); ?>
 

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

@@ -79 +79 @@
         states = <?php echo json_encode($statesLabels); ?>,
         reasons = <?php echo json_encode($reasonLabels); ?>;
-    $('#order-statuslabels').labelset(labels,'#statusLabel');
-    $("#order-statuslabels select").each(function(i,menu){
-        var menuid = $(menu).attr('id'),
-            id = menuid.substr(menuid.indexOf('-')+1);
+    $('#order-statuslabels').labelset(labels, '#statusLabel');
+    $("#order-statuslabels select").each(function(){
+        var menuid = $(this).attr('id'),
+            id = menuid.substr(menuid.indexOf('-') + 1);
 
-        if(states != null && states[id] != undefined)
-            $(this).find("option[value="+states[id]+"]").attr("selected", "selected");
+        if ( states != null && states[id] != undefined )
+            $(this).val(states[id]);
     });
-    $('#order-cancelreasons').labelset(reasons,'#reasonLabel');
+    $('#order-cancelreasons').labelset(reasons, '#reasonLabel');
 });
 /* ]]> */

shopp/trunk/readme.txt

@@ -1 +1 @@
 === Shopp ===
-Contributors: jond, barry.hughes, clifgriffin, jdillick, lorenzocaum, chaoix
+Contributors: jond, barry.hughes, clifgriffin, jdillick, lorenzocaum, chaoix, crunnells
 Donate link: http://shopp.me/shopp-donate
 Tags: ecommerce, e-commerce, wordpress ecommerce, shopp, shop, shopping, cart, store, storefront, sales, sell, catalog, checkout, accounts, secure, variations, variants, reports, downloads, digital, downloadable, inventory, stock, shipping, taxes, shipped, addons, widgets, shortcodes
 Requires at least: 3.5
-Tested up to: 3.9
+Tested up to: 4.1.1
 Stable tag: trunk
 License: GPLv3 or later

shopp/trunk/storage/core/FSStorage.php

@@ -63 +63 @@
         $error = false;
         if (empty($data)) $error = "$this->module: There is no file data to store.";
-
+        
+        $filepath = self::sanitize($this->path.'/'.$asset->filename);
         switch ($type) {
             case 'upload':
-
-                if ( ! is_readable($data) ) $error = "$this->module: Could not read the file.";
-                elseif (move_uploaded_file($data,self::sanitize($this->path.'/'.$asset->filename))) return $asset->filename;
+                if (move_uploaded_file($data,$filepath)) break;
                 else $error = "$this->module: Could not move the uploaded file to the storage repository.";
                 $buffer = ob_get_contents();
@@ -74 +73 @@
             case 'file':
                 if ( ! is_readable($data) ) $error = "$this->module: Could not read the file.";
-                elseif (copy($data,self::sanitize($this->path.'/'.$asset->filename))) return $asset->filename;
+                elseif (copy($data,$filepath)) break;
                 else $error = "$this->module: Could not move the file to the storage repository.";
                 break;
             default:
-                if (file_put_contents(self::sanitize($this->path.'/'.$asset->filename),$data) > 0) return $asset->filename;
+                if (file_put_contents($filepath,$data) > 0) break;
                 else $error = "$this->module: Could not store the file data.";
         }
@@ -86 +85 @@
             return $error;
         }
-
+        
+        // Set correct file permissions
+        $filestat = stat($filepath);
+        $perms = $filestat['mode'] & 0000666;
+        @ chmod( $filepath, $perms );
+        
+        return $asset->filename;
+        
     }
 

shopp/trunk/templates/login.php

@@ -25 +25 @@
                     <?php shopp( 'customer.password-login', 'size=20&title=' . __( 'Password', 'Shopp' ) ); ?>
                 </span>
-                <span><?php shopp( 'customer.login-button' ); ?></span>
+                <span>
+                    <label>&nbsp;</label>
+                    <?php shopp( 'customer.login-button' ); ?>
+                </span>
             </li>
             <li>

shopp/trunk/templates/receipt.php

@@ -83 +83 @@
                         <?php shopp( 'purchase.item-download' ); ?>
                         <?php shopp( 'purchase.item-addons-list' ); ?>
+                        <?php shopp( 'purchase.item-inputs-list' ); ?>
                     </td>
                     <td><?php shopp( 'purchase.item-quantity' ); ?></td>