sunnysideup / silverstripe-ecommerce_countries

code/model/address/CountryPrice_EcommerceCountry.php

Spacing +6 added lines, -6 removed lines

@@ -88,7 +88,7 @@ 
                     'Root.FAQPage',
                     new LiteralField(
                         "FAQPageExplanation",
-                        "<p class=\"message warning\">FAQ information can only be added to the main country for a ". _t('Distributor.SINGULAR_NAME', 'Distributor') ."</p>"
+                        "<p class=\"message warning\">FAQ information can only be added to the main country for a "._t('Distributor.SINGULAR_NAME', 'Distributor')."</p>"
                     )
                 );
             }
@@ -210,7 +210,7 @@ 
             $originalCountry = $country;
 
             //no country provided
-            if (! $country) {
+            if (!$country) {
                 $urlCountryCode = CountryPrice_Translation::get_country_url_provider()->CurrentCountrySegment();
 
                 // 2. CHECK WHAT THE SYSTEM THINKS THE COUNTRY CHOULD BE
@@ -225,7 +225,7 @@ 
                 }
 
                 //if we still dont have a country then we use the standard e-commerce methods ...
-                if (! $countryCode) {
+                if (!$countryCode) {
                     $countryCode = EcommerceCountry::get_country();
                 }
 
@@ -244,7 +244,7 @@ 
                     if (
                             ($country && $country->Code !== $urlCountryCode)
                         ||
-                            ! $country
+                            !$country
 
                     ) {
                         $country = DataObject::get_one('EcommerceCountry', ['Code' => $urlCountryCode]);
@@ -314,9 +314,9 @@ 
     public static function get_backup_country()
     {
         $obj = EcommerceCountry::get()->filter(array("IsBackupCountry" => true))->first();
-        if (! $obj) {
+        if (!$obj) {
             $obj = EcommerceCountry::get()->filter(array("Code" => EcommerceConfig::get('EcommerceCountry', 'default_country_code')))->first();
-            if (! $obj) {
+            if (!$obj) {
                 $obj = EcommerceCountry::get()->first();
             }
         }

code/control/CountryPrice_ChangeCountryController.php

Spacing +5 added lines, -5 removed lines

@@ -85,7 +85,7 @@ 
 
         //redirect now
         if (isset($_GET['force']) && $_GET['force']) {
-            return $this->redirect($this->Link($newCountryCode) . '?force-back-home');
+            return $this->redirect($this->Link($newCountryCode).'?force-back-home');
         }
         if (isset($_GET['force-back-home']) && $_GET['force-back-home']) {
             return $this->redirect(Director::baseURL('/'));
@@ -106,7 +106,7 @@ 
             $action
         );
 
-        return $link . '/';
+        return $link.'/';
     }
 
     /**
@@ -160,10 +160,10 @@ 
 
             $path = isset($parsedUrl['path']) ? $parsedUrl['path'] : '';
 
-            $query = empty($query) ? '' :  '?'. http_build_query($query);
+            $query = empty($query) ? '' : '?'.http_build_query($query);
             $newURL =
-                $parsedUrl['scheme'] .
-                '://' .
+                $parsedUrl['scheme'].
+                '://'.
                 Controller::join_links(
                     $parsedUrl['host'],
                     $parsedUrl['path']

code/api/CountryURLProvider.php

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
         $potentialCountry = '';
         if ($includeGetVariable)
             $getVar = Config::inst()->get('CountryURLProvider', 'locale_get_parameter');
-            if(isset($_GET[$getVar])) {
+            if (isset($_GET[$getVar])) {
                 $potentialCountry = $_GET[$getVar];
             }
         }
@@ -92,14 +92,14 @@ 
             }
             $parsedUrl['path'] = implode('/', $pathParts);
             $newURL =
-                $parsedUrl['scheme'] .
-                '://' .
+                $parsedUrl['scheme'].
+                '://'.
                 Controller::join_links(
                     $parsedUrl['host'],
                     $parsedUrl['path']
                 );
             if (isset($parsedUrl['query'])) {
-                $newURL = $newURL . '?' . $parsedUrl['query'];
+                $newURL = $newURL.'?'.$parsedUrl['query'];
             }
         }
         if (trim($oldURL, '/') !== trim($newURL, '/')) {

Braces +3 added lines, -2 removed lines

@@ -38,8 +38,9 @@
     public function CurrentCountrySegment($url = '', $includeGetVariable = true)
     {
         $potentialCountry = '';
-        if ($includeGetVariable)
-            $getVar = Config::inst()->get('CountryURLProvider', 'locale_get_parameter');
+        if ($includeGetVariable) {
+                    $getVar = Config::inst()->get('CountryURLProvider', 'locale_get_parameter');
+        }
             if(isset($_GET[$getVar])) {
                 $potentialCountry = $_GET[$getVar];
             }