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/pages/ProductHolder.php

Doc Comments +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 	 * Products function.
 	 *
 	 * @access public
-	 * @return array
+	 * @return PaginatedList
 	 */
 	public function ProductList($limit = 10) {
 

Indentation +109 added lines, -109 removed lines

@@ -7,144 +7,144 @@
 
 class ProductHolder extends Page {
 	
-	private static $allowed_children = array('ProductHolder', 'ProductPage');
+    private static $allowed_children = array('ProductHolder', 'ProductPage');
 	
-	private static $db = array(
+    private static $db = array(
 		
-	);
+    );
 	
-	private static $has_one = array(
+    private static $has_one = array(
 
-	);
+    );
 
-	private static $many_many = array(
-		'Products' => 'ProductPage'
-	);
+    private static $many_many = array(
+        'Products' => 'ProductPage'
+    );
 
-	private static $many_many_extraFields = array(
-		'Products' => array(
-			'SortOrder' => 'Int'
-		)
-	);
+    private static $many_many_extraFields = array(
+        'Products' => array(
+            'SortOrder' => 'Int'
+        )
+    );
 
     private static $singular_name = 'Product Group';
     private static $plural_name = 'Product Groups';
     private static $description = 'Display a list of related products';
 	
-	private static $defaults = array(
+    private static $defaults = array(
 		
-	);
+    );
 	
-	public function getCMSFields(){
-		$fields = parent::getCMSFields();
-
-		if(SiteConfig::current_site_config()->MultiGroup){
-			$config = GridFieldConfig_RelationEditor::create();
-			if(class_exists('GridFieldSortableRows')){
-				$config->addComponent(new GridFieldSortableRows('SortOrder'));
-			}
-			if(class_exists('GridFieldManyRelationHandler')){
-				$config->removeComponentsByType('GridFieldAddExistingAutocompleter');
-				$config->addComponent(new GridFieldManyRelationHandler());
-			}
-			$fields->addFieldToTab(
-				'Root.Products',
-				GridField::create(
-					'Products',
-					_t('ProductHolder.Products', 'Products'),
-					$this->Products(),
-					$config
-				)
-			);
-		}
-
-		$this->extend('updateCMSFields', $fields);
-
-		return $fields;
-	}
-
-	public function Products() {
-		return $this->getManyManyComponents('Products')->sort('SortOrder');
-	}
-
-	/**
-	 * loadDescendantProductGroupIDListInto function.
-	 * 
-	 * @access public
-	 * @param mixed &$idList
-	 * @return void
-	 */
-	public function loadDescendantProductGroupIDListInto(&$idList) {
-		if ($children = $this->AllChildren()) {
-			foreach($children as $child) {
-				if(in_array($child->ID, $idList)) continue;
+    public function getCMSFields(){
+        $fields = parent::getCMSFields();
+
+        if(SiteConfig::current_site_config()->MultiGroup){
+            $config = GridFieldConfig_RelationEditor::create();
+            if(class_exists('GridFieldSortableRows')){
+                $config->addComponent(new GridFieldSortableRows('SortOrder'));
+            }
+            if(class_exists('GridFieldManyRelationHandler')){
+                $config->removeComponentsByType('GridFieldAddExistingAutocompleter');
+                $config->addComponent(new GridFieldManyRelationHandler());
+            }
+            $fields->addFieldToTab(
+                'Root.Products',
+                GridField::create(
+                    'Products',
+                    _t('ProductHolder.Products', 'Products'),
+                    $this->Products(),
+                    $config
+                )
+            );
+        }
+
+        $this->extend('updateCMSFields', $fields);
+
+        return $fields;
+    }
+
+    public function Products() {
+        return $this->getManyManyComponents('Products')->sort('SortOrder');
+    }
+
+    /**
+     * loadDescendantProductGroupIDListInto function.
+     * 
+     * @access public
+     * @param mixed &$idList
+     * @return void
+     */
+    public function loadDescendantProductGroupIDListInto(&$idList) {
+        if ($children = $this->AllChildren()) {
+            foreach($children as $child) {
+                if(in_array($child->ID, $idList)) continue;
 				
-				if($child instanceof ProductHolder) {
-					$idList[] = $child->ID; 
-					$child->loadDescendantProductGroupIDListInto($idList);
-				}                             
-			}
-		}
-	}
+                if($child instanceof ProductHolder) {
+                    $idList[] = $child->ID; 
+                    $child->loadDescendantProductGroupIDListInto($idList);
+                }                             
+            }
+        }
+    }
 	
-	/**
-	 * ProductGroupIDs function.
-	 * 
-	 * @access public
-	 * @return array
-	 */
-	public function ProductGroupIDs() {
-		$holderIDs = array();
-		$this->loadDescendantProductGroupIDListInto($holderIDs);
-		return $holderIDs;
-	}
+    /**
+     * ProductGroupIDs function.
+     * 
+     * @access public
+     * @return array
+     */
+    public function ProductGroupIDs() {
+        $holderIDs = array();
+        $this->loadDescendantProductGroupIDListInto($holderIDs);
+        return $holderIDs;
+    }
 	
-	/**
-	 * Products function.
-	 * 
-	 * @access public
-	 * @return array
-	 */
-	public function ProductList($limit = 10) {
+    /**
+     * Products function.
+     * 
+     * @access public
+     * @return array
+     */
+    public function ProductList($limit = 10) {
 
-		$config = SiteConfig::current_site_config();
+        $config = SiteConfig::current_site_config();
 
-		if($config->ProductLimit>0){
-			$limit = $config->ProductLimit;
-		}
+        if($config->ProductLimit>0){
+            $limit = $config->ProductLimit;
+        }
 
-		if($config->MultiGroup){
-			$entries = $this->Products()->sort('SortOrder');
-		}else{
-			$filter = '"ParentID" = ' . $this->ID;
+        if($config->MultiGroup){
+            $entries = $this->Products()->sort('SortOrder');
+        }else{
+            $filter = '"ParentID" = ' . $this->ID;
 
-			// Build a list of all IDs for ProductGroups that are children
-			$holderIDs = $this->ProductGroupIDs();
+            // Build a list of all IDs for ProductGroups that are children
+            $holderIDs = $this->ProductGroupIDs();
 
-			// If no ProductHolders, no ProductPages. So return false
-			if($holderIDs) {
-				// Otherwise, do the actual query
-				if($filter) $filter .= ' OR ';
-				$filter .= '"ParentID" IN (' . implode(',', $holderIDs) . ")";
-			}
+            // If no ProductHolders, no ProductPages. So return false
+            if($holderIDs) {
+                // Otherwise, do the actual query
+                if($filter) $filter .= ' OR ';
+                $filter .= '"ParentID" IN (' . implode(',', $holderIDs) . ")";
+            }
 
-			$order = '"SiteTree"."Title" ASC';
+            $order = '"SiteTree"."Title" ASC';
 
-			$entries = ProductPage::get()->where($filter);
-		}
+            $entries = ProductPage::get()->where($filter);
+        }
 
 
-    	$list = new PaginatedList($entries, Controller::curr()->request);
-    	$list->setPageLength($limit);
-    	return $list;
+        $list = new PaginatedList($entries, Controller::curr()->request);
+        $list->setPageLength($limit);
+        return $list;
 		
-	}
+    }
 }
 
 class ProductHolder_Controller extends Page_Controller {
 	
-	public function init(){
-		parent::init();
+    public function init(){
+        parent::init();
 
-	}
+    }
 }
\ No newline at end of file

Spacing +15 added lines, -15 removed lines

@@ -35,15 +35,15 @@ 
 		
 	);
 	
