dynamic / foxystripe

code/model/foxycart.cart_validation.php

Doc Comments +3 added lines

@@ -43,6 +43,9 @@
 		self::setSecret(FoxyCart::getStoreKey());
 	}
 
+	/**
+	 * @return string
+	 */
 	public static function getSecret(){
 		return FoxyCart::getStoreKey();
 	}

Spacing +13 added lines, -13 removed lines

@@ -30,20 +30,20 @@ 
 	// protected static $cart_url = 'https://yourdomain.foxycart.com/cart';
 	protected static $cart_url;
 
-	public static function setCartURL($storeName = null){
+	public static function setCartURL($storeName = null) {
 		self::$cart_url = 'https://'.$storeName.'.faxycart.com/cart';
 	}
 
-	public static function setSecret($secret = null){
+	public static function setSecret($secret = null) {
 		self::$secret = $secret;
 	}
 
-	public function __construct(){
+	public function __construct() {
 		self::setCartURL(FoxyCart::getFoxyCartStoreName());
 		self::setSecret(FoxyCart::getStoreKey());
 	}
 
-	public static function getSecret(){
+	public static function getSecret() {
 		return FoxyCart::getStoreKey();
 	}
 
@@ -107,7 +107,7 @@ 
 				$codes[$pair['prefix']] = $pair['value'];
 			}
 		}
-		if ( ! count($codes)) {
+		if (!count($codes)) {
 			self::$log[] = '<strong style="color:#600;">No code found</strong> for the above link.';
 			return $fail;
 		}
@@ -131,7 +131,7 @@ 
 
 		if ($output) {
 			echo self::$cart_url.'?'.$qs;
-		} else {
+		}else {
 			return self::$cart_url.'?'.$qs;
 		}
 	}
@@ -149,18 +149,18 @@ 
 		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 {
+		}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 {
+			}else {
 				$value = ($urlencode) ? urlencode($option_value).'||'.$hash : $option_value.'||'.$hash;
 			}
 		}
 
 		if ($output) {
 			echo $value;
-		} else {
+		}else {
 			return $value;
 		}
 	}
@@ -248,7 +248,7 @@ 
 						$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 {
+						}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).
@@ -267,14 +267,14 @@ 
 					$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 );
