nextcloud / server

apps/lookup_server_connector/lib/UpdateLookupServer.php

Indentation +90 added lines, -90 removed lines

@@ -35,102 +35,102 @@
  * @package OCA\LookupServerConnector
  */
 class UpdateLookupServer {
-	/** @var AccountManager */
-	private $accountManager;
-	/** @var IClientService */
-	private $clientService;
-	/** @var Signer */
-	private $signer;
-	/** @var IJobList */
-	private $jobList;
-	/** @var string URL point to lookup server */
-	private $lookupServer = 'https://lookup.nextcloud.com';
+    /** @var AccountManager */
+    private $accountManager;
+    /** @var IClientService */
+    private $clientService;
+    /** @var Signer */
+    private $signer;
+    /** @var IJobList */
+    private $jobList;
+    /** @var string URL point to lookup server */
+    private $lookupServer = 'https://lookup.nextcloud.com';
 
-	/**
-	 * @param AccountManager $accountManager
-	 * @param IClientService $clientService
-	 * @param Signer $signer
-	 * @param IJobList $jobList
-	 * @param string $lookupServer if nothing is given we use the default lookup server
-	 */
-	public function __construct(AccountManager $accountManager,
-								IClientService $clientService,
-								Signer $signer,
-								IJobList $jobList,
-								$lookupServer = '') {
-		$this->accountManager = $accountManager;
-		$this->clientService = $clientService;
-		$this->signer = $signer;
-		$this->jobList = $jobList;
-		if ($lookupServer !== '') {
-			$this->lookupServer = $lookupServer;
-		}
-		$this->lookupServer = rtrim($this->lookupServer, '/');
-		$this->lookupServer .= '/users';
-	}
+    /**
+     * @param AccountManager $accountManager
+     * @param IClientService $clientService
+     * @param Signer $signer
+     * @param IJobList $jobList
+     * @param string $lookupServer if nothing is given we use the default lookup server
+     */
+    public function __construct(AccountManager $accountManager,
+                                IClientService $clientService,
+                                Signer $signer,
+                                IJobList $jobList,
+                                $lookupServer = '') {
+        $this->accountManager = $accountManager;
+        $this->clientService = $clientService;
+        $this->signer = $signer;
+        $this->jobList = $jobList;
+        if ($lookupServer !== '') {
+            $this->lookupServer = $lookupServer;
+        }
+        $this->lookupServer = rtrim($this->lookupServer, '/');
+        $this->lookupServer .= '/users';
+    }
 
-	/**
-	 * @param IUser $user
-	 */
-	public function userUpdated(IUser $user) {
-		$userData = $this->accountManager->getUser($user);
-		$publicData = [];
+    /**
+     * @param IUser $user
+     */
+    public function userUpdated(IUser $user) {
+        $userData = $this->accountManager->getUser($user);
+        $publicData = [];
 
-		foreach ($userData as $key => $data) {
-			if ($data['scope'] === AccountManager::VISIBILITY_PUBLIC) {
-				$publicData[$key] = $data;
-			}
-		}
+        foreach ($userData as $key => $data) {
+            if ($data['scope'] === AccountManager::VISIBILITY_PUBLIC) {
+                $publicData[$key] = $data;
+            }
+        }
 
-		$this->sendToLookupServer($user, $publicData);
-	}
+        $this->sendToLookupServer($user, $publicData);
+    }
 
-	/**
-	 * send public user data to the lookup server
-	 *
-	 * @param IUser $user
-	 * @param array $publicData
-	 */
-	protected function sendToLookupServer(IUser $user, array $publicData) {
+    /**
+     * send public user data to the lookup server
+     *
+     * @param IUser $user
+     * @param array $publicData
+     */
+    protected function sendToLookupServer(IUser $user, array $publicData) {
 
-		$dataArray = ['federationId' => $user->getCloudId()];
+        $dataArray = ['federationId' => $user->getCloudId()];
 
-		if (!empty($publicData)) {
-			$dataArray['name'] = isset($publicData[AccountManager::PROPERTY_DISPLAYNAME]) ? $publicData[AccountManager::PROPERTY_DISPLAYNAME]['value'] : '';
-			$dataArray['email'] = isset($publicData[AccountManager::PROPERTY_EMAIL]) ? $publicData[AccountManager::PROPERTY_EMAIL]['value'] : '';
-			$dataArray['address'] = isset($publicData[AccountManager::PROPERTY_ADDRESS]) ? $publicData[AccountManager::PROPERTY_ADDRESS]['value'] : '';
-			$dataArray['website'] = isset($publicData[AccountManager::PROPERTY_WEBSITE]) ? $publicData[AccountManager::PROPERTY_WEBSITE]['value'] : '';
-			$dataArray['twitter'] = isset($publicData[AccountManager::PROPERTY_TWITTER]) ? $publicData[AccountManager::PROPERTY_TWITTER]['value'] : '';
-			$dataArray['phone'] = isset($publicData[AccountManager::PROPERTY_PHONE]) ? $publicData[AccountManager::PROPERTY_PHONE]['value'] : '';
-		}
+        if (!empty($publicData)) {
+            $dataArray['name'] = isset($publicData[AccountManager::PROPERTY_DISPLAYNAME]) ? $publicData[AccountManager::PROPERTY_DISPLAYNAME]['value'] : '';
+            $dataArray['email'] = isset($publicData[AccountManager::PROPERTY_EMAIL]) ? $publicData[AccountManager::PROPERTY_EMAIL]['value'] : '';
+            $dataArray['address'] = isset($publicData[AccountManager::PROPERTY_ADDRESS]) ? $publicData[AccountManager::PROPERTY_ADDRESS]['value'] : '';
+            $dataArray['website'] = isset($publicData[AccountManager::PROPERTY_WEBSITE]) ? $publicData[AccountManager::PROPERTY_WEBSITE]['value'] : '';
+            $dataArray['twitter'] = isset($publicData[AccountManager::PROPERTY_TWITTER]) ? $publicData[AccountManager::PROPERTY_TWITTER]['value'] : '';
+            $dataArray['phone'] = isset($publicData[AccountManager::PROPERTY_PHONE]) ? $publicData[AccountManager::PROPERTY_PHONE]['value'] : '';
+        }
 
-		$dataArray = $this->signer->sign('lookupserver', $dataArray, $user);
-		$httpClient = $this->clientService->newClient();
-		try {
-			if (empty($publicData)) {
-				$httpClient->delete($this->lookupServer,
-					[
-						'body' => json_encode($dataArray),
-						'timeout' => 10,
-						'connect_timeout' => 3,
-					]
-				);
-			} else {
-				$httpClient->post($this->lookupServer,
-					[
-						'body' => json_encode($dataArray),
-						'timeout' => 10,
-						'connect_timeout' => 3,
-					]
-				);
-			}
-		} catch (\Exception $e) {
-			$this->jobList->add(RetryJob::class,
-				[
-					'dataArray' => $dataArray,
-					'retryNo' => 0,
-				]
-			);
-		}
-	}
+        $dataArray = $this->signer->sign('lookupserver', $dataArray, $user);
+        $httpClient = $this->clientService->newClient();
+        try {
+            if (empty($publicData)) {
+                $httpClient->delete($this->lookupServer,
+                    [
+                        'body' => json_encode($dataArray),
+                        'timeout' => 10,
+                        'connect_timeout' => 3,
+                    ]
+                );
+            } else {
+                $httpClient->post($this->lookupServer,
+                    [
+                        'body' => json_encode($dataArray),
+                        'timeout' => 10,
+                        'connect_timeout' => 3,
+                    ]
+                );
+            }
+        } catch (\Exception $e) {
+            $this->jobList->add(RetryJob::class,
+                [
+                    'dataArray' => $dataArray,
+                    'retryNo' => 0,
+                ]
+            );
+        }
+    }
 }

apps/lookup_server_connector/appinfo/app.php

Indentation +19 added lines, -19 removed lines

@@ -22,26 +22,26 @@
 $dispatcher = \OC::$server->getEventDispatcher();
 
 $dispatcher->addListener('OC\AccountManager::userUpdated', function(\Symfony\Component\EventDispatcher\GenericEvent $event) {
-	$user = $event->getSubject();
+    $user = $event->getSubject();
 
-	$keyManager = new \OC\Security\IdentityProof\Manager(
-		\OC::$server->getAppDataDir('identityproof'),
-		\OC::$server->getCrypto()
-	);
+    $keyManager = new \OC\Security\IdentityProof\Manager(
+        \OC::$server->getAppDataDir('identityproof'),
+        \OC::$server->getCrypto()
+    );
 
-	$config = \OC::$server->getConfig();
-	$lookupServer = $config->getSystemValue('lookup_server', '');
+    $config = \OC::$server->getConfig();
+    $lookupServer = $config->getSystemValue('lookup_server', '');
 
-	$updateLookupServer = new \OCA\LookupServerConnector\UpdateLookupServer(
-		new \OC\Accounts\AccountManager(\OC::$server->getDatabaseConnection(), \OC::$server->getEventDispatcher()),
-		\OC::$server->getHTTPClientService(),
-		new \OC\Security\IdentityProof\Signer(
-			$keyManager,
-			new \OC\AppFramework\Utility\TimeFactory(),
-			\OC::$server->getUserManager()
-		),
-		\OC::$server->getJobList(),
-		$lookupServer
-	);
-	$updateLookupServer->userUpdated($user);
+    $updateLookupServer = new \OCA\LookupServerConnector\UpdateLookupServer(
+        new \OC\Accounts\AccountManager(\OC::$server->getDatabaseConnection(), \OC::$server->getEventDispatcher()),
+        \OC::$server->getHTTPClientService(),
+        new \OC\Security\IdentityProof\Signer(
+            $keyManager,
+            new \OC\AppFramework\Utility\TimeFactory(),
+            \OC::$server->getUserManager()
+        ),
+        \OC::$server->getJobList(),
+        $lookupServer
+    );
+    $updateLookupServer->userUpdated($user);
 });

lib/private/Accounts/AccountManager.php

Spacing +3 added lines, -3 removed lines

@@ -141,19 +141,19 @@
 		$websiteVerified = isset($oldData[self::PROPERTY_WEBSITE]['verified']) && $oldData[self::PROPERTY_WEBSITE]['verified'] === self::VERIFIED;
 		$emailVerified = isset($oldData[self::PROPERTY_EMAIL]['verified']) && $oldData[self::PROPERTY_EMAIL]['verified'] === self::VERIFIED;
 
