nextcloud / server

lib/private/Federation/CloudIdManager.php

Indentation +109 added lines, -109 removed lines

@@ -34,113 +34,113 @@
 use OCP\Federation\ICloudIdManager;
 
 class CloudIdManager implements ICloudIdManager {
-	/** @var IManager */
-	private $contactsManager;
-
-	public function __construct(IManager $contactsManager) {
-		$this->contactsManager = $contactsManager;
-	}
-
-	/**
-	 * @param string $cloudId
-	 * @return ICloudId
-	 * @throws \InvalidArgumentException
-	 */
-	public function resolveCloudId(string $cloudId): ICloudId {
-		// TODO magic here to get the url and user instead of just splitting on @
-
-		if (!$this->isValidCloudId($cloudId)) {
-			throw new \InvalidArgumentException('Invalid cloud id');
-		}
-
-		// Find the first character that is not allowed in user names
-		$id = $this->fixRemoteURL($cloudId);
-		$posSlash = strpos($id, '/');
-		$posColon = strpos($id, ':');
-
-		if ($posSlash === false && $posColon === false) {
-			$invalidPos = \strlen($id);
-		} elseif ($posSlash === false) {
-			$invalidPos = $posColon;
-		} elseif ($posColon === false) {
-			$invalidPos = $posSlash;
-		} else {
-			$invalidPos = min($posSlash, $posColon);
-		}
-
-		$lastValidAtPos = strrpos($id, '@', $invalidPos - strlen($id));
-
-		if ($lastValidAtPos !== false) {
-			$user = substr($id, 0, $lastValidAtPos);
-			$remote = substr($id, $lastValidAtPos + 1);
-			if (!empty($user) && !empty($remote)) {
-				return new CloudId($id, $user, $remote, $this->getDisplayNameFromContact($id));
-			}
-		}
-		throw new \InvalidArgumentException('Invalid cloud id');
-	}
-
-	protected function getDisplayNameFromContact(string $cloudId): ?string {
-		$addressBookEntries = $this->contactsManager->search($cloudId, ['CLOUD']);
-		foreach ($addressBookEntries as $entry) {
-			if (isset($entry['CLOUD'])) {
-				foreach ($entry['CLOUD'] as $cloudID) {
-					if ($cloudID === $cloudId) {
-						return $entry['FN'];
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @param string $user
-	 * @param string $remote
-	 * @return CloudId
-	 */
-	public function getCloudId(string $user, string $remote): ICloudId {
-		// TODO check what the correct url is for remote (asking the remote)
-		$fixedRemote = $this->fixRemoteURL($remote);
-		if (strpos($fixedRemote, 'http://') === 0) {
-			$host = substr($fixedRemote, strlen('http://'));
-		} elseif (strpos($fixedRemote, 'https://') === 0) {
-			$host = substr($fixedRemote, strlen('https://'));
-		} else {
-			$host = $fixedRemote;
-		}
-		$id = $user . '@' . $remote;
-		$displayName = $this->getDisplayNameFromContact($user . '@' . $host);
-		return new CloudId($id, $user, $fixedRemote, $displayName);
-	}
-
-	/**
-	 * 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(string $remote): string {
-		$remote = str_replace('\\', '/', $remote);
-		if ($fileNamePosition = strpos($remote, '/index.php')) {
-			$remote = substr($remote, 0, $fileNamePosition);
-		}
-		$remote = rtrim($remote, '/');
-
-		return $remote;
-	}
-
-	/**
-	 * @param string $cloudId
-	 * @return bool
-	 */
-	public function isValidCloudId(string $cloudId): bool {
-		return strpos($cloudId, '@') !== false;
-	}
+    /** @var IManager */
+    private $contactsManager;
+
+    public function __construct(IManager $contactsManager) {
+        $this->contactsManager = $contactsManager;
+    }
+
+    /**
+     * @param string $cloudId
+     * @return ICloudId
+     * @throws \InvalidArgumentException
+     */
+    public function resolveCloudId(string $cloudId): ICloudId {
+        // TODO magic here to get the url and user instead of just splitting on @
+
+        if (!$this->isValidCloudId($cloudId)) {
+            throw new \InvalidArgumentException('Invalid cloud id');
+        }
+
+        // Find the first character that is not allowed in user names
+        $id = $this->fixRemoteURL($cloudId);
+        $posSlash = strpos($id, '/');
+        $posColon = strpos($id, ':');
+
+        if ($posSlash === false && $posColon === false) {
+            $invalidPos = \strlen($id);
+        } elseif ($posSlash === false) {
+            $invalidPos = $posColon;
+        } elseif ($posColon === false) {
+            $invalidPos = $posSlash;
+        } else {
+            $invalidPos = min($posSlash, $posColon);
+        }
+
+        $lastValidAtPos = strrpos($id, '@', $invalidPos - strlen($id));
+
+        if ($lastValidAtPos !== false) {
+            $user = substr($id, 0, $lastValidAtPos);
+            $remote = substr($id, $lastValidAtPos + 1);
+            if (!empty($user) && !empty($remote)) {
+                return new CloudId($id, $user, $remote, $this->getDisplayNameFromContact($id));
+            }
+        }
+        throw new \InvalidArgumentException('Invalid cloud id');
+    }
+
+    protected function getDisplayNameFromContact(string $cloudId): ?string {
+        $addressBookEntries = $this->contactsManager->search($cloudId, ['CLOUD']);
+        foreach ($addressBookEntries as $entry) {
+            if (isset($entry['CLOUD'])) {
+                foreach ($entry['CLOUD'] as $cloudID) {
+                    if ($cloudID === $cloudId) {
+                        return $entry['FN'];
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @param string $user
+     * @param string $remote
+     * @return CloudId
+     */
+    public function getCloudId(string $user, string $remote): ICloudId {
+        // TODO check what the correct url is for remote (asking the remote)
+        $fixedRemote = $this->fixRemoteURL($remote);
+        if (strpos($fixedRemote, 'http://') === 0) {
+            $host = substr($fixedRemote, strlen('http://'));
+        } elseif (strpos($fixedRemote, 'https://') === 0) {
+            $host = substr($fixedRemote, strlen('https://'));
+        } else {
+            $host = $fixedRemote;
+        }
+        $id = $user . '@' . $remote;
+        $displayName = $this->getDisplayNameFromContact($user . '@' . $host);
+        return new CloudId($id, $user, $fixedRemote, $displayName);
+    }
+
+    /**
+     * 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(string $remote): string {
+        $remote = str_replace('\\', '/', $remote);
+        if ($fileNamePosition = strpos($remote, '/index.php')) {
+            $remote = substr($remote, 0, $fileNamePosition);
+        }
+        $remote = rtrim($remote, '/');
+
+        return $remote;
+    }
+
+    /**
+     * @param string $cloudId
+     * @return bool
+     */
+    public function isValidCloudId(string $cloudId): bool {
+        return strpos($cloudId, '@') !== false;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -109,8 +109,8 @@
 		} else {
 			$host = $fixedRemote;
 		}
-		$id = $user . '@' . $remote;
-		$displayName = $this->getDisplayNameFromContact($user . '@' . $host);
+		$id = $user.'@'.$remote;
+		$displayName = $this->getDisplayNameFromContact($user.'@'.$host);
 		return new CloudId($id, $user, $fixedRemote, $displayName);
 	}