dynamic / foxystripe

code/model/foxycart.cart_validation.php

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]).

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;
 	}
 

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')),

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;

code/objects/ProductCategory.php

Spacing +1 added lines, -1 removed lines

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

code/pages/OrderHistoryPage.php

Spacing +4 added lines, -4 removed lines

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

code/form/FoxyStripeDropdownField.php

Spacing +6 added lines, -6 removed lines

@@ -48,7 +48,7 @@ 
  * @package forms
  * @subpackage fields-basic
  */
-class FoxyStripeDropdownField extends DropdownField{
+class FoxyStripeDropdownField extends DropdownField {
 
 	/**
 	 * Mark certain elements as disabled,
@@ -56,12 +56,12 @@ 
 	 *
 	 * @param array $items Collection of array keys, as defined in the $source array
 	 */
-	public function setDisabledItems($items){
+	public function setDisabledItems($items) {
 		$controller = Controller::curr();
 		$code = $controller->data()->Code;
 		$updated = [];
-		if(is_array($items) && !empty($items)){
-			foreach($items as $item){
+		if (is_array($items) && !empty($items)) {
+			foreach ($items as $item) {
 				array_push($updated, ProductPage::getGeneratedValue($code, $this->getName(), $item, 'value'));
 			}
 		}
@@ -76,8 +76,8 @@ 
 		$controller = Controller::curr();
 		$code = $controller->data()->Code;
 		$updated = [];
-		if(is_array($source) && !empty($source)){
-			foreach($source as $key => $val){
+		if (is_array($source) && !empty($source)) {
+			foreach ($source as $key => $val) {
 				$updated[ProductPage::getGeneratedValue($code, $this->getName(), $key, 'value')] = $val;
 			}
 		}

tests/StoreSettingsTest.php

Spacing +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-class StoreSettingsTest extends FS_Test{
+class StoreSettingsTest extends FS_Test {
 
 	protected static $use_draft_site = true;
 
-	function setUp(){
+	function setUp() {
 		parent::setUp();
 
 		$siteConf = SiteConfig::current_site_config();
@@ -13,7 +13,7 @@ 
 		$siteConf->write();
 	}
 
-	function testStoreKey(){
+	function testStoreKey() {
 		$pref = FoxyCart::getKeyPrefix();
 		$siteConf = SiteConfig::current_site_config();
 
@@ -22,7 +22,7 @@ 
         $this->assertEquals(substr($siteConf->StoreKey, 0, 6), $pref);
 	}
 
-	function testStoreName(){
+	function testStoreName() {
 		$siteConf = SiteConfig::current_site_config();
 
         $this->assertEquals($siteConf->StoreName, 'foxystripe');

tests/ProductPageTest.php

Spacing +18 added lines, -18 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-class ProductPageTest extends FS_Test{
+class ProductPageTest extends FS_Test {
 
 	protected static $use_draft_site = true;
 
-	function setUp(){
+	function setUp() {
 		parent::setUp();
 
 		$groupForItem = OptionGroup::create();
@@ -16,7 +16,7 @@ 
 		$productHolder->write();
 	}
 
-	function testProductCreation(){
+	function testProductCreation() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$default = $this->objFromFixture('ProductCategory', 'default');
@@ -29,7 +29,7 @@ 
 
 	}
 
-	function testProductDeletion(){
+	function testProductDeletion() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$product2 = $this->objFromFixture('ProductPage', 'product2');
@@ -39,22 +39,22 @@ 
 		$product2->doPublish();
 		$this->assertTrue($product2->isPublished());
 
-		$versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '. $productID);
+		$versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '.$productID);
 		$versionsPostPublish = array();
-		foreach($versions as $versionRow) $versionsPostPublish[] = $versionRow;
+		foreach ($versions as $versionRow) $versionsPostPublish[] = $versionRow;
 
 		$product2->delete();
 		$this->assertTrue(!$product2->isPublished());
 
-		$versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '. $productID);
+		$versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '.$productID);
 		$versionsPostDelete = array();
-		foreach($versions as $versionRow) $versionsPostDelete[] = $versionRow;
+		foreach ($versions as $versionRow) $versionsPostDelete[] = $versionRow;
 
 		$this->assertTrue($versionsPostPublish == $versionsPostDelete);
 
 	}
 
-	function testProductTitleLeadingWhiteSpace(){
+	function testProductTitleLeadingWhiteSpace() {
 
 		$this->logInWithPermission('ADMIN');
 		$product = $this->objFromFixture('ProductPage', 'product1');
@@ -66,7 +66,7 @@ 
 
 	}
 
-	function testProductTitleTrailingWhiteSpace(){
+	function testProductTitleTrailingWhiteSpace() {
 
 		$this->logInWithPermission('ADMIN');
 		$product = $this->objFromFixture('ProductPage', 'product1');
@@ -78,7 +78,7 @@ 
 
 	}
 
-	function testProductCategoryCreation(){
+	function testProductCategoryCreation() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$category = $this->objFromFixture('ProductCategory', 'apparel');
@@ -91,7 +91,7 @@ 
 
 	}
 
-	function testProductCategoryDeletion(){
+	function testProductCategoryDeletion() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$category = $this->objFromFixture('ProductCategory', 'default');
@@ -117,11 +117,11 @@ 
 
 		$category2->delete();
 
-		$this->assertFalse(in_array($category2ID,ProductCategory::get()->column('ID')));
+		$this->assertFalse(in_array($category2ID, ProductCategory::get()->column('ID')));
 
 	}
 
-	function testOptionGroupCreation(){
+	function testOptionGroupCreation() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$group = $this->objFromFixture('OptionGroup', 'size');
@@ -131,7 +131,7 @@ 
 
 	}
 
-	function testOptionGroupDeletion(){
+	function testOptionGroupDeletion() {
 
 		$this->logInWithPermission('ADMIN');
 		$group = $this->objFromFixture('OptionGroup', 'color');
@@ -150,7 +150,7 @@ 
 
 	}
 
-	function testOptionItemCreation(){
+	function testOptionItemCreation() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$optionGroup = OptionGroup::get()->filter(array('Title' => 'Sample-Group'))->first();
@@ -165,13 +165,13 @@ 
 
 	}
 
-	function testOptionItemDeletion(){
+	function testOptionItemDeletion() {
 
 		$this->logInWithPermission('ADMIN');
 		$optionGroup = (OptionGroup::get()->first())
 			? OptionGroup::get()->first()
 			: OptionGroup::create();
-		if($optionGroup->ID == 0){
+		if ($optionGroup->ID == 0) {
 			$optionGroup->Title = 'Size';
 			$optionGroup->write();
 		}