@@ -28,15 +28,15 @@ |
||
28 | 28 | |
29 | 29 | public function getSettingsAttribute() |
30 | 30 | { |
31 | - if(array_key_exists('settings', $this->json)) { |
|
31 | + if (array_key_exists('settings', $this->json)) { |
|
32 | 32 | return $this->json['settings']; |
33 | 33 | } |
34 | 34 | |
35 | - if(!array_key_exists('admin', $this->json)) { |
|
35 | + if (!array_key_exists('admin', $this->json)) { |
|
36 | 36 | return array(); |
37 | 37 | } |
38 | 38 | |
39 | - if(!array_key_exists('settings', $this->json['admin'])) { |
|
39 | + if (!array_key_exists('settings', $this->json['admin'])) { |
|
40 | 40 | return array(); |
41 | 41 | } |
42 | 42 |
@@ -69,7 +69,7 @@ |
||
69 | 69 | 'settings' => $settings] |
70 | 70 | ]; |
71 | 71 | |
72 | - // updateOrCreate the site |
|
72 | + // updateOrCreate the site |
|
73 | 73 | $result = Site::updateOrCreate( |
74 | 74 | ['id' => $req['id']], |
75 | 75 | ['name' => $req['name'], |
@@ -55,7 +55,7 @@ |
||
55 | 55 | foreach ($req['logo'] as $faviKey => $faviValue) { |
56 | 56 | $settings['logo'][$faviKey] = $faviValue; |
57 | 57 | } |
58 | - foreach($req['integrations'] as $igsKey => $igsValue){ |
|
58 | + foreach ($req['integrations'] as $igsKey => $igsValue) { |
|
59 | 59 | $settings['integrations'][$igsKey] = $igsValue; |
60 | 60 | } |
61 | 61 | $settings['lang'] = $req['lang']; |
@@ -29,7 +29,7 @@ |
||
29 | 29 | * |
30 | 30 | * @return void |
31 | 31 | */ |
32 | - public function __construct(Site $site, SiteRepository $siteRepository, User $user) |
|
32 | + public function __construct(Site $site, SiteRepository $siteRepository, User $user) |
|
33 | 33 | { |
34 | 34 | $this->site = $site; |
35 | 35 | $this->siteId = ChuckSite::getSetting('integrations.matomo-site-id'); |
@@ -64,33 +64,33 @@ discard block |
||
64 | 64 | $date = 'today'; |
65 | 65 | $period = 'day'; |
66 | 66 | |
67 | - if($data["value"]["range"] !== "Today" || $data["value"]["range"] !== "Yesterday"){ |
|
68 | - if(isset($data["value"]["y2"],$data["value"]["m2"],$data["value"]["d2"])){ |
|
67 | + if ($data["value"]["range"] !== "Today" || $data["value"]["range"] !== "Yesterday") { |
|
68 | + if (isset($data["value"]["y2"], $data["value"]["m2"], $data["value"]["d2"])) { |
|
69 | 69 | $now = \Carbon\Carbon::now(); |
70 | - $startdate = \Carbon\Carbon::createFromFormat('Y-m-d', $data["value"]["y2"].'-'.$data["value"]["m2"].'-'.$data["value"]["d2"]); |
|
71 | - $enddate = \Carbon\Carbon::createFromFormat('Y-m-d',$data["value"]["y1"].'-'.$data["value"]["m1"].'-'.$data["value"]["d1"]); |
|
70 | + $startdate = \Carbon\Carbon::createFromFormat('Y-m-d', $data["value"]["y2"] . '-' . $data["value"]["m2"] . '-' . $data["value"]["d2"]); |
|
71 | + $enddate = \Carbon\Carbon::createFromFormat('Y-m-d', $data["value"]["y1"] . '-' . $data["value"]["m1"] . '-' . $data["value"]["d1"]); |
|
72 | 72 | $checkforrange = $now->diffInDays($enddate); |
73 | 73 | $diff = $startdate->diffInDays($enddate); |
74 | - if($checkforrange !== 0){ |
|
74 | + if ($checkforrange !== 0) { |
|
75 | 75 | $period = 'range'; |
76 | - $date = $data["value"]["y2"].'-'.$data["value"]["m2"].'-'.$data["value"]["d2"].','.$data["value"]["y1"].'-'.$data["value"]["m1"].'-'.$data["value"]["d1"]; |
|
77 | - }else{ |
|
78 | - if($diff == 6){ |
|
76 | + $date = $data["value"]["y2"] . '-' . $data["value"]["m2"] . '-' . $data["value"]["d2"] . ',' . $data["value"]["y1"] . '-' . $data["value"]["m1"] . '-' . $data["value"]["d1"]; |
|
77 | + } else { |
|
78 | + if ($diff == 6) { |
|
79 | 79 | $period = 'week'; |
80 | 80 | $date = 'last7'; |
81 | 81 | } |
82 | - if($diff == 29){ |
|
82 | + if ($diff == 29) { |
|
83 | 83 | $period = 'month'; |
84 | 84 | $date = 'last30'; |
85 | 85 | } |
86 | 86 | } |
87 | 87 | } |
88 | 88 | } |
89 | - if($data["value"]["range"] == "Today"){ |
|
89 | + if ($data["value"]["range"] == "Today") { |
|
90 | 90 | $date = 'today'; |
91 | 91 | $period = 'day'; |
92 | 92 | } |
93 | - if($data["value"]["range"] == "Yesterday"){ |
|
93 | + if ($data["value"]["range"] == "Yesterday") { |
|
94 | 94 | $date = 'yesterday'; |
95 | 95 | $period = 'day'; |
96 | 96 | } |
@@ -233,10 +233,10 @@ discard block |
||
233 | 233 | $settings['id'] = ChuckSite::getSite('id'); |
234 | 234 | $settings['name'] = ChuckSite::getSite('name'); |
235 | 235 | $settings['slug'] = ChuckSite::getSite('slug'); |
236 | - $settings['company'] = ChuckSite::getSetting('company') ; |
|
237 | - $settings['socialmedia'] = ChuckSite::getSetting('socialmedia'); |
|
236 | + $settings['company'] = ChuckSite::getSetting('company'); |
|
237 | + $settings['socialmedia'] = ChuckSite::getSetting('socialmedia'); |
|
238 | 238 | $settings['favicon'] = ChuckSite::getSetting('favicon'); |
239 | - $settings['logo'] = ChuckSite::getSetting('logo'); |
|
239 | + $settings['logo'] = ChuckSite::getSetting('logo'); |
|
240 | 240 | $settings['lang'] = ChuckSite::getSetting('lang'); |
241 | 241 | $settings['domain'] = ChuckSite::getSetting('domain'); |
242 | 242 | $settings['integrations'] = [ |
@@ -74,7 +74,7 @@ |
||
74 | 74 | if($checkforrange !== 0){ |
75 | 75 | $period = 'range'; |
76 | 76 | $date = $data["value"]["y2"].'-'.$data["value"]["m2"].'-'.$data["value"]["d2"].','.$data["value"]["y1"].'-'.$data["value"]["m1"].'-'.$data["value"]["d1"]; |
77 | - }else{ |
|
77 | + } else{ |
|
78 | 78 | if($diff == 6){ |
79 | 79 | $period = 'week'; |
80 | 80 | $date = 'last7'; |
@@ -28,7 +28,7 @@ |
||
28 | 28 | * |
29 | 29 | * @return void |
30 | 30 | */ |
31 | - public function __construct(Site $site, SiteRepository $siteRepository, User $user) |
|
31 | + public function __construct(Site $site, SiteRepository $siteRepository, User $user) |
|
32 | 32 | { |
33 | 33 | $this->site = $site; |
34 | 34 | $this->siteId = ChuckSite::getSetting('integrations.matomo-site-id'); |
@@ -50,33 +50,33 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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'] = [ |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | if($checkforrange !== 0){ |
61 | 61 | $period = 'range'; |
62 | 62 | $date = $data["value"]["y2"].'-'.$data["value"]["m2"].'-'.$data["value"]["d2"].','.$data["value"]["y1"].'-'.$data["value"]["m1"].'-'.$data["value"]["d1"]; |
63 | - }else{ |
|
63 | + } else{ |
|
64 | 64 | if($diff == 6){ |
65 | 65 | $period = 'week'; |
66 | 66 | $date = 'last7'; |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | ->setParameter('filter_limit', -1) |
201 | 201 | ->execute() |
202 | 202 | ->getResponse(); |
203 | - }else{ |
|
203 | + } else{ |
|
204 | 204 | $recordedSessions = []; |
205 | 205 | } |
206 | 206 | |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | $period = 'range'; |
276 | 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{ |
|
278 | + } else{ |
|
279 | 279 | $imgDate = $data["value"]["y2"].'-'.$data["value"]["m2"].'-'.$data["value"]["d2"].','.$data["value"]["y1"].'-'.$data["value"]["m1"].'-'.$data["value"]["d1"]; |
280 | 280 | if($diff == 6){ |
281 | 281 | $period = 'week'; |
@@ -340,7 +340,7 @@ discard block |
||
340 | 340 | $period = 'range'; |
341 | 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{ |
|
343 | + } else{ |
|
344 | 344 | $imgDate = $data["value"]["y2"].'-'.$data["value"]["m2"].'-'.$data["value"]["d2"].','.$data["value"]["y1"].'-'.$data["value"]["m1"].'-'.$data["value"]["d1"]; |
345 | 345 | if($diff == 6){ |
346 | 346 | $period = 'week'; |