nystudio107 / craft-instantanalytics

src/twigextensions/InstantAnalyticsTwigExtension.php

Spacing +9 added lines, -9 removed lines

@@ -45,7 +45,7 @@ 
      */
     public function getGlobals()
     {
-        $globals = [];
+        $globals = [ ];
         $view = Craft::$app->getView();
         if ($view->getIsRenderingPageTemplate()) {
             $request = Craft::$app->getRequest();
@@ -66,10 +66,10 @@ 
     public function getFilters()
     {
         return [
-            new \Twig_SimpleFilter('pageViewAnalytics', [$this, 'pageViewAnalytics']),
-            new \Twig_SimpleFilter('eventAnalytics', [$this, 'eventAnalytics']),
-            new \Twig_SimpleFilter('pageViewTrackingUrl', [$this, 'pageViewTrackingUrl']),
-            new \Twig_SimpleFilter('eventTrackingUrl', [$this, 'eventTrackingUrl']),
+            new \Twig_SimpleFilter('pageViewAnalytics', [ $this, 'pageViewAnalytics' ]),
+            new \Twig_SimpleFilter('eventAnalytics', [ $this, 'eventAnalytics' ]),
+            new \Twig_SimpleFilter('pageViewTrackingUrl', [ $this, 'pageViewTrackingUrl' ]),
+            new \Twig_SimpleFilter('eventTrackingUrl', [ $this, 'eventTrackingUrl' ]),
         ];
     }
 
@@ -79,10 +79,10 @@ 
     public function getFunctions()
     {
         return [
-            new \Twig_SimpleFunction('pageViewAnalytics', [$this, 'pageViewAnalytics']),
-            new \Twig_SimpleFunction('eventAnalytics', [$this, 'eventAnalytics']),
-            new \Twig_SimpleFunction('pageViewTrackingUrl', [$this, 'pageViewTrackingUrl']),
-            new \Twig_SimpleFunction('eventTrackingUrl', [$this, 'eventTrackingUrl']),
+            new \Twig_SimpleFunction('pageViewAnalytics', [ $this, 'pageViewAnalytics' ]),
+            new \Twig_SimpleFunction('eventAnalytics', [ $this, 'eventAnalytics' ]),
+            new \Twig_SimpleFunction('pageViewTrackingUrl', [ $this, 'pageViewTrackingUrl' ]),
+            new \Twig_SimpleFunction('eventTrackingUrl', [ $this, 'eventTrackingUrl' ]),
         ];
     }
 

src/helpers/IAnalytics.php

Spacing +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
     /**
      * @inheritdoc
      */
-    public function __construct($isSsl = false, $isDisabled = false, array $options = [])
+    public function __construct($isSsl = false, $isDisabled = false, array $options = [ ])
     {
         /** @var Settings $settings */
         $settings = InstantAnalytics::$plugin->getSettings();
@@ -140,11 +140,11 @@ 
     {
         /** @var Settings $settings */
         $settings = InstantAnalytics::$plugin->getSettings();
-        $requestIp = $_SERVER['REMOTE_ADDR'];
+        $requestIp = $_SERVER[ 'REMOTE_ADDR' ];
         if ($this->shouldSendAnalytics) {
             try {
                 Craft::info(
-                    "Send hit for IAnalytics object: ".print_r($this, true),
+                    "Send hit for IAnalytics object: " . print_r($this, true),
                     __METHOD__
                 );
 
@@ -152,7 +152,7 @@ 
             } catch (\Exception $e) {
                 if ($settings->logExcludedAnalytics) {
                     Craft::info(
-                        "*** sendHit(): error sending analytics: ".$e->getMessage(),
+                        "*** sendHit(): error sending analytics: " . $e->getMessage(),
                         __METHOD__
                     );
                 }
@@ -160,7 +160,7 @@ 
         } else {
             if ($settings->logExcludedAnalytics) {
                 Craft::info(
-                    "*** sendHit(): analytics not sent for ".$requestIp,
+                    "*** sendHit(): analytics not sent for " . $requestIp,
                     __METHOD__
                 );
             }

src/services/IA.php

Spacing +27 added lines, -27 removed lines

@@ -81,7 +81,7 @@ 
                 ->setDocumentTitle($title);
             $result = $analytics;
             Craft::info(
-                "Created sendPageView for `".$url."` - `".$title."`",
+                "Created sendPageView for `" . $url . "` - `" . $title . "`",
                 __METHOD__
             );
         }
@@ -112,7 +112,7 @@ 
                 ->setEventValue(intval($eventValue));
             $result = $analytics;
             Craft::info(
-                "Created sendEvent for `".$eventCategory."` - `".$eventAction."` - `".$eventLabel."` - `".$eventValue."`",
+                "Created sendEvent for `" . $eventCategory . "` - `" . $eventAction . "` - `" . $eventLabel . "` - `" . $eventValue . "`",
                 __METHOD__
             );
         }
@@ -154,9 +154,9 @@ 
         $path = parse_url($url, PHP_URL_PATH);
         $pathFragments = explode('/', rtrim($path, '/'));
         $fileName = end($pathFragments);
-        $trackingUrl = UrlHelper::siteUrl('instantanalytics/pageViewTrack/'.$fileName, $urlParams);
+        $trackingUrl = UrlHelper::siteUrl('instantanalytics/pageViewTrack/' . $fileName, $urlParams);
         Craft::info(
-            "Created pageViewTrackingUrl for ".$trackingUrl,
+            "Created pageViewTrackingUrl for " . $trackingUrl,
             __METHOD__
         );
 
@@ -185,9 +185,9 @@ 
             'eventValue'    => $eventValue,
         ];
         $fileName = pathinfo(parse_url($url, PHP_URL_PATH), PATHINFO_BASENAME);
-        $trackingUrl = UrlHelper::siteUrl('instantanalytics/eventTrack/'.$fileName, $urlParams);
+        $trackingUrl = UrlHelper::siteUrl('instantanalytics/eventTrack/' . $fileName, $urlParams);
         Craft::info(
-            "Created eventTrackingUrl for ".$trackingUrl,
+            "Created eventTrackingUrl for " . $trackingUrl,
             __METHOD__
         );
 
@@ -212,7 +212,7 @@ 
         if (!$settings->sendAnalyticsData) {
             if ($settings->logExcludedAnalytics) {
                 Craft::info(
-                    "Analytics excluded for: ".$requestIp." due to: `sendAnalyticsData`",
+                    "Analytics excluded for: " . $requestIp . " due to: `sendAnalyticsData`",
                     __METHOD__
                 );
             }
@@ -223,7 +223,7 @@ 
         if (!$settings->sendAnalyticsInDevMode && Craft::$app->getConfig()->getGeneral()->devMode) {
             if ($settings->logExcludedAnalytics) {
                 Craft::info(
-                    "Analytics excluded for: ".$requestIp." due to: `sendAnalyticsInDevMode`",
+                    "Analytics excluded for: " . $requestIp . " due to: `sendAnalyticsInDevMode`",
                     __METHOD__
                 );
             }
@@ -234,7 +234,7 @@ 
         if ($request->getIsConsoleRequest()) {
             if ($settings->logExcludedAnalytics) {
                 Craft::info(
-                    "Analytics excluded for: ".$requestIp." due to: `craft()->isConsole()`",
+                    "Analytics excluded for: " . $requestIp . " due to: `craft()->isConsole()`",
                     __METHOD__
                 );
             }
@@ -245,7 +245,7 @@ 
         if ($request->getIsCpRequest()) {
             if ($settings->logExcludedAnalytics) {
                 Craft::info(
-                    "Analytics excluded for: ".$requestIp." due to: `craft()->request->isCpRequest()`",
+                    "Analytics excluded for: " . $requestIp . " due to: `craft()->request->isCpRequest()`",
                     __METHOD__
                 );
             }
@@ -256,7 +256,7 @@ 
         if ($request->getIsLivePreview()) {
             if ($settings->logExcludedAnalytics) {
                 Craft::info(
-                    "Analytics excluded for: ".$requestIp." due to: `craft()->request->isLivePreview()`",
+                    "Analytics excluded for: " . $requestIp . " due to: `craft()->request->isLivePreview()`",
                     __METHOD__
                 );
             }
@@ -267,12 +267,12 @@ 
         // Check the $_SERVER[] super-global exclusions
         if (isset($settings->serverExcludes) && is_array($settings->serverExcludes)) {
             foreach ($settings->serverExcludes as $match => $matchArray) {
-                if (isset($_SERVER[$match])) {
+                if (isset($_SERVER[ $match ])) {
                     foreach ($matchArray as $matchItem) {
-                        if (preg_match($matchItem, $_SERVER[$match])) {
+                        if (preg_match($matchItem, $_SERVER[ $match ])) {
                             if ($settings->logExcludedAnalytics) {
                                 Craft::info(
-                                    "Analytics excluded for: ".$requestIp." due to: `serverExcludes`",
+                                    "Analytics excluded for: " . $requestIp . " due to: `serverExcludes`",
                                     __METHOD__
                                 );
                             }
@@ -291,7 +291,7 @@ 
             if ($crawlerDetect->isCrawler()) {
                 if ($settings->logExcludedAnalytics) {
                     Craft::info(
-                        "Analytics excluded for: ".$requestIp." due to: `filterBotUserAgents`",
+                        "Analytics excluded for: " . $requestIp . " due to: `filterBotUserAgents`",
                         __METHOD__
                     );
                 }
@@ -308,7 +308,7 @@ 
             if ($settings->adminExclude && $user->admin) {
                 if ($settings->logExcludedAnalytics) {
                     Craft::info(
-                        "Analytics excluded for: ".$requestIp." due to: `adminExclude`",
+                        "Analytics excluded for: " . $requestIp . " due to: `adminExclude`",
                         __METHOD__
                     );
                 }
@@ -321,7 +321,7 @@ 
                     if ($user->isInGroup($matchItem)) {
                         if ($settings->logExcludedAnalytics) {
                             Craft::info(
-                                "Analytics excluded for: ".$requestIp." due to: `groupExcludes`",
+                                "Analytics excluded for: " . $requestIp . " due to: `groupExcludes`",
                                 __METHOD__
                             );
                         }
@@ -351,13 +351,13 @@ 
         // We want to send just a path to GA for page views
         if (UrlHelper::isAbsoluteUrl($url)) {
             $urlParts = parse_url($url);
-            if (isset($urlParts['path'])) {
-                $url = $urlParts['path'];
+            if (isset($urlParts[ 'path' ])) {
+                $url = $urlParts[ 'path' ];
             } else {
                 $url = "/";
             }
-            if (isset($urlParts['query'])) {
-                $url = $url."?".$urlParts['query'];
+            if (isset($urlParts[ 'query' ])) {
+                $url = $url . "?" . $urlParts[ 'query' ];
             }
         }
 
@@ -471,8 +471,8 @@ 
     private function getGclid()
     {
         $gclid = "";
-        if (isset($_GET['gclid'])) {
-            $gclid = $_GET['gclid'];
+        if (isset($_GET[ 'gclid' ])) {
+            $gclid = $_GET[ 'gclid' ];
             if (!empty($gclid)) {
                 setcookie("gclid", $gclid, time() + (10 * 365 * 24 * 60 * 60), "/");
             }
@@ -490,14 +490,14 @@ 
     private function gaParseCookie()
     {
         $cid = '';
-        if (isset($_COOKIE['_ga'])) {
-            $parts = preg_split('[\.]', $_COOKIE["_ga"], 4);
+        if (isset($_COOKIE[ '_ga' ])) {
+            $parts = preg_split('[\.]', $_COOKIE[ "_ga" ], 4);
             if ($parts !== false) {
                 $cid = implode('.', array_slice($parts, 2));
             }
         } else {
-            if (isset($_COOKIE['_ia']) && $_COOKIE['_ia'] != '') {
-                $cid = $_COOKIE['_ia'];
+            if (isset($_COOKIE[ '_ia' ]) && $_COOKIE[ '_ia' ] != '') {
+                $cid = $_COOKIE[ '_ia' ];
             } else {
                 $cid = $this->gaGenUUID();
             }

src/InstantAnalytics.php

Spacing +14 added lines, -14 removed lines

@@ -83,7 +83,7 @@ 
         // Add in our Twig extensions
         $view->registerTwigExtension(new InstantAnalyticsTwigExtension());
         // Install our template hook
-        $view->hook('iaSendPageView', [$this, 'iaSendPageView']);
+        $view->hook('iaSendPageView', [ $this, 'iaSendPageView' ]);
         // Determine if Craft Commerce is installed & enabled
         self::$commercePlugin = Craft::$app->getPlugins()->getPlugin('commerce');
         // Determine if SEOmatic is installed & enabled
@@ -92,7 +92,7 @@ 
         Event::on(
             CraftVariable::class,
             CraftVariable::EVENT_INIT,
-            function (Event $event) {
+            function(Event $event) {
                 /** @var CraftVariable $variable */
                 $variable = $event->sender;
                 $variable->set('instantAnalytics', InstantAnalyticsVariable::class);
@@ -103,7 +103,7 @@ 
         Event::on(
             Plugins::class,
             Plugins::EVENT_AFTER_INSTALL_PLUGIN,
-            function (PluginEvent $event) {
+            function(PluginEvent $event) {
                 if ($event->plugin === $this) {
                     $request = Craft::$app->getRequest();
                     if (($request->isCpRequest) && (!$request->isConsoleRequest)) {
@@ -119,7 +119,7 @@ 
             Event::on(
                 View::class,
                 View::EVENT_BEFORE_RENDER_PAGE_TEMPLATE,
-                function (TemplateEvent $event) {
+                function(TemplateEvent $event) {
                     self::$currentTemplate = $event->template;
                 }
             );
@@ -127,7 +127,7 @@ 
             Event::on(
                 View::class,
                 View::EVENT_AFTER_RENDER_PAGE_TEMPLATE,
-                function (TemplateEvent $event) {
+                function(TemplateEvent $event) {
                     $settings = InstantAnalytics::$plugin->getSettings();
                     if ($settings->autoSendPageView) {
                         $this->sendPageView();
@@ -138,10 +138,10 @@ 
             Event::on(
                 UrlManager::class,
                 UrlManager::EVENT_REGISTER_SITE_URL_RULES,
-                function (RegisterUrlRulesEvent $event) {
-                    $event->rules['instantanalytics/pageViewTrack/<filename:[-\w\.*]+>?'] =
+                function(RegisterUrlRulesEvent $event) {
+                    $event->rules[ 'instantanalytics/pageViewTrack/<filename:[-\w\.*]+>?' ] =
                         'instant-analytics/track/track-page-view-url';
-                    $event->rules['instantanalytics/eventTrack/<filename:[-\w\.*]+>?'] =
+                    $event->rules[ 'instantanalytics/eventTrack/<filename:[-\w\.*]+>?' ] =
                         'instant-analytics/track/track-event-url';
                 }
             );
@@ -155,7 +155,7 @@ 
             Craft::t(
                 'instant-analytics',
                 '{name} plugin loaded',
-                ['name' => $this->name]
+                [ 'name' => $this->name ]
             ),
             __METHOD__
         );
@@ -166,7 +166,7 @@ 
      */
     public function settingsHtml()
     {
-        $commerceFields = [];
+        $commerceFields = [ ];
 
         if (self::$commercePlugin) {
             /**
@@ -212,7 +212,7 @@ 
      */
     private function getPullFieldsFromLayoutId(int $layoutId)
     {
-        $result = ['' => "none"];
+        $result = [ '' => "none" ];
         $fieldLayout = Craft::$app->getFields()->getLayoutById($layoutId);
         $fieldLayoutFields = $fieldLayout->getFields();
         foreach ($fieldLayoutFields as $fieldLayoutField) {
@@ -222,7 +222,7 @@ 
                 case "RichText":
                 case "RedactorI":
                 case "Categories":
-                    $result[$field->handle] = $field->name;
+                    $result[ $field->handle ] = $field->name;
                     break;
 
                 case "Tags":
@@ -246,7 +246,7 @@ 
             if ($analytics) {
                 $response = $analytics->sendPageView();
                 Craft::info(
-                    "pageView sent, response: ".print_r($response, true),
+                    "pageView sent, response: " . print_r($response, true),
                     __METHOD__
                 );
             } else {
@@ -270,7 +270,7 @@ 
         $request = Craft::$app->getRequest();
         if ($request->getIsSiteRequest() && !$request->getIsConsoleRequest()) {
             // If SEOmatic is installed, set the page title from it
-            if (self::$seomaticPlugin && isset($context['seomaticMeta'])) {
+            if (self::$seomaticPlugin && isset($context[ 'seomaticMeta' ])) {
                 /**
                  * TODO: fix for SEOmatic
                  * $seomaticMeta = $context['seomaticMeta'];