-		if($twitterVerified &&
+		if ($twitterVerified &&
 			$oldData[self::PROPERTY_TWITTER]['value'] !== $newData[self::PROPERTY_TWITTER]['value']
 		) {
 			$newData[self::PROPERTY_TWITTER]['value']['verified'] = self::NOT_VERIFIED;
 		}
 
-		if($websiteVerified &&
+		if ($websiteVerified &&
 			$oldData[self::PROPERTY_WEBSITE]['value'] !== $newData[self::PROPERTY_WEBSITE]['value']
 		) {
 			$newData[self::PROPERTY_WEBSITE]['value']['verified'] = self::NOT_VERIFIED;
 		}
 
-		if($emailVerified &&
+		if ($emailVerified &&
 			$oldData[self::PROPERTY_EMAIL]['value'] !== $newData[self::PROPERTY_EMAIL]['value']
 		) {
 			$newData[self::PROPERTY_EMAIL]['value']['verified'] = self::NOT_VERIFIED;

Indentation +211 added lines, -211 removed lines

@@ -38,216 +38,216 @@
  */
 class AccountManager {
 
-	/** nobody can see my account details */
-	const VISIBILITY_PRIVATE = 'private';
-	/** only contacts, especially trusted servers can see my contact details */
-	const VISIBILITY_CONTACTS_ONLY = 'contacts';
-	/** every body ca see my contact detail, will be published to the lookup server */
-	const VISIBILITY_PUBLIC = 'public';
-
-	const PROPERTY_AVATAR = 'avatar';
-	const PROPERTY_DISPLAYNAME = 'displayname';
-	const PROPERTY_PHONE = 'phone';
-	const PROPERTY_EMAIL = 'email';
-	const PROPERTY_WEBSITE = 'website';
-	const PROPERTY_ADDRESS = 'address';
-	const PROPERTY_TWITTER = 'twitter';
-
-	const NOT_VERIFIED = '0';
-	const VERIFICATION_IN_PROGRESS = '1';
-	const VERIFIED = '2';
-
-	/** @var  IDBConnection database connection */
-	private $connection;
-
-	/** @var string table name */
-	private $table = 'accounts';
-
-	/** @var EventDispatcherInterface */
-	private $eventDispatcher;
-
-	/**
-	 * AccountManager constructor.
-	 *
-	 * @param IDBConnection $connection
-	 * @param EventDispatcherInterface $eventDispatcher
-	 */
-	public function __construct(IDBConnection $connection, EventDispatcherInterface $eventDispatcher) {
-		$this->connection = $connection;
-		$this->eventDispatcher = $eventDispatcher;
-	}
-
-	/**
-	 * update user record
-	 *
-	 * @param IUser $user
-	 * @param $data
-	 */
-	public function updateUser(IUser $user, $data) {
-		$userData = $this->getUser($user);
-		$updated = true;
-		if (empty($userData)) {
-			$this->insertNewUser($user, $data);
-		} elseif ($userData !== $data) {
-			$data = $this->updateVerifyStatus($userData, $data);
-			$this->updateExistingUser($user, $data);
-		} else {
-			// nothing needs to be done if new and old data set are the same
-			$updated = false;
-		}
-
-		if ($updated) {
-			$this->eventDispatcher->dispatch(
-				'OC\AccountManager::userUpdated',
-				new GenericEvent($user, $data)
-			);
-		}
-	}
-
-	/**
-	 * get stored data from a given user
-	 *
-	 * @param IUser $user
-	 * @return array
-	 */
-	public function getUser(IUser $user) {
-		$uid = $user->getUID();
-		$query = $this->connection->getQueryBuilder();
-		$query->select('data')->from($this->table)
-			->where($query->expr()->eq('uid', $query->createParameter('uid')))
-			->setParameter('uid', $uid);
-		$query->execute();
-		$result = $query->execute()->fetchAll();
-
-		if (empty($result)) {
-			$userData = $this->buildDefaultUserRecord($user);
-			$this->insertNewUser($user, $userData);
-			return $userData;
-		}
-
-		return json_decode($result[0]['data'], true);
-	}
-
-	/**
-	 * reset verification status if personal data changed
-	 *
-	 * @param array $oldData
-	 * @param array $newData
-	 * @return array
-	 */
-	protected function updateVerifyStatus($oldData, $newData) {
-
-		$twitterVerified = isset($oldData[self::PROPERTY_TWITTER]['verified']) && $oldData[self::PROPERTY_TWITTER]['verified'] === self::VERIFIED;
-		$websiteVerified = isset($oldData[self::PROPERTY_WEBSITE]['verified']) && $oldData[self::PROPERTY_WEBSITE]['verified'] === self::VERIFIED;
-		$emailVerified = isset($oldData[self::PROPERTY_EMAIL]['verified']) && $oldData[self::PROPERTY_EMAIL]['verified'] === self::VERIFIED;
-
-		if($twitterVerified &&
-			$oldData[self::PROPERTY_TWITTER]['value'] !== $newData[self::PROPERTY_TWITTER]['value']
-		) {
-			$newData[self::PROPERTY_TWITTER]['value']['verified'] = self::NOT_VERIFIED;
-		}
-
-		if($websiteVerified &&
-			$oldData[self::PROPERTY_WEBSITE]['value'] !== $newData[self::PROPERTY_WEBSITE]['value']
-		) {
-			$newData[self::PROPERTY_WEBSITE]['value']['verified'] = self::NOT_VERIFIED;
-		}
-
-		if($emailVerified &&
-			$oldData[self::PROPERTY_EMAIL]['value'] !== $newData[self::PROPERTY_EMAIL]['value']
-		) {
-			$newData[self::PROPERTY_EMAIL]['value']['verified'] = self::NOT_VERIFIED;
-		}
-
-		return $newData;
-
-	}
-
-	/**
-	 * add new user to accounts table
-	 *
-	 * @param IUser $user
-	 * @param array $data
-	 */
-	protected function insertNewUser(IUser $user, $data) {
-		$uid = $user->getUID();
-		$jsonEncodedData = json_encode($data);
-		$query = $this->connection->getQueryBuilder();
-		$query->insert($this->table)
-			->values(
-				[
-					'uid' => $query->createNamedParameter($uid),
-					'data' => $query->createNamedParameter($jsonEncodedData),
-				]
-			)
-			->execute();
-	}
-
-	/**
-	 * update existing user in accounts table
-	 *
-	 * @param IUser $user
-	 * @param array $data
-	 */
-	protected function updateExistingUser(IUser $user, $data) {
-		$uid = $user->getUID();
-		$jsonEncodedData = json_encode($data);
-		$query = $this->connection->getQueryBuilder();
-		$query->update($this->table)
-			->set('data', $query->createNamedParameter($jsonEncodedData))
-			->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
-			->execute();
-	}
-
-	/**
-	 * build default user record in case not data set exists yet
-	 *
-	 * @param IUser $user
-	 * @return array
-	 */
-	protected function buildDefaultUserRecord(IUser $user) {
-		return [
-			self::PROPERTY_DISPLAYNAME =>
-				[
-					'value' => $user->getDisplayName(),
-					'scope' => self::VISIBILITY_CONTACTS_ONLY,
-					'verified' => '0',
-				],
-			self::PROPERTY_ADDRESS =>
-				[
-					'value' => '',
-					'scope' => self::VISIBILITY_PRIVATE,
-					'verified' => '0',
-				],
-			self::PROPERTY_WEBSITE =>
-				[
-					'value' => '',
-					'scope' => self::VISIBILITY_PRIVATE,
-					'verified' => '0',
-				],
-			self::PROPERTY_EMAIL =>
-				[
-					'value' => $user->getEMailAddress(),
-					'scope' => self::VISIBILITY_CONTACTS_ONLY,
-					'verified' => '0',
-				],
-			self::PROPERTY_AVATAR =>
-				[
-					'scope' => self::VISIBILITY_CONTACTS_ONLY
-				],
-			self::PROPERTY_PHONE =>
-				[
-					'value' => '',
-					'scope' => self::VISIBILITY_PRIVATE,
-					'verified' => '0',
-				],
-			self::PROPERTY_TWITTER =>
-				[
-					'value' => '',
-					'scope' => self::VISIBILITY_PRIVATE,
-					'verified' => '0',
-				],
-		];
-	}
+    /** nobody can see my account details */
+    const VISIBILITY_PRIVATE = 'private';
+    /** only contacts, especially trusted servers can see my contact details */
+    const VISIBILITY_CONTACTS_ONLY = 'contacts';
+    /** every body ca see my contact detail, will be published to the lookup server */
+    const VISIBILITY_PUBLIC = 'public';
+
+    const PROPERTY_AVATAR = 'avatar';
+    const PROPERTY_DISPLAYNAME = 'displayname';
+    const PROPERTY_PHONE = 'phone';
+    const PROPERTY_EMAIL = 'email';
+    const PROPERTY_WEBSITE = 'website';
+    const PROPERTY_ADDRESS = 'address';
+    const PROPERTY_TWITTER = 'twitter';
+
+    const NOT_VERIFIED = '0';
+    const VERIFICATION_IN_PROGRESS = '1';
+    const VERIFIED = '2';
+
+    /** @var  IDBConnection database connection */
+    private $connection;
+
+    /** @var string table name */
+    private $table = 'accounts';
+
+    /** @var EventDispatcherInterface */
+    private $eventDispatcher;
+
+    /**
+     * AccountManager constructor.
+     *
+     * @param IDBConnection $connection
+     * @param EventDispatcherInterface $eventDispatcher
+     */
+    public function __construct(IDBConnection $connection, EventDispatcherInterface $eventDispatcher) {
+        $this->connection = $connection;
+        $this->eventDispatcher = $eventDispatcher;
+    }
+
+    /**
+     * update user record
+     *
+     * @param IUser $user
+     * @param $data
+     */
+    public function updateUser(IUser $user, $data) {
+        $userData = $this->getUser($user);
+        $updated = true;
+        if (empty($userData)) {
+            $this->insertNewUser($user, $data);
+        } elseif ($userData !== $data) {
+            $data = $this->updateVerifyStatus($userData, $data);
+            $this->updateExistingUser($user, $data);
+        } else {
+            // nothing needs to be done if new and old data set are the same
+            $updated = false;
+        }
+
+        if ($updated) {
+            $this->eventDispatcher->dispatch(
+                'OC\AccountManager::userUpdated',
+                new GenericEvent($user, $data)
+            );
+        }
+    }
+
+    /**
+     * get stored data from a given user
+     *
+     * @param IUser $user
+     * @return array
+     */
+    public function getUser(IUser $user) {
+        $uid = $user->getUID();
+        $query = $this->connection->getQueryBuilder();
+        $query->select('data')->from($this->table)
+            ->where($query->expr()->eq('uid', $query->createParameter('uid')))
+            ->setParameter('uid', $uid);
+        $query->execute();
+        $result = $query->execute()->fetchAll();
+
+        if (empty($result)) {
+            $userData = $this->buildDefaultUserRecord($user);
+            $this->insertNewUser($user, $userData);
+            return $userData;
+        }
+
+        return json_decode($result[0]['data'], true);
+    }
+
+    /**
+     * reset verification status if personal data changed
+     *
+     * @param array $oldData
+     * @param array $newData
+     * @return array
+     */
+    protected function updateVerifyStatus($oldData, $newData) {
+
+        $twitterVerified = isset($oldData[self::PROPERTY_TWITTER]['verified']) && $oldData[self::PROPERTY_TWITTER]['verified'] === self::VERIFIED;
+        $websiteVerified = isset($oldData[self::PROPERTY_WEBSITE]['verified']) && $oldData[self::PROPERTY_WEBSITE]['verified'] === self::VERIFIED;
+        $emailVerified = isset($oldData[self::PROPERTY_EMAIL]['verified']) && $oldData[self::PROPERTY_EMAIL]['verified'] === self::VERIFIED;
+
+        if($twitterVerified &&
+            $oldData[self::PROPERTY_TWITTER]['value'] !== $newData[self::PROPERTY_TWITTER]['value']
+        ) {
+            $newData[self::PROPERTY_TWITTER]['value']['verified'] = self::NOT_VERIFIED;
+        }
+
+        if($websiteVerified &&
+            $oldData[self::PROPERTY_WEBSITE]['value'] !== $newData[self::PROPERTY_WEBSITE]['value']
+        ) {
+            $newData[self::PROPERTY_WEBSITE]['value']['verified'] = self::NOT_VERIFIED;
+        }
+
+        if($emailVerified &&
+            $oldData[self::PROPERTY_EMAIL]['value'] !== $newData[self::PROPERTY_EMAIL]['value']
+        ) {
+            $newData[self::PROPERTY_EMAIL]['value']['verified'] = self::NOT_VERIFIED;
+        }
+
+        return $newData;
+
+    }
+
+    /**
+     * add new user to accounts table
+     *
+     * @param IUser $user
+     * @param array $data
+     */
+    protected function insertNewUser(IUser $user, $data) {
+        $uid = $user->getUID();
+        $jsonEncodedData = json_encode($data);
+        $query = $this->connection->getQueryBuilder();
+        $query->insert($this->table)
+            ->values(
+                [
+                    'uid' => $query->createNamedParameter($uid),
+                    'data' => $query->createNamedParameter($jsonEncodedData),
+                ]
+            )
+            ->execute();
+    }
+
+    /**
+     * update existing user in accounts table
+     *
+     * @param IUser $user
+     * @param array $data
+     */
+    protected function updateExistingUser(IUser $user, $data) {
+        $uid = $user->getUID();
+        $jsonEncodedData = json_encode($data);
+        $query = $this->connection->getQueryBuilder();
+        $query->update($this->table)
+            ->set('data', $query->createNamedParameter($jsonEncodedData))
+            ->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
+            ->execute();
+    }
+
+    /**
+     * build default user record in case not data set exists yet
+     *
+     * @param IUser $user
+     * @return array
+     */
+    protected function buildDefaultUserRecord(IUser $user) {
+        return [
+            self::PROPERTY_DISPLAYNAME =>
+                [
+                    'value' => $user->getDisplayName(),
+                    'scope' => self::VISIBILITY_CONTACTS_ONLY,
+                    'verified' => '0',
+                ],
+            self::PROPERTY_ADDRESS =>
+                [
+                    'value' => '',
+                    'scope' => self::VISIBILITY_PRIVATE,
+                    'verified' => '0',
+                ],
+            self::PROPERTY_WEBSITE =>
+                [
+                    'value' => '',
+                    'scope' => self::VISIBILITY_PRIVATE,
+                    'verified' => '0',
+                ],
+            self::PROPERTY_EMAIL =>
+                [
+                    'value' => $user->getEMailAddress(),
+                    'scope' => self::VISIBILITY_CONTACTS_ONLY,
+                    'verified' => '0',
+                ],
+            self::PROPERTY_AVATAR =>
+                [
+                    'scope' => self::VISIBILITY_CONTACTS_ONLY
+                ],
+            self::PROPERTY_PHONE =>
+                [
+                    'value' => '',
+                    'scope' => self::VISIBILITY_PRIVATE,
+                    'verified' => '0',
+                ],
+            self::PROPERTY_TWITTER =>
+                [
+                    'value' => '',
+                    'scope' => self::VISIBILITY_PRIVATE,
+                    'verified' => '0',
+                ],
+        ];
+    }
 
 }

settings/routes.php

Indentation +52 added lines, -52 removed lines

@@ -36,77 +36,77 @@
 
 $application = new Application();
 $application->registerRoutes($this, [
-	'resources' => [
-		'users' => ['url' => '/settings/users/users'],
-		'AuthSettings' => ['url' => '/settings/personal/authtokens'],
-	],
-	'routes' => [
-		['name' => 'MailSettings#setMailSettings', 'url' => '/settings/admin/mailsettings', 'verb' => 'POST'],
-		['name' => 'MailSettings#storeCredentials', 'url' => '/settings/admin/mailsettings/credentials', 'verb' => 'POST'],
-		['name' => 'MailSettings#sendTestMail', 'url' => '/settings/admin/mailtest', 'verb' => 'POST'],
-		['name' => 'Encryption#startMigration', 'url' => '/settings/admin/startmigration', 'verb' => 'POST'],
-		['name' => 'AppSettings#listCategories', 'url' => '/settings/apps/categories', 'verb' => 'GET'],
-		['name' => 'AppSettings#viewApps', 'url' => '/settings/apps', 'verb' => 'GET'],
-		['name' => 'AppSettings#listApps', 'url' => '/settings/apps/list', 'verb' => 'GET'],
-		['name' => 'SecuritySettings#trustedDomains', 'url' => '/settings/admin/security/trustedDomains', 'verb' => 'POST'],
-		['name' => 'Users#setDisplayName', 'url' => '/settings/users/{username}/displayName', 'verb' => 'POST'],
-		['name' => 'Users#setEMailAddress', 'url' => '/settings/users/{id}/mailAddress', 'verb' => 'PUT'],
-		['name' => 'Users#setUserSettings', 'url' => '/settings/users/{username}/settings', 'verb' => 'PUT'],
-		['name' => 'Users#getVerificationCode', 'url' => '/settings/users/{account}/verify', 'verb' => 'GET'],
-		['name' => 'Users#stats', 'url' => '/settings/users/stats', 'verb' => 'GET'],
-		['name' => 'LogSettings#setLogLevel', 'url' => '/settings/admin/log/level', 'verb' => 'POST'],
-		['name' => 'LogSettings#getEntries', 'url' => '/settings/admin/log/entries', 'verb' => 'GET'],
-		['name' => 'LogSettings#download', 'url' => '/settings/admin/log/download', 'verb' => 'GET'],
-		['name' => 'CheckSetup#check', 'url' => '/settings/ajax/checksetup', 'verb' => 'GET'],
-		['name' => 'CheckSetup#getFailedIntegrityCheckFiles', 'url' => '/settings/integrity/failed', 'verb' => 'GET'],
-		['name' => 'CheckSetup#rescanFailedIntegrityCheck', 'url' => '/settings/integrity/rescan', 'verb' => 'GET'],
-		['name' => 'Certificate#addPersonalRootCertificate', 'url' => '/settings/personal/certificate', 'verb' => 'POST'],
-		['name' => 'Certificate#removePersonalRootCertificate', 'url' => '/settings/personal/certificate/{certificateIdentifier}', 'verb' => 'DELETE'],
-		['name' => 'Certificate#addSystemRootCertificate', 'url' => '/settings/admin/certificate', 'verb' => 'POST'],
-		['name' => 'Certificate#removeSystemRootCertificate', 'url' => '/settings/admin/certificate/{certificateIdentifier}', 'verb' => 'DELETE'],
-		['name' => 'AdminSettings#index', 'url' => '/settings/admin/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'server']],
-		['name' => 'AdminSettings#form', 'url' => '/settings/admin/{section}', 'verb' => 'GET'],
-		['name' => 'ChangePassword#changePersonalPassword', 'url' => '/settings/personal/changepassword', 'verb' => 'POST'],
-		['name' => 'ChangePassword#changeUserPassword', 'url' => '/settings/users/changepassword', 'verb' => 'POST'],
-		['name' => 'Personal#setLanguage', 'url' => '/settings/ajax/setlanguage.php', 'verb' => 'POST'],
-		['name' => 'Groups#index', 'url' => '/settings/users/groups', 'verb' => 'GET'],
-		['name' => 'Groups#show', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'GET'],
-		['name' => 'Groups#create', 'url' => '/settings/users/groups', 'verb' => 'POST'],
-		['name' => 'Groups#update', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'PUT'],
-		['name' => 'Groups#destroy', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'DELETE'],
-	]
+    'resources' => [
+        'users' => ['url' => '/settings/users/users'],
+        'AuthSettings' => ['url' => '/settings/personal/authtokens'],
+    ],
+    'routes' => [
+        ['name' => 'MailSettings#setMailSettings', 'url' => '/settings/admin/mailsettings', 'verb' => 'POST'],
+        ['name' => 'MailSettings#storeCredentials', 'url' => '/settings/admin/mailsettings/credentials', 'verb' => 'POST'],
+        ['name' => 'MailSettings#sendTestMail', 'url' => '/settings/admin/mailtest', 'verb' => 'POST'],
+        ['name' => 'Encryption#startMigration', 'url' => '/settings/admin/startmigration', 'verb' => 'POST'],
+        ['name' => 'AppSettings#listCategories', 'url' => '/settings/apps/categories', 'verb' => 'GET'],
+        ['name' => 'AppSettings#viewApps', 'url' => '/settings/apps', 'verb' => 'GET'],
+        ['name' => 'AppSettings#listApps', 'url' => '/settings/apps/list', 'verb' => 'GET'],
+        ['name' => 'SecuritySettings#trustedDomains', 'url' => '/settings/admin/security/trustedDomains', 'verb' => 'POST'],
+        ['name' => 'Users#setDisplayName', 'url' => '/settings/users/{username}/displayName', 'verb' => 'POST'],
+        ['name' => 'Users#setEMailAddress', 'url' => '/settings/users/{id}/mailAddress', 'verb' => 'PUT'],
+        ['name' => 'Users#setUserSettings', 'url' => '/settings/users/{username}/settings', 'verb' => 'PUT'],
+        ['name' => 'Users#getVerificationCode', 'url' => '/settings/users/{account}/verify', 'verb' => 'GET'],
+        ['name' => 'Users#stats', 'url' => '/settings/users/stats', 'verb' => 'GET'],
+        ['name' => 'LogSettings#setLogLevel', 'url' => '/settings/admin/log/level', 'verb' => 'POST'],
+        ['name' => 'LogSettings#getEntries', 'url' => '/settings/admin/log/entries', 'verb' => 'GET'],
+        ['name' => 'LogSettings#download', 'url' => '/settings/admin/log/download', 'verb' => 'GET'],
+        ['name' => 'CheckSetup#check', 'url' => '/settings/ajax/checksetup', 'verb' => 'GET'],
+        ['name' => 'CheckSetup#getFailedIntegrityCheckFiles', 'url' => '/settings/integrity/failed', 'verb' => 'GET'],
+        ['name' => 'CheckSetup#rescanFailedIntegrityCheck', 'url' => '/settings/integrity/rescan', 'verb' => 'GET'],
+        ['name' => 'Certificate#addPersonalRootCertificate', 'url' => '/settings/personal/certificate', 'verb' => 'POST'],
+        ['name' => 'Certificate#removePersonalRootCertificate', 'url' => '/settings/personal/certificate/{certificateIdentifier}', 'verb' => 'DELETE'],
+        ['name' => 'Certificate#addSystemRootCertificate', 'url' => '/settings/admin/certificate', 'verb' => 'POST'],
+        ['name' => 'Certificate#removeSystemRootCertificate', 'url' => '/settings/admin/certificate/{certificateIdentifier}', 'verb' => 'DELETE'],
+        ['name' => 'AdminSettings#index', 'url' => '/settings/admin/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'server']],
+        ['name' => 'AdminSettings#form', 'url' => '/settings/admin/{section}', 'verb' => 'GET'],
+        ['name' => 'ChangePassword#changePersonalPassword', 'url' => '/settings/personal/changepassword', 'verb' => 'POST'],
+        ['name' => 'ChangePassword#changeUserPassword', 'url' => '/settings/users/changepassword', 'verb' => 'POST'],
+        ['name' => 'Personal#setLanguage', 'url' => '/settings/ajax/setlanguage.php', 'verb' => 'POST'],
+        ['name' => 'Groups#index', 'url' => '/settings/users/groups', 'verb' => 'GET'],
+        ['name' => 'Groups#show', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'GET'],
+        ['name' => 'Groups#create', 'url' => '/settings/users/groups', 'verb' => 'POST'],
+        ['name' => 'Groups#update', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'PUT'],
+        ['name' => 'Groups#destroy', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'DELETE'],
+    ]
 ]);
 
 /** @var $this \OCP\Route\IRouter */
 
 // Settings pages
 $this->create('settings_help', '/settings/help')
-	->actionInclude('settings/help.php');
+    ->actionInclude('settings/help.php');
 $this->create('settings_personal', '/settings/personal')
-	->actionInclude('settings/personal.php');
+    ->actionInclude('settings/personal.php');
 $this->create('settings_users', '/settings/users')
-	->actionInclude('settings/users.php');
+    ->actionInclude('settings/users.php');
 // Settings ajax actions
 // users
 $this->create('settings_ajax_setquota', '/settings/ajax/setquota.php')
-	->actionInclude('settings/ajax/setquota.php');
+    ->actionInclude('settings/ajax/setquota.php');
 $this->create('settings_ajax_togglegroups', '/settings/ajax/togglegroups.php')
-	->actionInclude('settings/ajax/togglegroups.php');
+    ->actionInclude('settings/ajax/togglegroups.php');
 $this->create('settings_ajax_togglesubadmins', '/settings/ajax/togglesubadmins.php')
-	->actionInclude('settings/ajax/togglesubadmins.php');
+    ->actionInclude('settings/ajax/togglesubadmins.php');
 $this->create('settings_ajax_changegorupname', '/settings/ajax/changegroupname.php')
-	->actionInclude('settings/ajax/changegroupname.php');
+    ->actionInclude('settings/ajax/changegroupname.php');
 // apps
 $this->create('settings_ajax_enableapp', '/settings/ajax/enableapp.php')
-	->actionInclude('settings/ajax/enableapp.php');
+    ->actionInclude('settings/ajax/enableapp.php');
 $this->create('settings_ajax_disableapp', '/settings/ajax/disableapp.php')
-	->actionInclude('settings/ajax/disableapp.php');
+    ->actionInclude('settings/ajax/disableapp.php');
 $this->create('settings_ajax_updateapp', '/settings/ajax/updateapp.php')
-	->actionInclude('settings/ajax/updateapp.php');
+    ->actionInclude('settings/ajax/updateapp.php');
 $this->create('settings_ajax_uninstallapp', '/settings/ajax/uninstallapp.php')
-	->actionInclude('settings/ajax/uninstallapp.php');
+    ->actionInclude('settings/ajax/uninstallapp.php');
 $this->create('settings_ajax_navigationdetect', '/settings/ajax/navigationdetect.php')
-	->actionInclude('settings/ajax/navigationdetect.php');
+    ->actionInclude('settings/ajax/navigationdetect.php');
 // admin
 $this->create('settings_ajax_excludegroups', '/settings/ajax/excludegroups.php')
-	->actionInclude('settings/ajax/excludegroups.php');
+    ->actionInclude('settings/ajax/excludegroups.php');

settings/templates/personal.php

Spacing +52 added lines, -52 removed lines

@@ -22,10 +22,10 @@ 
 
 <div id="app-navigation">
 	<ul class="with-icon">
-	<?php foreach($_['forms'] as $form) {
+	<?php foreach ($_['forms'] as $form) {
 		if (isset($form['anchor'])) {
-			$anchor = '#' . $form['anchor'];
-			$class = 'nav-icon-' . $form['anchor'];
+			$anchor = '#'.$form['anchor'];
+			$class = 'nav-icon-'.$form['anchor'];
 			$sectionName = $form['section-name'];
 			print_unescaped(sprintf("<li><a href='%s' class='%s'>%s</a></li>", \OCP\Util::sanitizeHTML($anchor),
 			\OCP\Util::sanitizeHTML($class), \OCP\Util::sanitizeHTML($sectionName)));
@@ -37,15 +37,15 @@ 
 <div id="app-content">
 
 <div id="quota" class="section">
-	<div style="width:<?php p($_['usage_relative']);?>%"
-		<?php if($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
+	<div style="width:<?php p($_['usage_relative']); ?>%"
+		<?php if ($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
 		<p id="quotatext">
 			<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
-					[$_['usage'], $_['total_space']]));?>
+					[$_['usage'], $_['total_space']])); ?>
 			<?php else: ?>
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
-					[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
+					[$_['usage'], $_['total_space'], $_['usage_relative']])); ?>
 			<?php endif ?>
 		</p>
 	</div>
@@ -79,7 +79,7 @@ 
 			</div>
 		</div>
 		<span class="icon-checkmark hidden"/>
-		<?php if($_['lookupServerUploadEnabled']) { ?>
+		<?php if ($_['lookupServerUploadEnabled']) { ?>
 		<input type="hidden" id="avatarscope" value="<?php p($_['avatarScope']) ?>">
 		<?php } ?>
 	</form>
@@ -93,14 +93,14 @@ 
 				<span class="icon-password"/>
 			</h2>
 			<input type="text" id="displayname" name="displayname"
-				<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
+				<?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
 				value="<?php p($_['displayName']) ?>"
 				autocomplete="on" autocapitalize="none" autocorrect="off" />
-			<?php if(!$_['displayNameChangeSupported']) { ?>
-				<span><?php if(isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
+			<?php if (!$_['displayNameChangeSupported']) { ?>
+				<span><?php if (isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
 			<?php } ?>
 			<span class="icon-checkmark hidden"/>
-			<?php if($_['lookupServerUploadEnabled']) { ?>
+			<?php if ($_['lookupServerUploadEnabled']) { ?>
 			<input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>">
 			<?php } ?>
 		</form>
@@ -113,23 +113,23 @@ 
 			</h2>
 			<span class="verify" id="verify-email">Verify</span>
 			<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
-				<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
+				<?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
 				placeholder="<?php p($l->t('Your email address')); ?>"
 				autocomplete="on" autocapitalize="none" autocorrect="off" />
-			<?php if(!$_['displayNameChangeSupported']) { ?>
-				<span><?php if(isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
+			<?php if (!$_['displayNameChangeSupported']) { ?>
+				<span><?php if (isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
 			<?php } ?>
-			<?php if($_['displayNameChangeSupported']) { ?>
+			<?php if ($_['displayNameChangeSupported']) { ?>
 				<br />
 				<em><?php p($l->t('For password reset and notifications')); ?></em>
 			<?php } ?>
 			<span class="icon-checkmark hidden"/>
-			<?php if($_['lookupServerUploadEnabled']) { ?>
+			<?php if ($_['lookupServerUploadEnabled']) { ?>
 			<input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>">
 			<?php } ?>
 		</form>
 	</div>
-	<?php if($_['lookupServerUploadEnabled']) { ?>
+	<?php if ($_['lookupServerUploadEnabled']) { ?>
 	<div class="personal-settings-setting-box">
 		<form id="phoneform" class="section">
 			<h2>
@@ -200,19 +200,19 @@ 
 </div>
 
 <?php
-if($_['passwordChangeSupported']) {
+if ($_['passwordChangeSupported']) {
 	script('jquery-showpassword');
 ?>
 <form id="passwordform" class="section">
-	<h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
+	<h2 class="inlineblock"><?php p($l->t('Password')); ?></h2>
 	<div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div>
 	<br>
 	<label for="pass1" class="hidden-visually"><?php p($l->t('Current password')); ?>: </label>
 	<input type="password" id="pass1" name="oldpassword"
-		placeholder="<?php p($l->t('Current password'));?>"
+		placeholder="<?php p($l->t('Current password')); ?>"
 		autocomplete="off" autocapitalize="none" autocorrect="off" />
 	<div class="personal-show-container">
-		<label for="pass2" class="hidden-visually"><?php p($l->t('New password'));?>: </label>
+		<label for="pass2" class="hidden-visually"><?php p($l->t('New password')); ?>: </label>
 		<input type="password" id="pass2" name="newpassword"
 			placeholder="<?php p($l->t('New password')); ?>"
 			data-typetoggle="#personal-show"
@@ -228,44 +228,44 @@ 
 
 <form id="language" class="section">
 	<h2>
-		<label for="languageinput"><?php p($l->t('Language'));?></label>
+		<label for="languageinput"><?php p($l->t('Language')); ?></label>
 	</h2>
-	<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
-		<option value="<?php p($_['activelanguage']['code']);?>">
-			<?php p($_['activelanguage']['name']);?>
+	<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language')); ?>">
+		<option value="<?php p($_['activelanguage']['code']); ?>">
+			<?php p($_['activelanguage']['name']); ?>
 		</option>
-		<?php foreach($_['commonlanguages'] as $language):?>
-			<option value="<?php p($language['code']);?>">
-				<?php p($language['name']);?>
+		<?php foreach ($_['commonlanguages'] as $language):?>
+			<option value="<?php p($language['code']); ?>">
+				<?php p($language['name']); ?>
 			</option>
-		<?php endforeach;?>
+		<?php endforeach; ?>
 		<optgroup label="––––––––––"></optgroup>
-		<?php foreach($_['languages'] as $language):?>
-			<option value="<?php p($language['code']);?>">
-				<?php p($language['name']);?>
+		<?php foreach ($_['languages'] as $language):?>
+			<option value="<?php p($language['code']); ?>">
+				<?php p($language['name']); ?>
 			</option>
-		<?php endforeach;?>
+		<?php endforeach; ?>
 	</select>
 	<a href="https://www.transifex.com/nextcloud/nextcloud/"
 		target="_blank" rel="noreferrer">
-		<em><?php p($l->t('Help translate'));?></em>
+		<em><?php p($l->t('Help translate')); ?></em>
 	</a>
 </form>
 
 
 <div id="clientsbox" class="section clientsbox">
-	<h2><?php p($l->t('Get the apps to sync your files'));?></h2>
+	<h2><?php p($l->t('Get the apps to sync your files')); ?></h2>
 	<a href="<?php p($_['clients']['desktop']); ?>" rel="noreferrer" target="_blank">
 		<img src="<?php print_unescaped(image_path('core', 'desktopapp.svg')); ?>"
-			 alt="<?php p($l->t('Desktop client'));?>" />
+			 alt="<?php p($l->t('Desktop client')); ?>" />
 	</a>
 	<a href="<?php p($_['clients']['android']); ?>" rel="noreferrer" target="_blank">
 		<img src="<?php print_unescaped(image_path('core', 'googleplay.png')); ?>"
-			 alt="<?php p($l->t('Android app'));?>" />
+			 alt="<?php p($l->t('Android app')); ?>" />
 	</a>
 	<a href="<?php p($_['clients']['ios']); ?>" rel="noreferrer" target="_blank">
 		<img src="<?php print_unescaped(image_path('core', 'appstore.svg')); ?>"
-			 alt="<?php p($l->t('iOS app'));?>" />
+			 alt="<?php p($l->t('iOS app')); ?>" />
 	</a>
 
 		<p>
@@ -281,19 +281,19 @@ 
 				$l->t('If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!'))); ?>
 		</p>
 
-	<?php if(OC_APP::isEnabled('firstrunwizard')) {?>
-		<p><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again'));?></a></p>
+	<?php if (OC_APP::isEnabled('firstrunwizard')) {?>
+		<p><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again')); ?></a></p>
 	<?php }?>
 </div>
 
 <div id="sessions" class="section">
-	<h2><?php p($l->t('Sessions'));?></h2>
-	<span class="hidden-when-empty"><?php p($l->t('Web, desktop and mobile clients currently logged in to your account.'));?></span>
+	<h2><?php p($l->t('Sessions')); ?></h2>
+	<span class="hidden-when-empty"><?php p($l->t('Web, desktop and mobile clients currently logged in to your account.')); ?></span>
 	<table class="icon-loading">
 		<thead class="token-list-header">
 			<tr>
-				<th><?php p($l->t('Device'));?></th>
-				<th><?php p($l->t('Last activity'));?></th>
+				<th><?php p($l->t('Device')); ?></th>
+				<th><?php p($l->t('Last activity')); ?></th>
 				<th></th>
 			</tr>
 		</thead>
@@ -303,13 +303,13 @@ 
 </div>
 
 <div id="apppasswords" class="section">
-	<h2><?php p($l->t('App passwords'));?></h2>
-	<p><?php p($l->t('Passcodes that give an app or device permissions to access your account.'));?></p>
+	<h2><?php p($l->t('App passwords')); ?></h2>
+	<p><?php p($l->t('Passcodes that give an app or device permissions to access your account.')); ?></p>
 	<table class="icon-loading">
 		<thead class="hidden-when-empty">
 			<tr>
-				<th><?php p($l->t('Name'));?></th>
-				<th><?php p($l->t('Last activity'));?></th>
+				<th><?php p($l->t('Name')); ?></th>
+				<th><?php p($l->t('Last activity')); ?></th>
 				<th></th>
 			</tr>
 		</thead>
@@ -338,14 +338,14 @@ 
 	</div>
 </div>
 
-<?php foreach($_['forms'] as $form) {
+<?php foreach ($_['forms'] as $form) {
 	if (isset($form['form'])) {?>
-	<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p('');?>"><?php print_unescaped($form['form']);?></div>
+	<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p(''); ?>"><?php print_unescaped($form['form']); ?></div>
 	<?php }
 };?>
 
 <div class="section">
-	<h2><?php p($l->t('Version'));?></h2>
+	<h2><?php p($l->t('Version')); ?></h2>
 	<p><a href="<?php print_unescaped($theme->getBaseUrl()); ?>" target="_blank"><?php p($theme->getTitle()); ?></a> <?php p(OC_Util::getHumanVersion()) ?></p>
 	<p><?php include('settings.development.notice.php'); ?></p>
 </div>

apps/federation/lib/BackgroundJob/RequestSharedSecret.php

Indentation +150 added lines, -150 removed lines

@@ -48,154 +48,154 @@
  */
 class RequestSharedSecret extends Job {
 
-	/** @var IClient */
-	private $httpClient;
-
-	/** @var IJobList */
-	private $jobList;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var DbHandler */
-	private $dbHandler;
-
-	/** @var TrustedServers */
-	private $trustedServers;
-
-	/** @var IDiscoveryService  */
-	private $ocsDiscoveryService;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var bool */
-	protected $retainJob = false;
-
-	private $format = '?format=json';
-
-	private $defaultEndPoint = '/ocs/v2.php/apps/federation/api/v1/request-shared-secret';
-
-	/**
-	 * RequestSharedSecret constructor.
-	 *
-	 * @param IClient $httpClient
-	 * @param IURLGenerator $urlGenerator
-	 * @param IJobList $jobList
-	 * @param TrustedServers $trustedServers
-	 * @param DbHandler $dbHandler
-	 * @param IDiscoveryService $ocsDiscoveryService
-	 */
-	public function __construct(
-		IClient $httpClient = null,
-		IURLGenerator $urlGenerator = null,
-		IJobList $jobList = null,
-		TrustedServers $trustedServers = null,
-		DbHandler $dbHandler = null,
-		IDiscoveryService $ocsDiscoveryService = null
-	) {
-		$this->httpClient = $httpClient ? $httpClient : \OC::$server->getHTTPClientService()->newClient();
-		$this->jobList = $jobList ? $jobList : \OC::$server->getJobList();
-		$this->urlGenerator = $urlGenerator ? $urlGenerator : \OC::$server->getURLGenerator();
-		$this->dbHandler = $dbHandler ? $dbHandler : new DbHandler(\OC::$server->getDatabaseConnection(), \OC::$server->getL10N('federation'));
-		$this->logger = \OC::$server->getLogger();
-		$this->ocsDiscoveryService = $ocsDiscoveryService ? $ocsDiscoveryService : \OC::$server->query(\OCP\OCS\IDiscoveryService::class);
-		if ($trustedServers) {
-			$this->trustedServers = $trustedServers;
-		} else {
-			$this->trustedServers = new TrustedServers(
-				$this->dbHandler,
-				\OC::$server->getHTTPClientService(),
-				$this->logger,
-				$this->jobList,
-				\OC::$server->getSecureRandom(),
-				\OC::$server->getConfig(),
-				\OC::$server->getEventDispatcher()
-			);
-		}
-	}
-
-
-	/**
-	 * run the job, then remove it from the joblist
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger $logger
-	 */
-	public function execute($jobList, ILogger $logger = null) {
-		$target = $this->argument['url'];
-		// only execute if target is still in the list of trusted domains
-		if ($this->trustedServers->isTrustedServer($target)) {
-			$this->parentExecute($jobList, $logger);
-		}
-
-		if (!$this->retainJob) {
-			$jobList->remove($this, $this->argument);
-		}
-	}
-
-	/**
-	 * call execute() method of parent
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger $logger
-	 */
-	protected function parentExecute($jobList, $logger) {
-		parent::execute($jobList, $logger);
-	}
-
-	protected function run($argument) {
-
-		$target = $argument['url'];
-		$source = $this->urlGenerator->getAbsoluteURL('/');
-		$source = rtrim($source, '/');
-		$token = $argument['token'];
-
-		$endPoints = $this->ocsDiscoveryService->discover($target, 'FEDERATED_SHARING');
-		$endPoint = isset($endPoints['shared-secret']) ? $endPoints['shared-secret'] : $this->defaultEndPoint;
-
-		// make sure that we have a well formated url
-		$url = rtrim($target, '/') . '/' . trim($endPoint, '/') . $this->format;
-
-		try {
-			$result = $this->httpClient->post(
-				$url,
-				[
-					'body' => [
-						'url' => $source,
-						'token' => $token,
-					],
-					'timeout' => 3,
-					'connect_timeout' => 3,
-				]
-			);
-
-			$status = $result->getStatusCode();
-
-		} catch (ClientException $e) {
-			$status = $e->getCode();
-			if ($status === Http::STATUS_FORBIDDEN) {
-				$this->logger->info($target . ' refused to ask for a shared secret.', ['app' => 'federation']);
-			} else {
-				$this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage(), ['app' => 'federation']);
-			}
-		} catch (\Exception $e) {
-			$status = Http::STATUS_INTERNAL_SERVER_ERROR;
-			$this->logger->logException($e, ['app' => 'federation']);
-		}
-
-		// if we received a unexpected response we try again later
-		if (
-			$status !== Http::STATUS_OK
-			&& $status !== Http::STATUS_FORBIDDEN
-		) {
-			$this->retainJob = true;
-		}
-
-		if ($status === Http::STATUS_FORBIDDEN) {
-			// clear token if remote server refuses to ask for shared secret
-			$this->dbHandler->addToken($target, '');
-		}
-
-	}
+    /** @var IClient */
+    private $httpClient;
+
+    /** @var IJobList */
+    private $jobList;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var DbHandler */
+    private $dbHandler;
+
+    /** @var TrustedServers */
+    private $trustedServers;
+
+    /** @var IDiscoveryService  */
+    private $ocsDiscoveryService;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var bool */
+    protected $retainJob = false;
+
+    private $format = '?format=json';
+
+    private $defaultEndPoint = '/ocs/v2.php/apps/federation/api/v1/request-shared-secret';
+
+    /**
+     * RequestSharedSecret constructor.
+     *
+     * @param IClient $httpClient
+     * @param IURLGenerator $urlGenerator
+     * @param IJobList $jobList
+     * @param TrustedServers $trustedServers
+     * @param DbHandler $dbHandler
+     * @param IDiscoveryService $ocsDiscoveryService
+     */
+    public function __construct(
+        IClient $httpClient = null,
+        IURLGenerator $urlGenerator = null,
+        IJobList $jobList = null,
+        TrustedServers $trustedServers = null,
+        DbHandler $dbHandler = null,
+        IDiscoveryService $ocsDiscoveryService = null
+    ) {
+        $this->httpClient = $httpClient ? $httpClient : \OC::$server->getHTTPClientService()->newClient();
+        $this->jobList = $jobList ? $jobList : \OC::$server->getJobList();
+        $this->urlGenerator = $urlGenerator ? $urlGenerator : \OC::$server->getURLGenerator();
+        $this->dbHandler = $dbHandler ? $dbHandler : new DbHandler(\OC::$server->getDatabaseConnection(), \OC::$server->getL10N('federation'));
+        $this->logger = \OC::$server->getLogger();
+        $this->ocsDiscoveryService = $ocsDiscoveryService ? $ocsDiscoveryService : \OC::$server->query(\OCP\OCS\IDiscoveryService::class);
+        if ($trustedServers) {
+            $this->trustedServers = $trustedServers;
+        } else {
+            $this->trustedServers = new TrustedServers(
+                $this->dbHandler,
+                \OC::$server->getHTTPClientService(),
+                $this->logger,
+                $this->jobList,
+                \OC::$server->getSecureRandom(),
+                \OC::$server->getConfig(),
+                \OC::$server->getEventDispatcher()
+            );
+        }
+    }
+
+
+    /**
+     * run the job, then remove it from the joblist
+     *
+     * @param JobList $jobList
+     * @param ILogger $logger
+     */
+    public function execute($jobList, ILogger $logger = null) {
+        $target = $this->argument['url'];
+        // only execute if target is still in the list of trusted domains
+        if ($this->trustedServers->isTrustedServer($target)) {
+            $this->parentExecute($jobList, $logger);
+        }
+
+        if (!$this->retainJob) {
+            $jobList->remove($this, $this->argument);
+        }
+    }
+
+    /**
+     * call execute() method of parent
+     *
+     * @param JobList $jobList
+     * @param ILogger $logger
+     */
+    protected function parentExecute($jobList, $logger) {
+        parent::execute($jobList, $logger);
+    }
+
+    protected function run($argument) {
+
+        $target = $argument['url'];
+        $source = $this->urlGenerator->getAbsoluteURL('/');
+        $source = rtrim($source, '/');
+        $token = $argument['token'];
+
+        $endPoints = $this->ocsDiscoveryService->discover($target, 'FEDERATED_SHARING');
+        $endPoint = isset($endPoints['shared-secret']) ? $endPoints['shared-secret'] : $this->defaultEndPoint;
+
+        // make sure that we have a well formated url
+        $url = rtrim($target, '/') . '/' . trim($endPoint, '/') . $this->format;
+
+        try {
+            $result = $this->httpClient->post(
+                $url,
+                [
+                    'body' => [
+                        'url' => $source,
+                        'token' => $token,
+                    ],
+                    'timeout' => 3,
+                    'connect_timeout' => 3,
+                ]
+            );
+
+            $status = $result->getStatusCode();
+
+        } catch (ClientException $e) {
+            $status = $e->getCode();
+            if ($status === Http::STATUS_FORBIDDEN) {
+                $this->logger->info($target . ' refused to ask for a shared secret.', ['app' => 'federation']);
+            } else {
+                $this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage(), ['app' => 'federation']);
+            }
+        } catch (\Exception $e) {
+            $status = Http::STATUS_INTERNAL_SERVER_ERROR;
+            $this->logger->logException($e, ['app' => 'federation']);
+        }
+
+        // if we received a unexpected response we try again later
+        if (
+            $status !== Http::STATUS_OK
+            && $status !== Http::STATUS_FORBIDDEN
+        ) {
+            $this->retainJob = true;
+        }
+
+        if ($status === Http::STATUS_FORBIDDEN) {
+            // clear token if remote server refuses to ask for shared secret
+            $this->dbHandler->addToken($target, '');
+        }
+
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -155,7 +155,7 @@ 
 		$endPoint = isset($endPoints['shared-secret']) ? $endPoints['shared-secret'] : $this->defaultEndPoint;
 
 		// make sure that we have a well formated url
-		$url = rtrim($target, '/') . '/' . trim($endPoint, '/') . $this->format;
+		$url = rtrim($target, '/').'/'.trim($endPoint, '/').$this->format;
 
 		try {
 			$result = $this->httpClient->post(
@@ -175,9 +175,9 @@ 
 		} catch (ClientException $e) {
 			$status = $e->getCode();
 			if ($status === Http::STATUS_FORBIDDEN) {
-				$this->logger->info($target . ' refused to ask for a shared secret.', ['app' => 'federation']);
+				$this->logger->info($target.' refused to ask for a shared secret.', ['app' => 'federation']);
 			} else {
-				$this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage(), ['app' => 'federation']);
+				$this->logger->info($target.' responded with a '.$status.' containing: '.$e->getMessage(), ['app' => 'federation']);
 			}
 		} catch (\Exception $e) {
 			$status = Http::STATUS_INTERNAL_SERVER_ERROR;

apps/federation/lib/BackgroundJob/GetSharedSecret.php

Indentation +167 added lines, -167 removed lines

@@ -48,171 +48,171 @@
  */
 class GetSharedSecret extends Job{
 
-	/** @var IClient */
-	private $httpClient;
-
-	/** @var IJobList */
-	private $jobList;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var TrustedServers  */
-	private $trustedServers;
-
-	/** @var DbHandler */
-	private $dbHandler;
-
-	/** @var IDiscoveryService  */
-	private $ocsDiscoveryService;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var bool */
-	protected $retainJob = false;
-
-	private $format = '?format=json';
-
-	private $defaultEndPoint = '/ocs/v2.php/apps/federation/api/v1/shared-secret';
-
-	/**
-	 * RequestSharedSecret constructor.
-	 *
-	 * @param IClient $httpClient
-	 * @param IURLGenerator $urlGenerator
-	 * @param IJobList $jobList
-	 * @param TrustedServers $trustedServers
-	 * @param ILogger $logger
-	 * @param DbHandler $dbHandler
-	 * @param IDiscoveryService $ocsDiscoveryService
-	 */
-	public function __construct(
-		IClient $httpClient = null,
-		IURLGenerator $urlGenerator = null,
-		IJobList $jobList = null,
-		TrustedServers $trustedServers = null,
-		ILogger $logger = null,
-		DbHandler $dbHandler = null,
-		IDiscoveryService $ocsDiscoveryService = null
-	) {
-		$this->logger = $logger ? $logger : \OC::$server->getLogger();
-		$this->httpClient = $httpClient ? $httpClient : \OC::$server->getHTTPClientService()->newClient();
-		$this->jobList = $jobList ? $jobList : \OC::$server->getJobList();
-		$this->urlGenerator = $urlGenerator ? $urlGenerator : \OC::$server->getURLGenerator();
-		$this->dbHandler = $dbHandler ? $dbHandler : new DbHandler(\OC::$server->getDatabaseConnection(), \OC::$server->getL10N('federation'));
-		$this->ocsDiscoveryService = $ocsDiscoveryService ? $ocsDiscoveryService : \OC::$server->query(\OCP\OCS\IDiscoveryService::class);
-		if ($trustedServers) {
-			$this->trustedServers = $trustedServers;
-		} else {
-			$this->trustedServers = new TrustedServers(
-				$this->dbHandler,
-				\OC::$server->getHTTPClientService(),
-				$this->logger,
-				$this->jobList,
-				\OC::$server->getSecureRandom(),
-				\OC::$server->getConfig(),
-				\OC::$server->getEventDispatcher()
-			);
-		}
-	}
-
-	/**
-	 * run the job, then remove it from the joblist
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger $logger
-	 */
-	public function execute($jobList, ILogger $logger = null) {
-		$target = $this->argument['url'];
-		// only execute if target is still in the list of trusted domains
-		if ($this->trustedServers->isTrustedServer($target)) {
-			$this->parentExecute($jobList, $logger);
-		}
-
-		if (!$this->retainJob) {
-			$jobList->remove($this, $this->argument);
-		}
-	}
-
-	/**
-	 * call execute() method of parent
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger $logger
-	 */
-	protected function parentExecute($jobList, $logger = null) {
-		parent::execute($jobList, $logger);
-	}
-
-	protected function run($argument) {
-		$target = $argument['url'];
-		$source = $this->urlGenerator->getAbsoluteURL('/');
-		$source = rtrim($source, '/');
-		$token = $argument['token'];
-
-		$endPoints = $this->ocsDiscoveryService->discover($target, 'FEDERATED_SHARING');
-		$endPoint = isset($endPoints['shared-secret']) ? $endPoints['shared-secret'] : $this->defaultEndPoint;
-
-		// make sure that we have a well formated url
-		$url = rtrim($target, '/') . '/' . trim($endPoint, '/') . $this->format;
-
-		$result = null;
-		try {
-			$result = $this->httpClient->get(
-				$url,
-				[
-					'query' =>
-						[
-							'url' => $source,
-							'token' => $token
-						],
-					'timeout' => 3,
-					'connect_timeout' => 3,
-				]
-			);
-
-			$status = $result->getStatusCode();
-
-		} catch (ClientException $e) {
-			$status = $e->getCode();
-			if ($status === Http::STATUS_FORBIDDEN) {
-				$this->logger->info($target . ' refused to exchange a shared secret with you.', ['app' => 'federation']);
-			} else {
-				$this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage(), ['app' => 'federation']);
-			}
-		} catch (\Exception $e) {
-			$status = Http::STATUS_INTERNAL_SERVER_ERROR;
-			$this->logger->logException($e, ['app' => 'federation']);
-		}
-
-		// if we received a unexpected response we try again later
-		if (
-			$status !== Http::STATUS_OK
-			&& $status !== Http::STATUS_FORBIDDEN
-		) {
-			$this->retainJob = true;
-		}  else {
-			// reset token if we received a valid response
-			$this->dbHandler->addToken($target, '');
-		}
-
-		if ($status === Http::STATUS_OK && $result instanceof IResponse) {
-			$body = $result->getBody();
-			$result = json_decode($body, true);
-			if (isset($result['ocs']['data']['sharedSecret'])) {
-				$this->trustedServers->addSharedSecret(
-						$target,
-						$result['ocs']['data']['sharedSecret']
-				);
-			} else {
-				$this->logger->error(
-						'remote server "' . $target . '"" does not return a valid shared secret',
-						['app' => 'federation']
-				);
-				$this->trustedServers->setServerStatus($target, TrustedServers::STATUS_FAILURE);
-			}
-		}
-
-	}
+    /** @var IClient */
+    private $httpClient;
+
+    /** @var IJobList */
+    private $jobList;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var TrustedServers  */
+    private $trustedServers;
+
+    /** @var DbHandler */
+    private $dbHandler;
+
+    /** @var IDiscoveryService  */
+    private $ocsDiscoveryService;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var bool */
+    protected $retainJob = false;
+
+    private $format = '?format=json';
+
+    private $defaultEndPoint = '/ocs/v2.php/apps/federation/api/v1/shared-secret';
+
+    /**
+     * RequestSharedSecret constructor.
+     *
+     * @param IClient $httpClient
+     * @param IURLGenerator $urlGenerator
+     * @param IJobList $jobList
+     * @param TrustedServers $trustedServers
+     * @param ILogger $logger
+     * @param DbHandler $dbHandler
+     * @param IDiscoveryService $ocsDiscoveryService
+     */
+    public function __construct(
+        IClient $httpClient = null,
+        IURLGenerator $urlGenerator = null,
+        IJobList $jobList = null,
+        TrustedServers $trustedServers = null,
+        ILogger $logger = null,
+        DbHandler $dbHandler = null,
+        IDiscoveryService $ocsDiscoveryService = null
+    ) {
+        $this->logger = $logger ? $logger : \OC::$server->getLogger();
+        $this->httpClient = $httpClient ? $httpClient : \OC::$server->getHTTPClientService()->newClient();
+        $this->jobList = $jobList ? $jobList : \OC::$server->getJobList();
+        $this->urlGenerator = $urlGenerator ? $urlGenerator : \OC::$server->getURLGenerator();
+        $this->dbHandler = $dbHandler ? $dbHandler : new DbHandler(\OC::$server->getDatabaseConnection(), \OC::$server->getL10N('federation'));
+        $this->ocsDiscoveryService = $ocsDiscoveryService ? $ocsDiscoveryService : \OC::$server->query(\OCP\OCS\IDiscoveryService::class);
+        if ($trustedServers) {
+            $this->trustedServers = $trustedServers;
+        } else {
+            $this->trustedServers = new TrustedServers(
+                $this->dbHandler,
+                \OC::$server->getHTTPClientService(),
+                $this->logger,
+                $this->jobList,
+                \OC::$server->getSecureRandom(),
+                \OC::$server->getConfig(),
+                \OC::$server->getEventDispatcher()
+            );
+        }
+    }
+
+    /**
+     * run the job, then remove it from the joblist
+     *
+     * @param JobList $jobList
+     * @param ILogger $logger
+     */
+    public function execute($jobList, ILogger $logger = null) {
+        $target = $this->argument['url'];
+        // only execute if target is still in the list of trusted domains
+        if ($this->trustedServers->isTrustedServer($target)) {
+            $this->parentExecute($jobList, $logger);
+        }
+
+        if (!$this->retainJob) {
+            $jobList->remove($this, $this->argument);
+        }
+    }
+
+    /**
+     * call execute() method of parent
+     *
+     * @param JobList $jobList
+     * @param ILogger $logger
+     */
+    protected function parentExecute($jobList, $logger = null) {
+        parent::execute($jobList, $logger);
+    }
+
+    protected function run($argument) {
+        $target = $argument['url'];
+        $source = $this->urlGenerator->getAbsoluteURL('/');
+        $source = rtrim($source, '/');
+        $token = $argument['token'];
+
+        $endPoints = $this->ocsDiscoveryService->discover($target, 'FEDERATED_SHARING');
+        $endPoint = isset($endPoints['shared-secret']) ? $endPoints['shared-secret'] : $this->defaultEndPoint;
+
+        // make sure that we have a well formated url
+        $url = rtrim($target, '/') . '/' . trim($endPoint, '/') . $this->format;
+
+        $result = null;
+        try {
+            $result = $this->httpClient->get(
+                $url,
+                [
+                    'query' =>
+                        [
+                            'url' => $source,
+                            'token' => $token
+                        ],
+                    'timeout' => 3,
+                    'connect_timeout' => 3,
+                ]
+            );
+
+            $status = $result->getStatusCode();
+
+        } catch (ClientException $e) {
+            $status = $e->getCode();
+            if ($status === Http::STATUS_FORBIDDEN) {
+                $this->logger->info($target . ' refused to exchange a shared secret with you.', ['app' => 'federation']);
+            } else {
+                $this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage(), ['app' => 'federation']);
+            }
+        } catch (\Exception $e) {
+            $status = Http::STATUS_INTERNAL_SERVER_ERROR;
+            $this->logger->logException($e, ['app' => 'federation']);
+        }
+
+        // if we received a unexpected response we try again later
+        if (
+            $status !== Http::STATUS_OK
+            && $status !== Http::STATUS_FORBIDDEN
+        ) {
+            $this->retainJob = true;
+        }  else {
+            // reset token if we received a valid response
+            $this->dbHandler->addToken($target, '');
+        }
+
+        if ($status === Http::STATUS_OK && $result instanceof IResponse) {
+            $body = $result->getBody();
+            $result = json_decode($body, true);
+            if (isset($result['ocs']['data']['sharedSecret'])) {
+                $this->trustedServers->addSharedSecret(
+                        $target,
+                        $result['ocs']['data']['sharedSecret']
+                );
+            } else {
+                $this->logger->error(
+                        'remote server "' . $target . '"" does not return a valid shared secret',
+                        ['app' => 'federation']
+                );
+                $this->trustedServers->setServerStatus($target, TrustedServers::STATUS_FAILURE);
+            }
+        }
+
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -46,7 +46,7 @@ 
  *
  * @package OCA\Federation\Backgroundjob
  */
-class GetSharedSecret extends Job{
+class GetSharedSecret extends Job {
 
 	/** @var IClient */
 	private $httpClient;
@@ -155,7 +155,7 @@ 
 		$endPoint = isset($endPoints['shared-secret']) ? $endPoints['shared-secret'] : $this->defaultEndPoint;
 
 		// make sure that we have a well formated url
-		$url = rtrim($target, '/') . '/' . trim($endPoint, '/') . $this->format;
+		$url = rtrim($target, '/').'/'.trim($endPoint, '/').$this->format;
 
 		$result = null;
 		try {
@@ -177,9 +177,9 @@ 
 		} catch (ClientException $e) {
 			$status = $e->getCode();
 			if ($status === Http::STATUS_FORBIDDEN) {
-				$this->logger->info($target . ' refused to exchange a shared secret with you.', ['app' => 'federation']);
+				$this->logger->info($target.' refused to exchange a shared secret with you.', ['app' => 'federation']);
 			} else {
-				$this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage(), ['app' => 'federation']);
+				$this->logger->info($target.' responded with a '.$status.' containing: '.$e->getMessage(), ['app' => 'federation']);
 			}
 		} catch (\Exception $e) {
 			$status = Http::STATUS_INTERNAL_SERVER_ERROR;
@@ -192,7 +192,7 @@ 
 			&& $status !== Http::STATUS_FORBIDDEN
 		) {
 			$this->retainJob = true;
-		}  else {
+		} else {
 			// reset token if we received a valid response
 			$this->dbHandler->addToken($target, '');
 		}
@@ -207,7 +207,7 @@ 
 				);
 			} else {
 				$this->logger->error(
-						'remote server "' . $target . '"" does not return a valid shared secret',
+						'remote server "'.$target.'"" does not return a valid shared secret',
 						['app' => 'federation']
 				);
 				$this->trustedServers->setServerStatus($target, TrustedServers::STATUS_FAILURE);

apps/files_sharing/lib/Controller/ShareesAPIController.php

Doc Comments +4 added lines, -1 removed lines

@@ -385,7 +385,7 @@ 
 	 * split user and remote from federated cloud id
 	 *
 	 * @param string $address federated share address
-	 * @return array [user, remoteURL]
+	 * @return string[] [user, remoteURL]
 	 * @throws \Exception
 	 */
 	public function splitUserRemote($address) {
@@ -652,6 +652,9 @@ 
 		return $result;
 	}
 
+	/**
+	 * @param string $search
+	 */
 	protected function getLookup($search) {
 		$isEnabled = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no');
 		$lookupServerUrl = $this->config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');

Indentation +669 added lines, -669 removed lines

@@ -43,673 +43,673 @@
 
 class ShareesAPIController extends OCSController {
 
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IManager */
-	protected $contactsManager;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IUserSession */
-	protected $userSession;
-
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-
-	/** @var ILogger */
-	protected $logger;
-
-	/** @var \OCP\Share\IManager */
-	protected $shareManager;
-
-	/** @var IClientService */
-	protected $clientService;
-
-	/** @var ICloudIdManager  */
-	protected $cloudIdManager;
-
-	/** @var bool */
-	protected $shareWithGroupOnly = false;
-
-	/** @var bool */
-	protected $shareeEnumeration = true;
-
-	/** @var int */
-	protected $offset = 0;
-
-	/** @var int */
-	protected $limit = 10;
-
-	/** @var array */
-	protected $result = [
-		'exact' => [
-			'users' => [],
-			'groups' => [],
-			'remotes' => [],
-			'emails' => [],
-			'circles' => [],
-		],
-		'users' => [],
-		'groups' => [],
-		'remotes' => [],
-		'emails' => [],
-		'lookup' => [],
-		'circles' => [],
-	];
-
-	protected $reachedEndFor = [];
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IGroupManager $groupManager
-	 * @param IUserManager $userManager
-	 * @param IManager $contactsManager
-	 * @param IConfig $config
-	 * @param IUserSession $userSession
-	 * @param IURLGenerator $urlGenerator
-	 * @param ILogger $logger
-	 * @param \OCP\Share\IManager $shareManager
-	 * @param IClientService $clientService
-	 * @param ICloudIdManager $cloudIdManager
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IGroupManager $groupManager,
-								IUserManager $userManager,
-								IManager $contactsManager,
-								IConfig $config,
-								IUserSession $userSession,
-								IURLGenerator $urlGenerator,
-								ILogger $logger,
-								\OCP\Share\IManager $shareManager,
-								IClientService $clientService,
-								ICloudIdManager $cloudIdManager
-	) {
-		parent::__construct($appName, $request);
-
-		$this->groupManager = $groupManager;
-		$this->userManager = $userManager;
-		$this->contactsManager = $contactsManager;
-		$this->config = $config;
-		$this->userSession = $userSession;
-		$this->urlGenerator = $urlGenerator;
-		$this->logger = $logger;
-		$this->shareManager = $shareManager;
-		$this->clientService = $clientService;
-		$this->cloudIdManager = $cloudIdManager;
-	}
-
-	/**
-	 * @param string $search
-	 */
-	protected function getUsers($search) {
-		$this->result['users'] = $this->result['exact']['users'] = $users = [];
-
-		$userGroups = [];
-		if ($this->shareWithGroupOnly) {
-			// Search in all the groups this user is part of
-			$userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
-			foreach ($userGroups as $userGroup) {
-				$usersTmp = $this->groupManager->displayNamesInGroup($userGroup, $search, $this->limit, $this->offset);
-				foreach ($usersTmp as $uid => $userDisplayName) {
-					$users[$uid] = $userDisplayName;
-				}
-			}
-		} else {
-			// Search in all users
-			$usersTmp = $this->userManager->searchDisplayName($search, $this->limit, $this->offset);
-
-			foreach ($usersTmp as $user) {
-				$users[$user->getUID()] = $user->getDisplayName();
-			}
-		}
-
-		if (!$this->shareeEnumeration || sizeof($users) < $this->limit) {
-			$this->reachedEndFor[] = 'users';
-		}
-
-		$foundUserById = false;
-		$lowerSearch = strtolower($search);
-		foreach ($users as $uid => $userDisplayName) {
-			if (strtolower($uid) === $lowerSearch || strtolower($userDisplayName) === $lowerSearch) {
-				if (strtolower($uid) === $lowerSearch) {
-					$foundUserById = true;
-				}
-				$this->result['exact']['users'][] = [
-					'label' => $userDisplayName,
-					'value' => [
-						'shareType' => Share::SHARE_TYPE_USER,
-						'shareWith' => $uid,
-					],
-				];
-			} else {
-				$this->result['users'][] = [
-					'label' => $userDisplayName,
-					'value' => [
-						'shareType' => Share::SHARE_TYPE_USER,
-						'shareWith' => $uid,
-					],
-				];
-			}
-		}
-
-		if ($this->offset === 0 && !$foundUserById) {
-			// On page one we try if the search result has a direct hit on the
-			// user id and if so, we add that to the exact match list
-			$user = $this->userManager->get($search);
-			if ($user instanceof IUser) {
-				$addUser = true;
-
-				if ($this->shareWithGroupOnly) {
-					// Only add, if we have a common group
-					$commonGroups = array_intersect($userGroups, $this->groupManager->getUserGroupIds($user));
-					$addUser = !empty($commonGroups);
-				}
-
-				if ($addUser) {
-					array_push($this->result['exact']['users'], [
-						'label' => $user->getDisplayName(),
-						'value' => [
-							'shareType' => Share::SHARE_TYPE_USER,
-							'shareWith' => $user->getUID(),
-						],
-					]);
-				}
-			}
-		}
-
-		if (!$this->shareeEnumeration) {
-			$this->result['users'] = [];
-		}
-	}
-
-	/**
-	 * @param string $search
-	 */
-	protected function getGroups($search) {
-		$this->result['groups'] = $this->result['exact']['groups'] = [];
-
-		$groups = $this->groupManager->search($search, $this->limit, $this->offset);
-		$groupIds = array_map(function (IGroup $group) { return $group->getGID(); }, $groups);
-
-		if (!$this->shareeEnumeration || sizeof($groups) < $this->limit) {
-			$this->reachedEndFor[] = 'groups';
-		}
-
-		$userGroups =  [];
-		if (!empty($groups) && $this->shareWithGroupOnly) {
-			// Intersect all the groups that match with the groups this user is a member of
-			$userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
-			$userGroups = array_map(function (IGroup $group) { return $group->getGID(); }, $userGroups);
-			$groupIds = array_intersect($groupIds, $userGroups);
-		}
-
-		$lowerSearch = strtolower($search);
-		foreach ($groups as $group) {
-			// FIXME: use a more efficient approach
-			$gid = $group->getGID();
-			if (!in_array($gid, $groupIds)) {
-				continue;
-			}
-			if (strtolower($gid) === $lowerSearch || strtolower($group->getDisplayName()) === $lowerSearch) {
-				$this->result['exact']['groups'][] = [
-					'label' => $group->getDisplayName(),
-					'value' => [
-						'shareType' => Share::SHARE_TYPE_GROUP,
-						'shareWith' => $gid,
-					],
-				];
-			} else {
-				$this->result['groups'][] = [
-					'label' => $group->getDisplayName(),
-					'value' => [
-						'shareType' => Share::SHARE_TYPE_GROUP,
-						'shareWith' => $gid,
-					],
-				];
-			}
-		}
-
-		if ($this->offset === 0 && empty($this->result['exact']['groups'])) {
-			// On page one we try if the search result has a direct hit on the
-			// user id and if so, we add that to the exact match list
-			$group = $this->groupManager->get($search);
-			if ($group instanceof IGroup && (!$this->shareWithGroupOnly || in_array($group->getGID(), $userGroups))) {
-				array_push($this->result['exact']['groups'], [
-					'label' => $group->getDisplayName(),
-					'value' => [
-						'shareType' => Share::SHARE_TYPE_GROUP,
-						'shareWith' => $group->getGID(),
-					],
-				]);
-			}
-		}
-
-		if (!$this->shareeEnumeration) {
-			$this->result['groups'] = [];
-		}
-	}
-
-
-	/**
-	 * @param string $search
-	 */
-	protected function getCircles($search) {
-		$this->result['circles'] = $this->result['exact']['circles'] = [];
-
-		$result = \OCA\Circles\Api\Sharees::search($search, $this->limit, $this->offset);
-		if (array_key_exists('circles', $result['exact'])) {
-			$this->result['exact']['circles'] = $result['exact']['circles'];
-		}
-		if (array_key_exists('circles', $result)) {
-			$this->result['circles'] = $result['circles'];
-		}
-	}
-
-
-	/**
-	 * @param string $search
-	 * @return array
-	 */
-	protected function getRemote($search) {
-		$result = ['results' => [], 'exact' => []];
-
-		// Search in contacts
-		//@todo Pagination missing
-		$addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN']);
-		$result['exactIdMatch'] = false;
-		foreach ($addressBookContacts as $contact) {
-			if (isset($contact['isLocalSystemBook'])) {
-				continue;
-			}
-			if (isset($contact['CLOUD'])) {
-				$cloudIds = $contact['CLOUD'];
-				if (!is_array($cloudIds)) {
-					$cloudIds = [$cloudIds];
-				}
-				$lowerSearch = strtolower($search);
-				foreach ($cloudIds as $cloudId) {
-					list(, $serverUrl) = $this->splitUserRemote($cloudId);
-					if (strtolower($contact['FN']) === $lowerSearch || strtolower($cloudId) === $lowerSearch) {
-						if (strtolower($cloudId) === $lowerSearch) {
-							$result['exactIdMatch'] = true;
-						}
-						$result['exact'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
-							'value' => [
-								'shareType' => Share::SHARE_TYPE_REMOTE,
-								'shareWith' => $cloudId,
-								'server' => $serverUrl,
-							],
-						];
-					} else {
-						$result['results'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
-							'value' => [
-								'shareType' => Share::SHARE_TYPE_REMOTE,
-								'shareWith' => $cloudId,
-								'server' => $serverUrl,
-							],
-						];
-					}
-				}
-			}
-		}
-
-		if (!$this->shareeEnumeration) {
-			$result['results'] = [];
-		}
-
-		if (!$result['exactIdMatch'] && $this->cloudIdManager->isValidCloudId($search) && $this->offset === 0) {
-			$result['exact'][] = [
-				'label' => $search,
-				'value' => [
-					'shareType' => Share::SHARE_TYPE_REMOTE,
-					'shareWith' => $search,
-				],
-			];
-		}
-
-		$this->reachedEndFor[] = 'remotes';
-
-		return $result;
-	}
-
-	/**
-	 * split user and remote from federated cloud id
-	 *
-	 * @param string $address federated share address
-	 * @return array [user, remoteURL]
-	 * @throws \Exception
-	 */
-	public function splitUserRemote($address) {
-		try {
-			$cloudId = $this->cloudIdManager->resolveCloudId($address);
-			return [$cloudId->getUser(), $cloudId->getRemote()];
-		} catch (\InvalidArgumentException $e) {
-			throw new \Exception('Invalid Federated Cloud ID', 0, $e);
-		}
-	}
-
-	/**
-	 * Strips away a potential file names and trailing slashes:
-	 * - http://localhost
-	 * - http://localhost/
-	 * - http://localhost/index.php
-	 * - http://localhost/index.php/s/{shareToken}
-	 *
-	 * all return: http://localhost
-	 *
-	 * @param string $remote
-	 * @return string
-	 */
-	protected function fixRemoteURL($remote) {
-		$remote = str_replace('\\', '/', $remote);
-		if ($fileNamePosition = strpos($remote, '/index.php')) {
-			$remote = substr($remote, 0, $fileNamePosition);
-		}
-		$remote = rtrim($remote, '/');
-
-		return $remote;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $search
-	 * @param string $itemType
-	 * @param int $page
-	 * @param int $perPage
-	 * @param int|int[] $shareType
-	 * @param bool $lookup
-	 * @return DataResponse
-	 * @throws OCSBadRequestException
-	 */
-	public function search($search = '', $itemType = null, $page = 1, $perPage = 200, $shareType = null, $lookup = true) {
-
-		// only search for string larger than a given threshold
-		$threshold = (int)$this->config->getSystemValue('sharing.minSearchStringLength', 0);
-		if (strlen($search) < $threshold) {
-			return new DataResponse($this->result);
-		}
-
-		// never return more than the max. number of results configured in the config.php
-		$maxResults = (int)$this->config->getSystemValue('sharing.maxAutocompleteResults', 0);
-		if ($maxResults > 0) {
-			$perPage = min($perPage, $maxResults);
-		}
-		if ($perPage <= 0) {
-			throw new OCSBadRequestException('Invalid perPage argument');
-		}
-		if ($page <= 0) {
-			throw new OCSBadRequestException('Invalid page');
-		}
-
-		$shareTypes = [
-			Share::SHARE_TYPE_USER,
-		];
-
-		if ($itemType === 'file' || $itemType === 'folder') {
-			if ($this->shareManager->allowGroupSharing()) {
-				$shareTypes[] = Share::SHARE_TYPE_GROUP;
-			}
-
-			if ($this->isRemoteSharingAllowed($itemType)) {
-				$shareTypes[] = Share::SHARE_TYPE_REMOTE;
-			}
-
-			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
-				$shareTypes[] = Share::SHARE_TYPE_EMAIL;
-			}
-		} else {
-			$shareTypes[] = Share::SHARE_TYPE_GROUP;
-			$shareTypes[] = Share::SHARE_TYPE_EMAIL;
-		}
-
-		if (\OCP\App::isEnabled('circles')) {
-			$shareTypes[] = Share::SHARE_TYPE_CIRCLE;
-		}
-
-		if (isset($_GET['shareType']) && is_array($_GET['shareType'])) {
-			$shareTypes = array_intersect($shareTypes, $_GET['shareType']);
-			sort($shareTypes);
-		} else if (is_numeric($shareType)) {
-			$shareTypes = array_intersect($shareTypes, [(int) $shareType]);
-			sort($shareTypes);
-		}
-
-		$this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
-		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
-		$this->limit = (int) $perPage;
-		$this->offset = $perPage * ($page - 1);
-
-		return $this->searchSharees($search, $itemType, $shareTypes, $page, $perPage, $lookup);
-	}
-
-	/**
-	 * Method to get out the static call for better testing
-	 *
-	 * @param string $itemType
-	 * @return bool
-	 */
-	protected function isRemoteSharingAllowed($itemType) {
-		try {
-			$backend = Share::getBackend($itemType);
-			return $backend->isShareTypeAllowed(Share::SHARE_TYPE_REMOTE);
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Testable search function that does not need globals
-	 *
-	 * @param string $search
-	 * @param string $itemType
-	 * @param array $shareTypes
-	 * @param int $page
-	 * @param int $perPage
-	 * @param bool $lookup
-	 * @return DataResponse
-	 * @throws OCSBadRequestException
-	 */
-	protected function searchSharees($search, $itemType, array $shareTypes, $page, $perPage, $lookup) {
-		// Verify arguments
-		if ($itemType === null) {
-			throw new OCSBadRequestException('Missing itemType');
-		}
-
-		// Get users
-		if (in_array(Share::SHARE_TYPE_USER, $shareTypes)) {
-			$this->getUsers($search);
-		}
-
-		// Get groups
-		if (in_array(Share::SHARE_TYPE_GROUP, $shareTypes)) {
-			$this->getGroups($search);
-		}
-
-		// Get circles
-		if (in_array(Share::SHARE_TYPE_CIRCLE, $shareTypes)) {
-			$this->getCircles($search);
-		}
-
-
-		// Get remote
-		$remoteResults = ['results' => [], 'exact' => [], 'exactIdMatch' => false];
-		if (in_array(Share::SHARE_TYPE_REMOTE, $shareTypes)) {
-			$remoteResults = $this->getRemote($search);
-		}
-
-		// Get emails
-		$mailResults = ['results' => [], 'exact' => [], 'exactIdMatch' => false];
-		if (in_array(Share::SHARE_TYPE_EMAIL, $shareTypes)) {
-			$mailResults = $this->getEmail($search);
-		}
-
-		// Get from lookup server
-		if ($lookup) {
-			$this->getLookup($search);
-		}
-
-		// if we have a exact match, either for the federated cloud id or for the
-		// email address we only return the exact match. It is highly unlikely
-		// that the exact same email address and federated cloud id exists
-		if ($mailResults['exactIdMatch'] && !$remoteResults['exactIdMatch']) {
-			$this->result['emails'] = $mailResults['results'];
-			$this->result['exact']['emails'] = $mailResults['exact'];
-		} else if (!$mailResults['exactIdMatch'] && $remoteResults['exactIdMatch']) {
-			$this->result['remotes'] = $remoteResults['results'];
-			$this->result['exact']['remotes'] = $remoteResults['exact'];
-		} else {
-			$this->result['remotes'] = $remoteResults['results'];
-			$this->result['exact']['remotes'] = $remoteResults['exact'];
-			$this->result['emails'] = $mailResults['results'];
-			$this->result['exact']['emails'] = $mailResults['exact'];
-		}
-
-		$response = new DataResponse($this->result);
-
-		if (sizeof($this->reachedEndFor) < 3) {
-			$response->addHeader('Link', $this->getPaginationLink($page, [
-				'search' => $search,
-				'itemType' => $itemType,
-				'shareType' => $shareTypes,
-				'perPage' => $perPage,
-			]));
-		}
-
-		return $response;
-	}
-
-	/**
-	 * @param string $search
-	 * @return array
-	 */
-	protected function getEmail($search) {
-		$result = ['results' => [], 'exact' => []];
-
-		// Search in contacts
-		//@todo Pagination missing
-		$addressBookContacts = $this->contactsManager->search($search, ['EMAIL', 'FN']);
-		$result['exactIdMatch'] = false;
-		foreach ($addressBookContacts as $contact) {
-			if (isset($contact['isLocalSystemBook'])) {
-				continue;
-			}
-			if (isset($contact['EMAIL'])) {
-				$emailAddresses = $contact['EMAIL'];
-				if (!is_array($emailAddresses)) {
-					$emailAddresses = [$emailAddresses];
-				}
-				foreach ($emailAddresses as $emailAddress) {
-					if (strtolower($contact['FN']) === strtolower($search) || strtolower($emailAddress) === strtolower($search)) {
-						if (strtolower($emailAddress) === strtolower($search)) {
-							$result['exactIdMatch'] = true;
-						}
-						$result['exact'][] = [
-							'label' => $contact['FN'] . " ($emailAddress)",
-							'value' => [
-								'shareType' => Share::SHARE_TYPE_EMAIL,
-								'shareWith' => $emailAddress,
-							],
-						];
-					} else {
-						$result['results'][] = [
-							'label' => $contact['FN'] . " ($emailAddress)",
-							'value' => [
-								'shareType' => Share::SHARE_TYPE_EMAIL,
-								'shareWith' => $emailAddress,
-							],
-						];
-					}
-				}
-			}
-		}
-
-		if (!$this->shareeEnumeration) {
-			$result['results'] = [];
-		}
-
-		if (!$result['exactIdMatch'] && filter_var($search, FILTER_VALIDATE_EMAIL)) {
-			$result['exact'][] = [
-				'label' => $search,
-				'value' => [
-					'shareType' => Share::SHARE_TYPE_EMAIL,
-					'shareWith' => $search,
-				],
-			];
-		}
-
-		$this->reachedEndFor[] = 'emails';
-
-		return $result;
-	}
-
-	protected function getLookup($search) {
-		$isEnabled = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no');
-		$lookupServerUrl = $this->config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
-		$result = [];
-
-		if($isEnabled === 'yes') {
-			try {
-				$client = $this->clientService->newClient();
-				$response = $client->get(
-					$lookupServerUrl . '/users?search=' . urlencode($search),
-					[
-						'timeout' => 10,
-						'connect_timeout' => 3,
-					]
-				);
-
-				$body = json_decode($response->getBody(), true);
-
-				$result = [];
-				foreach ($body as $lookup) {
-					$result[] = [
-						'label' => $lookup['federationId'],
-						'value' => [
-							'shareType' => Share::SHARE_TYPE_REMOTE,
-							'shareWith' => $lookup['federationId'],
-						],
-						'extra' => $lookup,
-					];
-				}
-			} catch (\Exception $e) {}
-		}
-
-		$this->result['lookup'] = $result;
-	}
-
-	/**
-	 * Generates a bunch of pagination links for the current page
-	 *
-	 * @param int $page Current page
-	 * @param array $params Parameters for the URL
-	 * @return string
-	 */
-	protected function getPaginationLink($page, array $params) {
-		if ($this->isV2()) {
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees') . '?';
-		} else {
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?';
-		}
-		$params['page'] = $page + 1;
-		$link = '<' . $url . http_build_query($params) . '>; rel="next"';
-
-		return $link;
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function isV2() {
-		return $this->request->getScriptName() === '/ocs/v2.php';
-	}
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var IManager */
+    protected $contactsManager;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IUserSession */
+    protected $userSession;
+
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+
+    /** @var ILogger */
+    protected $logger;
+
+    /** @var \OCP\Share\IManager */
+    protected $shareManager;
+
+    /** @var IClientService */
+    protected $clientService;
+
+    /** @var ICloudIdManager  */
+    protected $cloudIdManager;
+
+    /** @var bool */
+    protected $shareWithGroupOnly = false;
+
+    /** @var bool */
+    protected $shareeEnumeration = true;
+
+    /** @var int */
+    protected $offset = 0;
+
+    /** @var int */
+    protected $limit = 10;
+
+    /** @var array */
+    protected $result = [
+        'exact' => [
+            'users' => [],
+            'groups' => [],
+            'remotes' => [],
+            'emails' => [],
+            'circles' => [],
+        ],
+        'users' => [],
+        'groups' => [],
+        'remotes' => [],
+        'emails' => [],
+        'lookup' => [],
+        'circles' => [],
+    ];
+
+    protected $reachedEndFor = [];
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IGroupManager $groupManager
+     * @param IUserManager $userManager
+     * @param IManager $contactsManager
+     * @param IConfig $config
+     * @param IUserSession $userSession
+     * @param IURLGenerator $urlGenerator
+     * @param ILogger $logger
+     * @param \OCP\Share\IManager $shareManager
+     * @param IClientService $clientService
+     * @param ICloudIdManager $cloudIdManager
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IGroupManager $groupManager,
+                                IUserManager $userManager,
+                                IManager $contactsManager,
+                                IConfig $config,
+                                IUserSession $userSession,
+                                IURLGenerator $urlGenerator,
+                                ILogger $logger,
+                                \OCP\Share\IManager $shareManager,
+                                IClientService $clientService,
+                                ICloudIdManager $cloudIdManager
+    ) {
+        parent::__construct($appName, $request);
+
+        $this->groupManager = $groupManager;
+        $this->userManager = $userManager;
+        $this->contactsManager = $contactsManager;
+        $this->config = $config;
+        $this->userSession = $userSession;
+        $this->urlGenerator = $urlGenerator;
+        $this->logger = $logger;
+        $this->shareManager = $shareManager;
+        $this->clientService = $clientService;
+        $this->cloudIdManager = $cloudIdManager;
+    }
+
+    /**
+     * @param string $search
+     */
+    protected function getUsers($search) {
+        $this->result['users'] = $this->result['exact']['users'] = $users = [];
+
+        $userGroups = [];
+        if ($this->shareWithGroupOnly) {
+            // Search in all the groups this user is part of
+            $userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
+            foreach ($userGroups as $userGroup) {
+                $usersTmp = $this->groupManager->displayNamesInGroup($userGroup, $search, $this->limit, $this->offset);
+                foreach ($usersTmp as $uid => $userDisplayName) {
+                    $users[$uid] = $userDisplayName;
+                }
+            }
+        } else {
+            // Search in all users
+            $usersTmp = $this->userManager->searchDisplayName($search, $this->limit, $this->offset);
+
+            foreach ($usersTmp as $user) {
+                $users[$user->getUID()] = $user->getDisplayName();
+            }
+        }
+
+        if (!$this->shareeEnumeration || sizeof($users) < $this->limit) {
+            $this->reachedEndFor[] = 'users';
+        }
+
+        $foundUserById = false;
+        $lowerSearch = strtolower($search);
+        foreach ($users as $uid => $userDisplayName) {
+            if (strtolower($uid) === $lowerSearch || strtolower($userDisplayName) === $lowerSearch) {
+                if (strtolower($uid) === $lowerSearch) {
+                    $foundUserById = true;
+                }
+                $this->result['exact']['users'][] = [
+                    'label' => $userDisplayName,
+                    'value' => [
+                        'shareType' => Share::SHARE_TYPE_USER,
+                        'shareWith' => $uid,
+                    ],
+                ];
+            } else {
+                $this->result['users'][] = [
+                    'label' => $userDisplayName,
+                    'value' => [
+                        'shareType' => Share::SHARE_TYPE_USER,
+                        'shareWith' => $uid,
+                    ],
+                ];
+            }
+        }
+
+        if ($this->offset === 0 && !$foundUserById) {
+            // On page one we try if the search result has a direct hit on the
+            // user id and if so, we add that to the exact match list
+            $user = $this->userManager->get($search);
+            if ($user instanceof IUser) {
+                $addUser = true;
+
+                if ($this->shareWithGroupOnly) {
+                    // Only add, if we have a common group
+                    $commonGroups = array_intersect($userGroups, $this->groupManager->getUserGroupIds($user));
+                    $addUser = !empty($commonGroups);
+                }
+
+                if ($addUser) {
+                    array_push($this->result['exact']['users'], [
+                        'label' => $user->getDisplayName(),
+                        'value' => [
+                            'shareType' => Share::SHARE_TYPE_USER,
+                            'shareWith' => $user->getUID(),
+                        ],
+                    ]);
+                }
+            }
+        }
+
+        if (!$this->shareeEnumeration) {
+            $this->result['users'] = [];
+        }
+    }
+
+    /**
+     * @param string $search
+     */
+    protected function getGroups($search) {
+        $this->result['groups'] = $this->result['exact']['groups'] = [];
+
+        $groups = $this->groupManager->search($search, $this->limit, $this->offset);
+        $groupIds = array_map(function (IGroup $group) { return $group->getGID(); }, $groups);
+
+        if (!$this->shareeEnumeration || sizeof($groups) < $this->limit) {
+            $this->reachedEndFor[] = 'groups';
+        }
+
+        $userGroups =  [];
+        if (!empty($groups) && $this->shareWithGroupOnly) {
+            // Intersect all the groups that match with the groups this user is a member of
+            $userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
+            $userGroups = array_map(function (IGroup $group) { return $group->getGID(); }, $userGroups);
+            $groupIds = array_intersect($groupIds, $userGroups);
+        }
+
+        $lowerSearch = strtolower($search);
+        foreach ($groups as $group) {
+            // FIXME: use a more efficient approach
+            $gid = $group->getGID();
+            if (!in_array($gid, $groupIds)) {
+                continue;
+            }
+            if (strtolower($gid) === $lowerSearch || strtolower($group->getDisplayName()) === $lowerSearch) {
+                $this->result['exact']['groups'][] = [
+                    'label' => $group->getDisplayName(),
+                    'value' => [
+                        'shareType' => Share::SHARE_TYPE_GROUP,
+                        'shareWith' => $gid,
+                    ],
+                ];
+            } else {
+                $this->result['groups'][] = [
+                    'label' => $group->getDisplayName(),
+                    'value' => [
+                        'shareType' => Share::SHARE_TYPE_GROUP,
+                        'shareWith' => $gid,
+                    ],
+                ];
+            }
+        }
+
+        if ($this->offset === 0 && empty($this->result['exact']['groups'])) {
+            // On page one we try if the search result has a direct hit on the
+            // user id and if so, we add that to the exact match list
+            $group = $this->groupManager->get($search);
+            if ($group instanceof IGroup && (!$this->shareWithGroupOnly || in_array($group->getGID(), $userGroups))) {
+                array_push($this->result['exact']['groups'], [
+                    'label' => $group->getDisplayName(),
+                    'value' => [
+                        'shareType' => Share::SHARE_TYPE_GROUP,
+                        'shareWith' => $group->getGID(),
+                    ],
+                ]);
+            }
+        }
+
+        if (!$this->shareeEnumeration) {
+            $this->result['groups'] = [];
+        }
+    }
+
+
+    /**
+     * @param string $search
+     */
+    protected function getCircles($search) {
+        $this->result['circles'] = $this->result['exact']['circles'] = [];
+
+        $result = \OCA\Circles\Api\Sharees::search($search, $this->limit, $this->offset);
+        if (array_key_exists('circles', $result['exact'])) {
+            $this->result['exact']['circles'] = $result['exact']['circles'];
+        }
+        if (array_key_exists('circles', $result)) {
+            $this->result['circles'] = $result['circles'];
+        }
+    }
+
+
+    /**
+     * @param string $search
+     * @return array
+     */
+    protected function getRemote($search) {
+        $result = ['results' => [], 'exact' => []];
+
+        // Search in contacts
+        //@todo Pagination missing
+        $addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN']);
+        $result['exactIdMatch'] = false;
+        foreach ($addressBookContacts as $contact) {
+            if (isset($contact['isLocalSystemBook'])) {
+                continue;
+            }
+            if (isset($contact['CLOUD'])) {
+                $cloudIds = $contact['CLOUD'];
+                if (!is_array($cloudIds)) {
+                    $cloudIds = [$cloudIds];
+                }
+                $lowerSearch = strtolower($search);
+                foreach ($cloudIds as $cloudId) {
+                    list(, $serverUrl) = $this->splitUserRemote($cloudId);
+                    if (strtolower($contact['FN']) === $lowerSearch || strtolower($cloudId) === $lowerSearch) {
+                        if (strtolower($cloudId) === $lowerSearch) {
+                            $result['exactIdMatch'] = true;
+                        }
+                        $result['exact'][] = [
+                            'label' => $contact['FN'] . " ($cloudId)",
+                            'value' => [
+                                'shareType' => Share::SHARE_TYPE_REMOTE,
+                                'shareWith' => $cloudId,
+                                'server' => $serverUrl,
+                            ],
+                        ];
+                    } else {
+                        $result['results'][] = [
+                            'label' => $contact['FN'] . " ($cloudId)",
+                            'value' => [
+                                'shareType' => Share::SHARE_TYPE_REMOTE,
+                                'shareWith' => $cloudId,
+                                'server' => $serverUrl,
+                            ],
+                        ];
+                    }
+                }
+            }
+        }
+
+        if (!$this->shareeEnumeration) {
+            $result['results'] = [];
+        }
+
+        if (!$result['exactIdMatch'] && $this->cloudIdManager->isValidCloudId($search) && $this->offset === 0) {
+            $result['exact'][] = [
+                'label' => $search,
+                'value' => [
+                    'shareType' => Share::SHARE_TYPE_REMOTE,
+                    'shareWith' => $search,
+                ],
+            ];
+        }
+
+        $this->reachedEndFor[] = 'remotes';
+
+        return $result;
+    }
+
+    /**
+     * split user and remote from federated cloud id
+     *
+     * @param string $address federated share address
+     * @return array [user, remoteURL]
+     * @throws \Exception
+     */
+    public function splitUserRemote($address) {
+        try {
+            $cloudId = $this->cloudIdManager->resolveCloudId($address);
+            return [$cloudId->getUser(), $cloudId->getRemote()];
+        } catch (\InvalidArgumentException $e) {
+            throw new \Exception('Invalid Federated Cloud ID', 0, $e);
+        }
+    }
+
+    /**
+     * Strips away a potential file names and trailing slashes:
+     * - http://localhost
+     * - http://localhost/
+     * - http://localhost/index.php
+     * - http://localhost/index.php/s/{shareToken}
+     *
+     * all return: http://localhost
+     *
+     * @param string $remote
+     * @return string
+     */
+    protected function fixRemoteURL($remote) {
+        $remote = str_replace('\\', '/', $remote);
+        if ($fileNamePosition = strpos($remote, '/index.php')) {
+            $remote = substr($remote, 0, $fileNamePosition);
+        }
+        $remote = rtrim($remote, '/');
+
+        return $remote;
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $search
+     * @param string $itemType
+     * @param int $page
+     * @param int $perPage
+     * @param int|int[] $shareType
+     * @param bool $lookup
+     * @return DataResponse
+     * @throws OCSBadRequestException
+     */
+    public function search($search = '', $itemType = null, $page = 1, $perPage = 200, $shareType = null, $lookup = true) {
+
+        // only search for string larger than a given threshold
+        $threshold = (int)$this->config->getSystemValue('sharing.minSearchStringLength', 0);
+        if (strlen($search) < $threshold) {
+            return new DataResponse($this->result);
+        }
+
+        // never return more than the max. number of results configured in the config.php
+        $maxResults = (int)$this->config->getSystemValue('sharing.maxAutocompleteResults', 0);
+        if ($maxResults > 0) {
+            $perPage = min($perPage, $maxResults);
+        }
+        if ($perPage <= 0) {
+            throw new OCSBadRequestException('Invalid perPage argument');
+        }
+        if ($page <= 0) {
+            throw new OCSBadRequestException('Invalid page');
+        }
+
+        $shareTypes = [
+            Share::SHARE_TYPE_USER,
+        ];
+
+        if ($itemType === 'file' || $itemType === 'folder') {
+            if ($this->shareManager->allowGroupSharing()) {
+                $shareTypes[] = Share::SHARE_TYPE_GROUP;
+            }
+
+            if ($this->isRemoteSharingAllowed($itemType)) {
+                $shareTypes[] = Share::SHARE_TYPE_REMOTE;
+            }
+
+            if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
+                $shareTypes[] = Share::SHARE_TYPE_EMAIL;
+            }
+        } else {
+            $shareTypes[] = Share::SHARE_TYPE_GROUP;
+            $shareTypes[] = Share::SHARE_TYPE_EMAIL;
+        }
+
+        if (\OCP\App::isEnabled('circles')) {
+            $shareTypes[] = Share::SHARE_TYPE_CIRCLE;
+        }
+
+        if (isset($_GET['shareType']) && is_array($_GET['shareType'])) {
+            $shareTypes = array_intersect($shareTypes, $_GET['shareType']);
+            sort($shareTypes);
+        } else if (is_numeric($shareType)) {
+            $shareTypes = array_intersect($shareTypes, [(int) $shareType]);
+            sort($shareTypes);
+        }
+
+        $this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
+        $this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
+        $this->limit = (int) $perPage;
+        $this->offset = $perPage * ($page - 1);
+
+        return $this->searchSharees($search, $itemType, $shareTypes, $page, $perPage, $lookup);
+    }
+
+    /**
+     * Method to get out the static call for better testing
+     *
+     * @param string $itemType
+     * @return bool
+     */
+    protected function isRemoteSharingAllowed($itemType) {
+        try {
+            $backend = Share::getBackend($itemType);
+            return $backend->isShareTypeAllowed(Share::SHARE_TYPE_REMOTE);
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Testable search function that does not need globals
+     *
+     * @param string $search
+     * @param string $itemType
+     * @param array $shareTypes
+     * @param int $page
+     * @param int $perPage
+     * @param bool $lookup
+     * @return DataResponse
+     * @throws OCSBadRequestException
+     */
+    protected function searchSharees($search, $itemType, array $shareTypes, $page, $perPage, $lookup) {
+        // Verify arguments
+        if ($itemType === null) {
+            throw new OCSBadRequestException('Missing itemType');
+        }
+
+        // Get users
+        if (in_array(Share::SHARE_TYPE_USER, $shareTypes)) {
+            $this->getUsers($search);
+        }
+
+        // Get groups
+        if (in_array(Share::SHARE_TYPE_GROUP, $shareTypes)) {
+            $this->getGroups($search);
+        }
+
+        // Get circles
+        if (in_array(Share::SHARE_TYPE_CIRCLE, $shareTypes)) {
+            $this->getCircles($search);
+        }
+
+
+        // Get remote
+        $remoteResults = ['results' => [], 'exact' => [], 'exactIdMatch' => false];
+        if (in_array(Share::SHARE_TYPE_REMOTE, $shareTypes)) {
+            $remoteResults = $this->getRemote($search);
+        }
+
+        // Get emails
+        $mailResults = ['results' => [], 'exact' => [], 'exactIdMatch' => false];
+        if (in_array(Share::SHARE_TYPE_EMAIL, $shareTypes)) {
+            $mailResults = $this->getEmail($search);
+        }
+
+        // Get from lookup server
+        if ($lookup) {
+            $this->getLookup($search);
+        }
+
+        // if we have a exact match, either for the federated cloud id or for the
+        // email address we only return the exact match. It is highly unlikely
+        // that the exact same email address and federated cloud id exists
+        if ($mailResults['exactIdMatch'] && !$remoteResults['exactIdMatch']) {
+            $this->result['emails'] = $mailResults['results'];
+            $this->result['exact']['emails'] = $mailResults['exact'];
+        } else if (!$mailResults['exactIdMatch'] && $remoteResults['exactIdMatch']) {
+            $this->result['remotes'] = $remoteResults['results'];
+            $this->result['exact']['remotes'] = $remoteResults['exact'];
+        } else {
+            $this->result['remotes'] = $remoteResults['results'];
+            $this->result['exact']['remotes'] = $remoteResults['exact'];
+            $this->result['emails'] = $mailResults['results'];
+            $this->result['exact']['emails'] = $mailResults['exact'];
+        }
+
+        $response = new DataResponse($this->result);
+
+        if (sizeof($this->reachedEndFor) < 3) {
+            $response->addHeader('Link', $this->getPaginationLink($page, [
+                'search' => $search,
+                'itemType' => $itemType,
+                'shareType' => $shareTypes,
+                'perPage' => $perPage,
+            ]));
+        }
+
+        return $response;
+    }
+
+    /**
+     * @param string $search
+     * @return array
+     */
+    protected function getEmail($search) {
+        $result = ['results' => [], 'exact' => []];
+
+        // Search in contacts
+        //@todo Pagination missing
+        $addressBookContacts = $this->contactsManager->search($search, ['EMAIL', 'FN']);
+        $result['exactIdMatch'] = false;
+        foreach ($addressBookContacts as $contact) {
+            if (isset($contact['isLocalSystemBook'])) {
+                continue;
+            }
+            if (isset($contact['EMAIL'])) {
+                $emailAddresses = $contact['EMAIL'];
+                if (!is_array($emailAddresses)) {
+                    $emailAddresses = [$emailAddresses];
+                }
+                foreach ($emailAddresses as $emailAddress) {
+                    if (strtolower($contact['FN']) === strtolower($search) || strtolower($emailAddress) === strtolower($search)) {
+                        if (strtolower($emailAddress) === strtolower($search)) {
+                            $result['exactIdMatch'] = true;
+                        }
+                        $result['exact'][] = [
+                            'label' => $contact['FN'] . " ($emailAddress)",
+                            'value' => [
+                                'shareType' => Share::SHARE_TYPE_EMAIL,
+                                'shareWith' => $emailAddress,
+                            ],
+                        ];
+                    } else {
+                        $result['results'][] = [
+                            'label' => $contact['FN'] . " ($emailAddress)",
+                            'value' => [
+                                'shareType' => Share::SHARE_TYPE_EMAIL,
+                                'shareWith' => $emailAddress,
+                            ],
+                        ];
+                    }
+                }
+            }
+        }
+
+        if (!$this->shareeEnumeration) {
+            $result['results'] = [];
+        }
+
+        if (!$result['exactIdMatch'] && filter_var($search, FILTER_VALIDATE_EMAIL)) {
+            $result['exact'][] = [
+                'label' => $search,
+                'value' => [
+                    'shareType' => Share::SHARE_TYPE_EMAIL,
+                    'shareWith' => $search,
+                ],
+            ];
+        }
+
+        $this->reachedEndFor[] = 'emails';
+
+        return $result;
+    }
+
+    protected function getLookup($search) {
+        $isEnabled = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no');
+        $lookupServerUrl = $this->config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
+        $result = [];
+
+        if($isEnabled === 'yes') {
+            try {
+                $client = $this->clientService->newClient();
+                $response = $client->get(
+                    $lookupServerUrl . '/users?search=' . urlencode($search),
+                    [
+                        'timeout' => 10,
+                        'connect_timeout' => 3,
+                    ]
+                );
+
+                $body = json_decode($response->getBody(), true);
+
+                $result = [];
+                foreach ($body as $lookup) {
+                    $result[] = [
+                        'label' => $lookup['federationId'],
+                        'value' => [
+                            'shareType' => Share::SHARE_TYPE_REMOTE,
+                            'shareWith' => $lookup['federationId'],
+                        ],
+                        'extra' => $lookup,
+                    ];
+                }
+            } catch (\Exception $e) {}
+        }
+
+        $this->result['lookup'] = $result;
+    }
+
+    /**
+     * Generates a bunch of pagination links for the current page
+     *
+     * @param int $page Current page
+     * @param array $params Parameters for the URL
+     * @return string
+     */
+    protected function getPaginationLink($page, array $params) {
+        if ($this->isV2()) {
+            $url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees') . '?';
+        } else {
+            $url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?';
+        }
+        $params['page'] = $page + 1;
+        $link = '<' . $url . http_build_query($params) . '>; rel="next"';
+
+        return $link;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isV2() {
+        return $this->request->getScriptName() === '/ocs/v2.php';
+    }
 }

Spacing +14 added lines, -14 removed lines

@@ -236,17 +236,17 @@ 
 		$this->result['groups'] = $this->result['exact']['groups'] = [];
 
 		$groups = $this->groupManager->search($search, $this->limit, $this->offset);
-		$groupIds = array_map(function (IGroup $group) { return $group->getGID(); }, $groups);
+		$groupIds = array_map(function(IGroup $group) { return $group->getGID(); }, $groups);
 
 		if (!$this->shareeEnumeration || sizeof($groups) < $this->limit) {
 			$this->reachedEndFor[] = 'groups';
 		}
 
-		$userGroups =  [];
+		$userGroups = [];
 		if (!empty($groups) && $this->shareWithGroupOnly) {
 			// Intersect all the groups that match with the groups this user is a member of
 			$userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
-			$userGroups = array_map(function (IGroup $group) { return $group->getGID(); }, $userGroups);
+			$userGroups = array_map(function(IGroup $group) { return $group->getGID(); }, $userGroups);
 			$groupIds = array_intersect($groupIds, $userGroups);
 		}
 
@@ -341,7 +341,7 @@ 
 							$result['exactIdMatch'] = true;
 						}
 						$result['exact'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
+							'label' => $contact['FN']." ($cloudId)",
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_REMOTE,
 								'shareWith' => $cloudId,
@@ -350,7 +350,7 @@ 
 						];
 					} else {
 						$result['results'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
+							'label' => $contact['FN']." ($cloudId)",
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_REMOTE,
 								'shareWith' => $cloudId,
@@ -434,13 +434,13 @@ 
 	public function search($search = '', $itemType = null, $page = 1, $perPage = 200, $shareType = null, $lookup = true) {
 
 		// only search for string larger than a given threshold
-		$threshold = (int)$this->config->getSystemValue('sharing.minSearchStringLength', 0);
+		$threshold = (int) $this->config->getSystemValue('sharing.minSearchStringLength', 0);
 		if (strlen($search) < $threshold) {
 			return new DataResponse($this->result);
 		}
 
 		// never return more than the max. number of results configured in the config.php
-		$maxResults = (int)$this->config->getSystemValue('sharing.maxAutocompleteResults', 0);
+		$maxResults = (int) $this->config->getSystemValue('sharing.maxAutocompleteResults', 0);
 		if ($maxResults > 0) {
 			$perPage = min($perPage, $maxResults);
 		}
@@ -614,7 +614,7 @@ 
 							$result['exactIdMatch'] = true;
 						}
 						$result['exact'][] = [
-							'label' => $contact['FN'] . " ($emailAddress)",
+							'label' => $contact['FN']." ($emailAddress)",
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_EMAIL,
 								'shareWith' => $emailAddress,
@@ -622,7 +622,7 @@ 
 						];
 					} else {
 						$result['results'][] = [
-							'label' => $contact['FN'] . " ($emailAddress)",
+							'label' => $contact['FN']." ($emailAddress)",
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_EMAIL,
 								'shareWith' => $emailAddress,
@@ -657,11 +657,11 @@ 
 		$lookupServerUrl = $this->config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
 		$result = [];
 
-		if($isEnabled === 'yes') {
+		if ($isEnabled === 'yes') {
 			try {
 				$client = $this->clientService->newClient();
 				$response = $client->get(
-					$lookupServerUrl . '/users?search=' . urlencode($search),
+					$lookupServerUrl.'/users?search='.urlencode($search),
 					[
 						'timeout' => 10,
 						'connect_timeout' => 3,
@@ -696,12 +696,12 @@ 
 	 */
 	protected function getPaginationLink($page, array $params) {
 		if ($this->isV2()) {
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees') . '?';
+			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees').'?';
 		} else {
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?';
+			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees').'?';
 		}
 		$params['page'] = $page + 1;
-		$link = '<' . $url . http_build_query($params) . '>; rel="next"';
+		$link = '<'.$url.http_build_query($params).'>; rel="next"';
 
 		return $link;
 	}

settings/BackgroundJobs/VerifyUserData.php

Doc Comments +1 added lines, -1 removed lines

@@ -245,7 +245,7 @@
 	/**
 	 * re-add background job with new arguments
 	 *
-	 * @param IJobList $jobList
+	 * @param JobList $jobList
 	 * @param array $argument
 	 */
 	protected function reAddJob(IJobList $jobList, array $argument) {

Indentation +237 added lines, -237 removed lines

@@ -34,242 +34,242 @@
 
 class VerifyUserData extends Job {
 
-	/** @var  bool */
-	private $retainJob = true;
-
-	/** @var int max number of attempts to send the request */
-	private $maxTry = 24;
-
-	/** @var int how much time should be between two tries (1 hour) */
-	private $interval = 3600;
-
-	/** @var AccountManager */
-	private $accountManager;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IClientService */
-	private $httpClientService;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var string */
-	private $lookupServerUrl;
-
-	/**
-	 * VerifyUserData constructor.
-	 *
-	 * @param AccountManager|null $accountManager
-	 * @param IUserManager|null $userManager
-	 * @param IClientService|null $clientService
-	 * @param IConfig|null $config
-	 */
-	public function __construct(AccountManager $accountManager = null,
-								IUserManager $userManager = null,
-								IClientService $clientService = null,
-								ILogger $logger = null,
-								IConfig $config = null
-	) {
-		$this->accountManager = $accountManager !== null ? $accountManager : \OC::$server->query(AccountManager::class);
-		$this->userManager = $userManager !== null ? $userManager : \OC::$server->getUserManager();
-		$this->httpClientService = $clientService !== null ? $clientService : \OC::$server->getHTTPClientService();
-		$this->logger = $logger !== null ? $logger : \OC::$server->getLogger();
-
-		if ($config !== null) {
-			$this->lookupServerUrl = $config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
-		} else {
-			$this->lookupServerUrl = \OC::$server->getConfig()->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
-		}
-	}
-
-	/**
-	 * run the job, then remove it from the jobList
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger $logger
-	 */
-	public function execute($jobList, ILogger $logger = null) {
-
-		if ($this->shouldRun($this->argument)) {
-			parent::execute($jobList, $logger);
-			$jobList->remove($this, $this->argument);
-			if ($this->retainJob) {
-				$this->reAddJob($jobList, $this->argument);
-			}
-		}
-
-	}
-
-	protected function run($argument) {
-
-		$try = (int)$argument['try'] + 1;
-
-		switch($argument['type']) {
-			case AccountManager::PROPERTY_WEBSITE:
-				$result = $this->verifyWebsite($argument);
-				break;
-			case AccountManager::PROPERTY_TWITTER:
-			case AccountManager::PROPERTY_EMAIL:
-				$result = $this->verifyViaLookupServer($argument, $argument['type']);
-				break;
-			default:
-				// no valid type given, no need to retry
-				$this->logger->error($argument['type'] . ' is no valid type for user account data.');
-				$result = true;
-		}
-
-		if ($result === true || $try > $this->maxTry) {
-			$this->retainJob = false;
-		}
-	}
-
-	/**
-	 * verify web page
-	 *
-	 * @param array $argument
-	 * @return bool true if we could check the verification code, otherwise false
-	 */
-	protected function verifyWebsite(array $argument) {
-
-		$result = false;
-
-		$url = rtrim($argument['data'], '/') . '/' . 'CloudIdVerificationCode.txt';
-
-		$client = $this->httpClientService->newClient();
-		try {
-			$response = $client->get($url);
-		} catch (\Exception $e) {
-			return false;
-		}
-
-		if ($response->getStatusCode() === Http::STATUS_OK) {
-			$result = true;
-			$publishedCode = $response->getBody();
-			$user = $this->userManager->get($argument['uid']);
-			// we don't check a valid user -> give up
-			if ($user === null) {
-				$this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
-				return $result;
-			}
-			$userData = $this->accountManager->getUser($user);
-
-			if ($publishedCode === $argument['verificationCode']) {
-
-				$userData[AccountManager::PROPERTY_WEBSITE]['verified'] === AccountManager::VERIFIED;
-			} else {
-				$userData[AccountManager::PROPERTY_WEBSITE]['verified'] === AccountManager::NOT_VERIFIED;
-			}
-
-			$this->accountManager->updateUser($user, $userData);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * verify email address
-	 *
-	 * @param array $argument
-	 * @param string $dataType
-	 * @return bool true if we could check the verification code, otherwise false
-	 */
-	protected function verifyViaLookupServer(array $argument, $dataType) {
-
-		$user = $this->userManager->get($argument['uid']);
-
-		// we don't check a valid user -> give up
-		if ($user === null) {
-			$this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
-			return true;
-		}
-
-		$localUserData = $this->accountManager->getUser($user);
-		$cloudId = $user->getCloudId();
-
-		// ask lookup-server for user data
-		$lookupServerData = $this->queryLookupServer($cloudId);
-
-		// for some reasons we couldn't read any data from the lookup server, try again later
-		if (empty($lookupServerData)) {
-			return false;
-		}
-
-		// lookup server has verification data for wrong user data (e.g. email address), try again later
-		if ($lookupServerData[$dataType]['value'] !== $argument['data']) {
-			return false;
-		}
-
-		// lookup server hasn't verified the email address so far, try again later
-		if ($lookupServerData[$dataType]['verified'] === AccountManager::VERIFICATION_IN_PROGRESS) {
-			return false;
-		}
-
-		$localUserData[$dataType]['verified'] === $lookupServerData[$dataType]['verified'];
-		$this->accountManager->updateUser($user, $localUserData);
-
-		return true;
-	}
-
-	/**
-	 * @param string $cloudId
-	 * @return array
-	 */
-	protected function queryLookupServer($cloudId) {
-		try {
-			$client = $this->clientService->newClient();
-			$response = $client->get(
-				$this->lookupServerUrl . '/users?search=' . urlencode($cloudId),
-				[
-					'timeout' => 10,
-					'connect_timeout' => 3,
-				]
-			);
-
-			$body = json_decode($response->getBody(), true);
-
-			foreach ($body as $lookup) {
-				if ($lookup['federationId'] === $cloudId) {
-					return $lookup;
-				}
-			}
-
-		} catch (\Exception $e) {
-			// do nothing, we will just re-try later
-		}
-
-		return [];
-	}
-
-	/**
-	 * re-add background job with new arguments
-	 *
-	 * @param IJobList $jobList
-	 * @param array $argument
-	 */
-	protected function reAddJob(IJobList $jobList, array $argument) {
-		$jobList->add('OC\Settings\BackgroundJobs\VerifyUserData',
-			[
-				'verificationCode' => $argument['verificationCode'],
-				'data' => $argument['data'],
-				'type' => $argument['type'],
-				'uid' => $argument['uid'],
-				'try' => (int)$argument['try'] + 1,
-				'lastRun' => time()
-			]
-		);
-	}
-
-	/**
-	 * test if it is time for the next run
-	 *
-	 * @param array $argument
-	 * @return bool
-	 */
-	protected function shouldRun(array $argument) {
-		$lastRun = (int)$argument['lastRun'];
-		return ((time() - $lastRun) > $this->interval);
-	}
+    /** @var  bool */
+    private $retainJob = true;
+
+    /** @var int max number of attempts to send the request */
+    private $maxTry = 24;
+
+    /** @var int how much time should be between two tries (1 hour) */
+    private $interval = 3600;
+
+    /** @var AccountManager */
+    private $accountManager;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IClientService */
+    private $httpClientService;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var string */
+    private $lookupServerUrl;
+
+    /**
+     * VerifyUserData constructor.
+     *
+     * @param AccountManager|null $accountManager
+     * @param IUserManager|null $userManager
+     * @param IClientService|null $clientService
+     * @param IConfig|null $config
+     */
+    public function __construct(AccountManager $accountManager = null,
+                                IUserManager $userManager = null,
+                                IClientService $clientService = null,
+                                ILogger $logger = null,
+                                IConfig $config = null
+    ) {
+        $this->accountManager = $accountManager !== null ? $accountManager : \OC::$server->query(AccountManager::class);
+        $this->userManager = $userManager !== null ? $userManager : \OC::$server->getUserManager();
+        $this->httpClientService = $clientService !== null ? $clientService : \OC::$server->getHTTPClientService();
+        $this->logger = $logger !== null ? $logger : \OC::$server->getLogger();
+
+        if ($config !== null) {
+            $this->lookupServerUrl = $config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
+        } else {
+            $this->lookupServerUrl = \OC::$server->getConfig()->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
+        }
+    }
+
+    /**
+     * run the job, then remove it from the jobList
+     *
+     * @param JobList $jobList
+     * @param ILogger $logger
+     */
+    public function execute($jobList, ILogger $logger = null) {
+
+        if ($this->shouldRun($this->argument)) {
+            parent::execute($jobList, $logger);
+            $jobList->remove($this, $this->argument);
+            if ($this->retainJob) {
+                $this->reAddJob($jobList, $this->argument);
+            }
+        }
+
+    }
+
+    protected function run($argument) {
+
+        $try = (int)$argument['try'] + 1;
+
+        switch($argument['type']) {
+            case AccountManager::PROPERTY_WEBSITE:
+                $result = $this->verifyWebsite($argument);
+                break;
+            case AccountManager::PROPERTY_TWITTER:
+            case AccountManager::PROPERTY_EMAIL:
+                $result = $this->verifyViaLookupServer($argument, $argument['type']);
+                break;
+            default:
+                // no valid type given, no need to retry
+                $this->logger->error($argument['type'] . ' is no valid type for user account data.');
+                $result = true;
+        }
+
+        if ($result === true || $try > $this->maxTry) {
+            $this->retainJob = false;
+        }
+    }
+
+    /**
+     * verify web page
+     *
+     * @param array $argument
+     * @return bool true if we could check the verification code, otherwise false
+     */
+    protected function verifyWebsite(array $argument) {
+
+        $result = false;
+
+        $url = rtrim($argument['data'], '/') . '/' . 'CloudIdVerificationCode.txt';
+
+        $client = $this->httpClientService->newClient();
+        try {
+            $response = $client->get($url);
+        } catch (\Exception $e) {
+            return false;
+        }
+
+        if ($response->getStatusCode() === Http::STATUS_OK) {
+            $result = true;
+            $publishedCode = $response->getBody();
+            $user = $this->userManager->get($argument['uid']);
+            // we don't check a valid user -> give up
+            if ($user === null) {
+                $this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
+                return $result;
+            }
+            $userData = $this->accountManager->getUser($user);
+
+            if ($publishedCode === $argument['verificationCode']) {
+
+                $userData[AccountManager::PROPERTY_WEBSITE]['verified'] === AccountManager::VERIFIED;
+            } else {
+                $userData[AccountManager::PROPERTY_WEBSITE]['verified'] === AccountManager::NOT_VERIFIED;
+            }
+
+            $this->accountManager->updateUser($user, $userData);
+        }
+
+        return $result;
+    }
+
+    /**
+     * verify email address
+     *
+     * @param array $argument
+     * @param string $dataType
+     * @return bool true if we could check the verification code, otherwise false
+     */
+    protected function verifyViaLookupServer(array $argument, $dataType) {
+
+        $user = $this->userManager->get($argument['uid']);
+
+        // we don't check a valid user -> give up
+        if ($user === null) {
+            $this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
+            return true;
+        }
+
+        $localUserData = $this->accountManager->getUser($user);
+        $cloudId = $user->getCloudId();
+
+        // ask lookup-server for user data
+        $lookupServerData = $this->queryLookupServer($cloudId);
+
+        // for some reasons we couldn't read any data from the lookup server, try again later
+        if (empty($lookupServerData)) {
+            return false;
+        }
+
+        // lookup server has verification data for wrong user data (e.g. email address), try again later
+        if ($lookupServerData[$dataType]['value'] !== $argument['data']) {
+            return false;
+        }
+
+        // lookup server hasn't verified the email address so far, try again later
+        if ($lookupServerData[$dataType]['verified'] === AccountManager::VERIFICATION_IN_PROGRESS) {
+            return false;
+        }
+
+        $localUserData[$dataType]['verified'] === $lookupServerData[$dataType]['verified'];
+        $this->accountManager->updateUser($user, $localUserData);
+
+        return true;
+    }
+
+    /**
+     * @param string $cloudId
+     * @return array
+     */
+    protected function queryLookupServer($cloudId) {
+        try {
+            $client = $this->clientService->newClient();
+            $response = $client->get(
+                $this->lookupServerUrl . '/users?search=' . urlencode($cloudId),
+                [
+                    'timeout' => 10,
+                    'connect_timeout' => 3,
+                ]
+            );
+
+            $body = json_decode($response->getBody(), true);
+
+            foreach ($body as $lookup) {
+                if ($lookup['federationId'] === $cloudId) {
+                    return $lookup;
+                }
+            }
+
+        } catch (\Exception $e) {
+            // do nothing, we will just re-try later
+        }
+
+        return [];
+    }
+
+    /**
+     * re-add background job with new arguments
+     *
+     * @param IJobList $jobList
+     * @param array $argument
+     */
+    protected function reAddJob(IJobList $jobList, array $argument) {
+        $jobList->add('OC\Settings\BackgroundJobs\VerifyUserData',
+            [
+                'verificationCode' => $argument['verificationCode'],
+                'data' => $argument['data'],
+                'type' => $argument['type'],
+                'uid' => $argument['uid'],
+                'try' => (int)$argument['try'] + 1,
+                'lastRun' => time()
+            ]
+        );
+    }
+
+    /**
+     * test if it is time for the next run
+     *
+     * @param array $argument
+     * @return bool
+     */
+    protected function shouldRun(array $argument) {
+        $lastRun = (int)$argument['lastRun'];
+        return ((time() - $lastRun) > $this->interval);
+    }
 
 }

Spacing +9 added lines, -9 removed lines

@@ -104,9 +104,9 @@ 
 
 	protected function run($argument) {
 
-		$try = (int)$argument['try'] + 1;
+		$try = (int) $argument['try'] + 1;
 
-		switch($argument['type']) {
+		switch ($argument['type']) {
 			case AccountManager::PROPERTY_WEBSITE:
 				$result = $this->verifyWebsite($argument);
 				break;
@@ -116,7 +116,7 @@ 
 				break;
 			default:
 				// no valid type given, no need to retry
-				$this->logger->error($argument['type'] . ' is no valid type for user account data.');
+				$this->logger->error($argument['type'].' is no valid type for user account data.');
 				$result = true;
 		}
 
@@ -135,7 +135,7 @@ 
 
 		$result = false;
 
-		$url = rtrim($argument['data'], '/') . '/' . 'CloudIdVerificationCode.txt';
+		$url = rtrim($argument['data'], '/').'/'.'CloudIdVerificationCode.txt';
 
 		$client = $this->httpClientService->newClient();
 		try {
@@ -150,7 +150,7 @@ 
 			$user = $this->userManager->get($argument['uid']);
 			// we don't check a valid user -> give up
 			if ($user === null) {
-				$this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
+				$this->logger->error($argument['uid'].' doesn\'t exist, can\'t verify user data.');
 				return $result;
 			}
 			$userData = $this->accountManager->getUser($user);
@@ -181,7 +181,7 @@ 
 
 		// we don't check a valid user -> give up
 		if ($user === null) {
-			$this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
+			$this->logger->error($argument['uid'].' doesn\'t exist, can\'t verify user data.');
 			return true;
 		}
 
@@ -220,7 +220,7 @@ 
 		try {
 			$client = $this->clientService->newClient();
 			$response = $client->get(
-				$this->lookupServerUrl . '/users?search=' . urlencode($cloudId),
+				$this->lookupServerUrl.'/users?search='.urlencode($cloudId),
 				[
 					'timeout' => 10,
 					'connect_timeout' => 3,
@@ -255,7 +255,7 @@ 
 				'data' => $argument['data'],
 				'type' => $argument['type'],
 				'uid' => $argument['uid'],
-				'try' => (int)$argument['try'] + 1,
+				'try' => (int) $argument['try'] + 1,
 				'lastRun' => time()
 			]
 		);
@@ -268,7 +268,7 @@ 
 	 * @return bool
 	 */
 	protected function shouldRun(array $argument) {
-		$lastRun = (int)$argument['lastRun'];
+		$lastRun = (int) $argument['lastRun'];
 		return ((time() - $lastRun) > $this->interval);
 	}