+					unset($form_part_signed);
 					foreach ($options as $option) {
-						if( !isset($form_part_signed) ) $form_part_signed = $list[0];
+						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 );
+						$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]).

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(){
-		self::setCartURL(FoxyCart::getFoxyCartStoreName());
-		self::setSecret(FoxyCart::getStoreKey());
-	}
-
-	public static function getSecret(){
-		return FoxyCart::getStoreKey();
-	}
-
-
-	/**
-	 * 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(){
+        self::setCartURL(FoxyCart::getFoxyCartStoreName());
+        self::setSecret(FoxyCart::getStoreKey());
+    }
+
+    public static function getSecret(){
+        return FoxyCart::getStoreKey();
+    }
+
+
+    /**
+     * 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

Braces +3 added lines, -1 removed lines

@@ -269,7 +269,9 @@
 					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];
+						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],

code/model/FoxyCart.php

Spacing +15 added lines, -15 removed lines

@@ -9,43 +9,43 @@ 
 
 	private static $keyPrefix = 'dYnm1c';
 
-	public static function setStoreKey($length = 54, $count = 0){
+	public static function setStoreKey($length = 54, $count = 0) {
 		$charset = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'.strtotime('now');
 		$strLength = strlen($charset);
 		$str = '';
-		while($count < $length){
-			$str .= $charset[mt_rand(0, $strLength-1)];
+		while ($count < $length) {
+			$str .= $charset[mt_rand(0, $strLength - 1)];
 			$count++;
 		}
-		return self::getKeyPrefix().substr(base64_encode($str),0,$length);
+		return self::getKeyPrefix().substr(base64_encode($str), 0, $length);
 	}
 
-	public static function getStoreKey(){
+	public static function getStoreKey() {
 		$config = SiteConfig::current_site_config();
-		if($config->StoreKey){
+		if ($config->StoreKey) {
 			return $config->StoreKey;
 		}
 		return null;
 	}
 
-	public static function store_name_warning(){
+	public static function store_name_warning() {
 		$warning = null;
-		if(self::getFoxyCartStoreName()===null){
+		if (self::getFoxyCartStoreName() === null) {
 			$warning = 'Must define FoxyCart Store Name in your site settings in the cms';
 		}
 		return $warning;
 	}
 
-	public static function getFoxyCartStoreName(){
+	public static function getFoxyCartStoreName() {
 		$config = SiteConfig::current_site_config();
-		if($config->StoreName){
+		if ($config->StoreName) {
 			return $config->StoreName;
 		}
 		return null;
 	}
 
 	public static function FormActionURL() {
-		return sprintf('https://%s.foxycart.com/cart', self::getFoxyCartStoreName() );
+		return sprintf('https://%s.foxycart.com/cart', self::getFoxyCartStoreName());
 	}
 
     /**
@@ -59,7 +59,7 @@ 
         $foxyData["api_token"] = FoxyCart::getStoreKey();
 
         $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);
@@ -71,7 +71,7 @@ 
         // The following if block will print any CURL errors you might have
         if ($response == false) {
             //trigger_error("Could not connect to FoxyCart API", E_USER_ERROR);
-            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);
 
@@ -96,7 +96,7 @@ 
 
     public static function putCustomer($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();
@@ -112,7 +112,7 @@ 
         return self::getAPIRequest($foxyData);
     }
 
-	public static function getKeyPrefix(){
+	public static function getKeyPrefix() {
 		return self::$keyPrefix;
 	}
 

Indentation +43 added lines, -43 removed lines

@@ -7,46 +7,46 @@ 
 
 class FoxyCart extends Object {
 
-	private static $keyPrefix = 'dYnm1c';
-
-	public static function setStoreKey($length = 54, $count = 0){
-		$charset = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'.strtotime('now');
-		$strLength = strlen($charset);
-		$str = '';
-		while($count < $length){
-			$str .= $charset[mt_rand(0, $strLength-1)];
-			$count++;
-		}
-		return self::getKeyPrefix().substr(base64_encode($str),0,$length);
-	}
-
-	public static function getStoreKey(){
-		$config = SiteConfig::current_site_config();
-		if($config->StoreKey){
-			return $config->StoreKey;
-		}
-		return null;
-	}
-
-	public static function store_name_warning(){
-		$warning = null;
-		if(self::getFoxyCartStoreName()===null){
-			$warning = 'Must define FoxyCart Store Name in your site settings in the cms';
-		}
-		return $warning;
-	}
-
-	public static function getFoxyCartStoreName(){
-		$config = SiteConfig::current_site_config();
-		if($config->StoreName){
-			return $config->StoreName;
-		}
-		return null;
-	}
-
-	public static function FormActionURL() {
-		return sprintf('https://%s.foxycart.com/cart', self::getFoxyCartStoreName() );
-	}
+    private static $keyPrefix = 'dYnm1c';
+
+    public static function setStoreKey($length = 54, $count = 0){
+        $charset = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'.strtotime('now');
+        $strLength = strlen($charset);
+        $str = '';
+        while($count < $length){
+            $str .= $charset[mt_rand(0, $strLength-1)];
+            $count++;
+        }
+        return self::getKeyPrefix().substr(base64_encode($str),0,$length);
+    }
+
+    public static function getStoreKey(){
+        $config = SiteConfig::current_site_config();
+        if($config->StoreKey){
+            return $config->StoreKey;
+        }
+        return null;
+    }
+
+    public static function store_name_warning(){
+        $warning = null;
+        if(self::getFoxyCartStoreName()===null){
+            $warning = 'Must define FoxyCart Store Name in your site settings in the cms';
+        }
+        return $warning;
+    }
+
+    public static function getFoxyCartStoreName(){
+        $config = SiteConfig::current_site_config();
+        if($config->StoreName){
+            return $config->StoreName;
+        }
+        return null;
+    }
+
+    public static function FormActionURL() {
+        return sprintf('https://%s.foxycart.com/cart', self::getFoxyCartStoreName() );
+    }
 
     /**
      * FoxyCart API v1.1 functions
@@ -112,8 +112,8 @@ 
         return self::getAPIRequest($foxyData);
     }
 
-	public static function getKeyPrefix(){
-		return self::$keyPrefix;
-	}
+    public static function getKeyPrefix(){
+        return self::$keyPrefix;
+    }
 
 }

Braces +9 added lines, -3 removed lines

@@ -81,13 +81,17 @@ 
     public static function getCustomer($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);
+        }
 
         // grab customer record from API
 
         $foxyData = array();
         $foxyData["api_action"] = "customer_get";
-        if ($Member->Customer_ID) $foxyData["customer_id"] = $Member->Customer_ID;
+        if ($Member->Customer_ID) {
+            $foxyData["customer_id"] = $Member->Customer_ID;
+        }
         $foxyData["customer_email"] = $Member->Email;
 
         return self::getAPIRequest($foxyData);
@@ -102,7 +106,9 @@ 
         $foxyData = array();
         $foxyData["api_action"] = "customer_save";
         // customer_id will be 0 if created in SilverStripe.
-        if ($Member->Customer_ID) $foxyData["customer_id"] = $Member->Customer_ID;
+        if ($Member->Customer_ID) {
+            $foxyData["customer_id"] = $Member->Customer_ID;
+        }
         $foxyData["customer_email"] = $Member->Email;
         $foxyData["customer_password_hash"] = $Member->Password;
         $foxyData["customer_password_salt"] = $Member->Salt;

code/objects/ProductImage.php

Spacing +2 added lines, -2 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-class ProductImage extends DataObject{
+class ProductImage extends DataObject {
 
 	private static $db = array(
 		'Title' => 'Text',
@@ -24,7 +24,7 @@ 
 		'Title' => 'Caption'
 	);
 
-	public function getCMSFields(){
+	public function getCMSFields() {
 		$fields = FieldList::create(
             TextField::create('Title')
                 ->setTitle(_t('ProductImage.Title', 'Product Image Title')),

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',
-		'Parent' => 'SiteTree'
-	);
+    private static $has_one = array(
+        'Image' => 'Image',
+        'Parent' => 'SiteTree'
+    );
 
-	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');
+    }
 
 }

code/objects/OptionGroup.php

Spacing +13 added lines, -13 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-class OptionGroup extends DataObject{
+class OptionGroup extends DataObject {
 
 	private static $db = array(
 		'Title' => 'Varchar(100)'
@@ -15,7 +15,7 @@ 
 	private static $plural_name = 'Product Option Groups';
 	private static $description = 'Groups of product options, e.g. size, color, etc';
 
-	function getCMSFields(){
+	function getCMSFields() {
 
 		$fields = parent::getCMSFields();
 
@@ -27,22 +27,22 @@ 
 	public function requireDefaultRecords() {
 		parent::requireDefaultRecords();
 		// create a catch-all group
-		if(!OptionGroup::get()->filter(array('Title' => 'Options'))->first()) {
+		if (!OptionGroup::get()->filter(array('Title' => 'Options'))->first()) {
 			$do = new OptionGroup();
 			$do->Title = "Options";
 			$do->write();
 		}
-		if(!OptionGroup::get()->filter(array('Title' => 'Size'))->first()) {
+		if (!OptionGroup::get()->filter(array('Title' => 'Size'))->first()) {
             $do = new OptionGroup();
             $do->Title = "Size";
             $do->write();
         }
-        if(!OptionGroup::get()->filter(array('Title' => 'Color'))->first()) {
+        if (!OptionGroup::get()->filter(array('Title' => 'Color'))->first()) {
             $do = new OptionGroup();
             $do->Title = "Color";
             $do->write();
         }
-        if(!OptionGroup::get()->filter(array('Title' => 'Type'))->first()) {
+        if (!OptionGroup::get()->filter(array('Title' => 'Type'))->first()) {
             $do = new OptionGroup();
             $do->Title = "Type";
             $do->write();
@@ -53,30 +53,30 @@ 
 		return new RequiredFields(array('Title'));
 	}
 
-	public function validate(){
+	public function validate() {
 		$result = parent::validate();
 
 		$title = $this->Title;
 		$firstChar = substr($title, 0, 1);
-		if(preg_match('/[^a-zA-Z]/', $firstChar)){
+		if (preg_match('/[^a-zA-Z]/', $firstChar)) {
 			$result->error('The first character of the Title can only be a letter', 'bad');
 		}
-		if(preg_match('/[^a-zA-Z]\s/', $title)){
+		if (preg_match('/[^a-zA-Z]\s/', $title)) {
 			$result->error('Please only use letters, numbers and spaces in the title', 'bad');
 		}
 
 		return $result;
 	}
 
-	public function onBeforeDelete(){
+	public function onBeforeDelete() {
 		parent::onBeforeDelete();
 
 		//make sure that if we delete this option group, we reassign the group's option items to the 'None' group.
 		$items = OptionItem::get()->filter(array('ProductOptionGroupID' => $this->ID));
 
-		if(isset($items)){
+		if (isset($items)) {
 			$noneGroup = OptionGroup::get()->filter(array('Title' => 'Options'))->first();
-			foreach($items as $item){
+			foreach ($items as $item) {
 				$item->ProductOptionGroupID = $noneGroup->ID;
 				$item->write();
 			}
@@ -88,7 +88,7 @@ 
 	}
 
 	public function canEdit($member = null) {
-		switch($this->Title){
+		switch ($this->Title) {
 			case 'Options':
 				return false;
 				break;

Indentation +78 added lines, -78 removed lines

@@ -7,32 +7,32 @@ 
 
 class OptionGroup extends DataObject{
 
-	private static $db = array(
-		'Title' => 'Varchar(100)'
-	);
+    private static $db = array(
+        'Title' => 'Varchar(100)'
+    );
 
     private static $singular_name = 'Product Option Group';
-	private static $plural_name = 'Product Option Groups';
-	private static $description = 'Groups of product options, e.g. size, color, etc';
+    private static $plural_name = 'Product Option Groups';
+    private static $description = 'Groups of product options, e.g. size, color, etc';
 
-	function getCMSFields(){
+    function getCMSFields(){
 
-		$fields = parent::getCMSFields();
+        $fields = parent::getCMSFields();
 
-		$this->extend('getCMSFields', $fields);
+        $this->extend('getCMSFields', $fields);
 
-		return $fields;
-	}
+        return $fields;
+    }
 
-	public function requireDefaultRecords() {
-		parent::requireDefaultRecords();
-		// create a catch-all group
-		if(!OptionGroup::get()->filter(array('Title' => 'Options'))->first()) {
-			$do = new OptionGroup();
-			$do->Title = "Options";
-			$do->write();
-		}
-		if(!OptionGroup::get()->filter(array('Title' => 'Size'))->first()) {
+    public function requireDefaultRecords() {
+        parent::requireDefaultRecords();
+        // create a catch-all group
+        if(!OptionGroup::get()->filter(array('Title' => 'Options'))->first()) {
+            $do = new OptionGroup();
+            $do->Title = "Options";
+            $do->write();
+        }
+        if(!OptionGroup::get()->filter(array('Title' => 'Size'))->first()) {
             $do = new OptionGroup();
             $do->Title = "Size";
             $do->write();
@@ -47,64 +47,64 @@ 
             $do->Title = "Type";
             $do->write();
         }
-	}
-
-	public function getCMSValidator() {
-		return new RequiredFields(array('Title'));
-	}
-
-	public function validate(){
-		$result = parent::validate();
-
-		$title = $this->Title;
-		$firstChar = substr($title, 0, 1);
-		if(preg_match('/[^a-zA-Z]/', $firstChar)){
-			$result->error('The first character of the Title can only be a letter', 'bad');
-		}
-		if(preg_match('/[^a-zA-Z]\s/', $title)){
-			$result->error('Please only use letters, numbers and spaces in the title', 'bad');
-		}
-
-		return $result;
-	}
-
-	public function onBeforeDelete(){
-		parent::onBeforeDelete();
-
-		//make sure that if we delete this option group, we reassign the group's option items to the 'None' group.
-		$items = OptionItem::get()->filter(array('ProductOptionGroupID' => $this->ID));
-
-		if(isset($items)){
-			$noneGroup = OptionGroup::get()->filter(array('Title' => 'Options'))->first();
-			foreach($items as $item){
-				$item->ProductOptionGroupID = $noneGroup->ID;
-				$item->write();
-			}
-		}
-	}
-
-	public function canView($member = false) {
-		return true;
-	}
-
-	public function canEdit($member = null) {
-		switch($this->Title){
-			case 'Options':
-				return false;
-				break;
-			default:
-				return Permission::check('Product_CANCRUD');
-				break;
-		}
-
-	}
-
-	public function canDelete($member = null) {
-		return $this->canEdit();
-	}
-
-	public function canCreate($member = null) {
-		return Permission::check('Product_CANCRUD');
-	}
+    }
+
+    public function getCMSValidator() {
+        return new RequiredFields(array('Title'));
+    }
+
+    public function validate(){
+        $result = parent::validate();
+
+        $title = $this->Title;
+        $firstChar = substr($title, 0, 1);
+        if(preg_match('/[^a-zA-Z]/', $firstChar)){
+            $result->error('The first character of the Title can only be a letter', 'bad');
+        }
+        if(preg_match('/[^a-zA-Z]\s/', $title)){
+            $result->error('Please only use letters, numbers and spaces in the title', 'bad');
+        }
+
+        return $result;
+    }
+
+    public function onBeforeDelete(){
+        parent::onBeforeDelete();
+
+        //make sure that if we delete this option group, we reassign the group's option items to the 'None' group.
+        $items = OptionItem::get()->filter(array('ProductOptionGroupID' => $this->ID));
+
+        if(isset($items)){
+            $noneGroup = OptionGroup::get()->filter(array('Title' => 'Options'))->first();
+            foreach($items as $item){
+                $item->ProductOptionGroupID = $noneGroup->ID;
+                $item->write();
+            }
+        }
+    }
+
+    public function canView($member = false) {
+        return true;
+    }
+
+    public function canEdit($member = null) {
+        switch($this->Title){
+            case 'Options':
+                return false;
+                break;
+            default:
+                return Permission::check('Product_CANCRUD');
+                break;
+        }
+
+    }
+
+    public function canDelete($member = null) {
+        return $this->canEdit();
+    }
+
+    public function canCreate($member = null) {
+        return Permission::check('Product_CANCRUD');
+    }
 
 }

code/objects/ProductCategory.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 	public function requireDefaultRecords() {
 		parent::requireDefaultRecords();
 		$allCats = DataObject::get('ProductCategory');
-		if(!$allCats->count()){
+		if (!$allCats->count()) {
 			$cat = new ProductCategory();
 			$cat->Title = 'Default';
 			$cat->Code = 'DEFAULT';

Indentation +37 added lines, -37 removed lines

@@ -8,9 +8,9 @@ 
 class ProductCategory extends DataObject {
 
     private static $db = array(
-		'Title' => 'Varchar(255)',
-		'Code' => 'Varchar(50)'
-	);
+        'Title' => 'Varchar(255)',
+        'Code' => 'Varchar(50)'
+    );
 
     private static $singular_name = 'FoxyCart Category';
     private static $plural_name = 'FoxyCart Categories';
@@ -21,13 +21,13 @@ 
         'Code' => 'Code'
     );
 
-	private static $indexes = array(
-		'Code' => true
-	);
+    private static $indexes = array(
+        'Code' => true
+    );
 
     public function getCMSFields() {
 
-		$fields = FieldList::create(
+        $fields = FieldList::create(
             LiteralField::create(
                 'PCIntro',
                 _t(
@@ -50,35 +50,35 @@ 
         $this->extend('updateCMSFields', $fields);
 
         return $fields;
-	}
-
-	public function requireDefaultRecords() {
-		parent::requireDefaultRecords();
-		$allCats = DataObject::get('ProductCategory');
-		if(!$allCats->count()){
-			$cat = new ProductCategory();
-			$cat->Title = 'Default';
-			$cat->Code = 'DEFAULT';
-			$cat->write();
-		}
-	}
-
-	public function canView($member = false) {
-		return true;
-	}
-
-	public function canEdit($member = null) {
-		return Permission::check('Product_CANCRUD');
-	}
-
-	public function canDelete($member = null) {
-
-		//don't allow deletion of DEFAULT category
-		return ($this->Code == 'DEFAULT') ? false : Permission::check('Product_CANCRUD');
-	}
-
-	public function canCreate($member = null) {
-		return Permission::check('Product_CANCRUD');
-	}
+    }
+
+    public function requireDefaultRecords() {
+        parent::requireDefaultRecords();
+        $allCats = DataObject::get('ProductCategory');
+        if(!$allCats->count()){
+            $cat = new ProductCategory();
+            $cat->Title = 'Default';
+            $cat->Code = 'DEFAULT';
+            $cat->write();
+        }
+    }
+
+    public function canView($member = false) {
+        return true;
+    }
+
+    public function canEdit($member = null) {
+        return Permission::check('Product_CANCRUD');
+    }
+
+    public function canDelete($member = null) {
+
+        //don't allow deletion of DEFAULT category
+        return ($this->Code == 'DEFAULT') ? false : Permission::check('Product_CANCRUD');
+    }
+
+    public function canCreate($member = null) {
+        return Permission::check('Product_CANCRUD');
+    }
 
 }

code/pages/OrderHistoryPage.php

Spacing +4 added lines, -4 removed lines

@@ -11,7 +11,7 @@ 
     private static $plural_name = 'Order History Pages';
     private static $description = 'Show a customers past orders. Requires authentication';
 
-	public function getCMSFields(){
+	public function getCMSFields() {
 		$fields = parent::getCMSFields();
 
 
@@ -41,10 +41,10 @@ 
     );
 
     public function checkMember() {
-        if(Member::currentUser()) {
+        if (Member::currentUser()) {
             return true;
-        } else {
-            return Security::permissionFailure ($this, _t (
+        }else {
+            return Security::permissionFailure($this, _t(
                 'AccountPage.CANNOTCONFIRMLOGGEDIN',
                 'Please login to view this page.'
             ));

Indentation +6 added lines, -6 removed lines

@@ -11,14 +11,14 @@ 
     private static $plural_name = 'Order History Pages';
     private static $description = 'Show a customers past orders. Requires authentication';
 
-	public function getCMSFields(){
-		$fields = parent::getCMSFields();
+    public function getCMSFields(){
+        $fields = parent::getCMSFields();
 
 
 
-		$this->extend('updateCMSFields', $fields);
-		return $fields;
-	}
+        $this->extend('updateCMSFields', $fields);
+        return $fields;
+    }
 
     // return all current Member's Orders
     public function getOrders($limit = 10) {
@@ -36,7 +36,7 @@ 
 
 class OrderHistoryPage_Controller extends Page_Controller {
 	
-	private static $allowed_actions = array(
+    private static $allowed_actions = array(
         'index'
     );
 

code/extensions/FoxyStripeSiteConfig.php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-class FoxyStripeSiteConfig extends DataExtension{
+class FoxyStripeSiteConfig extends DataExtension {
 
 	private static $db = array(
 		'StoreName' => 'Varchar(255)',
@@ -16,7 +16,7 @@ 
         'ProductLimit' => 10
     );
 
-	public function updateCMSFields(FieldList $fields){
+	public function updateCMSFields(FieldList $fields) {
 
         // set TabSet names to avoid spaces from camel case
         $fields->addFieldToTab('Root', new TabSet('FoxyStripe', 'FoxyStripe'));
@@ -55,7 +55,7 @@ 
         ));
 
         // configuration warning
-		if(FoxyCart::store_name_warning()!==null){
+		if (FoxyCart::store_name_warning() !== null) {
 			$fields->insertBefore(LiteralField::create(
                 "StoreSubDomainHeaderWarning",
                 _t(
@@ -137,14 +137,14 @@ 
 
         $siteConfig = SiteConfig::current_site_config();
 
-        if(!$siteConfig->StoreKey) {
+        if (!$siteConfig->StoreKey) {
             $key = FoxyCart::setStoreKey();
-            while(!ctype_alnum($key)){
+            while (!ctype_alnum($key)) {
                 $key = FoxyCart::setStoreKey();
             }
             $siteConfig->StoreKey = $key;
             $siteConfig->write();
-            DB::alteration_message($siteConfig->ClassName.": created FoxyCart Store Key " . $key, 'created');
+            DB::alteration_message($siteConfig->ClassName.": created FoxyCart Store Key ".$key, 'created');
         }
     }
 

Indentation +58 added lines, -58 removed lines

@@ -2,21 +2,21 @@ 
 
 class FoxyStripeSiteConfig extends DataExtension{
 
-	private static $db = array(
-		'StoreName' => 'Varchar(255)',
-		'StoreKey' => 'Varchar(60)',
-		'MultiGroup' => 'Boolean',
-		'ProductLimit' => 'Int',
-		'CartValidation' => 'Boolean',
-		'MaxQuantity' => 'Int'
-	);
+    private static $db = array(
+        'StoreName' => 'Varchar(255)',
+        'StoreKey' => 'Varchar(60)',
+        'MultiGroup' => 'Boolean',
+        'ProductLimit' => 'Int',
+        'CartValidation' => 'Boolean',
+        'MaxQuantity' => 'Int'
+    );
 
     // Set Default values
     private static $defaults = array(
         'ProductLimit' => 10
     );
 
-	public function updateCMSFields(FieldList $fields){
+    public function updateCMSFields(FieldList $fields){
 
         // set TabSet names to avoid spaces from camel case
         $fields->addFieldToTab('Root', new TabSet('FoxyStripe', 'FoxyStripe'));
@@ -24,103 +24,103 @@ 
         // settings tab
         $fields->addFieldsToTab('Root.FoxyStripe.Settings', array(
             // Store Details
-			HeaderField::create('StoreDetails', _t('FoxyStripeSiteConfig.StoreDetails', 'Store Settings'), 3),
-			LiteralField::create('DetailsIntro', _t(
-				'FoxyStripeSiteConfig.DetailsIntro',
+            HeaderField::create('StoreDetails', _t('FoxyStripeSiteConfig.StoreDetails', 'Store Settings'), 3),
+            LiteralField::create('DetailsIntro', _t(
+                'FoxyStripeSiteConfig.DetailsIntro',
                 '<p>Maps to data in your <a href="https://admin.foxycart.com/admin.php?ThisAction=EditStore" target="_blank">FoxyCart store settings</a>.'
             )),
-			TextField::create('StoreName')
-				->setTitle(_t('FoxyStripeSiteConfig.StoreName', 'Store Sub Domain'))
-				->setDescription(_t('FoxyStripeSiteConfig.StoreNameDescription', 'the sub domain for your FoxyCart store')),
+            TextField::create('StoreName')
+                ->setTitle(_t('FoxyStripeSiteConfig.StoreName', 'Store Sub Domain'))
+                ->setDescription(_t('FoxyStripeSiteConfig.StoreNameDescription', 'the sub domain for your FoxyCart store')),
 
-			// Advanced Settings
-			HeaderField::create('AdvanceHeader', _t('FoxyStripeSiteConfig.AdvancedHeader', 'Advanced Settings'), 3),
-			LiteralField::create('AdvancedIntro', _t(
+            // Advanced Settings
+            HeaderField::create('AdvanceHeader', _t('FoxyStripeSiteConfig.AdvancedHeader', 'Advanced Settings'), 3),
+            LiteralField::create('AdvancedIntro', _t(
                 'FoxyStripeSiteConfig.AdvancedIntro',
-				'<p>Maps to data in your <a href="https://admin.foxycart.com/admin.php?ThisAction=EditAdvancedFeatures" target="_blank">FoxyCart advanced store settings</a>.</p>'
-			)),
-			ReadonlyField::create('DataFeedLink', _t('FoxyStripeSiteConfig.DataFeedLink', 'FoxyCart DataFeed URL'), self::getDataFeedLink())
-				->setDescription(_t('FoxyStripeSiteConfig.DataFeedLinkDescription', 'copy/paste to FoxyCart')),
-			CheckboxField::create('CartValidation')
-				->setTitle(_t('FoxyStripeSiteConfig.CartValidation', 'Enable Cart Validation'))
-				->setDescription(_t(
+                '<p>Maps to data in your <a href="https://admin.foxycart.com/admin.php?ThisAction=EditAdvancedFeatures" target="_blank">FoxyCart advanced store settings</a>.</p>'
+            )),
+            ReadonlyField::create('DataFeedLink', _t('FoxyStripeSiteConfig.DataFeedLink', 'FoxyCart DataFeed URL'), self::getDataFeedLink())
+                ->setDescription(_t('FoxyStripeSiteConfig.DataFeedLinkDescription', 'copy/paste to FoxyCart')),
+            CheckboxField::create('CartValidation')
+                ->setTitle(_t('FoxyStripeSiteConfig.CartValidation', 'Enable Cart Validation'))
+                ->setDescription(_t(
                     'FoxyStripeSiteConfig.CartValidationDescription',
                     'You must <a href="https://admin.foxycart.com/admin.php?ThisAction=EditAdvancedFeatures#use_cart_validation" target="_blank">enable cart validation</a> in the FoxyCart admin.'
             )),
-			ReadonlyField::create('StoreKey')
-				->setTitle(_t('FoxyStripeSiteConfig.StoreKey', 'FoxyCart API Key'))
-				->setDescription(_t('FoxyStripeSiteConfig.StoreKeyDescription', 'copy/paste to FoxyCart')),
-			ReadonlyField::create('SSOLink', _t('FoxyStripeSiteConfig.SSOLink', 'Single Sign On URL'), self::getSSOLink())
-				->setDescription(_t('FoxyStripeSiteConfig.SSOLinkDescription', 'copy/paste to FoxyCart'))
+            ReadonlyField::create('StoreKey')
+                ->setTitle(_t('FoxyStripeSiteConfig.StoreKey', 'FoxyCart API Key'))
+                ->setDescription(_t('FoxyStripeSiteConfig.StoreKeyDescription', 'copy/paste to FoxyCart')),
+            ReadonlyField::create('SSOLink', _t('FoxyStripeSiteConfig.SSOLink', 'Single Sign On URL'), self::getSSOLink())
+                ->setDescription(_t('FoxyStripeSiteConfig.SSOLinkDescription', 'copy/paste to FoxyCart'))
         ));
 
         // configuration warning
-		if(FoxyCart::store_name_warning()!==null){
-			$fields->insertBefore(LiteralField::create(
+        if(FoxyCart::store_name_warning()!==null){
+            $fields->insertBefore(LiteralField::create(
                 "StoreSubDomainHeaderWarning",
                 _t(
                     'FoxyStripeSiteConfig.StoreSubDomainHeadingWarning',
                     "<p class=\"message error\">Store sub-domain must be entered in the <a href=\"/admin/settings/\">site settings</a></p>"
                 )
             ), 'StoreDetails');
-		}
+        }
 
         // products tab
-		$fields->addFieldsToTab('Root.FoxyStripe.Products', array(
-			HeaderField::create('ProductHeader', _t('FoxyStripeSiteConfig.ProductHeader', 'Products'), 3),
-			CheckboxField::create('MultiGroup')
-				->setTitle(_t('FoxyStripeSiteConfig.MultiGroup', 'Multiple Groups'))
-				->setDescription(_t(
+        $fields->addFieldsToTab('Root.FoxyStripe.Products', array(
+            HeaderField::create('ProductHeader', _t('FoxyStripeSiteConfig.ProductHeader', 'Products'), 3),
+            CheckboxField::create('MultiGroup')
+                ->setTitle(_t('FoxyStripeSiteConfig.MultiGroup', 'Multiple Groups'))
+                ->setDescription(_t(
                     'FoxyStripeSiteConfig.MultiGroupDescription',
                     'Allows products to be shown in multiple Product Groups'
                 )),
-			HeaderField::create('ProductGroupHD', _t('FoxyStripeSiteConfig.ProductGroupHD', 'Product Groups'), 3),
-			NumericField::create('ProductLimit')
-				->setTitle(_t('FoxyStripeSiteConfig.ProductLimit', 'Products per Page'))
-				->setDescription(_t(
+            HeaderField::create('ProductGroupHD', _t('FoxyStripeSiteConfig.ProductGroupHD', 'Product Groups'), 3),
+            NumericField::create('ProductLimit')
+                ->setTitle(_t('FoxyStripeSiteConfig.ProductLimit', 'Products per Page'))
+                ->setDescription(_t(
                     'FoxyStripeSiteConfig.ProductLimitDescription',
                     'Number of Products to show per page on a Product Group'
                 )),
-			HeaderField::create('ProductQuantityHD', _t('FoxyStripeSiteConfig.ProductQuantityHD', 'Product Form Max Quantity'), 3),
-			NumericField::create('MaxQuantity')
-				->setTitle(_t('FoxyStripeSiteConfig.MaxQuantity', 'Max Quantity'))
-				->setDescription(_t(
+            HeaderField::create('ProductQuantityHD', _t('FoxyStripeSiteConfig.ProductQuantityHD', 'Product Form Max Quantity'), 3),
+            NumericField::create('MaxQuantity')
+                ->setTitle(_t('FoxyStripeSiteConfig.MaxQuantity', 'Max Quantity'))
+                ->setDescription(_t(
                     'FoxyStripeSiteConfig.MaxQuantityDescription',
                     'Sets max quantity for product form dropdown (add to cart form - default 10)'
                 ))
-		));
+        ));
 
         // categories tab
-		$fields->addFieldsToTab('Root.FoxyStripe.Categories', array(
-			HeaderField::create('CategoryHD', _t('FoxyStripeSiteConfig.CategoryHD', 'FoxyStripe Categories'), 3),
-			LiteralField::create('CategoryDescrip', _t(
+        $fields->addFieldsToTab('Root.FoxyStripe.Categories', array(
+            HeaderField::create('CategoryHD', _t('FoxyStripeSiteConfig.CategoryHD', 'FoxyStripe Categories'), 3),
+            LiteralField::create('CategoryDescrip', _t(
                 'FoxyStripeSiteConfig.CategoryDescrip',
                 '<p>FoxyCart Categories offer a way to give products additional behaviors that cannot be accomplished by product options alone, including category specific coupon codes, shipping and handling fees, and email receipts. <a href="https://wiki.foxycart.com/v/2.0/categories" target="_blank">Learn More</a></p><p>Categories you\'ve created in FoxyStripe must also be created in your <a href="https://admin.foxycart.com/admin.php?ThisAction=ManageProductCategories" target="_blank">FoxyCart Categories</a> admin panel.</p>'
             )),
-			GridField::create(
+            GridField::create(
                 'ProductCategory',
                 _t('FoxyStripeSiteConfig.ProductCategory', 'FoxyCart Categories'),
                 ProductCategory::get(),
                 GridFieldConfig_RecordEditor::create()
             )
-		));
+        ));
 
         // option groups tab
-		$fields->addFieldsToTab('Root.FoxyStripe.Groups', array(
-			HeaderField::create('OptionGroupsHead', _t('FoxyStripeSiteConfig', 'Product Option Groups'), 3),
-			LiteralField::create('OptionGroupsDescrip', _t(
+        $fields->addFieldsToTab('Root.FoxyStripe.Groups', array(
+            HeaderField::create('OptionGroupsHead', _t('FoxyStripeSiteConfig', 'Product Option Groups'), 3),
+            LiteralField::create('OptionGroupsDescrip', _t(
                 'FoxyStripeSiteConfig.OptionGroupsDescrip',
                 '<p>Product Option Groups allow you to name a set of product options.</p>'
             )),
-			GridField::create(
+            GridField::create(
                 'OptionGroup',
                 _t('FoxyStripeSiteConfig.OptionGroup', 'Product Option Groups'),
                 OptionGroup::get(),
                 GridFieldConfig_RecordEditor::create()
             )
-		));
+        ));
 
-	}
+    }
 
     private static function getSSOLink() {
         return Director::absoluteBaseURL()."foxystripe/sso/";

code/controllers/FoxyStripe_Controller.php

Doc Comments +15 added lines

@@ -34,6 +34,9 @@ 
 		}
 	}
 
+    /**
+     * @param string $encrypted
+     */
     public function handleDataFeed($encrypted, $decrypted){
         //handle encrypted & decrypted data
         $orders = new SimpleXMLElement($decrypted);
@@ -79,6 +82,10 @@ 
         }
     }
 
