sunnysideup / silverstripe-ecommerce_countries

code/control/CountryPrice_Page_Controller_Extension.php

Spacing +7 added lines, -7 removed lines

@@ -28,17 +28,17 @@ 
         //provided by stealth ...
         $param = Config::inst()->get('CountryPrice_Translation', 'locale_get_parameter');
         $countryObject = CountryPrice_EcommerceCountry::get_real_country();
-        if($countryObject && $countryObject->Code) {
+        if ($countryObject && $countryObject->Code) {
             $oldCountryCode = strtoupper($countryObject->Code);
         } else {
             $oldCountryCode = 'XX';
         }
         if (isset($_GET[$param])) {
             $urlCountryCode = preg_replace("/[^A-Z]+/", "", strtoupper(Convert::raw2sql($_GET[$param])));
-            if($countryCode) {
+            if ($countryCode) {
                 if ($oldCountryCode !== $urlCountryCode) {
                     $countryObject = DataObject::get_one('EcommerceCountry', ['Code' => $urlCountryCode]);
-                    if($countryObject) {
+                    if ($countryObject) {
                         //change country Object
                         //reset everything ...
                         CountryPrices_ChangeCountryController::set_new_country($urlCountryCode);
@@ -48,7 +48,7 @@ 
                 }
             }
         }
-        if($countryObject) {
+        if ($countryObject) {
 
             //check if a redirect is required ...
             $this->checkForOffsiteRedirects($countryObject);
@@ -114,7 +114,7 @@ 
         $oldURL = $protocol.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
 
         $hasCountrySegment = CountryPrice_Translation::get_country_url_provider()->hasCountrySegment($oldURL);
-        if($hasCountrySegment){
+        if ($hasCountrySegment) {
             $newURL = CountryPrice_Translation::get_country_url_provider()->replaceCountryCodeInUrl($countryCode, $oldURL);
         }
         else {
@@ -169,7 +169,7 @@ 
     public function AlternativeHrefLangLinksCachingKey()
     {
         $countryObject = CountryPrice_EcommerceCountry::get_real_country();
-        if($countryObject && $countryObject->Code) {
+        if ($countryObject && $countryObject->Code) {
             return 'AlternativeHrefLangLinksCachingKey-'.$countryObject->Code.'-'.$this->owner->dataRecord->ID.'-'.strtotime($this->owner->dataRecord->LastEdited);
         }
         return 'AlternativeHrefLangLinksCachingKey'.$this->owner->dataRecord->ID.'-'.$this->owner->dataRecord->ID.'-'.strtotime($this->owner->dataRecord->LastEdited);
@@ -182,7 +182,7 @@ 
     public function UpdateCanonicalLink(&$link)
     {
         $obj = $this->owner->dataRecord->CanonicalObject();
-        if($obj) {
+        if ($obj) {
             $link = $obj->Link();
         } else {
             $link = $this->owner->dataRecord->AbsoluteLink();

code/control/CountryPrice_ChangeCountryController.php

Spacing +5 added lines, -5 removed lines

@@ -84,11 +84,11 @@ 
 
         //redirect now
         $param = Config::inst()->get('CountryPrice_Translation', 'locale_get_parameter');
-        if(isset($_GET['force']) && $_GET['force']) {
+        if (isset($_GET['force']) && $_GET['force']) {
 
-            return $this->redirect(self::$url_segment . '/changeto/' .$newCountryCode . '/'. '?force-back-home');
+            return $this->redirect(self::$url_segment.'/changeto/'.$newCountryCode.'/'.'?force-back-home');
         }
-        if(isset($_GET['force-back-home']) || $_GET['force-back-home']) {
+        if (isset($_GET['force-back-home']) || $_GET['force-back-home']) {
 
             return $this->redirect('/');
         }
@@ -149,10 +149,10 @@ 
 
             $path = isset($parsedUrl['path']) ? $parsedUrl['path'] : '';
 
-            $query = !empty($query) ? '?'. http_build_query($query) : '';
+            $query = !empty($query) ? '?'.http_build_query($query) : '';
 
             $hasCountrySegment = CountryPrice_Translation::get_country_url_provider()->hasCountrySegment($url);
-            if($hasCountrySegment){
+            if ($hasCountrySegment) {
                 $url = CountryPrice_Translation::get_country_url_provider()->replaceCountryCodeInUrl($newCountryCode, $url);
             }
             else {

code/model/translations/CountryPrice_SiteTreeExtensions.php

Spacing +6 added lines, -6 removed lines

@@ -48,12 +48,12 @@ 
     public function CanonicalObject()
     {
         $countryObject = CountryPrice_EcommerceCountry::get_real_country();
-        if($countryObject && $countryObject->Code) {
+        if ($countryObject && $countryObject->Code) {
             $object = $this->owner->CountryPriceTranslations()
                 ->innerJoin('EcommerceCountry', '"EcommerceCountry"."ID" = "CountryPrice_Translation"."EcommerceCountryID"')
                 ->filter(array('EcommerceCountry.Code' => $countryObject->Code))
                 ->first();
-            if($object && $object->exists()) {
+            if ($object && $object->exists()) {
                 return $object;
             }
         }
@@ -63,7 +63,7 @@ 
     public function loadTranslatedValues($countryID = 0, $variableOrMethod = '')
     {
         $translation = null;
-        if (! $countryID) {
+        if (!$countryID) {
             $countryObject = CountryPrice_EcommerceCountry::get_real_country();
             if ($countryObject) {
                 $countryID = $countryObject->ID;
@@ -82,9 +82,9 @@ 
             $fieldsToReplace = $translation->FieldsToReplace();
             foreach ($fieldsToReplace as $replaceFields) {
                 $pageField = $replaceFields->PageField;
-                $pageFieldTranslated = $pageField . 'Translated';
+                $pageFieldTranslated = $pageField.'Translated';
                 $translationField = $replaceFields->TranslationField;
-                if (! $variableOrMethod || $variableOrMethod === $pageField) {
+                if (!$variableOrMethod || $variableOrMethod === $pageField) {
                     if ($translation->hasMethod($translationField)) {
                         $this->owner->$pageField = $translation->$translationField();
                         $this->owner->$pageFieldTranslated = $translation->$translationField();
@@ -147,7 +147,7 @@ 
      */
     public function getEcommerceTranslation($countryID)
     {
-        if(!isset($this->_translations_all_cache[$countryID])) {
+        if (!isset($this->_translations_all_cache[$countryID])) {
             $this->_translations_all_cache[$countryID] = $this->owner
                 ->CountryPriceTranslations()
                 ->filter(