Passed
Pull Request — master (#9)
by
unknown
17:20
created
src/Controllers/MatomoController.php 1 patch
Spacing   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -50,33 +50,33 @@  discard block
 block discarded – undo
50 50
         $date = 'today';
51 51
         $period = 'day';
52 52
         
53
-        if($data["value"]["range"] !== "Today" || $data["value"]["range"] !== "Yesterday"){        
54
-            if(isset($data["value"]["y2"],$data["value"]["m2"],$data["value"]["d2"])){
53
+        if ($data["value"]["range"] !== "Today" || $data["value"]["range"] !== "Yesterday") {        
54
+            if (isset($data["value"]["y2"], $data["value"]["m2"], $data["value"]["d2"])) {
55 55
                 $now = \Carbon\Carbon::now();
56
-                $startdate = \Carbon\Carbon::createFromFormat('Y-m-d', $data["value"]["y2"].'-'.$data["value"]["m2"].'-'.$data["value"]["d2"]);
57
-                $enddate = \Carbon\Carbon::createFromFormat('Y-m-d',$data["value"]["y1"].'-'.$data["value"]["m1"].'-'.$data["value"]["d1"]);
56
+                $startdate = \Carbon\Carbon::createFromFormat('Y-m-d', $data["value"]["y2"] . '-' . $data["value"]["m2"] . '-' . $data["value"]["d2"]);
57
+                $enddate = \Carbon\Carbon::createFromFormat('Y-m-d', $data["value"]["y1"] . '-' . $data["value"]["m1"] . '-' . $data["value"]["d1"]);
58 58
                 $checkforrange = $now->diffInDays($enddate);
59 59
                 $diff = $startdate->diffInDays($enddate);
60
-                if($checkforrange !== 0){
60
+                if ($checkforrange !== 0) {
61 61
                     $period = 'range';
62
-                    $date = $data["value"]["y2"].'-'.$data["value"]["m2"].'-'.$data["value"]["d2"].','.$data["value"]["y1"].'-'.$data["value"]["m1"].'-'.$data["value"]["d1"];                    
63
-                }else{
64
-                    if($diff == 6){
62
+                    $date = $data["value"]["y2"] . '-' . $data["value"]["m2"] . '-' . $data["value"]["d2"] . ',' . $data["value"]["y1"] . '-' . $data["value"]["m1"] . '-' . $data["value"]["d1"];                    
63
+                } else {
64
+                    if ($diff == 6) {
65 65
                         $period = 'week';
66 66
                         $date = 'last7';
67 67
                     }
68
-                    if($diff == 29){
68
+                    if ($diff == 29) {
69 69
                         $period = 'month';
70 70
                         $date = 'last30';
71 71
                     }
72 72
                 }
73 73
             }      
74 74
         }
75
-        if($data["value"]["range"] == "Today"){
75
+        if ($data["value"]["range"] == "Today") {
76 76
             $date = 'today';
77 77
             $period = 'day';
78 78
         }
79
-        if($data["value"]["range"] == "Yesterday"){
79
+        if ($data["value"]["range"] == "Yesterday") {
80 80
             $date = 'yesterday';
81 81
             $period = 'day';
82 82
         }
@@ -158,24 +158,24 @@  discard block
 block discarded – undo
158 158
     {
159 159
         $data = $request->all();
160 160
         $matomoUrl = ChuckSite::getSetting('integrations.matomo-site-url') !== null ? ChuckSite::getSetting('integrations.matomo-site-url') : config('chuckcms.analytics.matomoURL');
161
-        if($data["value"]["range"] !== "Today" || $data["value"]["range"] !== "Yesterday"){
162
-            if(isset($data["value"]["y2"]) && isset($data["value"]["y1"])){
161
+        if ($data["value"]["range"] !== "Today" || $data["value"]["range"] !== "Yesterday") {
162
+            if (isset($data["value"]["y2"]) && isset($data["value"]["y1"])) {
163 163
                 $now = \Carbon\Carbon::now();
164
-                $startdate = \Carbon\Carbon::createFromFormat('Y-m-d', $data["value"]["y2"].'-'.$data["value"]["m2"].'-'.$data["value"]["d2"]);
165
-                $enddate = \Carbon\Carbon::createFromFormat('Y-m-d',$data["value"]["y1"].'-'.$data["value"]["m1"].'-'.$data["value"]["d1"]);
164
+                $startdate = \Carbon\Carbon::createFromFormat('Y-m-d', $data["value"]["y2"] . '-' . $data["value"]["m2"] . '-' . $data["value"]["d2"]);
165
+                $enddate = \Carbon\Carbon::createFromFormat('Y-m-d', $data["value"]["y1"] . '-' . $data["value"]["m1"] . '-' . $data["value"]["d1"]);
166 166
                 $checkforrange = $now->diffInDays($enddate);
167 167
           
168
-                if($checkforrange !== 0){
168
+                if ($checkforrange !== 0) {
169 169
                     $period = 'range';
170
-                    $date = date('Y-m-d', strtotime($startdate)).",".date('Y-m-d', strtotime($enddate));
170
+                    $date = date('Y-m-d', strtotime($startdate)) . "," . date('Y-m-d', strtotime($enddate));
171 171
                 }
172 172
             }
173 173
         }
174
-        if($data["value"]["range"] == "Today"){
174
+        if ($data["value"]["range"] == "Today") {
175 175
             $date = 'today';
176 176
             $period = 'day';
177 177
         }
178
-        if($data["value"]["range"] == "Yesterday"){
178
+        if ($data["value"]["range"] == "Yesterday") {
179 179
             $date = 'yesterday';
180 180
             $period = 'day';
181 181
         }
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
             ->setParameter('filter_limit', -1)
201 201
             ->execute()
202 202
             ->getResponse();
203
-        }else{
203
+        } else {
204 204
             $recordedSessions = [];
205 205
         }
206 206
         
@@ -264,39 +264,39 @@  discard block
 block discarded – undo
264 264
     {
265 265
         $data = $request->all();
266 266
         $imgDate = '';
267
-        if($data["value"]["range"] !== "Today" || $data["value"]["range"] !== "Yesterday"){        
268
-            if(isset($data["value"]["y2"],$data["value"]["m2"],$data["value"]["d2"])){
267
+        if ($data["value"]["range"] !== "Today" || $data["value"]["range"] !== "Yesterday") {        
268
+            if (isset($data["value"]["y2"], $data["value"]["m2"], $data["value"]["d2"])) {
269 269
                 $now = \Carbon\Carbon::now();
270
-                $startdate = \Carbon\Carbon::createFromFormat('Y-m-d', $data["value"]["y2"].'-'.$data["value"]["m2"].'-'.$data["value"]["d2"]);
271
-                $enddate = \Carbon\Carbon::createFromFormat('Y-m-d',$data["value"]["y1"].'-'.$data["value"]["m1"].'-'.$data["value"]["d1"]);
270
+                $startdate = \Carbon\Carbon::createFromFormat('Y-m-d', $data["value"]["y2"] . '-' . $data["value"]["m2"] . '-' . $data["value"]["d2"]);
271
+                $enddate = \Carbon\Carbon::createFromFormat('Y-m-d', $data["value"]["y1"] . '-' . $data["value"]["m1"] . '-' . $data["value"]["d1"]);
272 272
                 $checkforrange = $now->diffInDays($enddate);
273 273
                 $diff = $startdate->diffInDays($enddate);
274
-                if($checkforrange !== 0){
274
+                if ($checkforrange !== 0) {
275 275
                     $period = 'range';
276
-                    $date = $data["value"]["y2"].'-'.$data["value"]["m2"].'-'.$data["value"]["d2"].','.$data["value"]["y1"].'-'.$data["value"]["m1"].'-'.$data["value"]["d1"];                    
276
+                    $date = $data["value"]["y2"] . '-' . $data["value"]["m2"] . '-' . $data["value"]["d2"] . ',' . $data["value"]["y1"] . '-' . $data["value"]["m1"] . '-' . $data["value"]["d1"];                    
277 277
                     $imgDate = $date;
278
-                }else{
279
-                    $imgDate = $data["value"]["y2"].'-'.$data["value"]["m2"].'-'.$data["value"]["d2"].','.$data["value"]["y1"].'-'.$data["value"]["m1"].'-'.$data["value"]["d1"];
280
-                    if($diff == 6){
278
+                } else {
279
+                    $imgDate = $data["value"]["y2"] . '-' . $data["value"]["m2"] . '-' . $data["value"]["d2"] . ',' . $data["value"]["y1"] . '-' . $data["value"]["m1"] . '-' . $data["value"]["d1"];
280
+                    if ($diff == 6) {
281 281
                         $period = 'week';
282 282
                         $date = 'last7';
283 283
                     }
284
-                    if($diff == 29){
284
+                    if ($diff == 29) {
285 285
                         $period = 'month';
286 286
                         $date = 'last30';
287 287
                     }
288 288
                 }
289 289
             }      
290 290
         }
291
-        if($data["value"]["range"] == "Today"){
291
+        if ($data["value"]["range"] == "Today") {
292 292
             $date = 'today';
293 293
             $period = 'day';
294
-            $imgDate = date('Y-m-d').",".date('Y-m-d', strtotime(date('Y-m-d')." +2 day"));
294
+            $imgDate = date('Y-m-d') . "," . date('Y-m-d', strtotime(date('Y-m-d') . " +2 day"));
295 295
         }
296
-        if($data["value"]["range"] == "Yesterday"){
296
+        if ($data["value"]["range"] == "Yesterday") {
297 297
             $date = 'yesterday';
298 298
             $period = 'day';
299
-            $imgDate = date('Y-m-d', strtotime(date('Y-m-d')." -1 day")).",".date('Y-m-d', strtotime(date('Y-m-d')." +1 day"));
299
+            $imgDate = date('Y-m-d', strtotime(date('Y-m-d') . " -1 day")) . "," . date('Y-m-d', strtotime(date('Y-m-d') . " +1 day"));
300 300
         }
301 301
         $matomoUrl = ChuckSite::getSetting('integrations.matomo-site-url') !== null ? ChuckSite::getSetting('integrations.matomo-site-url') : config('chuckcms.analytics.matomoURL');
302 302
         $query_factory = QueryFactory::create($matomoUrl);
@@ -313,15 +313,15 @@  discard block
 block discarded – undo
313 313
             
314 314
         return response()->json([
315 315
                 'success'=>'success',
316
-                '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,
317
-                '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,
318
-                'bouncerateimg'=> $matomoUrl.'/index.php?forceView=1&viewDataTable=sparkline&module=API&idSite='.$this->siteId.'&period='.$period.'&date='.$imgDate.'&columns=bounce_rate&token_auth='.$this->authToken,
319
-                '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,
320
-                '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,
321
-                '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,
322
-                '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,
323
-                '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,
324
-                '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,
316
+                '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,
317
+                '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,
318
+                'bouncerateimg'=> $matomoUrl . '/index.php?forceView=1&viewDataTable=sparkline&module=API&idSite=' . $this->siteId . '&period=' . $period . '&date=' . $imgDate . '&columns=bounce_rate&token_auth=' . $this->authToken,
319
+                '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,
320
+                '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,
321
+                '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,
322
+                '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,
323
+                '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,
324
+                '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,
325 325
                 'data'=> $data
326 326
             ]);
327 327
     }
@@ -329,39 +329,39 @@  discard block
 block discarded – undo
329 329
     public function getReferrers(Request $request)
330 330
     {
331 331
         $data = $request->all();
332
-        if($data["value"]["range"] !== "Today" || $data["value"]["range"] !== "Yesterday"){        
333
-            if(isset($data["value"]["y2"],$data["value"]["m2"],$data["value"]["d2"])){
332
+        if ($data["value"]["range"] !== "Today" || $data["value"]["range"] !== "Yesterday") {        
333
+            if (isset($data["value"]["y2"], $data["value"]["m2"], $data["value"]["d2"])) {
334 334
                 $now = \Carbon\Carbon::now();
335
-                $startdate = \Carbon\Carbon::createFromFormat('Y-m-d', $data["value"]["y2"].'-'.$data["value"]["m2"].'-'.$data["value"]["d2"]);
336
-                $enddate = \Carbon\Carbon::createFromFormat('Y-m-d',$data["value"]["y1"].'-'.$data["value"]["m1"].'-'.$data["value"]["d1"]);
335
+                $startdate = \Carbon\Carbon::createFromFormat('Y-m-d', $data["value"]["y2"] . '-' . $data["value"]["m2"] . '-' . $data["value"]["d2"]);
336
+                $enddate = \Carbon\Carbon::createFromFormat('Y-m-d', $data["value"]["y1"] . '-' . $data["value"]["m1"] . '-' . $data["value"]["d1"]);
337 337
                 $checkforrange = $now->diffInDays($enddate);
338 338
                 $diff = $startdate->diffInDays($enddate);
339
-                if($checkforrange !== 0){
339
+                if ($checkforrange !== 0) {
340 340
                     $period = 'range';
341
-                    $date = $data["value"]["y2"].'-'.$data["value"]["m2"].'-'.$data["value"]["d2"].','.$data["value"]["y1"].'-'.$data["value"]["m1"].'-'.$data["value"]["d1"];                    
341
+                    $date = $data["value"]["y2"] . '-' . $data["value"]["m2"] . '-' . $data["value"]["d2"] . ',' . $data["value"]["y1"] . '-' . $data["value"]["m1"] . '-' . $data["value"]["d1"];                    
342 342
                     $imgDate = $date;
343
-                }else{
344
-                    $imgDate = $data["value"]["y2"].'-'.$data["value"]["m2"].'-'.$data["value"]["d2"].','.$data["value"]["y1"].'-'.$data["value"]["m1"].'-'.$data["value"]["d1"];
345
-                    if($diff == 6){
343
+                } else {
344
+                    $imgDate = $data["value"]["y2"] . '-' . $data["value"]["m2"] . '-' . $data["value"]["d2"] . ',' . $data["value"]["y1"] . '-' . $data["value"]["m1"] . '-' . $data["value"]["d1"];
345
+                    if ($diff == 6) {
346 346
                         $period = 'week';
347 347
                         $date = 'last7';
348 348
                     }
349
-                    if($diff == 29){
349
+                    if ($diff == 29) {
350 350
                         $period = 'month';
351 351
                         $date = 'last30';
352 352
                     }
353 353
                 }
354 354
             }      
355 355
         }
356
-        if($data["value"]["range"] == "Today"){
356
+        if ($data["value"]["range"] == "Today") {
357 357
             $date = 'today';
358 358
             $period = 'day';
359
-            $imgDate = date('Y-m-d').",".date('Y-m-d', strtotime(date('Y-m-d')." +2 day"));
359
+            $imgDate = date('Y-m-d') . "," . date('Y-m-d', strtotime(date('Y-m-d') . " +2 day"));
360 360
         }
361
-        if($data["value"]["range"] == "Yesterday"){
361
+        if ($data["value"]["range"] == "Yesterday") {
362 362
             $date = 'yesterday';
363 363
             $period = 'day';
364
-            $imgDate = date('Y-m-d', strtotime(date('Y-m-d')." -1 day")).",".date('Y-m-d', strtotime(date('Y-m-d')." +1 day"));
364
+            $imgDate = date('Y-m-d', strtotime(date('Y-m-d') . " -1 day")) . "," . date('Y-m-d', strtotime(date('Y-m-d') . " +1 day"));
365 365
         }
366 366
         $matomoUrl = ChuckSite::getSetting('integrations.matomo-site-url') !== null ? ChuckSite::getSetting('integrations.matomo-site-url') : config('chuckcms.analytics.matomoURL');
367 367
         $query_factory = QueryFactory::create($matomoUrl);
@@ -392,10 +392,10 @@  discard block
 block discarded – undo
392 392
         $settings['id'] = ChuckSite::getSite('id');
393 393
         $settings['name'] = ChuckSite::getSite('name');
394 394
         $settings['slug'] = ChuckSite::getSite('slug');
395
-        $settings['company'] =  ChuckSite::getSetting('company') ;
396
-        $settings['socialmedia'] =  ChuckSite::getSetting('socialmedia');
395
+        $settings['company'] = ChuckSite::getSetting('company');
396
+        $settings['socialmedia'] = ChuckSite::getSetting('socialmedia');
397 397
         $settings['favicon'] = ChuckSite::getSetting('favicon');
398
-        $settings['logo'] =  ChuckSite::getSetting('logo');
398
+        $settings['logo'] = ChuckSite::getSetting('logo');
399 399
         $settings['lang'] = ChuckSite::getSetting('lang');
400 400
         $settings['domain'] = ChuckSite::getSetting('domain');
401 401
         $settings['integrations'] = [
Please login to merge, or discard this patch.