nextcloud / twofactor_gateway

lib/Exception/SmsTransmissionException.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 /**
  * @author Christoph Wurst <christoph@winzerhof-wurst.at>

lib/Service/Gateway/SMS/Provider/SerwerSMS.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 
 			$responseData = json_decode($response->getBody(), true);
 
-			if ($responseData['success'] !== true) {
+			if ($responseData[ 'success' ] !== true) {
 				throw new SmsTransmissionException();
 			}
 		} catch (Exception $ex) {

lib/Service/Gateway/SMS/Provider/Ovh.php

Spacing +19 added lines, -19 removed lines

@@ -85,18 +85,18 @@ 
 		$sender = $config->getSender();
 		$smsAccount = $config->getAccount();
 
-		$this->attrs['AK'] = $config->getApplicationKey();
-		$this->attrs['AS'] = $config->getApplicationSecret();
-		$this->attrs['CK'] = $config->getConsumerKey();
-		if (!isset($this->endpoints[$endpoint])) {
+		$this->attrs[ 'AK' ] = $config->getApplicationKey();
+		$this->attrs[ 'AS' ] = $config->getApplicationSecret();
+		$this->attrs[ 'CK' ] = $config->getConsumerKey();
+		if (!isset($this->endpoints[ $endpoint ])) {
 			throw new InvalidSmsProviderException("Endpoint $endpoint not found");
 		}
-		$this->attrs['endpoint'] = $this->endpoints[$endpoint];
+		$this->attrs[ 'endpoint' ] = $this->endpoints[ $endpoint ];
 
 		$this->getTimeDelta();
 
-		$header = $this->getHeader('GET', $this->attrs['endpoint'].'/sms');
-		$response = $this->client->get($this->attrs['endpoint'].'/sms', [
+		$header = $this->getHeader('GET', $this->attrs[ 'endpoint' ].'/sms');
+		$response = $this->client->get($this->attrs[ 'endpoint' ].'/sms', [
 			'headers' => $header,
 		]);
 		$smsServices = json_decode($response->getBody(), true);
@@ -123,14 +123,14 @@ 
 		];
 		$body = json_encode($content);
 
-		$header = $this->getHeader('POST', $this->attrs['endpoint']."/sms/$smsAccount/jobs", $body);
-		$response = $this->client->post($this->attrs['endpoint']."/sms/$smsAccount/jobs", [
+		$header = $this->getHeader('POST', $this->attrs[ 'endpoint' ]."/sms/$smsAccount/jobs", $body);
+		$response = $this->client->post($this->attrs[ 'endpoint' ]."/sms/$smsAccount/jobs", [
 			'headers' => $header,
 			'json' => $content,
 		]);
 		$resultPostJob = json_decode($response->getBody(), true);
 
-		if (count($resultPostJob["validReceivers"]) === 0) {
+		if (count($resultPostJob[ "validReceivers" ]) === 0) {
 			throw new SmsTransmissionException("Bad receiver $identifier");
 		}
 	}
@@ -147,14 +147,14 @@ 
 	 * @throws InvalidSmsProviderException
 	 */
 	private function getTimeDelta() {
-		if (!isset($this->attrs['timedelta'])) {
-			if (!isset($this->attrs['endpoint'])) {
+		if (!isset($this->attrs[ 'timedelta' ])) {
+			if (!isset($this->attrs[ 'endpoint' ])) {
 				throw new InvalidSmsProviderException('Need to set the endpoint');
 			}
 			try {
-				$response = $this->client->get($this->attrs['endpoint'].'/auth/time');
-				$serverTimestamp = (int)$response->getBody();
-				$this->attrs['timedelta'] = $serverTimestamp - time();
+				$response = $this->client->get($this->attrs[ 'endpoint' ].'/auth/time');
+				$serverTimestamp = (int) $response->getBody();
+				$this->attrs[ 'timedelta' ] = $serverTimestamp - time();
 			} catch (Exception $ex) {
 				throw new InvalidSmsProviderException('Unable to calculate time delta:'.$ex->getMessage());
 			}
@@ -169,14 +169,14 @@ 
 	 * @return array $header Contains the data for the request need by OVH
 	 */
 	private function getHeader($method, $query, $body = '') {
-		$timestamp = time() + $this->attrs['timedelta'];
-		$prehash = $this->attrs['AS'].'+'.$this->attrs['CK'].'+'.$method.'+'.$query.'+'.$body.'+'.$timestamp;
+		$timestamp = time() + $this->attrs[ 'timedelta' ];
+		$prehash = $this->attrs[ 'AS' ].'+'.$this->attrs[ 'CK' ].'+'.$method.'+'.$query.'+'.$body.'+'.$timestamp;
 		$header = [
 			'Content-Type' => 'application/json; charset=utf-8',
-			'X-Ovh-Application' => $this->attrs['AK'],
+			'X-Ovh-Application' => $this->attrs[ 'AK' ],
 			'X-Ovh-Timestamp' => $timestamp,
 			'X-Ovh-Signature' => '$1$'.sha1($prehash),
-			'X-Ovh-Consumer' => $this->attrs['CK'],
+			'X-Ovh-Consumer' => $this->attrs[ 'CK' ],
 		];
 		return $header;
 	}

lib/Service/Gateway/Signal/Gateway.php

Spacing +5 added lines, -5 removed lines

@@ -63,25 +63,25 @@ 
 	public function send(IUser $user, string $identifier, string $message) {
 		$client = $this->clientService->newClient();
 		// determine type of gateway
-		$response = $client->get($this->config->getUrl() . '/v1/about');
+		$response = $client->get($this->config->getUrl().'/v1/about');
 		if ($response->getStatusCode() === 200) {
 			// New style gateway https://gitlab.com/morph027/signal-cli-dbus-rest-api
 			$response = $client->post(
-				$this->config->getUrl() . '/v1/send/' . $identifier,
+				$this->config->getUrl().'/v1/send/'.$identifier,
 				[
 					'json' => [ 'message' => $message ],
 				]
 			);
 			$body = $response->getBody();
 			$json = json_decode($body, true);
-			if ($response->getStatusCode() !== 201 || is_null($json) || !is_array($json) || !isset($json['timestamp'])) {
+			if ($response->getStatusCode() !== 201 || is_null($json) || !is_array($json) || !isset($json[ 'timestamp' ])) {
 				$status = $response->getStatusCode();
 				throw new SmsTransmissionException("error reported by Signal gateway, status=$status, body=$body}");
 			}
 		} else {
 			// Try old deprecated gateway https://gitlab.com/morph027/signal-web-gateway
 			$response = $client->post(
-				$this->config->getUrl() . '/v1/send/' . $identifier,
+				$this->config->getUrl().'/v1/send/'.$identifier,
 				[
 					'body' => [
 						'to' => $identifier,
@@ -93,7 +93,7 @@ 
 			$body = $response->getBody();
 			$json = json_decode($body, true);
 
-			if ($response->getStatusCode() !== 200 || is_null($json) || !is_array($json) || !isset($json['success']) || $json['success'] !== true) {
+			if ($response->getStatusCode() !== 200 || is_null($json) || !is_array($json) || !isset($json[ 'success' ]) || $json[ 'success' ] !== true) {
 				$status = $response->getStatusCode();
 				throw new SmsTransmissionException("error reported by Signal gateway, status=$status, body=$body}");
 			}

templates/personal_settings.php

Spacing +1 added lines, -1 removed lines

@@ -2,4 +2,4 @@
 script('twofactor_gateway', 'build');
 ?>
 
-<div id="twofactor-gateway-<?php print_unescaped($_['gateway']) ?>"></div>
+<div id="twofactor-gateway-<?php print_unescaped($_[ 'gateway' ]) ?>"></div>

lib/Service/Gateway/XMPP/GatewayConfig.php

Indentation +30 added lines, -30 removed lines

@@ -62,36 +62,36 @@
 		$this->config->setAppValue(Application::APP_ID, 'xmpp_sender', $sender);
 	}
 
-        public function getPassword(): string {
-                return $this->getOrFail('xmpp_password');
-        }
-
-        public function setPassword(string $password) {
-                $this->config->setAppValue(Application::APP_ID, 'xmpp_password', $password);
-        }
-
-        public function getServer(): string {
-                return $this->getOrFail('xmpp_server');
-        }
-
-        public function setServer(string $server) {
-                $this->config->setAppValue(Application::APP_ID, 'xmpp_server', $server);
-        }
-
-        public function getUsername(): string {
-                return $this->getOrFail('xmpp_username');
-        }
-
-        public function setUsername(string $username) {
-                $this->config->setAppValue(Application::APP_ID, 'xmpp_username', $username);
-        }
-        public function getMethod(): string {
-                return $this->getOrFail('xmpp_method');
-        }
-
-        public function setMethod(string $method) {
-                $this->config->setAppValue(Application::APP_ID, 'xmpp_method', $method);
-        }
+		public function getPassword(): string {
+				return $this->getOrFail('xmpp_password');
+		}
+
+		public function setPassword(string $password) {
+				$this->config->setAppValue(Application::APP_ID, 'xmpp_password', $password);
+		}
+
+		public function getServer(): string {
+				return $this->getOrFail('xmpp_server');
+		}
+
+		public function setServer(string $server) {
+				$this->config->setAppValue(Application::APP_ID, 'xmpp_server', $server);
+		}
+
+		public function getUsername(): string {
+				return $this->getOrFail('xmpp_username');
+		}
+
+		public function setUsername(string $username) {
+				$this->config->setAppValue(Application::APP_ID, 'xmpp_username', $username);
+		}
+		public function getMethod(): string {
+				return $this->getOrFail('xmpp_method');
+		}
+
+		public function setMethod(string $method) {
+				$this->config->setAppValue(Application::APP_ID, 'xmpp_method', $method);
+		}
 
 	public function isComplete(): bool {
 		$set = $this->config->getAppKeys(Application::APP_ID);

lib/Service/Gateway/XMPP/Gateway.php

Indentation +13 added lines, -13 removed lines

@@ -68,16 +68,16 @@ 
 	public function send(IUser $user, string $identifier, string $message) {
 		$this->logger->debug("sending xmpp message to $identifier, message: $message");
 
-                $sender = $this->gatewayConfig->getSender();
-                $password = $this->gatewayConfig->getPassword();
-                $server = $this->gatewayConfig->getServer();
+				$sender = $this->gatewayConfig->getSender();
+				$password = $this->gatewayConfig->getPassword();
+				$server = $this->gatewayConfig->getServer();
 		$method = $this->gatewayConfig->getMethod();
 		$user = $this->gatewayConfig->getUsername();
 		$url = $server.$identifier;
 
-                if ($method === "1") {
+				if ($method === "1") {
 		  $from = $user;
-                }
+				}
 		if ($method === "2") {
 		  $from = $sender;
 		}
@@ -85,15 +85,15 @@ 
 
 		try {
 		  $ch = curl_init();
-                  curl_setopt($ch, CURLOPT_URL,            $url );
-                  curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1 );
-                  curl_setopt($ch, CURLOPT_POST,           1 );
-                  curl_setopt($ch, CURLOPT_POSTFIELDS,     $message );
-                  curl_setopt($ch, CURLOPT_USERPWD,        $from.":".$password );
-                  curl_setopt($ch, CURLOPT_HTTPHEADER,     array('Content-Type: text/plain'));
+				  curl_setopt($ch, CURLOPT_URL,            $url );
+				  curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1 );
+				  curl_setopt($ch, CURLOPT_POST,           1 );
+				  curl_setopt($ch, CURLOPT_POSTFIELDS,     $message );
+				  curl_setopt($ch, CURLOPT_USERPWD,        $from.":".$password );
+				  curl_setopt($ch, CURLOPT_HTTPHEADER,     array('Content-Type: text/plain'));
 		  $result = curl_exec($ch);
-                  curl_close($ch);
-                  $this->logger->debug("XMPP message to $identifier sent");
+				  curl_close($ch);
+				  $this->logger->debug("XMPP message to $identifier sent");
 		} catch (Exception $ex) {
 			throw new SmsTransmissionException();
 		}

Spacing +6 added lines, -6 removed lines

@@ -85,12 +85,12 @@
 
 		try {
 		  $ch = curl_init();
-                  curl_setopt($ch, CURLOPT_URL,            $url );
-                  curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1 );
-                  curl_setopt($ch, CURLOPT_POST,           1 );
-                  curl_setopt($ch, CURLOPT_POSTFIELDS,     $message );
-                  curl_setopt($ch, CURLOPT_USERPWD,        $from.":".$password );
-                  curl_setopt($ch, CURLOPT_HTTPHEADER,     array('Content-Type: text/plain'));
+                  curl_setopt($ch, CURLOPT_URL, $url);
+                  curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+                  curl_setopt($ch, CURLOPT_POST, 1);
+                  curl_setopt($ch, CURLOPT_POSTFIELDS, $message);
+                  curl_setopt($ch, CURLOPT_USERPWD, $from.":".$password);
+                  curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: text/plain'));
 		  $result = curl_exec($ch);
                   curl_close($ch);
                   $this->logger->debug("XMPP message to $identifier sent");

lib/Service/Gateway/Factory.php

Indentation +5 added lines, -5 removed lines

@@ -40,8 +40,8 @@ 
 	/** @var TelegramGateway */
 	private $telegramGateway;
 
-        /** @var XMPPGateway */
-        private $xmppGateway;
+		/** @var XMPPGateway */
+		private $xmppGateway;
 
 	public function __construct(SignalGateway $signalGateway,
 								SMSGateway $smsGateway,
@@ -50,7 +50,7 @@ 
 		$this->signalGateway = $signalGateway;
 		$this->smsGateway = $smsGateway;
 		$this->telegramGateway = $telegramGateway;
-                $this->xmppGateway = $xmppGateway;
+				$this->xmppGateway = $xmppGateway;
 	}
 
 	public function getGateway(string $name): IGateway {
@@ -61,8 +61,8 @@ 
 				return $this->smsGateway;
 			case 'telegram':
 				return $this->telegramGateway;
-                        case 'xmpp':
-                                return $this->xmppGateway;
+						case 'xmpp':
+								return $this->xmppGateway;
 			default:
 				throw new Exception("Invalid gateway <$name>");
 		}

lib/Command/Remove.php

Indentation +5 added lines, -5 removed lines

@@ -44,8 +44,8 @@ 
 	/** @var TelegramGateway */
 	private $telegramGateway;
 
-        /** @var XMPPGateway */
-        private $xmppGateway;
+		/** @var XMPPGateway */
+		private $xmppGateway;
 
 	public function __construct(SignalGateway $signalGateway,
 								SMSGateway $smsGateway,
@@ -79,9 +79,9 @@ 
 			case 'telegram':
 				$gateway = $this->telegramGateway;
 				break;
-                        case 'xmpp':
-                                $gateway = $this->xmppGateway;
-                                break;
+						case 'xmpp':
+								$gateway = $this->xmppGateway;
+								break;
 			default:
 				$output->writeln("<error>Invalid gateway $gatewayName</error>");
 				return 1;