@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | $cfp->setDateCfpStart(new \DateTimeImmutable()); |
68 | 68 | } |
69 | 69 | $statement = 'INSERT into `cfp`(`dateCfpStart`, `dateCfpEnd`, `dateEventStart`, `dateEventEnd`, `name`, `uri`, `hash`, `timezone`, `description`, `eventUri`, `iconUri`, `latitude`, `longitude`, `location`, `tags`, `lastUpdate`) ' . |
70 | - 'VALUES (:dateCfpStart, :dateCfpEnd, :dateEventStart, :dateEventEnd, :name, :uri, :hash, :timezone, :description, :eventUri, :iconUri, :latitude, :longitude, :location, :tags, :lastUpdate);'; |
|
70 | + 'VALUES (:dateCfpStart, :dateCfpEnd, :dateEventStart, :dateEventEnd, :name, :uri, :hash, :timezone, :description, :eventUri, :iconUri, :latitude, :longitude, :location, :tags, :lastUpdate);'; |
|
71 | 71 | $statement = $this->pdo->prepare($statement); |
72 | 72 | |
73 | 73 | $values = [ |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | |
130 | 130 | foreach ($options as $option) { |
131 | 131 | $method = 'get' . $option; |
132 | - // Merge values from tags and source before comparing! |
|
132 | + // Merge values from tags and source before comparing! |
|
133 | 133 | if (in_array($option, ['tags', 'source'])) { |
134 | 134 | $setter = 'set' . $option; |
135 | 135 | $cfp->$setter(array_merge($oldValues->$method(), $cfp->$method())); |
@@ -158,9 +158,9 @@ discard block |
||
158 | 158 | } |
159 | 159 | |
160 | 160 | $statement = 'UPDATE `cfp` SET ' |
161 | - . implode(',', $statementElements) . ',' |
|
162 | - . '`lastUpdate` = :lastUpdate ' |
|
163 | - . 'WHERE `hash` = :fetchHash'; |
|
161 | + . implode(',', $statementElements) . ',' |
|
162 | + . '`lastUpdate` = :lastUpdate ' |
|
163 | + . 'WHERE `hash` = :fetchHash'; |
|
164 | 164 | $statement = $this->pdo->prepare($statement); |
165 | 165 | $values['fetchHash'] = $fetchHash; |
166 | 166 | $values['lastUpdate'] = (new \DateTime('now', new \DateTimezone('UTC')))->format('c'); |
@@ -353,7 +353,7 @@ discard block |
||
353 | 353 | $cfp->setLocation($item['location']); |
354 | 354 | $cfp->setTags(explode(',', $item['tags'])); |
355 | 355 | $cfp->setLastUpdated(new \DateTimeImmutable($item['lastUpdate'])); |
356 | - // $cfp->setSource(explode(',', $item['source'])); |
|
356 | + // $cfp->setSource(explode(',', $item['source'])); |
|
357 | 357 | |
358 | 358 | $list->add($cfp); |
359 | 359 | } |
@@ -35,10 +35,10 @@ |
||
35 | 35 | $container['googleAnalytics'] = function($c) { |
36 | 36 | $ga = new \TheIconic\Tracking\GoogleAnalytics\Analytics(true); |
37 | 37 | $ga->setProtocolVersion(1) |
38 | - ->setTrackingId($c->get('settings')['ga']['trackingCode']) |
|
39 | - ->setClientId(\Sabre\VObject\UUIDUtil::getUUID()) |
|
40 | - ->setAnonymizeIp(true) |
|
41 | - ->setAsyncRequest(true); |
|
38 | + ->setTrackingId($c->get('settings')['ga']['trackingCode']) |
|
39 | + ->setClientId(\Sabre\VObject\UUIDUtil::getUUID()) |
|
40 | + ->setAnonymizeIp(true) |
|
41 | + ->setAsyncRequest(true); |
|
42 | 42 | |
43 | 43 | return $ga; |
44 | 44 | }; |
@@ -60,13 +60,13 @@ |
||
60 | 60 | $response = $next($request, $response); |
61 | 61 | |
62 | 62 | $this->analytics |
63 | - ->setEventCategory($request->getUri()->getPath()) |
|
64 | - ->setEventAction($request->getMethod()) |
|
65 | - ->setEventLabel('type') |
|
66 | - ->setEventValue($response->getHeader('Content-Type')[0]) |
|
67 | - ->setIpOverride($request->getAttribute('ip_address')) |
|
68 | - ->setUserAgentOverride($request->getHeader('User-Agent')[0]) |
|
69 | - ->sendEvent(); |
|
63 | + ->setEventCategory($request->getUri()->getPath()) |
|
64 | + ->setEventAction($request->getMethod()) |
|
65 | + ->setEventLabel('type') |
|
66 | + ->setEventValue($response->getHeader('Content-Type')[0]) |
|
67 | + ->setIpOverride($request->getAttribute('ip_address')) |
|
68 | + ->setUserAgentOverride($request->getHeader('User-Agent')[0]) |
|
69 | + ->sendEvent(); |
|
70 | 70 | |
71 | 71 | return $response; |
72 | 72 | } |