nextcloud / twofactor_gateway

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;

lib/Command/Test.php

Indentation +6 added lines, -6 removed lines

@@ -45,8 +45,8 @@ 
 	/** @var TelegramGateway */
 	private $telegramGateway;
 
-        /** @var XMPPGateway */
-        private $xmppGateway;
+		/** @var XMPPGateway */
+		private $xmppGateway;
 
 	/** @var IUserManager */
 	private $userManager;
@@ -54,7 +54,7 @@ 
 	public function __construct(SignalGateway $signalGateway,
 								SMSGateway $smsGateway,
 								TelegramGateway $telegramGateway,
-                                                                XMPPGateway $xmppGateway,
+																XMPPGateway $xmppGateway,
 								IUserManager $userManager) {
 		parent::__construct('twofactorauth:gateway:test');
 		$this->signalGateway = $signalGateway;
@@ -102,9 +102,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;

lib/Command/Configure.php

Indentation +39 added lines, -39 removed lines

@@ -100,9 +100,9 @@ 
 			case 'telegram':
 				$this->configureTelegram($input, $output);
 				return 0;
-                        case 'xmpp':
-                                $this->configureXMPP($input, $output);
-                                return 0;
+						case 'xmpp':
+								$this->configureXMPP($input, $output);
+								return 0;
 			default:
 				$output->writeln("<error>Invalid gateway $gatewayName</error>");
 				return;
@@ -439,64 +439,64 @@ 
 		$config->setBotToken($token);
 	}
 
-        private function configureXMPP(InputInterface $input, OutputInterface $output) {
-                $helper = $this->getHelper('question');
+		private function configureXMPP(InputInterface $input, OutputInterface $output) {
+				$helper = $this->getHelper('question');
 		$sender = '';
 		while (empty($sender) or substr_count($sender,'@') !== 1):
-                  $senderQuestion = new Question('Please enter your sender XMPP-JID: ');
-                  $sender = $helper->ask($input, $output, $senderQuestion);
+				  $senderQuestion = new Question('Please enter your sender XMPP-JID: ');
+				  $sender = $helper->ask($input, $output, $senderQuestion);
 		  if (empty($sender)) {
-		    $output->writeln("XMPP-JID must not be empty!");
+			$output->writeln("XMPP-JID must not be empty!");
 		  }
 		  elseif (substr_count($sender,'@') !== 1) {
-		    $output->writeln("XMPP-JID not valid!");
+			$output->writeln("XMPP-JID not valid!");
 		  }
 		  else { 
-		    $username = explode('@',$sender)[0];
+			$username = explode('@',$sender)[0];
 		  }
 		endwhile;
-                $output->writeln("Using $sender as XMPP-JID.\nUsing $username as username.");
+				$output->writeln("Using $sender as XMPP-JID.\nUsing $username as username.");
 		$password = '';
 		while (empty($password)):
 		  $passwordQuestion = new Question('Please enter your sender XMPP password: ');
-                  $password = $helper->ask($input, $output, $passwordQuestion);
+				  $password = $helper->ask($input, $output, $passwordQuestion);
 		   if (empty($password)) {
-                    $output->writeln("Password must not be empty!");
-                   }
+					$output->writeln("Password must not be empty!");
+				   }
 		endwhile;
-                $output->writeln("Password accepted.");
-                $server = '';
-                while (empty($server)):
-                  $serverQuestion = new Question('Please enter full path to access REST/HTTP API: ');
-                  $server = $helper->ask($input, $output, $serverQuestion);
-                   if (empty($server)) {
-                    $output->writeln("API path must not be empty!");
-                   }
-                endwhile;
-                $output->writeln("Using $server as full URL to access REST/HTTP API.");
-                $method = 0;
-                while (intval($method) < 1 or intval($method) > 2):
+				$output->writeln("Password accepted.");
+				$server = '';
+				while (empty($server)):
+				  $serverQuestion = new Question('Please enter full path to access REST/HTTP API: ');
+				  $server = $helper->ask($input, $output, $serverQuestion);
+				   if (empty($server)) {
+					$output->writeln("API path must not be empty!");
+				   }
+				endwhile;
+				$output->writeln("Using $server as full URL to access REST/HTTP API.");
+				$method = 0;
+				while (intval($method) < 1 or intval($method) > 2):
 		  echo "Please enter 1 or 2 for XMPP sending option:\n";
 		  echo "(1) prosody with mod_rest\n";
 		  echo "(2) prosody with mod_post_msg\n";
-                  $methodQuestion = new Question('Your choice: ');
-                  $method = $helper->ask($input, $output, $methodQuestion);
-                endwhile;
-                if ($method === "1") {
-                  $output->writeln("Using prosody with mod_rest as XMPP sending option.");
-                }
-                elseif ($method === "2") {
-                  $output->writeln("Using prosody with mod_post_msg as XMPP sending option.");
-                }
-                $output->writeln("XMPP Admin Configuration finished.");
+				  $methodQuestion = new Question('Your choice: ');
+				  $method = $helper->ask($input, $output, $methodQuestion);
+				endwhile;
+				if ($method === "1") {
+				  $output->writeln("Using prosody with mod_rest as XMPP sending option.");
+				}
+				elseif ($method === "2") {
+				  $output->writeln("Using prosody with mod_post_msg as XMPP sending option.");
+				}
+				$output->writeln("XMPP Admin Configuration finished.");
 
 		/** @var XMPPConfig $config */
-                $config = $this->xmppGateway->getConfig();
+				$config = $this->xmppGateway->getConfig();
 
-                $config->setSender($sender);
+				$config->setSender($sender);
 		$config->setPassword($password);
 		$config->setServer($server);
 		$config->setUsername($username);
 		$config->setMethod($method);
-        }
+		}
 }

