@@ -44,9 +44,9 @@ |
||
| 44 | 44 | ) { |
| 45 | 45 | |
| 46 | 46 | return $this->filterByInstanceName($instanceName) |
| 47 | - ->filterByNetwork(Subscription::parseNetwork($status, $instanceStatus->getAvailableNetworks())) |
|
| 48 | - ->filterByMux(Subscription::parseMux($status, $instanceStatus->getAvailableMuxes())) |
|
| 49 | - ->addDescendingOrderByColumn('started'); |
|
| 47 | + ->filterByNetwork(Subscription::parseNetwork($status, $instanceStatus->getAvailableNetworks())) |
|
| 48 | + ->filterByMux(Subscription::parseMux($status, $instanceStatus->getAvailableMuxes())) |
|
| 49 | + ->addDescendingOrderByColumn('started'); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | } |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | // Check if the service string contains /$mux/ |
| 29 | 29 | foreach ($availableMuxes as $mux) |
| 30 | 30 | { |
| 31 | - if (strpos($service, '/' . $mux->name . '/') !== false) |
|
| 31 | + if (strpos($service, '/'.$mux->name.'/') !== false) |
|
| 32 | 32 | { |
| 33 | 33 | return $mux->name; |
| 34 | 34 | } |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | // Check if the service string contains /$network/ |
| 52 | 52 | foreach ($availableNetworks as $network) |
| 53 | 53 | { |
| 54 | - if (strpos($service, '/' . $network->networkname . '/') !== false) |
|
| 54 | + if (strpos($service, '/'.$network->networkname.'/') !== false) |
|
| 55 | 55 | { |
| 56 | 56 | return $network->networkname; |
| 57 | 57 | } |
@@ -120,13 +120,13 @@ discard block |
||
| 120 | 120 | $this->onUserSeen($instanceName, $connectionStatus->user); |
| 121 | 121 | |
| 122 | 122 | $user = UserQuery::create()->filterByInstanceName($instanceName)->filterByName($connectionStatus->user) |
| 123 | - ->findOne(); |
|
| 123 | + ->findOne(); |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | $connection = new Connection(); |
| 127 | 127 | $connection->setInstanceName($instanceName)->setPeer($connectionStatus->peer) |
| 128 | - ->setUser($user) |
|
| 129 | - ->setStarted($connectionStatus->started)->setType($connectionStatus->type)->save(); |
|
| 128 | + ->setUser($user) |
|
| 129 | + ->setStarted($connectionStatus->started)->setType($connectionStatus->type)->save(); |
|
| 130 | 130 | |
| 131 | 131 | $this->logger->info('Stored new connection (instance: {instanceName}, peer: {peer})', [ |
| 132 | 132 | 'instanceName' => $instanceName, |
@@ -160,8 +160,8 @@ discard block |
||
| 160 | 160 | |
| 161 | 161 | $input = new Input(); |
| 162 | 162 | $input->setInstanceName($instanceName) |
| 163 | - ->setStarted(new \DateTime()) |
|
| 164 | - ->setFromInputStatus($inputStatus)->save(); |
|
| 163 | + ->setStarted(new \DateTime()) |
|
| 164 | + ->setFromInputStatus($inputStatus)->save(); |
|
| 165 | 165 | |
| 166 | 166 | $this->logger |
| 167 | 167 | ->info('Stored new input (instance: {instanceName}, network: {network}, mux: {mux}, weight: {weight})', |
@@ -217,7 +217,7 @@ discard block |
||
| 217 | 217 | |
| 218 | 218 | // Try to determine which input is used by the subscription |
| 219 | 219 | $input = InputQuery::create()->filterBySubscriptionStatus($instanceName, $event->getInstanceStatus(), $status) |
| 220 | - ->findOne(); |
|
| 220 | + ->findOne(); |
|
| 221 | 221 | |
| 222 | 222 | if ($input === null) |
| 223 | 223 | { |
@@ -232,8 +232,8 @@ discard block |
||
| 232 | 232 | |
| 233 | 233 | $subscription = new Subscription(); |
| 234 | 234 | $subscription->setInstance($instance)->setInput($input)->setUser($user)->setChannel($channel) |
| 235 | - ->setSubscriptionId($status->id)->setStarted($status->start)->setTitle($status->title) |
|
| 236 | - ->setService($status->service); |
|
| 235 | + ->setSubscriptionId($status->id)->setStarted($status->start)->setTitle($status->title) |
|
| 236 | + ->setService($status->service); |
|
| 237 | 237 | $subscription->save(); |
| 238 | 238 | |
| 239 | 239 | $this->logger |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | |
| 261 | 261 | // Find the latest matching subscription |
| 262 | 262 | $subscription = SubscriptionQuery::create() |
| 263 | - ->getNewestMatching($instanceName, $stateChange->getSubscriptionId()); |
|
| 263 | + ->getNewestMatching($instanceName, $stateChange->getSubscriptionId()); |
|
| 264 | 264 | |
| 265 | 265 | // EPG grab subscriptions are not stored so we don't want to log these with a high level |
| 266 | 266 | if ($subscription === null) |