-	public function getCMSFields(){
+	public function getCMSFields() {
 		$fields = parent::getCMSFields();
 
-		if(SiteConfig::current_site_config()->MultiGroup){
+		if (SiteConfig::current_site_config()->MultiGroup) {
 			$config = GridFieldConfig_RelationEditor::create();
-			if(class_exists('GridFieldSortableRows')){
+			if (class_exists('GridFieldSortableRows')) {
 				$config->addComponent(new GridFieldSortableRows('SortOrder'));
 			}
-			if(class_exists('GridFieldManyRelationHandler')){
+			if (class_exists('GridFieldManyRelationHandler')) {
 				$config->removeComponentsByType('GridFieldAddExistingAutocompleter');
 				$config->addComponent(new GridFieldManyRelationHandler());
 			}
@@ -76,10 +76,10 @@ 
 	 */
 	public function loadDescendantProductGroupIDListInto(&$idList) {
 		if ($children = $this->AllChildren()) {
-			foreach($children as $child) {
-				if(in_array($child->ID, $idList)) continue;
+			foreach ($children as $child) {
+				if (in_array($child->ID, $idList)) continue;
 				
-				if($child instanceof ProductHolder) {
+				if ($child instanceof ProductHolder) {
 					$idList[] = $child->ID; 
 					$child->loadDescendantProductGroupIDListInto($idList);
 				}                             
@@ -109,23 +109,23 @@ 
 
 		$config = SiteConfig::current_site_config();
 
-		if($config->ProductLimit>0){
+		if ($config->ProductLimit > 0) {
 			$limit = $config->ProductLimit;
 		}
 
-		if($config->MultiGroup){
+		if ($config->MultiGroup) {
 			$entries = $this->Products()->sort('SortOrder');
-		}else{
-			$filter = '"ParentID" = ' . $this->ID;
+		}else {
+			$filter = '"ParentID" = '.$this->ID;
 
 			// Build a list of all IDs for ProductGroups that are children
 			$holderIDs = $this->ProductGroupIDs();
 
 			// If no ProductHolders, no ProductPages. So return false
-			if($holderIDs) {
+			if ($holderIDs) {
 				// Otherwise, do the actual query
-				if($filter) $filter .= ' OR ';
-				$filter .= '"ParentID" IN (' . implode(',', $holderIDs) . ")";
+				if ($filter) $filter .= ' OR ';
+				$filter .= '"ParentID" IN ('.implode(',', $holderIDs).")";
 			}
 
 			$order = '"SiteTree"."Title" ASC';
@@ -143,7 +143,7 @@ 
 
 class ProductHolder_Controller extends Page_Controller {
 	
-	public function init(){
+	public function init() {
 		parent::init();
 
 	}

Braces +7 added lines, -3 removed lines

@@ -77,7 +77,9 @@ 
 	public function loadDescendantProductGroupIDListInto(&$idList) {
 		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; 
@@ -115,7 +117,7 @@ 
 
 		if($config->MultiGroup){
 			$entries = $this->Products()->sort('SortOrder');
-		}else{
+		} else{
 			$filter = '"ParentID" = ' . $this->ID;
 
 			// Build a list of all IDs for ProductGroups that are children
@@ -124,7 +126,9 @@ 
 			// If no ProductHolders, no ProductPages. So return false
 			if($holderIDs) {
 				// Otherwise, do the actual query
-				if($filter) $filter .= ' OR ';
+				if($filter) {
+				    $filter .= ' OR ';
+				}
 				$filter .= '"ParentID" IN (' . implode(',', $holderIDs) . ")";
 			}
 

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/OrderDetail.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
         'Price.Nice'
     );
 
-	public function getCMSFields(){
+	public function getCMSFields() {
 		$fields = parent::getCMSFields();
 
         $fields->addFieldsToTab('Root.Options', array(
@@ -37,7 +37,7 @@ 
 		return $fields;
 	}
 
-	public function validate(){
+	public function validate() {
 		$result = parent::validate();
 
 		/*if($this->Country == 'DE' && $this->Postcode && strlen($this->Postcode) != 5) {

Indentation +28 added lines, -28 removed lines

@@ -2,65 +2,65 @@
 
 class OrderDetail extends DataObject {
 
-	private static $singular_name = 'Order Detail';
-	private static $plural_name = 'Order Details';
-	private static $description = '';
+    private static $singular_name = 'Order Detail';
+    private static $plural_name = 'Order Details';
+    private static $description = '';
 
-	private static $db = array(
+    private static $db = array(
         'Quantity' => 'Int',
         'Price' => 'Currency'
     );
 
-	private static $has_one = array(
+    private static $has_one = array(
         'Product' => 'ProductPage',
         'Order' => 'Order'
     );
 
-	private static $many_many = array(
+    private static $many_many = array(
         'Options' => 'OptionItem'
     );
 
-	private static $summary_fields = array(
+    private static $summary_fields = array(
         'Product.Title',
         'Quantity',
         'Price.Nice'
     );
 
-	public function getCMSFields(){
-		$fields = parent::getCMSFields();
+    public function getCMSFields(){
+        $fields = parent::getCMSFields();
 
         $fields->addFieldsToTab('Root.Options', array(
             GridField::create('Options', 'Product Options', $this->Options(), GridFieldConfig_RecordViewer::create())
         ));
 
-		$this->extend('updateCMSFields', $fields);
-		return $fields;
-	}
+        $this->extend('updateCMSFields', $fields);
+        return $fields;
+    }
 
-	public function validate(){
-		$result = parent::validate();
+    public function validate(){
+        $result = parent::validate();
 
-		/*if($this->Country == 'DE' && $this->Postcode && strlen($this->Postcode) != 5) {
+        /*if($this->Country == 'DE' && $this->Postcode && strlen($this->Postcode) != 5) {
 			$result->error('Need five digits for German postcodes');
 		}*/
 
-		return $result;
-	}
+        return $result;
+    }
 
-	public function canView($member = false) {
-		return Permission::check('Product_ORDERS');
-	}
+    public function canView($member = false) {
+        return Permission::check('Product_ORDERS');
+    }
 
-	public function canEdit($member = null) {
+    public function canEdit($member = null) {
         return false;
-	}
+    }
 
-	public function canDelete($member = null) {
-		return Permission::check('Product_ORDERS');
-	}
+    public function canDelete($member = null) {
+        return Permission::check('Product_ORDERS');
+    }
 
-	public function canCreate($member = null) {
-		return false;
-	}
+    public function canCreate($member = null) {
+        return false;
+    }
 
 }
\ No newline at end of file

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/Order.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-class Order extends DataObject implements PermissionProvider{
+class Order extends DataObject implements PermissionProvider {
 
 	private static $db = array(
         'Order_ID' => 'Int',
@@ -91,9 +91,9 @@ 
         return $this->getReceiptLink();
     }
 
-    function getReceiptLink(){
-        $obj= HTMLVarchar::create();
-        $obj->setValue('<a href="' . $this->ReceiptURL . '" target="_blank" class="cms-panel-link action external-link">view</a>');
+    function getReceiptLink() {
+        $obj = HTMLVarchar::create();
+        $obj->setValue('<a href="'.$this->ReceiptURL.'" target="_blank" class="cms-panel-link action external-link">view</a>');
         return $obj;
     }
 

Indentation +19 added lines, -19 removed lines

@@ -2,7 +2,7 @@ 
 
 class Order extends DataObject implements PermissionProvider{
 
-	private static $db = array(
+    private static $db = array(
         'Order_ID' => 'Int',
         'TransactionDate' => 'SS_Datetime',
         'ProductTotal' => 'Currency',
@@ -14,11 +14,11 @@ 
         'Response' => 'Text'
     );
 
-	private static $has_one = array(
+    private static $has_one = array(
         'Member' => 'Member'
     );
 
-	private static $has_many = array(
+    private static $has_many = array(
         'Details' => 'OrderDetail'
     );
 
@@ -38,7 +38,7 @@ 
         'ReceiptLink'
     );
 
-	private static $searchable_fields = array(
+    private static $searchable_fields = array(
         'Order_ID',
         'TransactionDate' => array(
             "field" => "DateField",
@@ -86,28 +86,28 @@ 
         return $obj;
     }
 
-	public function canView($member = false) {
-		return Permission::check('Product_ORDERS');
-	}
+    public function canView($member = false) {
+        return Permission::check('Product_ORDERS');
+    }
 
-	public function canEdit($member = null) {
+    public function canEdit($member = null) {
         //return Permission::check('Product_ORDERS');
         return false;
-	}
+    }
 
-	public function canDelete($member = null) {
+    public function canDelete($member = null) {
         return false;
         //return Permission::check('Product_ORDERS');
-	}
+    }
 
-	public function canCreate($member = null) {
-		return false;
-	}
+    public function canCreate($member = null) {
+        return false;
+    }
 
-	public function providePermissions() {
-		return array(
-			'Product_ORDERS' => 'Allow user to manage Orders and related objects'
-		);
-	}
+    public function providePermissions() {
+        return array(
+            'Product_ORDERS' => 'Allow user to manage Orders and related objects'
+        );
+    }
 
 }
\ No newline at end of file

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/OptionItem.php

Spacing +17 added lines, -17 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-class OptionItem extends DataObject{
+class OptionItem extends DataObject {
 
 	private static $db = array(
 		'Title' => 'Text',
@@ -41,7 +41,7 @@ 
 
 	private static $default_sort = 'SortOrder';
 
-	public function getCMSFields(){
+	public function getCMSFields() {
 		$fields = FieldList::create(
 			new Tabset('Root',
 				new Tab('Main'),
@@ -58,7 +58,7 @@ 
 		$parentCode = $product->Code;
 
 		// ProductOptionGroup Dropdown field w/ add new
-		$groups = function(){
+		$groups = function() {
 		    return OptionGroup::get()->map()->toArray();
 		};
 		$groupFields = singleton('OptionGroup')->getCMSFields();
@@ -72,7 +72,7 @@ 
 			Textfield::create('Title')
                 ->setTitle(_t("OptionItem.Title", "Product Option Name")),
 			CheckboxField::create('Available')
-				->setTitle( _t("OptionItem.Available", "Available for purchase"))
+				->setTitle(_t("OptionItem.Available", "Available for purchase"))
                 ->setDescription(_t('OptionItem.AvailableDescription', "If unchecked, will disable this option in the drop down menu")),
 			$groupField
 		));
@@ -172,18 +172,18 @@ 
 		return $fields;
 	}
 
-	public function validate(){
+	public function validate() {
 		$result = parent::validate();
 
-		if($this->ProductOptionGroupID == 0){
+		if ($this->ProductOptionGroupID == 0) {
 			$result->error('Must set a Group prior to saving');
 		}
 
 		return $result;
 	}
 
-	public static function getOptionModifierActionSymbol($oma, $returnWithOnlyPlusMinus=false){
-		switch($oma){
+	public static function getOptionModifierActionSymbol($oma, $returnWithOnlyPlusMinus = false) {
+		switch ($oma) {
 			case 'Subtract':
 				$symbol = '-';
 				break;
@@ -196,23 +196,23 @@ 
 		return $symbol;
 	}
 
-	public function getWeightModifierWithSymbol(){
+	public function getWeightModifierWithSymbol() {
 		return self::getOptionModifierActionSymbol($this->WeightModifierAction).$this->WeightModifier;
 	}
 
-	public function getPriceModifierWithSymbol(){
+	public function getPriceModifierWithSymbol() {
 		return self::getOptionModifierActionSymbol($this->PriceModifierAction).$this->PriceModifier;
 	}
 
-	public function getCodeModifierWithSymbol(){
+	public function getCodeModifierWithSymbol() {
 		return self::getOptionModifierActionSymbol($this->CodeModifierAction).$this->CodeModifier;
 	}
 
-	public function getProductOptionGroupTitle(){
+	public function getProductOptionGroupTitle() {
 		return $this->ProductOptionGroup()->Title;
 	}
 
-	public function getGeneratedValue(){
+	public function getGeneratedValue() {
 		$modPrice = ($this->PriceModifier) ? (string)$this->PriceModifier : '0';
 		$modPriceWithSymbol = OptionItem::getOptionModifierActionSymbol($this->PriceModifierAction).$modPrice;
 		$modWeight = ($this->WeightModifier) ? (string)$this->WeightModifier : '0';
@@ -221,15 +221,15 @@ 
 		return $this->Title.'{p'.$modPriceWithSymbol.'|w'.$modWeight.'|c'.$modCode.'}';
 	}
 
-	public function getGeneratedTitle(){
+	public function getGeneratedTitle() {
 		$modPrice = ($this->PriceModifier) ? (string)$this->PriceModifier : '0';
 		$title = $this->Title;
-		$title .= ($this->PriceModifier != 0) ? ': ('.OptionItem::getOptionModifierActionSymbol($this->PriceModifierAction, $returnWithOnlyPlusMinus=true).'$'.$modPrice.')' : '';
+		$title .= ($this->PriceModifier != 0) ? ': ('.OptionItem::getOptionModifierActionSymbol($this->PriceModifierAction, $returnWithOnlyPlusMinus = true).'$'.$modPrice.')' : '';
 		return $title;
 	}
 
-	public function getAvailability(){
-		return ($this->Available == 0) ? true : false ;
+	public function getAvailability() {
+		return ($this->Available == 0) ? true : false;
 	}
 
 	public function canView($member = false) {

Indentation +164 added lines, -164 removed lines

@@ -7,85 +7,85 @@ 
 
 class OptionItem extends DataObject{
 
-	private static $db = array(
-		'Title' => 'Text',
-		'WeightModifier' => 'Int',
-		'CodeModifier' => 'Text',
-		'PriceModifier' => 'Currency',
-		'WeightModifierAction' => "Enum('Add,Subtract,Set','Add')",
-		'CodeModifierAction' => "Enum('Add,Subtract,Set','Add')",
-		'PriceModifierAction' => "Enum('Add,Subtract,Set','Add')",
-		'Available' => 'Boolean',
-		'SortOrder' => 'Int'
-	);
-
-	private static $has_one = array(
-		'Product' => 'ProductPage',
-		'ProductOptionGroup' => 'OptionGroup',
-		//'Category' => 'ProductCategory'
-	);
+    private static $db = array(
+        'Title' => 'Text',
+        'WeightModifier' => 'Int',
+        'CodeModifier' => 'Text',
+        'PriceModifier' => 'Currency',
+        'WeightModifierAction' => "Enum('Add,Subtract,Set','Add')",
+        'CodeModifierAction' => "Enum('Add,Subtract,Set','Add')",
+        'PriceModifierAction' => "Enum('Add,Subtract,Set','Add')",
+        'Available' => 'Boolean',
+        'SortOrder' => 'Int'
+    );
+
+    private static $has_one = array(
+        'Product' => 'ProductPage',
+        'ProductOptionGroup' => 'OptionGroup',
+        //'Category' => 'ProductCategory'
+    );
 
     private static $belongs_many_many = array(
         'OrderDetails' => 'OrderDetail'
     );
 
     private static $defaults = array(
-		'Available' => true
-	);
+        'Available' => true
+    );
 
-	private static $summary_fields = array(
-		'Title' => 'Title',
-		'ProductOptionGroup.Title' => 'Group',
+    private static $summary_fields = array(
+        'Title' => 'Title',
+        'ProductOptionGroup.Title' => 'Group',
         'Available.Nice' => 'Available'
-	);
+    );
 
-	private static $default_sort = 'SortOrder';
+    private static $default_sort = 'SortOrder';
 
-	public function getCMSFields(){
-		$fields = FieldList::create(
-			new Tabset('Root',
-				new Tab('Main'),
-				new Tab('Modifiers')
-			)
-		);
+    public function getCMSFields(){
+        $fields = FieldList::create(
+            new Tabset('Root',
+                new Tab('Main'),
+                new Tab('Modifiers')
+            )
+        );
 
-		// set variables from Product
+        // set variables from Product
         $productID = ($this->ProductID != 0) ? $this->ProductID : Session::get('CMSMain.currentPage');
         $product = ProductPage::get()->byID($productID);
 
-		$parentPrice = $product->obj('Price')->Nice();
-		$parentWeight = $product->Weight;
-		$parentCode = $product->Code;
-
-		// ProductOptionGroup Dropdown field w/ add new
-		$groups = function(){
-		    return OptionGroup::get()->map()->toArray();
-		};
-		$groupFields = singleton('OptionGroup')->getCMSFields();
-		$groupField = DropdownField::create('ProductOptionGroupID', _t("OptionItem.Group", "Group"), $groups())
-			->setEmptyString('')
+        $parentPrice = $product->obj('Price')->Nice();
+        $parentWeight = $product->Weight;
+        $parentCode = $product->Code;
+
+        // ProductOptionGroup Dropdown field w/ add new
+        $groups = function(){
+            return OptionGroup::get()->map()->toArray();
+        };
+        $groupFields = singleton('OptionGroup')->getCMSFields();
+        $groupField = DropdownField::create('ProductOptionGroupID', _t("OptionItem.Group", "Group"), $groups())
+            ->setEmptyString('')
             ->setDescription(_t('OptionItem.GroupDescription', 'Name of this group of options. Managed in <a href="admin/settings">Settings > FoxyStripe > Option Groups</a>'));
-		if (class_exists('QuickAddNewExtension')) $groupField->useAddNew('OptionGroup', $groups, $groupFields);
+        if (class_exists('QuickAddNewExtension')) $groupField->useAddNew('OptionGroup', $groups, $groupFields);
 
         $fields->addFieldsToTab('Root.Main', array(
-			HeaderField::create('DetailsHD', _t("OptionItem.DetailsHD", "Product Option Details"), 2),
-			Textfield::create('Title')
+            HeaderField::create('DetailsHD', _t("OptionItem.DetailsHD", "Product Option Details"), 2),
+            Textfield::create('Title')
                 ->setTitle(_t("OptionItem.Title", "Product Option Name")),
-			CheckboxField::create('Available')
-				->setTitle( _t("OptionItem.Available", "Available for purchase"))
+            CheckboxField::create('Available')
+                ->setTitle( _t("OptionItem.Available", "Available for purchase"))
                 ->setDescription(_t('OptionItem.AvailableDescription', "If unchecked, will disable this option in the drop down menu")),
-			$groupField
-		));
+            $groupField
+        ));
 
-		$fields->addFieldsToTab('Root.Modifiers', array(
-			HeaderField::create('ModifyHD', _t('OptionItem.ModifyHD', 'Product Option Modifiers'), 2),
+        $fields->addFieldsToTab('Root.Modifiers', array(
+            HeaderField::create('ModifyHD', _t('OptionItem.ModifyHD', 'Product Option Modifiers'), 2),
 
-			// Weight Modifier Fields
-			HeaderField::create('WeightHD', _t('OptionItem.WeightHD', 'Modify Weight'), 3),
-			NumericField::create('WeightModifier')
+            // Weight Modifier Fields
+            HeaderField::create('WeightHD', _t('OptionItem.WeightHD', 'Modify Weight'), 3),
+            NumericField::create('WeightModifier')
                 ->setTitle(_t('OptionItem.WeightModifier', 'Weight')),
-			DropdownField::create('WeightModifierAction', _t('OptionItem.WeightModifierAction', 'Weight Modification'),
-				array(
+            DropdownField::create('WeightModifierAction', _t('OptionItem.WeightModifierAction', 'Weight Modification'),
+                array(
                     'Add' => _t(
                         'OptionItem.WeightAdd',
                         "Add to Base Weight ({weight})",
@@ -99,56 +99,56 @@ 
                         array('weight' => $parentWeight)
                     ),
                     'Set' => _t('OptionItem.WeightSet', 'Set as a new Weight')
-				)
-			)->setEmptyString('')
-			->setDescription(_t('OptionItem.WeightDescription', 'Does weight modify or replace base weight?')),
+                )
+            )->setEmptyString('')
+            ->setDescription(_t('OptionItem.WeightDescription', 'Does weight modify or replace base weight?')),
 
-			// Price Modifier FIelds
-			HeaderField::create('PriceHD', _t('OptionItem.PriceHD', 'Modify Price'), 3),
-			CurrencyField::create('PriceModifier')
+            // Price Modifier FIelds
+            HeaderField::create('PriceHD', _t('OptionItem.PriceHD', 'Modify Price'), 3),
+            CurrencyField::create('PriceModifier')
                 ->setTitle(_t('OptionItem.PriceModifier', 'Price')),
-			DropdownField::create('PriceModifierAction', _t('OptionItem.PriceModifierAction', 'Price Modification'),
-				array(
-					'Add' => _t(
+            DropdownField::create('PriceModifierAction', _t('OptionItem.PriceModifierAction', 'Price Modification'),
+                array(
+                    'Add' => _t(
                         'OptionItem.PriceAdd',
                         "Add to Base Price ({price})",
                         'Add to price',
                         array('price' => $parentPrice)
                     ),
-					'Subtract' => _t(
+                    'Subtract' => _t(
                         'OptionItem.PriceSubtract',
                         "Subtract from Base Price ({price})",
                         'Subtract from price',
                         array('price' => $parentPrice)
                     ),
-					'Set' => _t('OptionItem.PriceSet', 'Set as a new Price')
-				)
-			)->setEmptyString('')
-			->setDescription(_t('OptionItem.PriceDescription', 'Does price modify or replace base price?')),
-
-			// Code Modifier Fields
-			HeaderField::create('CodeHD', _t('OptionItem.CodeHD', 'Modify Code'), 3),
-			TextField::create('CodeModifier')
+                    'Set' => _t('OptionItem.PriceSet', 'Set as a new Price')
+                )
+            )->setEmptyString('')
+            ->setDescription(_t('OptionItem.PriceDescription', 'Does price modify or replace base price?')),
+
+            // Code Modifier Fields
+            HeaderField::create('CodeHD', _t('OptionItem.CodeHD', 'Modify Code'), 3),
+            TextField::create('CodeModifier')
                 ->setTitle(_t('OptionItem.CodeModifier', 'Code')),
-			DropdownField::create('CodeModifierAction', _t('OptionItem.CodeModifierAction', 'Code Modification'),
-				array(
-					'Add' => _t(
+            DropdownField::create('CodeModifierAction', _t('OptionItem.CodeModifierAction', 'Code Modification'),
+                array(
+                    'Add' => _t(
                         'OptionItem.CodeAdd',
                         "Add to Base Code ({code})",
                         'Add to code',
                         array('code' => $parentCode)
                     ),
-					'Subtract' => _t(
+                    'Subtract' => _t(
                         'OptionItem.CodeSubtract',
                         'Subtract from Base Code ({code})',
                         'Subtract from code',
                         array('code' => $parentCode)
                     ),
-					'Set' => _t('OptionItem.CodeSet', 'Set as a new Code')
-				)
-			)->setEmptyString('')
-			->setDescription(_t('OptionItem.CodeDescription', 'Does code modify or replace base code?'))
-		));
+                    'Set' => _t('OptionItem.CodeSet', 'Set as a new Code')
+                )
+            )->setEmptyString('')
+            ->setDescription(_t('OptionItem.CodeDescription', 'Does code modify or replace base code?'))
+        ));
 
         /*
         // Cateogry Dropdown field w/ add new
@@ -167,85 +167,85 @@ 
         */
 
         // allow CMS fields to be extended
-		$this->extend('getCMSFields', $fields);
-
-		return $fields;
-	}
-
-	public function validate(){
-		$result = parent::validate();
-
-		if($this->ProductOptionGroupID == 0){
-			$result->error('Must set a Group prior to saving');
-		}
-
-		return $result;
-	}
-
-	public static function getOptionModifierActionSymbol($oma, $returnWithOnlyPlusMinus=false){
-		switch($oma){
-			case 'Subtract':
-				$symbol = '-';
-				break;
-			case 'Set':
-				$symbol = ($returnWithOnlyPlusMinus) ? '' : ':';
-				break;
-			default:
-				$symbol = '+';
-		}
-		return $symbol;
-	}
-
-	public function getWeightModifierWithSymbol(){
-		return self::getOptionModifierActionSymbol($this->WeightModifierAction).$this->WeightModifier;
-	}
-
-	public function getPriceModifierWithSymbol(){
-		return self::getOptionModifierActionSymbol($this->PriceModifierAction).$this->PriceModifier;
-	}
-
-	public function getCodeModifierWithSymbol(){
-		return self::getOptionModifierActionSymbol($this->CodeModifierAction).$this->CodeModifier;
-	}
-
-	public function getProductOptionGroupTitle(){
-		return $this->ProductOptionGroup()->Title;
-	}
-
-	public function getGeneratedValue(){
-		$modPrice = ($this->PriceModifier) ? (string)$this->PriceModifier : '0';
-		$modPriceWithSymbol = OptionItem::getOptionModifierActionSymbol($this->PriceModifierAction).$modPrice;
-		$modWeight = ($this->WeightModifier) ? (string)$this->WeightModifier : '0';
-		$modWeight = OptionItem::getOptionModifierActionSymbol($this->WeightModifierAction).$modWeight;
-		$modCode = OptionItem::getOptionModifierActionSymbol($this->CodeModifierAction).$this->CodeModifier;
-		return $this->Title.'{p'.$modPriceWithSymbol.'|w'.$modWeight.'|c'.$modCode.'}';
-	}
-
-	public function getGeneratedTitle(){
-		$modPrice = ($this->PriceModifier) ? (string)$this->PriceModifier : '0';
-		$title = $this->Title;
-		$title .= ($this->PriceModifier != 0) ? ': ('.OptionItem::getOptionModifierActionSymbol($this->PriceModifierAction, $returnWithOnlyPlusMinus=true).'$'.$modPrice.')' : '';
-		return $title;
-	}
-
-	public function getAvailability(){
-		return ($this->Available == 0) ? true : false ;
-	}
-
-	public function canView($member = false) {
-		return true;
-	}
-
-	public function canEdit($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');
-	}
+        $this->extend('getCMSFields', $fields);
+
+        return $fields;
+    }
+
+    public function validate(){
+        $result = parent::validate();
+
+        if($this->ProductOptionGroupID == 0){
+            $result->error('Must set a Group prior to saving');
+        }
+
+        return $result;
+    }
+
+    public static function getOptionModifierActionSymbol($oma, $returnWithOnlyPlusMinus=false){
+        switch($oma){
+            case 'Subtract':
+                $symbol = '-';
+                break;
+            case 'Set':
+                $symbol = ($returnWithOnlyPlusMinus) ? '' : ':';
+                break;
+            default:
+                $symbol = '+';
+        }
+        return $symbol;
+    }
+
+    public function getWeightModifierWithSymbol(){
+        return self::getOptionModifierActionSymbol($this->WeightModifierAction).$this->WeightModifier;
+    }
+
+    public function getPriceModifierWithSymbol(){
+        return self::getOptionModifierActionSymbol($this->PriceModifierAction).$this->PriceModifier;
+    }
+
+    public function getCodeModifierWithSymbol(){
+        return self::getOptionModifierActionSymbol($this->CodeModifierAction).$this->CodeModifier;
+    }
+
+    public function getProductOptionGroupTitle(){
+        return $this->ProductOptionGroup()->Title;
+    }
+
+    public function getGeneratedValue(){
+        $modPrice = ($this->PriceModifier) ? (string)$this->PriceModifier : '0';
+        $modPriceWithSymbol = OptionItem::getOptionModifierActionSymbol($this->PriceModifierAction).$modPrice;
+        $modWeight = ($this->WeightModifier) ? (string)$this->WeightModifier : '0';
+        $modWeight = OptionItem::getOptionModifierActionSymbol($this->WeightModifierAction).$modWeight;
+        $modCode = OptionItem::getOptionModifierActionSymbol($this->CodeModifierAction).$this->CodeModifier;
+        return $this->Title.'{p'.$modPriceWithSymbol.'|w'.$modWeight.'|c'.$modCode.'}';
+    }
+
+    public function getGeneratedTitle(){
+        $modPrice = ($this->PriceModifier) ? (string)$this->PriceModifier : '0';
+        $title = $this->Title;
+        $title .= ($this->PriceModifier != 0) ? ': ('.OptionItem::getOptionModifierActionSymbol($this->PriceModifierAction, $returnWithOnlyPlusMinus=true).'$'.$modPrice.')' : '';
+        return $title;
+    }
+
+    public function getAvailability(){
+        return ($this->Available == 0) ? true : false ;
+    }
+
+    public function canView($member = false) {
+        return true;
+    }
+
+    public function canEdit($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');
+    }
 
 }

Braces +3 added lines, -1 removed lines

@@ -65,7 +65,9 @@
 		$groupField = DropdownField::create('ProductOptionGroupID', _t("OptionItem.Group", "Group"), $groups())
 			->setEmptyString('')
             ->setDescription(_t('OptionItem.GroupDescription', 'Name of this group of options. Managed in <a href="admin/settings">Settings > FoxyStripe > Option Groups</a>'));
-		if (class_exists('QuickAddNewExtension')) $groupField->useAddNew('OptionGroup', $groups, $groupFields);
+		if (class_exists('QuickAddNewExtension')) {
+		    $groupField->useAddNew('OptionGroup', $groups, $groupFields);
+		}
 
         $fields->addFieldsToTab('Root.Main', array(
 			HeaderField::create('DetailsHD', _t("OptionItem.DetailsHD", "Product Option Details"), 2),

code/objects/ProductDiscountTier.php

Spacing +4 added lines, -4 removed lines

@@ -36,7 +36,7 @@ 
 	);
 	private static $indexes = array();
 
-	public function getCMSFields(){
+	public function getCMSFields() {
 		$fields = parent::getCMSFields();
 
 		$fields->removeByName('ProductPageID');
@@ -59,7 +59,7 @@ 
 	 *
 	 * TODO implement validation to ensure values aren't duplicated in multiple tiers
 	 */
-	public function validate(){
+	public function validate() {
 		$result = parent::validate();
 
 		/*$tierQuantity = ProductDiscountTier::get()
@@ -88,11 +88,11 @@ 
 		return $result;
 	}
 
-	public function getTitle(){
+	public function getTitle() {
 		return "{$this->Quantity} at {$this->Percentage}%";
 	}
 
-	public function getDiscountPercentage(){
+	public function getDiscountPercentage() {
 		return "{$this->Percentage}%";
 	}
 

Indentation +81 added lines, -81 removed lines

@@ -2,67 +2,67 @@ 
 
 class ProductDiscountTier extends DataObject {
 
-	private static $singular_name = 'Discount Tier';
-	private static $plural_name = 'Discount Tiers';
-	private static $description = 'A discount tier for a Product Discount';
-
-	private static $db = array(
-		'Quantity' => 'Int',
-		'Percentage' => 'Int'
-	);
-	private static $has_one = array(
-		'ProductPage' => 'ProductPage'
-	);
-	private static $has_many = array();
-	private static $many_many = array();
-	private static $many_many_extraFields = array();
-	private static $belongs_many_many = array();
-
-	private static $casting = array();
-	private static $defaults = array();
-	private static $default_sort = array(
-		'Quantity'
-	);
-
-
-	private static $summary_fields = array(
-		'Quantity',
-		'DiscountPercentage'
-	);
-	private static $searchable_fields = array();
-	private static $field_labels = array(
-		'Quantity' => 'Quantity',
-		'DiscountPercentage' => 'Discount'
-	);
-	private static $indexes = array();
-
-	public function getCMSFields(){
-		$fields = parent::getCMSFields();
-
-		$fields->removeByName('ProductPageID');
-
-		$quantity = $fields->dataFieldByName('Quantity');
-		$quantity->setTitle('Quantity to trigger discount');
-		$percentage = $fields->dataFieldByName('Percentage');
-		$percentage->setTitle('Percent discount');
-
-		$this->extend('updateCMSFields', $fields);
-		return $fields;
-	}
-
-	public function getCMSValidator() {
-		return new RequiredFields(array('Quantity', 'Percentage'));
-	}
-
-	/**
-	 * @return ValidationResult
-	 *
-	 * TODO implement validation to ensure values aren't duplicated in multiple tiers
-	 */
-	public function validate(){
-		$result = parent::validate();
-
-		/*$tierQuantity = ProductDiscountTier::get()
+    private static $singular_name = 'Discount Tier';
+    private static $plural_name = 'Discount Tiers';
+    private static $description = 'A discount tier for a Product Discount';
+
+    private static $db = array(
+        'Quantity' => 'Int',
+        'Percentage' => 'Int'
+    );
+    private static $has_one = array(
+        'ProductPage' => 'ProductPage'
+    );
+    private static $has_many = array();
+    private static $many_many = array();
+    private static $many_many_extraFields = array();
+    private static $belongs_many_many = array();
+
+    private static $casting = array();
+    private static $defaults = array();
+    private static $default_sort = array(
+        'Quantity'
+    );
+
+
+    private static $summary_fields = array(
+        'Quantity',
+        'DiscountPercentage'
+    );
+    private static $searchable_fields = array();
+    private static $field_labels = array(
+        'Quantity' => 'Quantity',
+        'DiscountPercentage' => 'Discount'
+    );
+    private static $indexes = array();
+
+    public function getCMSFields(){
+        $fields = parent::getCMSFields();
+
+        $fields->removeByName('ProductPageID');
+
+        $quantity = $fields->dataFieldByName('Quantity');
+        $quantity->setTitle('Quantity to trigger discount');
+        $percentage = $fields->dataFieldByName('Percentage');
+        $percentage->setTitle('Percent discount');
+
+        $this->extend('updateCMSFields', $fields);
+        return $fields;
+    }
+
+    public function getCMSValidator() {
+        return new RequiredFields(array('Quantity', 'Percentage'));
+    }
+
+    /**
+     * @return ValidationResult
+     *
+     * TODO implement validation to ensure values aren't duplicated in multiple tiers
+     */
+    public function validate(){
+        $result = parent::validate();
+
+        /*$tierQuantity = ProductDiscountTier::get()
 			->filter(
 				array(
 					'ProductDiscountID' => $this->ProductDiscountID,
@@ -85,31 +85,31 @@ 
 			$result->error($this->Percentage." is already used in another discount tier. Please use a different percentage");
 		}*/
 
-		return $result;
-	}
+        return $result;
+    }
 
-	public function getTitle(){
-		return "{$this->Quantity} at {$this->Percentage}%";
-	}
+    public function getTitle(){
+        return "{$this->Quantity} at {$this->Percentage}%";
+    }
 
-	public function getDiscountPercentage(){
-		return "{$this->Percentage}%";
-	}
+    public function getDiscountPercentage(){
+        return "{$this->Percentage}%";
+    }
 
-	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');
+    }
 
 }