Spacing +3 added lines, -3 removed lines

@@ -442,17 +442,17 @@
         private function configureXMPP(InputInterface $input, OutputInterface $output) {
                 $helper = $this->getHelper('question');
 		$sender = '';
-		while (empty($sender) or substr_count($sender,'@') !== 1):
+		while (empty($sender) or substr_count($sender, '@') !== 1):
                   $senderQuestion = new Question('Please enter your sender XMPP-JID: ');
                   $sender = $helper->ask($input, $output, $senderQuestion);
 		  if (empty($sender)) {
 		    $output->writeln("XMPP-JID must not be empty!");
 		  }
-		  elseif (substr_count($sender,'@') !== 1) {
+		  elseif (substr_count($sender, '@') !== 1) {
 		    $output->writeln("XMPP-JID not valid!");
 		  }
 		  else { 
-		    $username = explode('@',$sender)[0];
+		    $username = explode('@', $sender)[ 0 ];
 		  }
 		endwhile;
                 $output->writeln("Using $sender as XMPP-JID.\nUsing $username as username.");

Braces +3 added lines, -6 removed lines

@@ -447,11 +447,9 @@ 
                   $sender = $helper->ask($input, $output, $senderQuestion);
 		  if (empty($sender)) {
 		    $output->writeln("XMPP-JID must not be empty!");
-		  }
-		  elseif (substr_count($sender,'@') !== 1) {
+		  } elseif (substr_count($sender,'@') !== 1) {
 		    $output->writeln("XMPP-JID not valid!");
-		  }
-		  else { 
+		  } else { 
 		    $username = explode('@',$sender)[0];
 		  }
 		endwhile;
@@ -484,8 +482,7 @@ 
                 endwhile;
                 if ($method === "1") {
                   $output->writeln("Using prosody with mod_rest as XMPP sending option.");
-                }
-                elseif ($method === "2") {
+                } elseif ($method === "2") {
                   $output->writeln("Using prosody with mod_post_msg as XMPP sending option.");
                 }
                 $output->writeln("XMPP Admin Configuration finished.");

lib/Command/Status.php

Indentation +4 added lines, -4 removed lines

@@ -42,8 +42,8 @@ 
 	/** @var TelegramGateway */
 	private $telegramGateway;
 
-        /** @var XMPPGateway */
-        private $xmppGateway;
+		/** @var XMPPGateway */
+		private $xmppGateway;
 
 	public function __construct(SignalGateway $signalGateway,
 								SMSGateway $smsGateway,
@@ -63,8 +63,8 @@ 
 		$output->writeln('SMS gateway: ' . ($smsConfigured ? 'configured' : 'not configured'));
 		$telegramConfigured = $this->telegramGateway->getConfig()->isComplete();
 		$output->writeln('Telegram gateway: ' . ($telegramConfigured ? 'configured' : 'not configured'));
-                $xmppConfigured = $this->xmppGateway->getConfig()->isComplete();
-                $output->writeln('XMPP gateway: ' . ($xmppConfigured ? 'configured' : 'not configured'));
+				$xmppConfigured = $this->xmppGateway->getConfig()->isComplete();
+				$output->writeln('XMPP gateway: ' . ($xmppConfigured ? 'configured' : 'not configured'));
 		return 0;
 	}
 }

Spacing +4 added lines, -4 removed lines

@@ -58,13 +58,13 @@
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		$signalConfigured = $this->signalGateway->getConfig()->isComplete();
-		$output->writeln('Signal gateway: ' . ($signalConfigured ? 'configured' : 'not configured'));
+		$output->writeln('Signal gateway: '.($signalConfigured ? 'configured' : 'not configured'));
 		$smsConfigured = $this->smsGateway->getConfig()->isComplete();
-		$output->writeln('SMS gateway: ' . ($smsConfigured ? 'configured' : 'not configured'));
+		$output->writeln('SMS gateway: '.($smsConfigured ? 'configured' : 'not configured'));
 		$telegramConfigured = $this->telegramGateway->getConfig()->isComplete();
-		$output->writeln('Telegram gateway: ' . ($telegramConfigured ? 'configured' : 'not configured'));
+		$output->writeln('Telegram gateway: '.($telegramConfigured ? 'configured' : 'not configured'));
                 $xmppConfigured = $this->xmppGateway->getConfig()->isComplete();
-                $output->writeln('XMPP gateway: ' . ($xmppConfigured ? 'configured' : 'not configured'));
+                $output->writeln('XMPP gateway: '.($xmppConfigured ? 'configured' : 'not configured'));
 		return 0;
 	}
 }

lib/Provider/Factory.php

Indentation +4 added lines, -4 removed lines

@@ -37,8 +37,8 @@ 
 	/** @var TelegramProvider */
 	private $telegramProvider;
 
-        /** @var XMPPProvider */
-        private $xmppProvider;
+		/** @var XMPPProvider */
+		private $xmppProvider;
 
 	public function __construct(SignalProvider $signalProvider,
 								SmsProvider $smsProvider,
@@ -47,7 +47,7 @@ 
 		$this->signalProvider = $signalProvider;
 		$this->smsProvider = $smsProvider;
 		$this->telegramProvider = $telegramProvider;
-                $this->xmppProvider = $xmppProvider;
+				$this->xmppProvider = $xmppProvider;
 	}
 
 
@@ -60,7 +60,7 @@ 
 			case 'telegram':
 				return $this->telegramProvider;
 			case 'xmpp':
-                                return $this->xmppProvider;
+								return $this->xmppProvider;
 			default:
 				throw new InvalidSmsProviderException();
 		}