chuckbe / chuckcms

src/Controllers/MatomoController.php

Spacing +22 added lines, -22 removed lines

@@ -117,17 +117,17 @@ 
             case 'week': case 'month':

                 $value = $request->all()["value"];

                 $range = array(

-                    'start' => $value["y2"].'-'.$value["m2"].'-'.$value["d2"],

-                    'end'   => $value["y1"].'-'.$value["m1"].'-'.$value["d1"]

+                    'start' => $value["y2"] . '-' . $value["m2"] . '-' . $value["d2"],

+                    'end'   => $value["y1"] . '-' . $value["m1"] . '-' . $value["d1"]

                 );

-                $imgDate = $range['start'].','.$range['end'];

+                $imgDate = $range['start'] . ',' . $range['end'];

                 break;

             case 'day':

-                if($date == 'today'){

-                    $imgDate = date('Y-m-d').",".date('Y-m-d', strtotime(date('Y-m-d')." +2 day"));

+                if ($date == 'today') {

+                    $imgDate = date('Y-m-d') . "," . date('Y-m-d', strtotime(date('Y-m-d') . " +2 day"));

                 }

-                if($date == 'yesterday'){

-                    $imgDate = date('Y-m-d').",".date('Y-m-d', strtotime(date('Y-m-d')." +2 day"));

+                if ($date == 'yesterday') {

+                    $imgDate = date('Y-m-d') . "," . date('Y-m-d', strtotime(date('Y-m-d') . " +2 day"));

                 }

                 break;

         }

@@ -146,15 +146,15 @@ 
             ->getResponse();

             

         return response()->json([

-            'visitimg'=> $matomoUrl.'/index.php?forceView=1&viewDataTable=sparkline&module=API&action=get&idSite='.$this->siteId.'&period='.$period.'&date='.$imgDate.'&segment=&showtitle=1&random=6179&columns=nb_visits%2Cnb_uniq_visitors&token_auth='.$this->authToken,

-            'avgvisitimg'=> $matomoUrl.'/index.php?forceView=1&viewDataTable=sparkline&module=API&action=get&idSite='.$this->siteId.'&period='.$period.'&date='.$imgDate.'&showtitle=1&random=6179&columns=avg_time_on_site&token_auth='.$this->authToken,

-            'bouncerateimg'=> $matomoUrl.'/index.php?forceView=1&viewDataTable=sparkline&module=API&idSite='.$this->siteId.'&period='.$period.'&date='.$imgDate.'&columns=bounce_rate&token_auth='.$this->authToken,

-            'actions_per_visit_img'=> $matomoUrl.'/index.php?forceView=1&viewDataTable=sparkline&module=API&action=get&idSite='.$this->siteId.'&period='.$period.'&date='.$imgDate.'&columns=nb_actions_per_visit&token_auth='.$this->authToken,

-            'pageviewimg' =>  $matomoUrl.'/index.php?forceView=1&viewDataTable=sparkline&module=API&action=get&idSite='.$this->siteId.'&period='.$period.'&date='.$imgDate.'&columns=nb_pageviews%2Cnb_uniq_pageviews&token_auth='.$this->authToken,

-            'searchesandkeywordsimg' => $matomoUrl.'/index.php?forceView=1&viewDataTable=sparkline&module=API&action=get&idSite='.$this->siteId.'&period='.$period.'&date='.$imgDate.'&columns=nb_searches%2Cnb_keywords&token_auth='.$this->authToken,

-            'downloadsimg' => $matomoUrl.'/index.php?forceView=1&viewDataTable=sparkline&module=API&action=get&idSite='.$this->siteId.'&period='.$period.'&date='.$imgDate.'&columns=nb_downloads%2Cnb_uniq_downloads&token_auth='.$this->authToken,

-            'outlinksimg' => $matomoUrl.'/index.php?forceView=1&viewDataTable=sparkline&module=API&action=get&idSite='.$this->siteId.'&period='.$period.'&date='.$imgDate.'&columns=nb_outlinks%2Cnb_uniq_outlinks&token_auth='.$this->authToken,

-            'maxactionsimg' => $matomoUrl.'/index.php?forceView=1&viewDataTable=sparkline&module=API&action=get&idSite='.$this->siteId.'&period='.$period.'&date='.$imgDate.'&columns=max_actions&token_auth='.$this->authToken,

+            'visitimg'=> $matomoUrl . '/index.php?forceView=1&viewDataTable=sparkline&module=API&action=get&idSite=' . $this->siteId . '&period=' . $period . '&date=' . $imgDate . '&segment=&showtitle=1&random=6179&columns=nb_visits%2Cnb_uniq_visitors&token_auth=' . $this->authToken,

+            'avgvisitimg'=> $matomoUrl . '/index.php?forceView=1&viewDataTable=sparkline&module=API&action=get&idSite=' . $this->siteId . '&period=' . $period . '&date=' . $imgDate . '&showtitle=1&random=6179&columns=avg_time_on_site&token_auth=' . $this->authToken,

+            'bouncerateimg'=> $matomoUrl . '/index.php?forceView=1&viewDataTable=sparkline&module=API&idSite=' . $this->siteId . '&period=' . $period . '&date=' . $imgDate . '&columns=bounce_rate&token_auth=' . $this->authToken,

+            'actions_per_visit_img'=> $matomoUrl . '/index.php?forceView=1&viewDataTable=sparkline&module=API&action=get&idSite=' . $this->siteId . '&period=' . $period . '&date=' . $imgDate . '&columns=nb_actions_per_visit&token_auth=' . $this->authToken,

+            'pageviewimg' =>  $matomoUrl . '/index.php?forceView=1&viewDataTable=sparkline&module=API&action=get&idSite=' . $this->siteId . '&period=' . $period . '&date=' . $imgDate . '&columns=nb_pageviews%2Cnb_uniq_pageviews&token_auth=' . $this->authToken,

+            'searchesandkeywordsimg' => $matomoUrl . '/index.php?forceView=1&viewDataTable=sparkline&module=API&action=get&idSite=' . $this->siteId . '&period=' . $period . '&date=' . $imgDate . '&columns=nb_searches%2Cnb_keywords&token_auth=' . $this->authToken,

+            'downloadsimg' => $matomoUrl . '/index.php?forceView=1&viewDataTable=sparkline&module=API&action=get&idSite=' . $this->siteId . '&period=' . $period . '&date=' . $imgDate . '&columns=nb_downloads%2Cnb_uniq_downloads&token_auth=' . $this->authToken,

+            'outlinksimg' => $matomoUrl . '/index.php?forceView=1&viewDataTable=sparkline&module=API&action=get&idSite=' . $this->siteId . '&period=' . $period . '&date=' . $imgDate . '&columns=nb_outlinks%2Cnb_uniq_outlinks&token_auth=' . $this->authToken,

+            'maxactionsimg' => $matomoUrl . '/index.php?forceView=1&viewDataTable=sparkline&module=API&action=get&idSite=' . $this->siteId . '&period=' . $period . '&date=' . $imgDate . '&columns=max_actions&token_auth=' . $this->authToken,

             'data'=> $data

         ]);

     }

