dukt / analytics

src/services/Views.php

Spacing +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
     {
         $result = ViewRecord::findOne($id);
 
-        if($result) {
+        if ($result) {
             return new View($result->toArray([
                 'id',
                 'name',
@@ -109,7 +109,7 @@ 
             'siteId' => $id
         ]);
 
-        if($result) {
+        if ($result) {
             return new SiteView($result->toArray([
                 'id',
                 'siteId',

src/services/Analytics.php

Spacing +8 added lines, -8 removed lines

@@ -120,7 +120,7 @@ 
 
         $localeDefinition = json_decode(file_get_contents($formatLocalePath), true);
 
-        if(isset($options['currency'])) {
+        if (isset($options['currency'])) {
             $localeDefinition['currency'] = $this->getD3LocaleDefinitionCurrency($options['currency']);
         }
 
@@ -136,7 +136,7 @@ 
     {
         $chartLanguage = Craft::t('analytics', 'analyticsChartLanguage');
 
-        if($chartLanguage == 'analyticsChartLanguage') {
+        if ($chartLanguage == 'analyticsChartLanguage') {
             $chartLanguage = 'en';
         }
 
@@ -228,8 +228,8 @@ 
 
         $currencyDefinition = $localeDefinition['currency'];
 
-        foreach($currencyDefinition as $key => $row) {
-            if(!empty($row)) {
+        foreach ($currencyDefinition as $key => $row) {
+            if (!empty($row)) {
                 // Todo: Check currency symbol replacement with arabic
 
                 $pattern = '/[^\s]+/u';
@@ -271,7 +271,7 @@ 
             $gclid = $_GET['gclid'];
             if (!empty($gclid))
             {
-                setcookie("gclid", $gclid, time() + (10 * 365 * 24 * 60 * 60),  "/");
+                setcookie("gclid", $gclid, time() + (10 * 365 * 24 * 60 * 60), "/");
             }
         }
         return $gclid;
@@ -286,17 +286,17 @@ 
         if (isset($_COOKIE['_ga']))
         {
             list($version, $domainDepth, $cid1, $cid2) = preg_split('[\.]', $_COOKIE["_ga"], 4);
-            $contents = array('version' => $version, 'domainDepth' => $domainDepth, 'cid' => $cid1 . '.' . $cid2);
+            $contents = array('version' => $version, 'domainDepth' => $domainDepth, 'cid' => $cid1.'.'.$cid2);
             $cid = $contents['cid'];
         }
         else
         {
-            if (isset($_COOKIE['_ia']) && $_COOKIE['_ia'] !='' )
+            if (isset($_COOKIE['_ia']) && $_COOKIE['_ia'] != '')
                 $cid = $_COOKIE['_ia'];
             else
                 $cid = $this->_gaGenUUID();
         }
-        setcookie('_ia', $cid, time()+60*60*24*730, "/"); // Two years
+        setcookie('_ia', $cid, time() + 60 * 60 * 24 * 730, "/"); // Two years
         return $cid;
     } /* -- _gaParseCookie */
 

Braces +6 added lines, -6 removed lines

@@ -288,13 +288,13 @@
             list($version, $domainDepth, $cid1, $cid2) = preg_split('[\.]', $_COOKIE["_ga"], 4);
             $contents = array('version' => $version, 'domainDepth' => $domainDepth, 'cid' => $cid1 . '.' . $cid2);
             $cid = $contents['cid'];
-        }
-        else
+        } else
         {
-            if (isset($_COOKIE['_ia']) && $_COOKIE['_ia'] !='' )
-                $cid = $_COOKIE['_ia'];
-            else
-                $cid = $this->_gaGenUUID();
+            if (isset($_COOKIE['_ia']) && $_COOKIE['_ia'] !='' ) {
+                            $cid = $_COOKIE['_ia'];
+            } else {
+                            $cid = $this->_gaGenUUID();
+            }
         }
         setcookie('_ia', $cid, time()+60*60*24*730, "/"); // Two years
         return $cid;

src/services/Reports.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
 
         $tableId = null;
 
-        if($view) {
+        if ($view) {
             $tableId = 'ga:'.$view->gaViewId;
         }
 
@@ -43,7 +43,7 @@ 
         $cacheId = ['reports.getRealtimeReport', $tableId, $metrics, $optParams];
         $response = Analytics::$plugin->cache->get($cacheId);
 
-        if(!$response)
+        if (!$response)
         {
             $response = Analytics::$plugin->getApis()->getAnalytics()->getService()->data_realtime->get($tableId, $metrics, $optParams);
 
@@ -80,7 +80,7 @@ 
 
         $viewId = null;
 
-        if($siteView) {
+        if ($siteView) {
             $viewId = $siteView->viewId;
         }
 

src/migrations/m161021_000001_force_connect.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
             ->where(['handle' => 'analytics'])
             ->one();
 
-        if($row)
+        if ($row)
         {
             $settingsJson = $row['settings'];
 

src/migrations/m141009_105954_analytics_reportsWidgetToExplorerWidget.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
                 $settings = Json::decode($result['settings']);
                 $newSettings = [];
 
-                if(!empty($settings['type'])) {
+                if (!empty($settings['type'])) {
                     switch ($settings['type']) {
                         case 'visits':
                             $newSettings = [

src/migrations/m170324_000003_fix_widget_options.php

Spacing +2 added lines, -2 removed lines

@@ -24,11 +24,11 @@
             ->orWhere(['type' => 'dukt\analytics\widgets\Report'])
             ->all();
 
-        if($widgetResults) {
+        if ($widgetResults) {
             foreach ($widgetResults as $result) {
                 $settings = Json::decode($result['settings']);
                 
-                if(isset($settings['options']['metric'])) {
+                if (isset($settings['options']['metric'])) {
                     $settings['options'] = [
                         $settings['chart'] => $settings['options']
                     ];

src/migrations/m161117_000001_remove_account_explorer_data_setting.php

Spacing +2 added lines, -2 removed lines

@@ -25,13 +25,13 @@
             ->where(['handle' => 'analytics'])
             ->one();
 
-        if($row)
+        if ($row)
         {
             $settingsJson = $row['settings'];
 
             $settings = Json::decode($settingsJson);
 
-            if(isset($settings['accountExplorerData']))
+            if (isset($settings['accountExplorerData']))
             {
                 unset($settings['accountExplorerData']);
             }

src/migrations/m150921_000001_explorer_widget_to_realtime_and_reports.php

Spacing +9 added lines, -9 removed lines

@@ -23,9 +23,9 @@ 
             ->where(['type' => 'Analytics_Explorer'])
             ->all();
 
-        if($widgetResults)
+        if ($widgetResults)
         {
-            foreach($widgetResults as $result)
+            foreach ($widgetResults as $result)
             {
                 $oldSettings = Json::decode($result['settings']);
 
@@ -34,36 +34,36 @@ 
 
                 $newSettings = [];
 
-                if(isset($oldSettings['chart']))
+                if (isset($oldSettings['chart']))
                 {
                     $newSettings['chart'] = $oldSettings['chart'];
                 }
 
-                if(isset($oldSettings['period']))
+                if (isset($oldSettings['period']))
                 {
                     $newSettings['period'] = $oldSettings['period'];
                 }
 
                 $newSettings['options'] = [];
 
-                if(isset($oldSettings['dimension']))
+                if (isset($oldSettings['dimension']))
                 {
                     $newSettings['options']['dimension'] = $oldSettings['dimension'];
                 }
 
-                if(isset($oldSettings['metric']))
+                if (isset($oldSettings['metric']))
                 {
                     $newSettings['options']['metric'] = $oldSettings['metric'];
                 }
 
-                switch($oldSettings['menu'])
+                switch ($oldSettings['menu'])
                 {
                     case 'realtimeVisitors':
-                        $type='Analytics_Realtime';
+                        $type = 'Analytics_Realtime';
                         break;
 
                     default:
-                        $type='Analytics_Report';
+                        $type = 'Analytics_Report';
                 }
 
 

src/controllers/UtilsController.php

Spacing +8 added lines, -8 removed lines

@@ -107,23 +107,23 @@ 
 
         $items = Analytics::$plugin->getApis()->getAnalytics()->getColumns();
 
-        if($items)
+        if ($items)
         {
-            foreach($items as $item)
+            foreach ($items as $item)
             {
-                if($item->attributes['status'] == 'DEPRECATED')
+                if ($item->attributes['status'] == 'DEPRECATED')
                 {
                     continue;
                 }
 
-                if($item->attributes['addedInApiVersion'] > $this->addedInApiVersion)
+                if ($item->attributes['addedInApiVersion'] > $this->addedInApiVersion)
                 {
                     continue;
                 }
 
-                if(isset($item->attributes['minTemplateIndex']))
+                if (isset($item->attributes['minTemplateIndex']))
                 {
-                    for($i = $item->attributes['minTemplateIndex']; $i <= $item->attributes['maxTemplateIndex']; $i++)
+                    for ($i = $item->attributes['minTemplateIndex']; $i <= $item->attributes['maxTemplateIndex']; $i++)
                     {
                         $column = [];
                         $column['id'] = str_replace('XX', $i, $item->id);
@@ -167,12 +167,12 @@ 
         $column['group'] = $item->attributes['group'];
         $column['status'] = $item->attributes['status'];
 
-        if(isset($item->attributes['allowInSegments']))
+        if (isset($item->attributes['allowInSegments']))
         {
             $column['allowInSegments'] = $item->attributes['allowInSegments'];
         }
 
-        if(isset($item->attributes['addedInApiVersion']))
+        if (isset($item->attributes['addedInApiVersion']))
         {
             $column['addedInApiVersion'] = $item->attributes['addedInApiVersion'];
         }

Braces +1 added lines, -2 removed lines

@@ -132,8 +132,7 @@
 
                         $columns[$column['id']] = $this->populateColumnAttributes($column, $item);
                     }
-                }
-                else
+                } else
                 {
                     $column = [];
                     $column['id'] = $item->id;