+    /**
+     * @param SimpleXMLElement $orders
+     * @param DataObject $transaction
+     */
     public function parseOrderInfo($orders, $transaction) {
 
         foreach ($orders->transactions->transaction as $order) {
@@ -95,6 +102,10 @@ 
         }
     }
 
+    /**
+     * @param SimpleXMLElement $orders
+     * @param DataObject $transaction
+     */
     public function parseOrderCustomer($orders, $transaction) {
 
         foreach ($orders->transactions->transaction as $order) {
@@ -133,6 +144,10 @@ 
         }
     }
 
+    /**
+     * @param SimpleXMLElement $orders
+     * @param DataObject $transaction
+     */
     public function parseOrderDetails($orders, $transaction) {
 
         // remove previous OrderDetails so we don't end up with duplicates

Indentation +23 added lines, -23 removed lines

@@ -2,37 +2,37 @@ 
 
 class FoxyStripe_Controller extends Page_Controller {
 	
-	const URLSegment = 'foxystripe';
+    const URLSegment = 'foxystripe';
 
-	public function getURLSegment() {
-		return self::URLSegment;
-	}
+    public function getURLSegment() {
+        return self::URLSegment;
+    }
 	
-	static $allowed_actions = array(
-		'index',
+    static $allowed_actions = array(
+        'index',
         'sso'
-	);
+    );
 	
-	public function index() {
-	    // handle POST from FoxyCart API transaction
-		if ((isset($_POST["FoxyData"]) OR isset($_POST['FoxySubscriptionData']))) {
-			$FoxyData_encrypted = (isset($_POST["FoxyData"])) ?
+    public function index() {
+        // handle POST from FoxyCart API transaction
+        if ((isset($_POST["FoxyData"]) OR isset($_POST['FoxySubscriptionData']))) {
+            $FoxyData_encrypted = (isset($_POST["FoxyData"])) ?
                 urldecode($_POST["FoxyData"]) :
                 urldecode($_POST["FoxySubscriptionData"]);
-			$FoxyData_decrypted = rc4crypt::decrypt(FoxyCart::getStoreKey(),$FoxyData_encrypted);
-			self::handleDataFeed($FoxyData_encrypted, $FoxyData_decrypted);
+            $FoxyData_decrypted = rc4crypt::decrypt(FoxyCart::getStoreKey(),$FoxyData_encrypted);
+            self::handleDataFeed($FoxyData_encrypted, $FoxyData_decrypted);
 			
-			// extend to allow for additional integrations with Datafeed
-			$this->extend('addIntegrations', $FoxyData_encrypted);
+            // extend to allow for additional integrations with Datafeed
+            $this->extend('addIntegrations', $FoxyData_encrypted);
 			
-			return 'foxy';
+            return 'foxy';
 			
-		} else {
+        } else {
 			
-			return "No FoxyData or FoxySubscriptionData received.";
+            return "No FoxyData or FoxySubscriptionData received.";
 			
-		}
-	}
+        }
+    }
 
     public function handleDataFeed($encrypted, $decrypted){
         //handle encrypted & decrypted data
@@ -203,10 +203,10 @@ 
 
 
 
-	// Single Sign on integration with FoxyCart
+    // Single Sign on integration with FoxyCart
     public function sso() {
 
-	    // GET variables from FoxyCart Request
+        // GET variables from FoxyCart Request
         $fcsid = $this->request->getVar('fcsid');
         $timestampNew = strtotime('+30 days');
 
@@ -225,7 +225,7 @@ 
         $redirect_complete = 'https://' . FoxyCart::getFoxyCartStoreName() . '.foxycart.com/checkout?fc_auth_token=' . $auth_token .
             '&fcsid=' . $fcsid . '&fc_customer_id=' . $Member->Customer_ID . '&timestamp=' . $timestampNew;
 	
-	    $this->redirect($redirect_complete);
+        $this->redirect($redirect_complete);
 
     }
 	

Spacing +13 added lines, -15 removed lines

@@ -17,9 +17,8 @@ 
 	    // handle POST from FoxyCart API transaction
 		if ((isset($_POST["FoxyData"]) OR isset($_POST['FoxySubscriptionData']))) {
 			$FoxyData_encrypted = (isset($_POST["FoxyData"])) ?
-                urldecode($_POST["FoxyData"]) :
-                urldecode($_POST["FoxySubscriptionData"]);
-			$FoxyData_decrypted = rc4crypt::decrypt(FoxyCart::getStoreKey(),$FoxyData_encrypted);
+                urldecode($_POST["FoxyData"]) : urldecode($_POST["FoxySubscriptionData"]);
+			$FoxyData_decrypted = rc4crypt::decrypt(FoxyCart::getStoreKey(), $FoxyData_encrypted);
 			self::handleDataFeed($FoxyData_encrypted, $FoxyData_decrypted);
 			
 			// extend to allow for additional integrations with Datafeed
@@ -27,14 +26,14 @@ 
 			
 			return 'foxy';
 			
-		} else {
+		}else {
 			
 			return "No FoxyData or FoxySubscriptionData received.";
 			
 		}
 	}
 
-    public function handleDataFeed($encrypted, $decrypted){
+    public function handleDataFeed($encrypted, $decrypted) {
         //handle encrypted & decrypted data
         $orders = new SimpleXMLElement($decrypted);
 
@@ -43,12 +42,11 @@ 
 
             if (isset($order->id)) {
                 ($transaction = Order::get()->filter('Order_ID', $order->id)->First()) ?
-                    $transaction :
-                    $transaction = Order::create();
+                    $transaction : $transaction = Order::create();
             }
 
             // save base order info
-            $transaction->Order_ID = (int) $order->id;
+            $transaction->Order_ID = (int)$order->id;
             $transaction->Response = $decrypted;
 
             // record transaction as order
@@ -103,11 +101,11 @@ 
             if (isset($order->customer_email) && $order->is_anonymous == 0) {
 
                 // if Customer is existing member, associate with current order
-                if(Member::get()->filter('Email', $order->customer_email)->First()) {
+                if (Member::get()->filter('Email', $order->customer_email)->First()) {
 
                     $customer = Member::get()->filter('Email', $order->customer_email)->First();
 
-                } else {
+                }else {
 
                     // set PasswordEncryption to 'none' so imported, encrypted password is not encrypted again
                     Config::inst()->update('Security', 'password_encryption_algorithm', 'none');
@@ -213,17 +211,17 @@ 
         // get current member if logged in. If not, create a 'fake' user with Customer_ID = 0
         // fake user will redirect to FC checkout, ask customer to log in
         // to do: consider a login/registration form here if not logged in
-        if($Member = Member::currentUser()) {
+        if ($Member = Member::currentUser()) {
             $Member = Member::currentUser();
-        } else {
+        }else {
             $Member = new Member();
             $Member->Customer_ID = 0;
         }
 
-        $auth_token = sha1($Member->Customer_ID . '|' . $timestampNew . '|' . FoxyCart::getStoreKey());
+        $auth_token = sha1($Member->Customer_ID.'|'.$timestampNew.'|'.FoxyCart::getStoreKey());
 
-        $redirect_complete = 'https://' . FoxyCart::getFoxyCartStoreName() . '.foxycart.com/checkout?fc_auth_token=' . $auth_token .
-            '&fcsid=' . $fcsid . '&fc_customer_id=' . $Member->Customer_ID . '&timestamp=' . $timestampNew;
+        $redirect_complete = 'https://'.FoxyCart::getFoxyCartStoreName().'.foxycart.com/checkout?fc_auth_token='.$auth_token.
+            '&fcsid='.$fcsid.'&fc_customer_id='.$Member->Customer_ID.'&timestamp='.$timestampNew;
 	
 	    $this->redirect($redirect_complete);
 

code/forms/FoxyStripePurchaseForm.php

Doc Comments +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     private $product;
 
     /**
-     * @param $siteConfig
+     * @param SiteConfig|null $siteConfig
      * @return $this
      */
     public function setSiteConfig($siteConfig)

Spacing +4 added lines, -4 removed lines

@@ -120,7 +120,7 @@ 
             $fields->push(HiddenField::create(ProductPage::getGeneratedValue($code, 'product_id',
                 $this->product->ID))->setValue($this->product->ID));
             $fields->push(HiddenField::create(ProductPage::getGeneratedValue($code, 'price',
-                $this->product->Price))->setValue($this->product->Price));//can't override id
+                $this->product->Price))->setValue($this->product->Price)); //can't override id
             $fields->push(HiddenField::create(ProductPage::getGeneratedValue($code, 'weight',
                 $this->product->Weight))->setValue($this->product->Weight));
 
@@ -148,11 +148,11 @@ 
 
             $fields->push(DropdownField::create('quantity', 'Quantity', $quantity));
 
-            $fields->push(HeaderField::create('submitPrice', '$' . $this->product->Price, 4)->addExtraClass('submit-price'));
+            $fields->push(HeaderField::create('submitPrice', '$'.$this->product->Price, 4)->addExtraClass('submit-price'));
             $fields->push(HeaderField::create('unavailableText', 'Selection unavailable', 4)->addExtraClass('hidden unavailable-text'));
 
             $this->extend('updatePurchaseFormFields', $fields);
-        } else {
+        }else {
             $fields->push(HeaderField::create('submitPrice', 'Currently Out of Stock'), 4);
         }
 
@@ -189,7 +189,7 @@ 
     protected function getProductOptionSet()
     {
 
-        $assignAvailable = function ($self) {
+        $assignAvailable = function($self) {
             $this->extend('updateFoxyStripePurchaseForm', $form);
             $self->Available = ($self->getAvailability()) ? true : false;
         };