dynamic / foxystripe

code/pages/ProductHolder.php

Braces +3 added lines, -1 removed lines

@@ -81,7 +81,9 @@
     {
         if ($children = $this->AllChildren()) {
             foreach ($children as $child) {
-                if (in_array($child->ID, $idList)) continue;
+                if (in_array($child->ID, $idList)) {
+                    continue;
+                }
 
                 if ($child instanceof ProductHolder) {
                     $idList[] = $child->ID;

code/form/FoxyStripeDropdownField.php

Indentation +33 added lines, -33 removed lines

@@ -50,41 +50,41 @@
  */
 class FoxyStripeDropdownField extends DropdownField{
 
-	/**
-	 * Mark certain elements as disabled,
-	 * regardless of the {@link setDisabled()} settings.
-	 *
-	 * @param array $items Collection of array keys, as defined in the $source array
+    /**
+     * Mark certain elements as disabled,
+     * regardless of the {@link setDisabled()} settings.
+     *
+     * @param array $items Collection of array keys, as defined in the $source array
      * @return $this
-	 */
-	public function setDisabledItems($items){
-		$controller = Controller::curr();
-		$code = $controller->data()->Code;
-		$updated = [];
-		if(is_array($items) && !empty($items)){
-			foreach($items as $item){
-				array_push($updated, FoxyStripeProduct::getGeneratedValue($code, $this->getName(), $item, 'value'));
-			}
-		}
-		$this->disabledItems = $updated;
-		return $this;
-	}
+     */
+    public function setDisabledItems($items){
+        $controller = Controller::curr();
+        $code = $controller->data()->Code;
+        $updated = [];
+        if(is_array($items) && !empty($items)){
+            foreach($items as $item){
+                array_push($updated, FoxyStripeProduct::getGeneratedValue($code, $this->getName(), $item, 'value'));
+            }
+        }
+        $this->disabledItems = $updated;
+        return $this;
+    }
 
-	/**
-	 * @param array $source
+    /**
+     * @param array $source
      * @return $this
-	 */
-	public function setSource($source) {
-		$controller = Controller::curr();
-		$code = $controller->data()->Code;
-		$updated = [];
-		if(is_array($source) && !empty($source)){
-			foreach($source as $key => $val){
-				$updated[FoxyStripeProduct::getGeneratedValue($code, $this->getName(), $key, 'value')] = $val;
-			}
-		}
-		$this->source = $updated;
-		return $this;
-	}
+     */
+    public function setSource($source) {
+        $controller = Controller::curr();
+        $code = $controller->data()->Code;
+        $updated = [];
+        if(is_array($source) && !empty($source)){
+            foreach($source as $key => $val){
+                $updated[FoxyStripeProduct::getGeneratedValue($code, $this->getName(), $key, 'value')] = $val;
+            }
+        }
+        $this->source = $updated;
+        return $this;
+    }
 
 }

code/objects/ProductImage.php

Indentation +29 added lines, -29 removed lines

@@ -7,25 +7,25 @@ 
 
 class ProductImage extends DataObject{
 
-	private static $db = array(
-		'Title' => 'Text',
-		'SortOrder' => 'Int'
-	);
+    private static $db = array(
+        'Title' => 'Text',
+        'SortOrder' => 'Int'
+    );
 
-	private static $has_one = array(
-		'Image' => 'Image',
-		'Product' => 'FoxyStripeProduct'
-	);
+    private static $has_one = array(
+        'Image' => 'Image',
+        'Product' => 'FoxyStripeProduct'
+    );
 
-	private static $default_sort = 'SortOrder';
+    private static $default_sort = 'SortOrder';
 
-	private static $summary_fields = array(
-		'Image.CMSThumbnail' => 'Image',
-		'Title' => 'Caption'
-	);
+    private static $summary_fields = array(
+        'Image.CMSThumbnail' => 'Image',
+        'Title' => 'Caption'
+    );
 
-	public function getCMSFields(){
-		$fields = FieldList::create(
+    public function getCMSFields(){
+        $fields = FieldList::create(
             TextField::create('Title')
                 ->setTitle(_t('ProductImage.Title', 'Product Image Title')),
             UploadField::create('Image')
@@ -34,25 +34,25 @@ 
                 ->setAllowedExtensions(array('jpg', 'jpeg', 'gif', 'png'))
         );
 
-		$this->extend('updateCMSFields', $fields);
+        $this->extend('updateCMSFields', $fields);
 
         return $fields;
-	}
+    }
 
-	public function canView($member = false) {
-		return true;
-	}
+    public function canView($member = false) {
+        return true;
+    }
 
-	public function canEdit($member = null) {
-		return Permission::check('Product_CANCRUD');
-	}
+    public function canEdit($member = null) {
+        return Permission::check('Product_CANCRUD');
+    }
 
-	public function canDelete($member = null) {
-		return Permission::check('Product_CANCRUD');
-	}
+    public function canDelete($member = null) {
+        return Permission::check('Product_CANCRUD');
+    }
 
-	public function canCreate($member = null) {
-		return Permission::check('Product_CANCRUD');
-	}
+    public function canCreate($member = null) {
+        return Permission::check('Product_CANCRUD');
+    }
 
 }

tests/FoxyStripeProductTest.php

Braces +6 added lines, -2 removed lines

@@ -55,14 +55,18 @@
 
         $versions = DB::query('Select * FROM "FoxyStripeProduct_versions" WHERE "RecordID" = ' . $productID);
         $versionsPostPublish = array();
-        foreach ($versions as $versionRow) $versionsPostPublish[] = $versionRow;
+        foreach ($versions as $versionRow) {
+            $versionsPostPublish[] = $versionRow;
+        }
 
         $product2->delete();
         $this->assertTrue(!$product2->isPublished());
 
         $versions = DB::query('Select * FROM "FoxyStripeProduct_versions" WHERE "RecordID" = ' . $productID);
         $versionsPostDelete = array();
-        foreach ($versions as $versionRow) $versionsPostDelete[] = $versionRow;
+        foreach ($versions as $versionRow) {
+            $versionsPostDelete[] = $versionRow;
+        }
 
         $this->assertEquals($versionsPostPublish, $versionsPostDelete);
 

Spacing +2 added lines, -2 removed lines

@@ -53,14 +53,14 @@
         $product2->doPublish();
         $this->assertTrue($product2->isPublished());
 
-        $versions = DB::query('Select * FROM "ShippableProduct_versions" WHERE "RecordID" = ' . $productID);
+        $versions = DB::query('Select * FROM "ShippableProduct_versions" WHERE "RecordID" = '.$productID);
         $versionsPostPublish = array();
         foreach ($versions as $versionRow) $versionsPostPublish[] = $versionRow;
 
         $product2->delete();
         $this->assertTrue(!$product2->isPublished());
 
-        $versions = DB::query('Select * FROM "ShippableProduct_versions" WHERE "RecordID" = ' . $productID);
+        $versions = DB::query('Select * FROM "ShippableProduct_versions" WHERE "RecordID" = '.$productID);
         $versionsPostDelete = array();
         foreach ($versions as $versionRow) $versionsPostDelete[] = $versionRow;
 

code/objects/products/FoxyStripeProduct.php

Braces +6 added lines, -2 removed lines

@@ -141,11 +141,15 @@
                             Settings > FoxyStripe > Categories
                         </a>'
             ));
-        if (class_exists('QuickAddNewExtension')) $catField->useAddNew('FoxyCartProductCategory', $source);
+        if (class_exists('QuickAddNewExtension')) {
+            $catField->useAddNew('FoxyCartProductCategory', $source);
+        }
 
         // Product Images gridfield
         $config = GridFieldConfig_RelationEditor::create();
-        if (class_exists('GridFieldSortableRows')) $config->addComponent(new GridFieldSortableRows('SortOrder'));
+        if (class_exists('GridFieldSortableRows')) {
+            $config->addComponent(new GridFieldSortableRows('SortOrder'));
+        }
         if (class_exists('GridFieldBulkImageUpload')) {
             $config->addComponent(new GridFieldBulkUpload());
             $config->getComponentByType('GridFieldBulkUpload')->setUfConfig('folderName', 'Uploads/ProductImages');

Spacing +5 added lines, -6 removed lines

@@ -122,7 +122,7 @@ 
         $previewDescription = ($this->stat('customPreviewDescription')) ? $this->stat('customPreviewDescription') : _t('ProductPage.PreviewImageDescription', 'Image used throughout site to represent this product');
 
         // Cateogry Dropdown field w/ add new
-        $source = function () {
+        $source = function() {
             return FoxyCartProductCategory::get()->map()->toArray();
         };
         $catField = DropdownField::create('CategoryID', _t('ProductPage.Category', 'FoxyCart Category'), $source())
@@ -159,7 +159,7 @@ 
         if (class_exists('GridFieldSortableRows')) {
             $config->addComponent(new GridFieldSortableRows('SortOrder'));
             $products = $this->ProductOptions()->sort('SortOrder');
-        } else {
+        }else {
             $products = $this->ProductOptions();
         }
         $config->removeComponentsByType('GridFieldAddExistingAutocompleter');
@@ -215,7 +215,7 @@ 
                 ->setFolderName('Uploads/Products')
                 ->setAllowedExtensions(['jpg', 'jpeg', 'gif', 'png'])
                 ->setAllowedMaxFileNumber(1),
-            HeaderField::create('ProductImagesHD', _t('ProductPage.ProductImagesHD' . 'Product Image Gallery'), 2),
+            HeaderField::create('ProductImagesHD', _t('ProductPage.ProductImagesHD'.'Product Image Gallery'), 2),
             $prodImagesField
                 ->setDescription(_t(
                     'ProductPage.ProductImagesDescription',
@@ -273,7 +273,7 @@ 
             $product = ProductPage::get()->byID($this->ID);
             if (isset($product->ParentID)) {
                 $origParent = $product->ParentID;
-            } else {
+            }else {
                 $origParent = null;
             }
             $currentParent = $this->ParentID;
@@ -348,8 +348,7 @@ 
     {
         $optionName = ($optionName !== null) ? preg_replace('/\s/', '_', $optionName) : $optionName;
         return (SiteConfig::current_site_config()->CartValidation)
-            ? FoxyCart_Helper::fc_hash_value($productCode, $optionName, $optionValue, $method, $output, $urlEncode) :
-            $optionValue;
+            ? FoxyCart_Helper::fc_hash_value($productCode, $optionName, $optionValue, $method, $output, $urlEncode) : $optionValue;
     }
 
     /**

tests/ProductDiscountTierTest.php

Indentation +51 added lines, -51 removed lines

@@ -2,79 +2,79 @@
 
 class ProductDiscountTierTest extends FS_Test{
 
-	protected static $use_draft_site = true;
+    protected static $use_draft_site = true;
 
-	function setUp(){
-		parent::setUp();
+    function setUp(){
+        parent::setUp();
 
-		$productHolder = ProductHolder::create();
-		$productHolder->Title = 'Product Holder';
-		$productHolder->write();
+        $productHolder = ProductHolder::create();
+        $productHolder->Title = 'Product Holder';
+        $productHolder->write();
 
-		$product = $this->objFromFixture('ShippableProduct', 'product1');
-		$product->ParentID = $productHolder->ID;
-		$product->write();
-	}
+        $product = $this->objFromFixture('ShippableProduct', 'product1');
+        $product->ParentID = $productHolder->ID;
+        $product->write();
+    }
 
-	public function testProductDiscountTierCreation(){
-		$this->logInWithPermission('Product_CANCRUD');
+    public function testProductDiscountTierCreation(){
+        $this->logInWithPermission('Product_CANCRUD');
 
-		$discount = ShippableProduct::get()->first();
+        $discount = ShippableProduct::get()->first();
 
-		$tier = $this->objFromFixture('ProductDiscountTier', 'fiveforten');
-		$tier->ShippableProductID = $discount->ID;
-		$tier->write();
-		$tierID = $tier->ID;
+        $tier = $this->objFromFixture('ProductDiscountTier', 'fiveforten');
+        $tier->ShippableProductID = $discount->ID;
+        $tier->write();
+        $tierID = $tier->ID;
 
-		$checkTier = ProductDiscountTier::get()->byID($tierID);
+        $checkTier = ProductDiscountTier::get()->byID($tierID);
 
-		$this->assertEquals($checkTier->Quantity, 5);
-		$this->assertEquals($checkTier->Percentage, 10);
+        $this->assertEquals($checkTier->Quantity, 5);
+        $this->assertEquals($checkTier->Percentage, 10);
 
-		$this->logOut();
-	}
+        $this->logOut();
+    }
 
-	public function testProductDiscountTierEdit(){
-		$this->logInWithPermission('ADMIN');
+    public function testProductDiscountTierEdit(){
+        $this->logInWithPermission('ADMIN');
 
-		$discount = ShippableProduct::get()->first();
+        $discount = ShippableProduct::get()->first();
 
-		$tier = $this->objFromFixture('ProductDiscountTier', 'fiveforten');
-		$tier->ShippableProductID = $discount->ID;
-		$tier->write();
-		$tierID = $tier->ID;
-		$this->logInWithPermission('Product_CANCRUD');
+        $tier = $this->objFromFixture('ProductDiscountTier', 'fiveforten');
+        $tier->ShippableProductID = $discount->ID;
+        $tier->write();
+        $tierID = $tier->ID;
+        $this->logInWithPermission('Product_CANCRUD');
 
-		$tier->Quantity = 2;
-		$tier->Percentage = 5;
-		$tier->write();
+        $tier->Quantity = 2;
+        $tier->Percentage = 5;
+        $tier->write();
 
-		$checkTier = ProductDiscountTier::get()->byID($tierID);
+        $checkTier = ProductDiscountTier::get()->byID($tierID);
 
-		$this->assertEquals($checkTier->Quantity, 2);
-		$this->assertEquals($checkTier->Percentage, 5);
+        $this->assertEquals($checkTier->Quantity, 2);
+        $this->assertEquals($checkTier->Percentage, 5);
 
-		$this->logOut();
-	}
+        $this->logOut();
+    }
 
-	public function testProductDiscountTierDeletion(){
-		$this->logInWithPermission('ADMIN');
+    public function testProductDiscountTierDeletion(){
+        $this->logInWithPermission('ADMIN');
 
-		$discount = ShippableProduct::get()->first();
+        $discount = ShippableProduct::get()->first();
 
-		$tier = $this->objFromFixture('ProductDiscountTier', 'fiveforten');
-		$tier->ShippableProductID = $discount->ID;
-		$tier->write();
-		$tierID = $tier->ID;
+        $tier = $this->objFromFixture('ProductDiscountTier', 'fiveforten');
+        $tier->ShippableProductID = $discount->ID;
+        $tier->write();
+        $tierID = $tier->ID;
 
-		$this->logOut();
+        $this->logOut();
 
-		$this->logInWithPermission('Product_CANCRUD');
+        $this->logInWithPermission('Product_CANCRUD');
 
-		$tier->delete();
-		$this->assertTrue(!ProductDiscountTier::get()->byID($tierID));
+        $tier->delete();
+        $this->assertTrue(!ProductDiscountTier::get()->byID($tierID));
 
-		$this->logOut();
-	}
+        $this->logOut();
+    }
 
 }

code/model/foxycart.cart_validation.php

Doc Comments +6 added lines

@@ -30,10 +30,16 @@
 	// protected static $cart_url = 'https://yourdomain.foxycart.com/cart';
 	protected static $cart_url;
 
+	/**
+	 * @param string $storeName
+	 */
 	public static function setCartURL($storeName = null){
 		self::$cart_url = 'https://'.$storeName.'.faxycart.com/cart';
 	}
 
+	/**
+	 * @param string $secret
+	 */
 	public static function setSecret($secret = null){
 		self::$secret = $secret;
 	}

Indentation +310 added lines, -310 removed lines

@@ -14,315 +14,315 @@
  *   - Empty textareas are assumed to be "open"
  */
 class FoxyCart_Helper {
-	/**
-	 * API Key (Secret)
-	 *
-	 * @var string
-	 **/
-	private static $secret;
-
-	/**
-	 * Cart URL
-	 *
-	 * @var string
-	 * Notes: Could be 'https://yourdomain.foxycart.com/cart' or 'https://secure.yourdomain.com/cart'
-	 **/
-	// protected static $cart_url = 'https://yourdomain.foxycart.com/cart';
-	protected static $cart_url;
-
-	public static function setCartURL($storeName = null){
-		self::$cart_url = 'https://'.$storeName.'.faxycart.com/cart';
-	}
-
-	public static function setSecret($secret = null){
-		self::$secret = $secret;
-	}
-
-	public function __construct(){
-		static::setCartURL(FoxyCart::get_foxy_cart_store_name());
-		static::setSecret(FoxyCart::get_store_key());
-	}
-
-	public static function getSecret(){
-		return FoxyCart::get_store_key();
-	}
-
-
-	/**
-	 * Cart Excludes
-	 *
-	 * Arrays of values and prefixes that should be ignored when signing links and forms.
-	 * @var array
-	 */
-	protected static $cart_excludes = array(
-		// Cart values
-		'cart', 'fcsid', 'empty', 'coupon', 'output', 'sub_token', 'redirect', 'callback', '_',
-		// Checkout pre-population values
-		'customer_email', 'customer_first_name', 'customer_last_name', 'customer_address1', 'customer_address2',
-		'customer_city', 'customer_state', 'customer_postal_code', 'customer_country', 'customer_phone', 'customer_company',
-		'shipping_first_name', 'shipping_last_name', 'shipping_address1', 'shipping_address2',
-		'shipping_city', 'shipping_state', 'shipping_postal_code', 'shipping_country', 'shipping_phone', 'shipping_company',
-	);
-	protected static $cart_excludes_prefixes = array(
-		'h:', 'x:', '__',
-	);
-
-	/**
-	 * Debugging
-	 *
-	 * Set to $debug to TRUE to enable debug logging.
-	 *
-	 */
-	protected static $debug = FALSE;
-	protected static $log = array();
-
-
-	/**
-	 * "Link Method": Generate HMAC SHA256 for GET Query Strings
-	 *
-	 * Notes: Can't parse_str because PHP doesn't support non-alphanumeric characters as array keys.
-	 * @return string
-	 **/
-	public static function fc_hash_querystring($qs, $output = TRUE) {
-		self::$log[] = '<strong>Signing link</strong> with data: '.htmlspecialchars(substr($qs, 0, 150)).'...';
-		$fail = self::$cart_url.'?'.$qs;
-
-		// If the link appears to be hashed already, don't bother
-		if (strpos($qs, '||')) {
-			self::$log[] = '<strong>Link appears to be signed already</strong>: '.htmlspecialchars($code[0]);
-			return $fail;
-		}
-
-		// Stick an ampersand on the beginning of the querystring to make matching the first element a little easier
-		$qs = '&'.urldecode($qs);
-
-		// Get all the prefixes, codes, and name=value pairs
-		preg_match_all('%(?P<amp>&(?:amp;)?)(?P<prefix>[a-z0-9]{1,3}:)?(?P<name>[^=]+)=(?P<value>[^&]+)%', $qs, $pairs, PREG_SET_ORDER);
-		self::$log[] = 'Found the following pairs to sign:<pre>'.htmlspecialchars(print_r($pairs, true)).'</pre>';
-
-		// Get all the "code" values, set the matches in $codes
-		$codes = array();
-		foreach ($pairs as $pair) {
-			if ($pair['name'] == 'code') {
-				$codes[$pair['prefix']] = $pair['value'];
-			}
-		}
-		if ( ! count($codes)) {
-			self::$log[] = '<strong style="color:#600;">No code found</strong> for the above link.';
-			return $fail;
-		}
-		self::$log[] = '<strong style="color:orange;">CODES found:</strong> '.htmlspecialchars(print_r($codes, true));
-
-		// Sign the name/value pairs
-		foreach ($pairs as $pair) {
-			// Skip the cart excludes
-			if (in_array($pair['name'], self::$cart_excludes) || in_array($pair['prefix'], self::$cart_excludes_prefixes)) {
-				self::$log[] = '<strong style="color:purple;">Skipping</strong> the reserved parameter or prefix "'.$pair['prefix'].$pair['name'].'" = '.$pair['value'];
-				continue;
-			}
-
-			// Continue to sign the value and replace the name=value in the querystring with name=value||hash
-			$value = self::fc_hash_value($codes[$pair['prefix']], $pair['name'], $pair['value'], 'value', FALSE, 'urlencode');
-			$replacement = $pair['amp'].$pair['prefix'].urlencode($pair['name']).'='.$value;
-			$qs = str_replace($pair[0], $replacement, $qs);
-			self::$log[] = 'Signed <strong>'.$pair['name'].'</strong> = <strong>'.$pair['value'].'</strong> with '.$replacement.'.<br />Replacing: '.$pair[0].'<br />With... '.$replacement;
-		}
-		$qs = ltrim($qs, '&'); // Get rid of that leading ampersand we added earlier
-
-		if ($output) {
-			echo self::$cart_url.'?'.$qs;
-		} else {
-			return self::$cart_url.'?'.$qs;
-		}
-	}
-
-
-	/**
-	 * "Form Method": Generate HMAC SHA256 for form elements or individual <input />s
-	 *
-	 * @return string
-	 **/
-	public static function fc_hash_value($product_code, $option_name, $option_value = '', $method = 'name', $output = TRUE, $urlencode = false) {
-		if (!$product_code || !$option_name) {
-			return FALSE;
-		}
-		if ($option_value == '--OPEN--') {
-			$hash = hash_hmac('sha256', $product_code.$option_name.$option_value, self::getSecret());
-			$value = ($urlencode) ? urlencode($option_name).'||'.$hash.'||open' : $option_name.'||'.$hash.'||open';
-		} else {
-			$hash = hash_hmac('sha256', $product_code.$option_name.$option_value, self::getSecret());
-			if ($method == 'name') {
-				$value = ($urlencode) ? urlencode($option_name).'||'.$hash : $option_name.'||'.$hash;
-			} else {
-				$value = ($urlencode) ? urlencode($option_value).'||'.$hash : $option_value.'||'.$hash;
-			}
-		}
-
-		if ($output) {
-			echo $value;
-		} else {
-			return $value;
-		}
-	}
-
-	/**
-	 * Raw HTML Signing: Sign all links and form elements in a block of HTML
-	 *
-	 * Accepts a string of HTML and signs all links and forms.
-	 * Requires link 'href' and form 'action' attributes to use 'https' and not 'http'.
-	 * Requires a 'code' to be set in every form.
-	 *
-	 * @return string
-	 **/
-	public static function fc_hash_html($html) {
-		// Initialize some counting
-		$count['temp'] = 0; // temp counter
-		$count['links'] = 0;
-		$count['forms'] = 0;
-		$count['inputs'] = 0;
-		$count['lists'] = 0;
-		$count['textareas'] = 0;
-
-		// Find and sign all the links
-		preg_match_all('%<a .*?href=[\'"]'.preg_quote(self::$cart_url).'(?:\.php)?\?(.+?)[\'"].*?>%i', $html, $querystrings);
-		// print_r($querystrings);
-		foreach ($querystrings[1] as $querystring) {
-			// If it's already signed, skip it.
-			if (preg_match('%&(?:amp;)?hash=%i', $querystring)) {
-				continue;
-			}
-			$pattern = '%(href=[\'"])'.preg_quote(self::$cart_url, '%').'(?:\.php)?\?'.preg_quote($querystring, '%').'([\'"])%i';
-			$signed = self::fc_hash_querystring($querystring, FALSE);
-			$html = preg_replace($pattern, '$1'.$signed.'$2', $html, -1, $count['temp']);
-			$count['links'] += $count['temp'];
-		}
-		unset($querystrings);
-
-		// Find and sign all form values
-		preg_match_all('%<form [^>]*?action=[\'"]'.preg_quote(self::$cart_url).'?[\'"].*?>(.+?)</form>%is', $html, $forms);
-		foreach ($forms[1] as $form) {
-			$count['forms']++;
-			self::$log[] = '<strong>Signing form</strong> with data: '.htmlspecialchars(substr($form, 0, 150)).'...';
-
-			// Store the original form so we can replace it when we're done
-			$form_original = $form;
-
-			// Check for the "code" input, set the matches in $codes
-			if (!preg_match_all('%<[^>]*?name=([\'"])([0-9]{1,3}:)?code\1[^>]*?>%i', $form, $codes, PREG_SET_ORDER)) {
-				self::$log[] = '<strong style="color:#600;">No code found</strong> for the above form.';
-				continue;
-			}
-			// For each code found, sign the appropriate inputs
-			foreach ($codes as $code) {
-				// If the form appears to be hashed already, don't bother
-				if (strpos($code[0], '||')) {
-					self::$log[] = '<strong>Form appears to be signed already</strong>: '.htmlspecialchars($code[0]);
-					continue;
-				}
-				// Get the code and the prefix
-				$prefix = (isset($code[2])) ? $code[2] : '';
-				preg_match('%<[^>]*?value=([\'"])(.+?)\1[^>]*?>%i', $code[0], $code);
-				$code = trim($code[2]);
-				self::$log[] = '<strong>Prefix for '.htmlspecialchars($code).'</strong>: '.htmlspecialchars($prefix);
-				if (!$code) { // If the code is empty, skip this form or specific prefixed elements
-					continue;
-				}
-
-				// Sign all <input /> elements with matching prefix
-				preg_match_all('%<input [^>]*?name=([\'"])'.preg_quote($prefix).'(?![0-9]{1,3})(?:.+?)\1[^>]*>%i', $form, $inputs);
-				foreach ($inputs[0] as $input) {
-					$count['inputs']++;
-					// Test to make sure both name and value attributes are found
-					if (preg_match('%name=([\'"])'.preg_quote($prefix).'(?![0-9]{1,3})(.+?)\1%i', $input, $name) > 0) {
-						preg_match('%value=([\'"])(.*?)\1%i', $input, $value);
-						$value = (count($value) > 0) ? $value : array('', '', '');
-						preg_match('%type=([\'"])(.*?)\1%i', $input, $type);
-						$type = (count($type) > 0) ? $type : array('', '', '');
-						// Skip the cart excludes
-						if (in_array($prefix.$name[2], self::$cart_excludes) || in_array(substr($prefix.$name[2], 0, 2), self::$cart_excludes_prefixes)) {
-							self::$log[] = '<strong style="color:purple;">Skipping</strong> the reserved parameter or prefix "'.$prefix.$name[2].'" = '.$value[2];
-							continue;
-						}
-						self::$log[] = '<strong>INPUT['.$type[2].']:</strong> Name: <strong>'.$prefix.htmlspecialchars(preg_quote($name[2])).'</strong>';
-						self::$log[] = '<strong>Replacement Pattern:</strong> ([\'"])'.$prefix.preg_quote($name[2]).'\1';
-						$value[2] = ($value[2] == '') ? '--OPEN--' : $value[2];
-						if ($type[2] == 'radio') {
-							$input_signed = preg_replace('%([\'"])'.preg_quote($value[2]).'\1%', '${1}'.self::fc_hash_value($code, $name[2], $value[2], 'value', FALSE)."$1", $input);
-						} else {
-							$input_signed = preg_replace('%([\'"])'.$prefix.preg_quote($name[2]).'\1%', '${1}'.$prefix.self::fc_hash_value($code, $name[2], $value[2], 'name', FALSE)."$1", $input);
-						}
-						self::$log[] = '<strong>INPUT:</strong> Code: <strong>'.htmlspecialchars($prefix.$code).
-						               '</strong> :: Name: <strong>'.htmlspecialchars($prefix.$name[2]).
-						               '</strong> :: Value: <strong>'.htmlspecialchars($value[2]).
-						               '</strong><br />Initial input: '.htmlspecialchars($input).
-						               '<br />Signed: <span style="color:#060;">'.htmlspecialchars($input_signed).'</span>';
-						$form = str_replace($input, $input_signed, $form);
-					}
-				}
-				self::$log[] = '<strong>FORM after INPUTS:</strong> <pre>'.htmlspecialchars($form).'</pre>';
-
-				// Sign all <option /> elements
-				preg_match_all('%<select [^>]*name=([\'"])'.preg_quote($prefix).'(?![0-9]{1,3})(.+?)\1[^>]*>(.+?)</select>%is', $form, $lists, PREG_SET_ORDER);
-				foreach ($lists as $list) {
-					$count['lists']++;
-					preg_match_all('%<option [^>]*value=([\'"])(.+?)\1[^>]*>(?:.*?)</option>%i', $list[0], $options, PREG_SET_ORDER);
-					self::$log[] = '<strong>Options:</strong> <pre>'.htmlspecialchars(print_r($options, true)).'</pre>';
-					unset( $form_part_signed );
-					foreach ($options as $option) {
-						if( !isset($form_part_signed) ) $form_part_signed = $list[0];
-						$option_signed = preg_replace(
-							'%'.preg_quote($option[1]).preg_quote($option[2]).preg_quote($option[1]).'%',
-							$option[1].self::fc_hash_value($code, $list[2], $option[2], 'value', FALSE).$option[1],
-							$option[0]);
-						$form_part_signed = str_replace($option[0], $option_signed, $form_part_signed );
-						self::$log[] = '<strong>OPTION:</strong> Code: <strong>'.htmlspecialchars($prefix.$code).
-						               '</strong> :: Name: <strong>'.htmlspecialchars($prefix.$list[2]).
-						               '</strong> :: Value: <strong>'.htmlspecialchars($option[2]).
-						               '</strong><br />Initial option: '.htmlspecialchars($option[0]).
-						               '<br />Signed: <span style="color:#060;">'.htmlspecialchars($option_signed).'</span>';
-					}
-					$form = str_replace($list[0], $form_part_signed, $form);
-				}
-				self::$log[] = '<strong>FORM after OPTIONS:</strong> <pre>'.htmlspecialchars($form).'</pre>';
-
-				// Sign all <textarea /> elements
-				preg_match_all('%<textarea [^>]*name=([\'"])'.preg_quote($prefix).'(?![0-9]{1,3})(.+?)\1[^>]*>(.*?)</textarea>%is', $form, $textareas, PREG_SET_ORDER);
-				// echo "\n\nTextareas: ".print_r($textareas, true);
-				foreach ($textareas as $textarea) {
-					$count['textareas']++;
-					// Tackle implied "--OPEN--" first, if textarea is empty
-					$textarea[3] = ($textarea[3] == '') ? '--OPEN--' : $textarea[3];
-					$textarea_signed = preg_replace('%([\'"])'.preg_quote($prefix.$textarea[2]).'\1%', "$1".self::fc_hash_value($code, $textarea[2], $textarea[3], 'name', FALSE)."$1", $textarea[0]);
-					$form = str_replace($textarea[0], $textarea_signed, $form);
-					self::$log[] = '<strong>TEXTAREA:</strong> Code: <strong>'.htmlspecialchars($prefix.$code).
-					               '</strong> :: Name: <strong>'.htmlspecialchars($prefix.$textarea[2]).
-					               '</strong> :: Value: <strong>'.htmlspecialchars($textarea[3]).
-					               '</strong><br />Initial textarea: '.htmlspecialchars($textarea[0]).
-					               '<br />Signed: <span style="color:#060;">'.htmlspecialchars($textarea_signed).'</span>';
-				}
-				self::$log[] = '<strong>FORM after TEXTAREAS:</strong> <pre>'.htmlspecialchars($form).'</pre>';
-
-				// Exclude all <button> elements
-				$form = preg_replace('%<button ([^>]*)name=([\'"])(.*?)\1([^>]*>.*?</button>)%i', "<button $1name=$2x:$3$4", $form);
-
-			}
-			// Replace the entire form
-			self::$log[] = '<strong>FORM after ALL:</strong> <pre>'.htmlspecialchars($form).'</pre>'.'replacing <pre>'.htmlspecialchars($form_original).'</pre>';
-			$html = str_replace($form_original, $form, $html);
-			self::$log[] = '<strong>FORM end</strong><hr />';
-		}
-
-		// Return the signed output
-		$output = '';
-		if (self::$debug) {
-			self::$log['Summary'] = $count['links'].' links signed. '.$count['forms'].' forms signed. '.$count['inputs'].' inputs signed. '.$count['lists'].' lists signed. '.$count['textareas'].' textareas signed.';
-			$output .= '<h3>FoxyCart HMAC Debugging:</h3><ul>';
-			foreach (self::$log as $name => $value) {
-				$output .= '<li><strong>'.$name.':</strong> '.$value.'</li>';
-			}
-			$output .= '</ul><hr />';
-		}
-		return $output.$html;
-	}
+    /**
+     * API Key (Secret)
+     *
+     * @var string
+     **/
+    private static $secret;
+
+    /**
+     * Cart URL
+     *
+     * @var string
+     * Notes: Could be 'https://yourdomain.foxycart.com/cart' or 'https://secure.yourdomain.com/cart'
+     **/
+    // protected static $cart_url = 'https://yourdomain.foxycart.com/cart';
+    protected static $cart_url;
+
+    public static function setCartURL($storeName = null){
+        self::$cart_url = 'https://'.$storeName.'.faxycart.com/cart';
+    }
+
+    public static function setSecret($secret = null){
+        self::$secret = $secret;
+    }
+
+    public function __construct(){
+        static::setCartURL(FoxyCart::get_foxy_cart_store_name());
+        static::setSecret(FoxyCart::get_store_key());
+    }
+
+    public static function getSecret(){
+        return FoxyCart::get_store_key();
+    }
+
+
+    /**
+     * Cart Excludes
+     *
+     * Arrays of values and prefixes that should be ignored when signing links and forms.
+     * @var array
+     */
+    protected static $cart_excludes = array(
+        // Cart values
+        'cart', 'fcsid', 'empty', 'coupon', 'output', 'sub_token', 'redirect', 'callback', '_',
+        // Checkout pre-population values
+        'customer_email', 'customer_first_name', 'customer_last_name', 'customer_address1', 'customer_address2',
+        'customer_city', 'customer_state', 'customer_postal_code', 'customer_country', 'customer_phone', 'customer_company',
+        'shipping_first_name', 'shipping_last_name', 'shipping_address1', 'shipping_address2',
+        'shipping_city', 'shipping_state', 'shipping_postal_code', 'shipping_country', 'shipping_phone', 'shipping_company',
+    );
+    protected static $cart_excludes_prefixes = array(
+        'h:', 'x:', '__',
+    );
+
+    /**
+     * Debugging
+     *
+     * Set to $debug to TRUE to enable debug logging.
+     *
+     */
+    protected static $debug = FALSE;
+    protected static $log = array();
+
+
+    /**
+     * "Link Method": Generate HMAC SHA256 for GET Query Strings
+     *
+     * Notes: Can't parse_str because PHP doesn't support non-alphanumeric characters as array keys.
+     * @return string
+     **/
+    public static function fc_hash_querystring($qs, $output = TRUE) {
+        self::$log[] = '<strong>Signing link</strong> with data: '.htmlspecialchars(substr($qs, 0, 150)).'...';
+        $fail = self::$cart_url.'?'.$qs;
+
+        // If the link appears to be hashed already, don't bother
+        if (strpos($qs, '||')) {
+            self::$log[] = '<strong>Link appears to be signed already</strong>: '.htmlspecialchars($code[0]);
+            return $fail;
+        }
+
+        // Stick an ampersand on the beginning of the querystring to make matching the first element a little easier
+        $qs = '&'.urldecode($qs);
+
+        // Get all the prefixes, codes, and name=value pairs
+        preg_match_all('%(?P<amp>&(?:amp;)?)(?P<prefix>[a-z0-9]{1,3}:)?(?P<name>[^=]+)=(?P<value>[^&]+)%', $qs, $pairs, PREG_SET_ORDER);
+        self::$log[] = 'Found the following pairs to sign:<pre>'.htmlspecialchars(print_r($pairs, true)).'</pre>';
+
+        // Get all the "code" values, set the matches in $codes
+        $codes = array();
+        foreach ($pairs as $pair) {
+            if ($pair['name'] == 'code') {
+                $codes[$pair['prefix']] = $pair['value'];
+            }
+        }
+        if ( ! count($codes)) {
+            self::$log[] = '<strong style="color:#600;">No code found</strong> for the above link.';
+            return $fail;
+        }
+        self::$log[] = '<strong style="color:orange;">CODES found:</strong> '.htmlspecialchars(print_r($codes, true));
+
+        // Sign the name/value pairs
+        foreach ($pairs as $pair) {
+            // Skip the cart excludes
+            if (in_array($pair['name'], self::$cart_excludes) || in_array($pair['prefix'], self::$cart_excludes_prefixes)) {
+                self::$log[] = '<strong style="color:purple;">Skipping</strong> the reserved parameter or prefix "'.$pair['prefix'].$pair['name'].'" = '.$pair['value'];
+                continue;
+            }
+
+            // Continue to sign the value and replace the name=value in the querystring with name=value||hash
+            $value = self::fc_hash_value($codes[$pair['prefix']], $pair['name'], $pair['value'], 'value', FALSE, 'urlencode');
+            $replacement = $pair['amp'].$pair['prefix'].urlencode($pair['name']).'='.$value;
+            $qs = str_replace($pair[0], $replacement, $qs);
+            self::$log[] = 'Signed <strong>'.$pair['name'].'</strong> = <strong>'.$pair['value'].'</strong> with '.$replacement.'.<br />Replacing: '.$pair[0].'<br />With... '.$replacement;
+        }
+        $qs = ltrim($qs, '&'); // Get rid of that leading ampersand we added earlier
+
+        if ($output) {
+            echo self::$cart_url.'?'.$qs;
+        } else {
+            return self::$cart_url.'?'.$qs;
+        }
+    }
+
+
+    /**
+     * "Form Method": Generate HMAC SHA256 for form elements or individual <input />s
+     *
+     * @return string
+     **/
+    public static function fc_hash_value($product_code, $option_name, $option_value = '', $method = 'name', $output = TRUE, $urlencode = false) {
+        if (!$product_code || !$option_name) {
+            return FALSE;
+        }
+        if ($option_value == '--OPEN--') {
+            $hash = hash_hmac('sha256', $product_code.$option_name.$option_value, self::getSecret());
+            $value = ($urlencode) ? urlencode($option_name).'||'.$hash.'||open' : $option_name.'||'.$hash.'||open';
+        } else {
+            $hash = hash_hmac('sha256', $product_code.$option_name.$option_value, self::getSecret());
+            if ($method == 'name') {
+                $value = ($urlencode) ? urlencode($option_name).'||'.$hash : $option_name.'||'.$hash;
+            } else {
+                $value = ($urlencode) ? urlencode($option_value).'||'.$hash : $option_value.'||'.$hash;
+            }
+        }
+
+        if ($output) {
+            echo $value;
+        } else {
+            return $value;
+        }
+    }
+
+    /**
+     * Raw HTML Signing: Sign all links and form elements in a block of HTML
+     *
+     * Accepts a string of HTML and signs all links and forms.
+     * Requires link 'href' and form 'action' attributes to use 'https' and not 'http'.
+     * Requires a 'code' to be set in every form.
+     *
+     * @return string
+     **/
+    public static function fc_hash_html($html) {
+        // Initialize some counting
+        $count['temp'] = 0; // temp counter
+        $count['links'] = 0;
+        $count['forms'] = 0;
+        $count['inputs'] = 0;
+        $count['lists'] = 0;
+        $count['textareas'] = 0;
+
+        // Find and sign all the links
+        preg_match_all('%<a .*?href=[\'"]'.preg_quote(self::$cart_url).'(?:\.php)?\?(.+?)[\'"].*?>%i', $html, $querystrings);
+        // print_r($querystrings);
+        foreach ($querystrings[1] as $querystring) {
+            // If it's already signed, skip it.
+            if (preg_match('%&(?:amp;)?hash=%i', $querystring)) {
+                continue;
+            }
+            $pattern = '%(href=[\'"])'.preg_quote(self::$cart_url, '%').'(?:\.php)?\?'.preg_quote($querystring, '%').'([\'"])%i';
+            $signed = self::fc_hash_querystring($querystring, FALSE);
+            $html = preg_replace($pattern, '$1'.$signed.'$2', $html, -1, $count['temp']);
+            $count['links'] += $count['temp'];
+        }
+        unset($querystrings);
+
+        // Find and sign all form values
+        preg_match_all('%<form [^>]*?action=[\'"]'.preg_quote(self::$cart_url).'?[\'"].*?>(.+?)</form>%is', $html, $forms);
+        foreach ($forms[1] as $form) {
+            $count['forms']++;
+            self::$log[] = '<strong>Signing form</strong> with data: '.htmlspecialchars(substr($form, 0, 150)).'...';
+
+            // Store the original form so we can replace it when we're done
+            $form_original = $form;
+
+            // Check for the "code" input, set the matches in $codes
+            if (!preg_match_all('%<[^>]*?name=([\'"])([0-9]{1,3}:)?code\1[^>]*?>%i', $form, $codes, PREG_SET_ORDER)) {
+                self::$log[] = '<strong style="color:#600;">No code found</strong> for the above form.';
+                continue;
+            }
+            // For each code found, sign the appropriate inputs
+            foreach ($codes as $code) {
+                // If the form appears to be hashed already, don't bother
+                if (strpos($code[0], '||')) {
+                    self::$log[] = '<strong>Form appears to be signed already</strong>: '.htmlspecialchars($code[0]);
+                    continue;
+                }
+                // Get the code and the prefix
+                $prefix = (isset($code[2])) ? $code[2] : '';
+                preg_match('%<[^>]*?value=([\'"])(.+?)\1[^>]*?>%i', $code[0], $code);
+                $code = trim($code[2]);
+                self::$log[] = '<strong>Prefix for '.htmlspecialchars($code).'</strong>: '.htmlspecialchars($prefix);
+                if (!$code) { // If the code is empty, skip this form or specific prefixed elements
+                    continue;
+                }
+
+                // Sign all <input /> elements with matching prefix
+                preg_match_all('%<input [^>]*?name=([\'"])'.preg_quote($prefix).'(?![0-9]{1,3})(?:.+?)\1[^>]*>%i', $form, $inputs);
+                foreach ($inputs[0] as $input) {
+                    $count['inputs']++;
+                    // Test to make sure both name and value attributes are found
+                    if (preg_match('%name=([\'"])'.preg_quote($prefix).'(?![0-9]{1,3})(.+?)\1%i', $input, $name) > 0) {
+                        preg_match('%value=([\'"])(.*?)\1%i', $input, $value);
+                        $value = (count($value) > 0) ? $value : array('', '', '');
+                        preg_match('%type=([\'"])(.*?)\1%i', $input, $type);
+                        $type = (count($type) > 0) ? $type : array('', '', '');
+                        // Skip the cart excludes
+                        if (in_array($prefix.$name[2], self::$cart_excludes) || in_array(substr($prefix.$name[2], 0, 2), self::$cart_excludes_prefixes)) {
+                            self::$log[] = '<strong style="color:purple;">Skipping</strong> the reserved parameter or prefix "'.$prefix.$name[2].'" = '.$value[2];
+                            continue;
+                        }
+                        self::$log[] = '<strong>INPUT['.$type[2].']:</strong> Name: <strong>'.$prefix.htmlspecialchars(preg_quote($name[2])).'</strong>';
+                        self::$log[] = '<strong>Replacement Pattern:</strong> ([\'"])'.$prefix.preg_quote($name[2]).'\1';
+                        $value[2] = ($value[2] == '') ? '--OPEN--' : $value[2];
+                        if ($type[2] == 'radio') {
+                            $input_signed = preg_replace('%([\'"])'.preg_quote($value[2]).'\1%', '${1}'.self::fc_hash_value($code, $name[2], $value[2], 'value', FALSE)."$1", $input);
+                        } else {
+                            $input_signed = preg_replace('%([\'"])'.$prefix.preg_quote($name[2]).'\1%', '${1}'.$prefix.self::fc_hash_value($code, $name[2], $value[2], 'name', FALSE)."$1", $input);
+                        }
+                        self::$log[] = '<strong>INPUT:</strong> Code: <strong>'.htmlspecialchars($prefix.$code).
+                                        '</strong> :: Name: <strong>'.htmlspecialchars($prefix.$name[2]).
+                                        '</strong> :: Value: <strong>'.htmlspecialchars($value[2]).
+                                        '</strong><br />Initial input: '.htmlspecialchars($input).
+                                        '<br />Signed: <span style="color:#060;">'.htmlspecialchars($input_signed).'</span>';
+                        $form = str_replace($input, $input_signed, $form);
+                    }
+                }
+                self::$log[] = '<strong>FORM after INPUTS:</strong> <pre>'.htmlspecialchars($form).'</pre>';
+
+                // Sign all <option /> elements
+                preg_match_all('%<select [^>]*name=([\'"])'.preg_quote($prefix).'(?![0-9]{1,3})(.+?)\1[^>]*>(.+?)</select>%is', $form, $lists, PREG_SET_ORDER);
+                foreach ($lists as $list) {
+                    $count['lists']++;
+                    preg_match_all('%<option [^>]*value=([\'"])(.+?)\1[^>]*>(?:.*?)</option>%i', $list[0], $options, PREG_SET_ORDER);
+                    self::$log[] = '<strong>Options:</strong> <pre>'.htmlspecialchars(print_r($options, true)).'</pre>';
+                    unset( $form_part_signed );
+                    foreach ($options as $option) {
+                        if( !isset($form_part_signed) ) $form_part_signed = $list[0];
+                        $option_signed = preg_replace(
+                            '%'.preg_quote($option[1]).preg_quote($option[2]).preg_quote($option[1]).'%',
+                            $option[1].self::fc_hash_value($code, $list[2], $option[2], 'value', FALSE).$option[1],
+                            $option[0]);
+                        $form_part_signed = str_replace($option[0], $option_signed, $form_part_signed );
+                        self::$log[] = '<strong>OPTION:</strong> Code: <strong>'.htmlspecialchars($prefix.$code).
+                                        '</strong> :: Name: <strong>'.htmlspecialchars($prefix.$list[2]).
+                                        '</strong> :: Value: <strong>'.htmlspecialchars($option[2]).
+                                        '</strong><br />Initial option: '.htmlspecialchars($option[0]).
+                                        '<br />Signed: <span style="color:#060;">'.htmlspecialchars($option_signed).'</span>';
+                    }
+                    $form = str_replace($list[0], $form_part_signed, $form);
+                }
+                self::$log[] = '<strong>FORM after OPTIONS:</strong> <pre>'.htmlspecialchars($form).'</pre>';
+
+                // Sign all <textarea /> elements
+                preg_match_all('%<textarea [^>]*name=([\'"])'.preg_quote($prefix).'(?![0-9]{1,3})(.+?)\1[^>]*>(.*?)</textarea>%is', $form, $textareas, PREG_SET_ORDER);
+                // echo "\n\nTextareas: ".print_r($textareas, true);
+                foreach ($textareas as $textarea) {
+                    $count['textareas']++;
+                    // Tackle implied "--OPEN--" first, if textarea is empty
+                    $textarea[3] = ($textarea[3] == '') ? '--OPEN--' : $textarea[3];
+                    $textarea_signed = preg_replace('%([\'"])'.preg_quote($prefix.$textarea[2]).'\1%', "$1".self::fc_hash_value($code, $textarea[2], $textarea[3], 'name', FALSE)."$1", $textarea[0]);
+                    $form = str_replace($textarea[0], $textarea_signed, $form);
+                    self::$log[] = '<strong>TEXTAREA:</strong> Code: <strong>'.htmlspecialchars($prefix.$code).
+                                    '</strong> :: Name: <strong>'.htmlspecialchars($prefix.$textarea[2]).
+                                    '</strong> :: Value: <strong>'.htmlspecialchars($textarea[3]).
+                                    '</strong><br />Initial textarea: '.htmlspecialchars($textarea[0]).
+                                    '<br />Signed: <span style="color:#060;">'.htmlspecialchars($textarea_signed).'</span>';
+                }
+                self::$log[] = '<strong>FORM after TEXTAREAS:</strong> <pre>'.htmlspecialchars($form).'</pre>';
+
+                // Exclude all <button> elements
+                $form = preg_replace('%<button ([^>]*)name=([\'"])(.*?)\1([^>]*>.*?</button>)%i', "<button $1name=$2x:$3$4", $form);
+
+            }
+            // Replace the entire form
+            self::$log[] = '<strong>FORM after ALL:</strong> <pre>'.htmlspecialchars($form).'</pre>'.'replacing <pre>'.htmlspecialchars($form_original).'</pre>';
+            $html = str_replace($form_original, $form, $html);
+            self::$log[] = '<strong>FORM end</strong><hr />';
+        }
+
+        // Return the signed output
+        $output = '';
+        if (self::$debug) {
+            self::$log['Summary'] = $count['links'].' links signed. '.$count['forms'].' forms signed. '.$count['inputs'].' inputs signed. '.$count['lists'].' lists signed. '.$count['textareas'].' textareas signed.';
+            $output .= '<h3>FoxyCart HMAC Debugging:</h3><ul>';
+            foreach (self::$log as $name => $value) {
+                $output .= '<li><strong>'.$name.':</strong> '.$value.'</li>';
+            }
+            $output .= '</ul><hr />';
+        }
+        return $output.$html;
+    }
 
 }
\ No newline at end of file

tests/StoreSettingsTest.php

Indentation +14 added lines, -14 removed lines

@@ -2,28 +2,28 @@
 
 class StoreSettingsTest extends FS_Test{
 
-	protected static $use_draft_site = true;
+    protected static $use_draft_site = true;
 
-	function setUp(){
-		parent::setUp();
+    function setUp(){
+        parent::setUp();
 
-		$siteConf = SiteConfig::current_site_config();
-		$siteConf->StoreName = 'foxystripe';
+        $siteConf = SiteConfig::current_site_config();
+        $siteConf->StoreName = 'foxystripe';
         $siteConf->requireDefaultRecords();
-		$siteConf->write();
-	}
+        $siteConf->write();
+    }
 
-	function testStoreKey(){
-		$siteConf = SiteConfig::current_site_config();
+    function testStoreKey(){
+        $siteConf = SiteConfig::current_site_config();
 
-		$this->assertTrue(ctype_alnum($siteConf->StoreKey));
+        $this->assertTrue(ctype_alnum($siteConf->StoreKey));
         $this->assertEquals(strlen($siteConf->StoreKey), 60);
-	}
+    }
 
-	function testStoreName(){
-		$siteConf = SiteConfig::current_site_config();
+    function testStoreName(){
+        $siteConf = SiteConfig::current_site_config();
 
         $this->assertEquals($siteConf->StoreName, 'foxystripe');
-	}
+    }
 
 }

code/model/FoxyCart.php

Spacing +6 added lines, -6 removed lines

@@ -19,14 +19,14 @@ 
      */
     public static function setStoreKey($length = 54, $count = 0)
     {
-        $charset = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789' . strtotime('now');
+        $charset = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'.strtotime('now');
         $strLength = strlen($charset);
         $str = '';
         while ($count < $length) {
             $str .= $charset[mt_rand(0, $strLength - 1)];
             $count++;
         }
-        return static::get_key_prefix() . substr(base64_encode($str), 0, $length);
+        return static::get_key_prefix().substr(base64_encode($str), 0, $length);
     }
 
     /**
@@ -82,11 +82,11 @@ 
     private static function getAPIRequest($foxyData = array())
     {
 
-        $foxy_domain = static::get_foxy_cart_store_name() . '.foxycart.com';
+        $foxy_domain = static::get_foxy_cart_store_name().'.foxycart.com';
         $foxyData["api_token"] = FoxyCart::get_store_key();
 
         $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, "https://" . $foxy_domain . "/api");
+        curl_setopt($ch, CURLOPT_URL, "https://".$foxy_domain."/api");
         curl_setopt($ch, CURLOPT_POSTFIELDS, $foxyData);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
@@ -95,7 +95,7 @@ 
 
         // The following if block will print any CURL errors you might have
         if ($response == false) {
-            SS_Log::log("Could not connect to FoxyCart API: " . $response, SS_Log::ERR);
+            SS_Log::log("Could not connect to FoxyCart API: ".$response, SS_Log::ERR);
         }
         curl_close($ch);
 
@@ -130,7 +130,7 @@ 
     public static function putCustomer(Member $Member = null)
     {
         // throw error if no $Member Object
-        if (!isset($Member)) ;//trigger_error('No Member set', E_USER_ERROR);
+        if (!isset($Member)); //trigger_error('No Member set', E_USER_ERROR);
 
         // send updated customer record from API
         $foxyData = array();