@@ -188,13 +188,13 @@ 
         $date = strtolower($data["range"]);

         $period = 'day';

 

-        if(!isset($data["y2"],$data["m2"],$data["d2"])){

+        if (!isset($data["y2"], $data["m2"], $data["d2"])) {

             return $periodCheck ? $period : $date;

         }

 

         $range = array(

-            'start' => $data["y2"].'-'.$data["m2"].'-'.$data["d2"],

-            'end'   => $data["y1"].'-'.$data["m1"].'-'.$data["d1"]

+            'start' => $data["y2"] . '-' . $data["m2"] . '-' . $data["d2"],

+            'end'   => $data["y1"] . '-' . $data["m1"] . '-' . $data["d1"]

         );

 

         $now = Carbon::now();

@@ -206,19 +206,19 @@ 
         $diffStartToEnd = $start->diffInDays($end); //difference in days between start date and end date

 

 

-        if($diffStartToEnd == 6){

+        if ($diffStartToEnd == 6) {

             $period = 'week';

             $date = 'last7';

         }

 

-        if($diffStartToEnd == 29){

+        if ($diffStartToEnd == 29) {

             $period = 'month';

             $date = 'last30';

         }

 

         if ($difference > 0) {

             $period = 'range';

-            $date = $range['start'].','.$range['end'];

+            $date = $range['start'] . ',' . $range['end'];

         }

         

         return $periodCheck ? $period : $date;