nextcloud / server

apps/dav/lib/Comments/CommentNode.php

Spacing +5 added lines, -5 removed lines

@@ -85,14 +85,14 @@ 
 		$this->logger = $logger;
 
 		$methods = get_class_methods($this->comment);
-		$methods = array_filter($methods, function ($name) {
+		$methods = array_filter($methods, function($name) {
 			return strpos($name, 'get') === 0;
 		});
 		foreach ($methods as $getter) {
 			if ($getter === 'getMentions') {
-				continue;	// special treatment
+				continue; // special treatment
 			}
-			$name = '{'.self::NS_OWNCLOUD.'}' . lcfirst(substr($getter, 3));
+			$name = '{'.self::NS_OWNCLOUD.'}'.lcfirst(substr($getter, 3));
 			$this->properties[$name] = $getter;
 		}
 		$this->userManager = $userManager;
@@ -197,7 +197,7 @@ 
 			$this->logger->logException($e, ['app' => 'dav/comments']);
 			if ($e instanceof MessageTooLongException) {
 				$msg = 'Message exceeds allowed character limit of ';
-				throw new BadRequest($msg . IComment::MAX_MESSAGE_LENGTH, 0, $e);
+				throw new BadRequest($msg.IComment::MAX_MESSAGE_LENGTH, 0, $e);
 			}
 			throw $e;
 		}
@@ -283,7 +283,7 @@ 
 	 * @return array
 	 */
 	protected function composeMentionsPropertyValue() {
-		return array_map(function ($mention) {
+		return array_map(function($mention) {
 			try {
 				$displayName = $this->commentsManager->resolveDisplayName($mention['type'], $mention['id']);
 			} catch (\OutOfBoundsException $e) {

Indentation +241 added lines, -241 removed lines

@@ -36,270 +36,270 @@
 use Sabre\DAV\PropPatch;
 
 class CommentNode implements \Sabre\DAV\INode, \Sabre\DAV\IProperties {
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	public const PROPERTY_NAME_UNREAD = '{http://owncloud.org/ns}isUnread';
-	public const PROPERTY_NAME_MESSAGE = '{http://owncloud.org/ns}message';
-	public const PROPERTY_NAME_ACTOR_DISPLAYNAME = '{http://owncloud.org/ns}actorDisplayName';
-	public const PROPERTY_NAME_MENTIONS = '{http://owncloud.org/ns}mentions';
-	public const PROPERTY_NAME_MENTION = '{http://owncloud.org/ns}mention';
-	public const PROPERTY_NAME_MENTION_TYPE = '{http://owncloud.org/ns}mentionType';
-	public const PROPERTY_NAME_MENTION_ID = '{http://owncloud.org/ns}mentionId';
-	public const PROPERTY_NAME_MENTION_DISPLAYNAME = '{http://owncloud.org/ns}mentionDisplayName';
+    public const PROPERTY_NAME_UNREAD = '{http://owncloud.org/ns}isUnread';
+    public const PROPERTY_NAME_MESSAGE = '{http://owncloud.org/ns}message';
+    public const PROPERTY_NAME_ACTOR_DISPLAYNAME = '{http://owncloud.org/ns}actorDisplayName';
+    public const PROPERTY_NAME_MENTIONS = '{http://owncloud.org/ns}mentions';
+    public const PROPERTY_NAME_MENTION = '{http://owncloud.org/ns}mention';
+    public const PROPERTY_NAME_MENTION_TYPE = '{http://owncloud.org/ns}mentionType';
+    public const PROPERTY_NAME_MENTION_ID = '{http://owncloud.org/ns}mentionId';
+    public const PROPERTY_NAME_MENTION_DISPLAYNAME = '{http://owncloud.org/ns}mentionDisplayName';
 
-	/** @var  IComment */
-	public $comment;
+    /** @var  IComment */
+    public $comment;
 
-	/** @var ICommentsManager */
-	protected $commentsManager;
+    /** @var ICommentsManager */
+    protected $commentsManager;
 
-	/** @var  ILogger */
-	protected $logger;
+    /** @var  ILogger */
+    protected $logger;
 
-	/** @var array list of properties with key being their name and value their setter */
-	protected $properties = [];
+    /** @var array list of properties with key being their name and value their setter */
+    protected $properties = [];
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/** @var IUserSession */
-	protected $userSession;
+    /** @var IUserSession */
+    protected $userSession;
 
-	/**
-	 * CommentNode constructor.
-	 *
-	 * @param ICommentsManager $commentsManager
-	 * @param IComment $comment
-	 * @param IUserManager $userManager
-	 * @param IUserSession $userSession
-	 * @param ILogger $logger
-	 */
-	public function __construct(
-		ICommentsManager $commentsManager,
-		IComment $comment,
-		IUserManager $userManager,
-		IUserSession $userSession,
-		ILogger $logger
-	) {
-		$this->commentsManager = $commentsManager;
-		$this->comment = $comment;
-		$this->logger = $logger;
+    /**
+     * CommentNode constructor.
+     *
+     * @param ICommentsManager $commentsManager
+     * @param IComment $comment
+     * @param IUserManager $userManager
+     * @param IUserSession $userSession
+     * @param ILogger $logger
+     */
+    public function __construct(
+        ICommentsManager $commentsManager,
+        IComment $comment,
+        IUserManager $userManager,
+        IUserSession $userSession,
+        ILogger $logger
+    ) {
+        $this->commentsManager = $commentsManager;
+        $this->comment = $comment;
+        $this->logger = $logger;
 
-		$methods = get_class_methods($this->comment);
-		$methods = array_filter($methods, function ($name) {
-			return strpos($name, 'get') === 0;
-		});
-		foreach ($methods as $getter) {
-			if ($getter === 'getMentions') {
-				continue;	// special treatment
-			}
-			$name = '{'.self::NS_OWNCLOUD.'}' . lcfirst(substr($getter, 3));
-			$this->properties[$name] = $getter;
-		}
-		$this->userManager = $userManager;
-		$this->userSession = $userSession;
-	}
+        $methods = get_class_methods($this->comment);
+        $methods = array_filter($methods, function ($name) {
+            return strpos($name, 'get') === 0;
+        });
+        foreach ($methods as $getter) {
+            if ($getter === 'getMentions') {
+                continue;	// special treatment
+            }
+            $name = '{'.self::NS_OWNCLOUD.'}' . lcfirst(substr($getter, 3));
+            $this->properties[$name] = $getter;
+        }
+        $this->userManager = $userManager;
+        $this->userSession = $userSession;
+    }
 
-	/**
-	 * returns a list of all possible property names
-	 *
-	 * @return array
-	 */
-	public static function getPropertyNames() {
-		return [
-			'{http://owncloud.org/ns}id',
-			'{http://owncloud.org/ns}parentId',
-			'{http://owncloud.org/ns}topmostParentId',
-			'{http://owncloud.org/ns}childrenCount',
-			'{http://owncloud.org/ns}verb',
-			'{http://owncloud.org/ns}actorType',
-			'{http://owncloud.org/ns}actorId',
-			'{http://owncloud.org/ns}creationDateTime',
-			'{http://owncloud.org/ns}latestChildDateTime',
-			'{http://owncloud.org/ns}objectType',
-			'{http://owncloud.org/ns}objectId',
-			// re-used property names are defined as constants
-			self::PROPERTY_NAME_MESSAGE,
-			self::PROPERTY_NAME_ACTOR_DISPLAYNAME,
-			self::PROPERTY_NAME_UNREAD,
-			self::PROPERTY_NAME_MENTIONS,
-			self::PROPERTY_NAME_MENTION,
-			self::PROPERTY_NAME_MENTION_TYPE,
-			self::PROPERTY_NAME_MENTION_ID,
-			self::PROPERTY_NAME_MENTION_DISPLAYNAME,
-		];
-	}
+    /**
+     * returns a list of all possible property names
+     *
+     * @return array
+     */
+    public static function getPropertyNames() {
+        return [
+            '{http://owncloud.org/ns}id',
+            '{http://owncloud.org/ns}parentId',
+            '{http://owncloud.org/ns}topmostParentId',
+            '{http://owncloud.org/ns}childrenCount',
+            '{http://owncloud.org/ns}verb',
+            '{http://owncloud.org/ns}actorType',
+            '{http://owncloud.org/ns}actorId',
+            '{http://owncloud.org/ns}creationDateTime',
+            '{http://owncloud.org/ns}latestChildDateTime',
+            '{http://owncloud.org/ns}objectType',
+            '{http://owncloud.org/ns}objectId',
+            // re-used property names are defined as constants
+            self::PROPERTY_NAME_MESSAGE,
+            self::PROPERTY_NAME_ACTOR_DISPLAYNAME,
+            self::PROPERTY_NAME_UNREAD,
+            self::PROPERTY_NAME_MENTIONS,
+            self::PROPERTY_NAME_MENTION,
+            self::PROPERTY_NAME_MENTION_TYPE,
+            self::PROPERTY_NAME_MENTION_ID,
+            self::PROPERTY_NAME_MENTION_DISPLAYNAME,
+        ];
+    }
 
-	protected function checkWriteAccessOnComment() {
-		$user = $this->userSession->getUser();
-		if ($this->comment->getActorType() !== 'users'
-			|| is_null($user)
-			|| $this->comment->getActorId() !== $user->getUID()
-		) {
-			throw new Forbidden('Only authors are allowed to edit their comment.');
-		}
-	}
+    protected function checkWriteAccessOnComment() {
+        $user = $this->userSession->getUser();
+        if ($this->comment->getActorType() !== 'users'
+            || is_null($user)
+            || $this->comment->getActorId() !== $user->getUID()
+        ) {
+            throw new Forbidden('Only authors are allowed to edit their comment.');
+        }
+    }
 
-	/**
-	 * Deleted the current node
-	 *
-	 * @return void
-	 */
-	public function delete() {
-		$this->checkWriteAccessOnComment();
-		$this->commentsManager->delete($this->comment->getId());
-	}
+    /**
+     * Deleted the current node
+     *
+     * @return void
+     */
+    public function delete() {
+        $this->checkWriteAccessOnComment();
+        $this->commentsManager->delete($this->comment->getId());
+    }
 
-	/**
-	 * Returns the name of the node.
-	 *
-	 * This is used to generate the url.
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return $this->comment->getId();
-	}
+    /**
+     * Returns the name of the node.
+     *
+     * This is used to generate the url.
+     *
+     * @return string
+     */
+    public function getName() {
+        return $this->comment->getId();
+    }
 
-	/**
-	 * Renames the node
-	 *
-	 * @param string $name The new name
-	 * @throws MethodNotAllowed
-	 */
-	public function setName($name) {
-		throw new MethodNotAllowed();
-	}
+    /**
+     * Renames the node
+     *
+     * @param string $name The new name
+     * @throws MethodNotAllowed
+     */
+    public function setName($name) {
+        throw new MethodNotAllowed();
+    }
 
-	/**
-	 * Returns the last modification time, as a unix timestamp
-	 *
-	 * @return int
-	 */
-	public function getLastModified() {
-		return null;
-	}
+    /**
+     * Returns the last modification time, as a unix timestamp
+     *
+     * @return int
+     */
+    public function getLastModified() {
+        return null;
+    }
 
-	/**
-	 * update the comment's message
-	 *
-	 * @param $propertyValue
-	 * @return bool
-	 * @throws BadRequest
-	 * @throws \Exception
-	 */
-	public function updateComment($propertyValue) {
-		$this->checkWriteAccessOnComment();
-		try {
-			$this->comment->setMessage($propertyValue);
-			$this->commentsManager->save($this->comment);
-			return true;
-		} catch (\Exception $e) {
-			$this->logger->logException($e, ['app' => 'dav/comments']);
-			if ($e instanceof MessageTooLongException) {
-				$msg = 'Message exceeds allowed character limit of ';
-				throw new BadRequest($msg . IComment::MAX_MESSAGE_LENGTH, 0, $e);
-			}
-			throw $e;
-		}
-	}
+    /**
+     * update the comment's message
+     *
+     * @param $propertyValue
+     * @return bool
+     * @throws BadRequest
+     * @throws \Exception
+     */
+    public function updateComment($propertyValue) {
+        $this->checkWriteAccessOnComment();
+        try {
+            $this->comment->setMessage($propertyValue);
+            $this->commentsManager->save($this->comment);
+            return true;
+        } catch (\Exception $e) {
+            $this->logger->logException($e, ['app' => 'dav/comments']);
+            if ($e instanceof MessageTooLongException) {
+                $msg = 'Message exceeds allowed character limit of ';
+                throw new BadRequest($msg . IComment::MAX_MESSAGE_LENGTH, 0, $e);
+            }
+            throw $e;
+        }
+    }
 
-	/**
-	 * Updates properties on this node.
-	 *
-	 * This method received a PropPatch object, which contains all the
-	 * information about the update.
-	 *
-	 * To update specific properties, call the 'handle' method on this object.
-	 * Read the PropPatch documentation for more information.
-	 *
-	 * @param PropPatch $propPatch
-	 * @return void
-	 */
-	public function propPatch(PropPatch $propPatch) {
-		// other properties than 'message' are read only
-		$propPatch->handle(self::PROPERTY_NAME_MESSAGE, [$this, 'updateComment']);
-	}
+    /**
+     * Updates properties on this node.
+     *
+     * This method received a PropPatch object, which contains all the
+     * information about the update.
+     *
+     * To update specific properties, call the 'handle' method on this object.
+     * Read the PropPatch documentation for more information.
+     *
+     * @param PropPatch $propPatch
+     * @return void
+     */
+    public function propPatch(PropPatch $propPatch) {
+        // other properties than 'message' are read only
+        $propPatch->handle(self::PROPERTY_NAME_MESSAGE, [$this, 'updateComment']);
+    }
 
-	/**
-	 * Returns a list of properties for this nodes.
-	 *
-	 * The properties list is a list of propertynames the client requested,
-	 * encoded in clark-notation {xmlnamespace}tagname
-	 *
-	 * If the array is empty, it means 'all properties' were requested.
-	 *
-	 * Note that it's fine to liberally give properties back, instead of
-	 * conforming to the list of requested properties.
-	 * The Server class will filter out the extra.
-	 *
-	 * @param array $properties
-	 * @return array
-	 */
-	public function getProperties($properties) {
-		$properties = array_keys($this->properties);
+    /**
+     * Returns a list of properties for this nodes.
+     *
+     * The properties list is a list of propertynames the client requested,
+     * encoded in clark-notation {xmlnamespace}tagname
+     *
+     * If the array is empty, it means 'all properties' were requested.
+     *
+     * Note that it's fine to liberally give properties back, instead of
+     * conforming to the list of requested properties.
+     * The Server class will filter out the extra.
+     *
+     * @param array $properties
+     * @return array
+     */
+    public function getProperties($properties) {
+        $properties = array_keys($this->properties);
 
-		$result = [];
-		foreach ($properties as $property) {
-			$getter = $this->properties[$property];
-			if (method_exists($this->comment, $getter)) {
-				$result[$property] = $this->comment->$getter();
-			}
-		}
+        $result = [];
+        foreach ($properties as $property) {
+            $getter = $this->properties[$property];
+            if (method_exists($this->comment, $getter)) {
+                $result[$property] = $this->comment->$getter();
+            }
+        }
 
-		if ($this->comment->getActorType() === 'users') {
-			$user = $this->userManager->get($this->comment->getActorId());
-			$displayName = is_null($user) ? null : $user->getDisplayName();
-			$result[self::PROPERTY_NAME_ACTOR_DISPLAYNAME] = $displayName;
-		}
+        if ($this->comment->getActorType() === 'users') {
+            $user = $this->userManager->get($this->comment->getActorId());
+            $displayName = is_null($user) ? null : $user->getDisplayName();
+            $result[self::PROPERTY_NAME_ACTOR_DISPLAYNAME] = $displayName;
+        }
 
-		$result[self::PROPERTY_NAME_MENTIONS] = $this->composeMentionsPropertyValue();
+        $result[self::PROPERTY_NAME_MENTIONS] = $this->composeMentionsPropertyValue();
 
-		$unread = null;
-		$user = $this->userSession->getUser();
-		if (!is_null($user)) {
-			$readUntil = $this->commentsManager->getReadMark(
-				$this->comment->getObjectType(),
-				$this->comment->getObjectId(),
-				$user
-			);
-			if (is_null($readUntil)) {
-				$unread = 'true';
-			} else {
-				$unread = $this->comment->getCreationDateTime() > $readUntil;
-				// re-format for output
-				$unread = $unread ? 'true' : 'false';
-			}
-		}
-		$result[self::PROPERTY_NAME_UNREAD] = $unread;
+        $unread = null;
+        $user = $this->userSession->getUser();
+        if (!is_null($user)) {
+            $readUntil = $this->commentsManager->getReadMark(
+                $this->comment->getObjectType(),
+                $this->comment->getObjectId(),
+                $user
+            );
+            if (is_null($readUntil)) {
+                $unread = 'true';
+            } else {
+                $unread = $this->comment->getCreationDateTime() > $readUntil;
+                // re-format for output
+                $unread = $unread ? 'true' : 'false';
+            }
+        }
+        $result[self::PROPERTY_NAME_UNREAD] = $unread;
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * transforms a mentions array as returned from IComment->getMentions to an
-	 * array with DAV-compatible structure that can be assigned to the
-	 * PROPERTY_NAME_MENTION property.
-	 *
-	 * @return array
-	 */
-	protected function composeMentionsPropertyValue() {
-		return array_map(function ($mention) {
-			try {
-				$displayName = $this->commentsManager->resolveDisplayName($mention['type'], $mention['id']);
-			} catch (\OutOfBoundsException $e) {
-				$this->logger->logException($e);
-				// No displayname, upon client's discretion what to display.
-				$displayName = '';
-			}
+    /**
+     * transforms a mentions array as returned from IComment->getMentions to an
+     * array with DAV-compatible structure that can be assigned to the
+     * PROPERTY_NAME_MENTION property.
+     *
+     * @return array
+     */
+    protected function composeMentionsPropertyValue() {
+        return array_map(function ($mention) {
+            try {
+                $displayName = $this->commentsManager->resolveDisplayName($mention['type'], $mention['id']);
+            } catch (\OutOfBoundsException $e) {
+                $this->logger->logException($e);
+                // No displayname, upon client's discretion what to display.
+                $displayName = '';
+            }
 
-			return [
-				self::PROPERTY_NAME_MENTION => [
-					self::PROPERTY_NAME_MENTION_TYPE => $mention['type'],
-					self::PROPERTY_NAME_MENTION_ID => $mention['id'],
-					self::PROPERTY_NAME_MENTION_DISPLAYNAME => $displayName,
-				]
-			];
-		}, $this->comment->getMentions());
-	}
+            return [
+                self::PROPERTY_NAME_MENTION => [
+                    self::PROPERTY_NAME_MENTION_TYPE => $mention['type'],
+                    self::PROPERTY_NAME_MENTION_ID => $mention['id'],
+                    self::PROPERTY_NAME_MENTION_DISPLAYNAME => $displayName,
+                ]
+            ];
+        }, $this->comment->getMentions());
+    }
 }

apps/dav/lib/Files/Sharing/FilesDropPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 		$path = array_pop($path);
 
 		$newName = \OC_Helper::buildNotExistingFileNameForView('/', $path, $this->view);
-		$url = $request->getBaseUrl() . $newName;
+		$url = $request->getBaseUrl().$newName;
 		$request->setUrl($url);
 	}
 }

Indentation +38 added lines, -38 removed lines

@@ -35,51 +35,51 @@
  */
 class FilesDropPlugin extends ServerPlugin {
 
-	/** @var View */
-	private $view;
+    /** @var View */
+    private $view;
 
-	/** @var bool */
-	private $enabled = false;
+    /** @var bool */
+    private $enabled = false;
 
-	/**
-	 * @param View $view
-	 */
-	public function setView($view) {
-		$this->view = $view;
-	}
+    /**
+     * @param View $view
+     */
+    public function setView($view) {
+        $this->view = $view;
+    }
 
-	public function enable() {
-		$this->enabled = true;
-	}
+    public function enable() {
+        $this->enabled = true;
+    }
 
 
-	/**
-	 * This initializes the plugin.
-	 *
-	 * @param \Sabre\DAV\Server $server Sabre server
-	 *
-	 * @return void
-	 * @throws MethodNotAllowed
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$server->on('beforeMethod:*', [$this, 'beforeMethod'], 999);
-		$this->enabled = false;
-	}
+    /**
+     * This initializes the plugin.
+     *
+     * @param \Sabre\DAV\Server $server Sabre server
+     *
+     * @return void
+     * @throws MethodNotAllowed
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $server->on('beforeMethod:*', [$this, 'beforeMethod'], 999);
+        $this->enabled = false;
+    }
 
-	public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
-		if (!$this->enabled) {
-			return;
-		}
+    public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
+        if (!$this->enabled) {
+            return;
+        }
 
-		if ($request->getMethod() !== 'PUT') {
-			throw new MethodNotAllowed('Only PUT is allowed on files drop');
-		}
+        if ($request->getMethod() !== 'PUT') {
+            throw new MethodNotAllowed('Only PUT is allowed on files drop');
+        }
 
-		$path = explode('/', $request->getPath());
-		$path = array_pop($path);
+        $path = explode('/', $request->getPath());
+        $path = array_pop($path);
 
-		$newName = \OC_Helper::buildNotExistingFileNameForView('/', $path, $this->view);
-		$url = $request->getBaseUrl() . $newName;
-		$request->setUrl($url);
-	}
+        $newName = \OC_Helper::buildNotExistingFileNameForView('/', $path, $this->view);
+        $url = $request->getBaseUrl() . $newName;
+        $request->setUrl($url);
+    }
 }

apps/dav/lib/Command/SyncSystemAddressBook.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 		$output->writeln('Syncing users ...');
 		$progress = new ProgressBar($output);
 		$progress->start();
-		$this->syncService->syncInstance(function () use ($progress) {
+		$this->syncService->syncInstance(function() use ($progress) {
 			$progress->advance();
 		});
 

Indentation +29 added lines, -29 removed lines

@@ -32,37 +32,37 @@
 
 class SyncSystemAddressBook extends Command {
 
-	/** @var SyncService */
-	private $syncService;
+    /** @var SyncService */
+    private $syncService;
 
-	/**
-	 * @param SyncService $syncService
-	 */
-	public function __construct(SyncService $syncService) {
-		parent::__construct();
-		$this->syncService = $syncService;
-	}
+    /**
+     * @param SyncService $syncService
+     */
+    public function __construct(SyncService $syncService) {
+        parent::__construct();
+        $this->syncService = $syncService;
+    }
 
-	protected function configure() {
-		$this
-			->setName('dav:sync-system-addressbook')
-			->setDescription('Synchronizes users to the system addressbook');
-	}
+    protected function configure() {
+        $this
+            ->setName('dav:sync-system-addressbook')
+            ->setDescription('Synchronizes users to the system addressbook');
+    }
 
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$output->writeln('Syncing users ...');
-		$progress = new ProgressBar($output);
-		$progress->start();
-		$this->syncService->syncInstance(function () use ($progress) {
-			$progress->advance();
-		});
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $output->writeln('Syncing users ...');
+        $progress = new ProgressBar($output);
+        $progress->start();
+        $this->syncService->syncInstance(function () use ($progress) {
+            $progress->advance();
+        });
 
-		$progress->finish();
-		$output->writeln('');
-		return 0;
-	}
+        $progress->finish();
+        $output->writeln('');
+        return 0;
+    }
 }

apps/dav/lib/Avatars/AvatarHome.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 	public function getChild($name) {
 		$elements = pathinfo($name);
 		$ext = isset($elements['extension']) ? $elements['extension'] : '';
-		$size = (int)(isset($elements['filename']) ? $elements['filename'] : '64');
+		$size = (int) (isset($elements['filename']) ? $elements['filename'] : '64');
 		if (!in_array($ext, ['jpeg', 'png'], true)) {
 			throw new MethodNotAllowed('File format not allowed');
 		}

Indentation +73 added lines, -73 removed lines

@@ -34,87 +34,87 @@
 
 class AvatarHome implements ICollection {
 
-	/** @var array */
-	private $principalInfo;
-	/** @var IAvatarManager */
-	private $avatarManager;
+    /** @var array */
+    private $principalInfo;
+    /** @var IAvatarManager */
+    private $avatarManager;
 
-	/**
-	 * AvatarHome constructor.
-	 *
-	 * @param array $principalInfo
-	 * @param IAvatarManager $avatarManager
-	 */
-	public function __construct($principalInfo, IAvatarManager $avatarManager) {
-		$this->principalInfo = $principalInfo;
-		$this->avatarManager = $avatarManager;
-	}
+    /**
+     * AvatarHome constructor.
+     *
+     * @param array $principalInfo
+     * @param IAvatarManager $avatarManager
+     */
+    public function __construct($principalInfo, IAvatarManager $avatarManager) {
+        $this->principalInfo = $principalInfo;
+        $this->avatarManager = $avatarManager;
+    }
 
-	public function createFile($name, $data = null) {
-		throw new Forbidden('Permission denied to create a file');
-	}
+    public function createFile($name, $data = null) {
+        throw new Forbidden('Permission denied to create a file');
+    }
 
-	public function createDirectory($name) {
-		throw new Forbidden('Permission denied to create a folder');
-	}
+    public function createDirectory($name) {
+        throw new Forbidden('Permission denied to create a folder');
+    }
 
-	public function getChild($name) {
-		$elements = pathinfo($name);
-		$ext = isset($elements['extension']) ? $elements['extension'] : '';
-		$size = (int)(isset($elements['filename']) ? $elements['filename'] : '64');
-		if (!in_array($ext, ['jpeg', 'png'], true)) {
-			throw new MethodNotAllowed('File format not allowed');
-		}
-		if ($size <= 0 || $size > 1024) {
-			throw new MethodNotAllowed('Invalid image size');
-		}
-		$avatar = $this->avatarManager->getAvatar($this->getName());
-		if (!$avatar->exists()) {
-			throw new NotFound();
-		}
-		return new AvatarNode($size, $ext, $avatar);
-	}
+    public function getChild($name) {
+        $elements = pathinfo($name);
+        $ext = isset($elements['extension']) ? $elements['extension'] : '';
+        $size = (int)(isset($elements['filename']) ? $elements['filename'] : '64');
+        if (!in_array($ext, ['jpeg', 'png'], true)) {
+            throw new MethodNotAllowed('File format not allowed');
+        }
+        if ($size <= 0 || $size > 1024) {
+            throw new MethodNotAllowed('Invalid image size');
+        }
+        $avatar = $this->avatarManager->getAvatar($this->getName());
+        if (!$avatar->exists()) {
+            throw new NotFound();
+        }
+        return new AvatarNode($size, $ext, $avatar);
+    }
 
-	public function getChildren() {
-		try {
-			return [
-				$this->getChild('96.jpeg')
-			];
-		} catch (NotFound $exception) {
-			return [];
-		}
-	}
+    public function getChildren() {
+        try {
+            return [
+                $this->getChild('96.jpeg')
+            ];
+        } catch (NotFound $exception) {
+            return [];
+        }
+    }
 
-	public function childExists($name) {
-		try {
-			$ret = $this->getChild($name);
-			return $ret !== null;
-		} catch (NotFound $ex) {
-			return false;
-		} catch (MethodNotAllowed $ex) {
-			return false;
-		}
-	}
+    public function childExists($name) {
+        try {
+            $ret = $this->getChild($name);
+            return $ret !== null;
+        } catch (NotFound $ex) {
+            return false;
+        } catch (MethodNotAllowed $ex) {
+            return false;
+        }
+    }
 
-	public function delete() {
-		throw new Forbidden('Permission denied to delete this folder');
-	}
+    public function delete() {
+        throw new Forbidden('Permission denied to delete this folder');
+    }
 
-	public function getName() {
-		[,$name] = Uri\split($this->principalInfo['uri']);
-		return $name;
-	}
+    public function getName() {
+        [,$name] = Uri\split($this->principalInfo['uri']);
+        return $name;
+    }
 
-	public function setName($name) {
-		throw new Forbidden('Permission denied to rename this folder');
-	}
+    public function setName($name) {
+        throw new Forbidden('Permission denied to rename this folder');
+    }
 
-	/**
-	 * Returns the last modification time, as a unix timestamp
-	 *
-	 * @return int|null
-	 */
-	public function getLastModified() {
-		return null;
-	}
+    /**
+     * Returns the last modification time, as a unix timestamp
+     *
+     * @return int|null
+     */
+    public function getLastModified() {
+        return null;
+    }
 }

apps/dav/lib/Avatars/AvatarNode.php

Indentation +59 added lines, -59 removed lines

@@ -26,71 +26,71 @@
 use Sabre\DAV\File;
 
 class AvatarNode extends File {
-	private $ext;
-	private $size;
-	private $avatar;
+    private $ext;
+    private $size;
+    private $avatar;
 
-	/**
-	 * AvatarNode constructor.
-	 *
-	 * @param integer $size
-	 * @param string $ext
-	 * @param IAvatar $avatar
-	 */
-	public function __construct($size, $ext, $avatar) {
-		$this->size = $size;
-		$this->ext = $ext;
-		$this->avatar = $avatar;
-	}
+    /**
+     * AvatarNode constructor.
+     *
+     * @param integer $size
+     * @param string $ext
+     * @param IAvatar $avatar
+     */
+    public function __construct($size, $ext, $avatar) {
+        $this->size = $size;
+        $this->ext = $ext;
+        $this->avatar = $avatar;
+    }
 
-	/**
-	 * Returns the name of the node.
-	 *
-	 * This is used to generate the url.
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return "$this->size.$this->ext";
-	}
+    /**
+     * Returns the name of the node.
+     *
+     * This is used to generate the url.
+     *
+     * @return string
+     */
+    public function getName() {
+        return "$this->size.$this->ext";
+    }
 
-	public function get() {
-		$image = $this->avatar->get($this->size);
-		$res = $image->resource();
+    public function get() {
+        $image = $this->avatar->get($this->size);
+        $res = $image->resource();
 
-		ob_start();
-		if ($this->ext === 'png') {
-			imagepng($res);
-		} else {
-			imagejpeg($res);
-		}
+        ob_start();
+        if ($this->ext === 'png') {
+            imagepng($res);
+        } else {
+            imagejpeg($res);
+        }
 
-		return ob_get_clean();
-	}
+        return ob_get_clean();
+    }
 
-	/**
-	 * Returns the mime-type for a file
-	 *
-	 * If null is returned, we'll assume application/octet-stream
-	 *
-	 * @return string|null
-	 */
-	public function getContentType() {
-		if ($this->ext === 'png') {
-			return 'image/png';
-		}
-		return 'image/jpeg';
-	}
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     *
+     * @return string|null
+     */
+    public function getContentType() {
+        if ($this->ext === 'png') {
+            return 'image/png';
+        }
+        return 'image/jpeg';
+    }
 
-	public function getETag() {
-		return $this->avatar->getFile($this->size)->getEtag();
-	}
+    public function getETag() {
+        return $this->avatar->getFile($this->size)->getEtag();
+    }
 
-	public function getLastModified() {
-		$timestamp = $this->avatar->getFile($this->size)->getMTime();
-		if (!empty($timestamp)) {
-			return (int)$timestamp;
-		}
-		return $timestamp;
-	}
+    public function getLastModified() {
+        $timestamp = $this->avatar->getFile($this->size)->getMTime();
+        if (!empty($timestamp)) {
+            return (int)$timestamp;
+        }
+        return $timestamp;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
 	public function getLastModified() {
 		$timestamp = $this->avatar->getFile($this->size)->getMTime();
 		if (!empty($timestamp)) {
-			return (int)$timestamp;
+			return (int) $timestamp;
 		}
 		return $timestamp;
 	}

apps/dav/lib/CardDAV/Xml/Groups.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 
 	public function xmlSerialize(Writer $writer) {
 		foreach ($this->groups as $group) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}group', $group);
+			$writer->writeElement('{'.self::NS_OWNCLOUD.'}group', $group);
 		}
 	}
 }

Indentation +14 added lines, -14 removed lines

@@ -27,21 +27,21 @@
 use Sabre\Xml\XmlSerializable;
 
 class Groups implements XmlSerializable {
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	/** @var string[] of TYPE:CHECKSUM */
-	private $groups;
+    /** @var string[] of TYPE:CHECKSUM */
+    private $groups;
 
-	/**
-	 * @param string $groups
-	 */
-	public function __construct($groups) {
-		$this->groups = $groups;
-	}
+    /**
+     * @param string $groups
+     */
+    public function __construct($groups) {
+        $this->groups = $groups;
+    }
 
-	public function xmlSerialize(Writer $writer) {
-		foreach ($this->groups as $group) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}group', $group);
-		}
-	}
+    public function xmlSerialize(Writer $writer) {
+        foreach ($this->groups as $group) {
+            $writer->writeElement('{' . self::NS_OWNCLOUD . '}group', $group);
+        }
+    }
 }

apps/dav/lib/CardDAV/SyncService.php

Spacing +4 added lines, -4 removed lines

@@ -96,7 +96,7 @@ 
 			if ($ex->getCode() === Http::STATUS_UNAUTHORIZED) {
 				// remote server revoked access to the address book, remove it
 				$this->backend->deleteAddressBook($addressBookId);
-				$this->logger->info('Authorization failed, remove address book: ' . $url, ['app' => 'dav']);
+				$this->logger->info('Authorization failed, remove address book: '.$url, ['app' => 'dav']);
 				throw $ex;
 			}
 		}
@@ -169,7 +169,7 @@ 
 	 */
 	protected function getClient($url, $userName, $sharedSecret) {
 		$settings = [
-			'baseUri' => $url . '/',
+			'baseUri' => $url.'/',
 			'userName' => $userName,
 			'password' => $sharedSecret,
 		];
@@ -306,7 +306,7 @@ 
 		if (is_null($this->localSystemAddressBook)) {
 			$systemPrincipal = "principals/system/system";
 			$this->localSystemAddressBook = $this->ensureSystemAddressBookExists($systemPrincipal, 'system', [
-				'{' . Plugin::NS_CARDDAV . '}addressbook-description' => 'System addressbook which holds all users of this instance'
+				'{'.Plugin::NS_CARDDAV.'}addressbook-description' => 'System addressbook which holds all users of this instance'
 			]);
 		}
 
@@ -315,7 +315,7 @@ 
 
 	public function syncInstance(\Closure $progressCallback = null) {
 		$systemAddressBook = $this->getLocalSystemAddressBook();
-		$this->userManager->callForAllUsers(function ($user) use ($systemAddressBook, $progressCallback) {
+		$this->userManager->callForAllUsers(function($user) use ($systemAddressBook, $progressCallback) {
 			$this->updateUser($user);
 			if (!is_null($progressCallback)) {
 				$progressCallback();

Indentation +296 added lines, -296 removed lines

@@ -42,300 +42,300 @@
 
 class SyncService {
 
-	/** @var CardDavBackend */
-	private $backend;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var array */
-	private $localSystemAddressBook;
-
-	/** @var AccountManager */
-	private $accountManager;
-
-	/** @var string */
-	protected $certPath;
-
-	/**
-	 * SyncService constructor.
-	 *
-	 * @param CardDavBackend $backend
-	 * @param IUserManager $userManager
-	 * @param ILogger $logger
-	 * @param AccountManager $accountManager
-	 */
-	public function __construct(CardDavBackend $backend, IUserManager $userManager, ILogger $logger, AccountManager $accountManager) {
-		$this->backend = $backend;
-		$this->userManager = $userManager;
-		$this->logger = $logger;
-		$this->accountManager = $accountManager;
-		$this->certPath = '';
-	}
-
-	/**
-	 * @param string $url
-	 * @param string $userName
-	 * @param string $addressBookUrl
-	 * @param string $sharedSecret
-	 * @param string $syncToken
-	 * @param int $targetBookId
-	 * @param string $targetPrincipal
-	 * @param array $targetProperties
-	 * @return string
-	 * @throws \Exception
-	 */
-	public function syncRemoteAddressBook($url, $userName, $addressBookUrl, $sharedSecret, $syncToken, $targetBookId, $targetPrincipal, $targetProperties) {
-		// 1. create addressbook
-		$book = $this->ensureSystemAddressBookExists($targetPrincipal, $targetBookId, $targetProperties);
-		$addressBookId = $book['id'];
-
-		// 2. query changes
-		try {
-			$response = $this->requestSyncReport($url, $userName, $addressBookUrl, $sharedSecret, $syncToken);
-		} catch (ClientHttpException $ex) {
-			if ($ex->getCode() === Http::STATUS_UNAUTHORIZED) {
-				// remote server revoked access to the address book, remove it
-				$this->backend->deleteAddressBook($addressBookId);
-				$this->logger->info('Authorization failed, remove address book: ' . $url, ['app' => 'dav']);
-				throw $ex;
-			}
-		}
-
-		// 3. apply changes
-		// TODO: use multi-get for download
-		foreach ($response['response'] as $resource => $status) {
-			$cardUri = basename($resource);
-			if (isset($status[200])) {
-				$vCard = $this->download($url, $userName, $sharedSecret, $resource);
-				$existingCard = $this->backend->getCard($addressBookId, $cardUri);
-				if ($existingCard === false) {
-					$this->backend->createCard($addressBookId, $cardUri, $vCard['body']);
-				} else {
-					$this->backend->updateCard($addressBookId, $cardUri, $vCard['body']);
-				}
-			} else {
-				$this->backend->deleteCard($addressBookId, $cardUri);
-			}
-		}
-
-		return $response['token'];
-	}
-
-	/**
-	 * @param string $principal
-	 * @param string $id
-	 * @param array $properties
-	 * @return array|null
-	 * @throws \Sabre\DAV\Exception\BadRequest
-	 */
-	public function ensureSystemAddressBookExists($principal, $id, $properties) {
-		$book = $this->backend->getAddressBooksByUri($principal, $id);
-		if (!is_null($book)) {
-			return $book;
-		}
-		$this->backend->createAddressBook($principal, $id, $properties);
-
-		return $this->backend->getAddressBooksByUri($principal, $id);
-	}
-
-	/**
-	 * Check if there is a valid certPath we should use
-	 *
-	 * @return string
-	 */
-	protected function getCertPath() {
-
-		// we already have a valid certPath
-		if ($this->certPath !== '') {
-			return $this->certPath;
-		}
-
-		$certManager = \OC::$server->getCertificateManager();
-		$certPath = $certManager->getAbsoluteBundlePath();
-		if (file_exists($certPath)) {
-			$this->certPath = $certPath;
-		}
-
-		return $this->certPath;
-	}
-
-	/**
-	 * @param string $url
-	 * @param string $userName
-	 * @param string $addressBookUrl
-	 * @param string $sharedSecret
-	 * @return Client
-	 */
-	protected function getClient($url, $userName, $sharedSecret) {
-		$settings = [
-			'baseUri' => $url . '/',
-			'userName' => $userName,
-			'password' => $sharedSecret,
-		];
-		$client = new Client($settings);
-		$certPath = $this->getCertPath();
-		$client->setThrowExceptions(true);
-
-		if ($certPath !== '' && strpos($url, 'http://') !== 0) {
-			$client->addCurlSetting(CURLOPT_CAINFO, $this->certPath);
-		}
-
-		return $client;
-	}
-
-	/**
-	 * @param string $url
-	 * @param string $userName
-	 * @param string $addressBookUrl
-	 * @param string $sharedSecret
-	 * @param string $syncToken
-	 * @return array
-	 */
-	protected function requestSyncReport($url, $userName, $addressBookUrl, $sharedSecret, $syncToken) {
-		$client = $this->getClient($url, $userName, $sharedSecret);
-
-		$body = $this->buildSyncCollectionRequestBody($syncToken);
-
-		$response = $client->request('REPORT', $addressBookUrl, $body, [
-			'Content-Type' => 'application/xml'
-		]);
-
-		return $this->parseMultiStatus($response['body']);
-	}
-
-	/**
-	 * @param string $url
-	 * @param string $userName
-	 * @param string $sharedSecret
-	 * @param string $resourcePath
-	 * @return array
-	 */
-	protected function download($url, $userName, $sharedSecret, $resourcePath) {
-		$client = $this->getClient($url, $userName, $sharedSecret);
-		return $client->request('GET', $resourcePath);
-	}
-
-	/**
-	 * @param string|null $syncToken
-	 * @return string
-	 */
-	private function buildSyncCollectionRequestBody($syncToken) {
-		$dom = new \DOMDocument('1.0', 'UTF-8');
-		$dom->formatOutput = true;
-		$root = $dom->createElementNS('DAV:', 'd:sync-collection');
-		$sync = $dom->createElement('d:sync-token', $syncToken);
-		$prop = $dom->createElement('d:prop');
-		$cont = $dom->createElement('d:getcontenttype');
-		$etag = $dom->createElement('d:getetag');
-
-		$prop->appendChild($cont);
-		$prop->appendChild($etag);
-		$root->appendChild($sync);
-		$root->appendChild($prop);
-		$dom->appendChild($root);
-		return $dom->saveXML();
-	}
-
-	/**
-	 * @param string $body
-	 * @return array
-	 * @throws \Sabre\Xml\ParseException
-	 */
-	private function parseMultiStatus($body) {
-		$xml = new Service();
-
-		/** @var MultiStatus $multiStatus */
-		$multiStatus = $xml->expect('{DAV:}multistatus', $body);
-
-		$result = [];
-		foreach ($multiStatus->getResponses() as $response) {
-			$result[$response->getHref()] = $response->getResponseProperties();
-		}
-
-		return ['response' => $result, 'token' => $multiStatus->getSyncToken()];
-	}
-
-	/**
-	 * @param IUser $user
-	 */
-	public function updateUser(IUser $user) {
-		$systemAddressBook = $this->getLocalSystemAddressBook();
-		$addressBookId = $systemAddressBook['id'];
-		$converter = new Converter($this->accountManager);
-		$name = $user->getBackendClassName();
-		$userId = $user->getUID();
-
-		$cardId = "$name:$userId.vcf";
-		$card = $this->backend->getCard($addressBookId, $cardId);
-		if ($user->isEnabled()) {
-			if ($card === false) {
-				$vCard = $converter->createCardFromUser($user);
-				if ($vCard !== null) {
-					$this->backend->createCard($addressBookId, $cardId, $vCard->serialize());
-				}
-			} else {
-				$vCard = $converter->createCardFromUser($user);
-				if (is_null($vCard)) {
-					$this->backend->deleteCard($addressBookId, $cardId);
-				} else {
-					$this->backend->updateCard($addressBookId, $cardId, $vCard->serialize());
-				}
-			}
-		} else {
-			$this->backend->deleteCard($addressBookId, $cardId);
-		}
-	}
-
-	/**
-	 * @param IUser|string $userOrCardId
-	 */
-	public function deleteUser($userOrCardId) {
-		$systemAddressBook = $this->getLocalSystemAddressBook();
-		if ($userOrCardId instanceof IUser) {
-			$name = $userOrCardId->getBackendClassName();
-			$userId = $userOrCardId->getUID();
-
-			$userOrCardId = "$name:$userId.vcf";
-		}
-		$this->backend->deleteCard($systemAddressBook['id'], $userOrCardId);
-	}
-
-	/**
-	 * @return array|null
-	 */
-	public function getLocalSystemAddressBook() {
-		if (is_null($this->localSystemAddressBook)) {
-			$systemPrincipal = "principals/system/system";
-			$this->localSystemAddressBook = $this->ensureSystemAddressBookExists($systemPrincipal, 'system', [
-				'{' . Plugin::NS_CARDDAV . '}addressbook-description' => 'System addressbook which holds all users of this instance'
-			]);
-		}
-
-		return $this->localSystemAddressBook;
-	}
-
-	public function syncInstance(\Closure $progressCallback = null) {
-		$systemAddressBook = $this->getLocalSystemAddressBook();
-		$this->userManager->callForAllUsers(function ($user) use ($systemAddressBook, $progressCallback) {
-			$this->updateUser($user);
-			if (!is_null($progressCallback)) {
-				$progressCallback();
-			}
-		});
-
-		// remove no longer existing
-		$allCards = $this->backend->getCards($systemAddressBook['id']);
-		foreach ($allCards as $card) {
-			$vCard = Reader::read($card['carddata']);
-			$uid = $vCard->UID->getValue();
-			// load backend and see if user exists
-			if (!$this->userManager->userExists($uid)) {
-				$this->deleteUser($card['uri']);
-			}
-		}
-	}
+    /** @var CardDavBackend */
+    private $backend;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var array */
+    private $localSystemAddressBook;
+
+    /** @var AccountManager */
+    private $accountManager;
+
+    /** @var string */
+    protected $certPath;
+
+    /**
+     * SyncService constructor.
+     *
+     * @param CardDavBackend $backend
+     * @param IUserManager $userManager
+     * @param ILogger $logger
+     * @param AccountManager $accountManager
+     */
+    public function __construct(CardDavBackend $backend, IUserManager $userManager, ILogger $logger, AccountManager $accountManager) {
+        $this->backend = $backend;
+        $this->userManager = $userManager;
+        $this->logger = $logger;
+        $this->accountManager = $accountManager;
+        $this->certPath = '';
+    }
+
+    /**
+     * @param string $url
+     * @param string $userName
+     * @param string $addressBookUrl
+     * @param string $sharedSecret
+     * @param string $syncToken
+     * @param int $targetBookId
+     * @param string $targetPrincipal
+     * @param array $targetProperties
+     * @return string
+     * @throws \Exception
+     */
+    public function syncRemoteAddressBook($url, $userName, $addressBookUrl, $sharedSecret, $syncToken, $targetBookId, $targetPrincipal, $targetProperties) {
+        // 1. create addressbook
+        $book = $this->ensureSystemAddressBookExists($targetPrincipal, $targetBookId, $targetProperties);
+        $addressBookId = $book['id'];
+
+        // 2. query changes
+        try {
+            $response = $this->requestSyncReport($url, $userName, $addressBookUrl, $sharedSecret, $syncToken);
+        } catch (ClientHttpException $ex) {
+            if ($ex->getCode() === Http::STATUS_UNAUTHORIZED) {
+                // remote server revoked access to the address book, remove it
+                $this->backend->deleteAddressBook($addressBookId);
+                $this->logger->info('Authorization failed, remove address book: ' . $url, ['app' => 'dav']);
+                throw $ex;
+            }
+        }
+
+        // 3. apply changes
+        // TODO: use multi-get for download
+        foreach ($response['response'] as $resource => $status) {
+            $cardUri = basename($resource);
+            if (isset($status[200])) {
+                $vCard = $this->download($url, $userName, $sharedSecret, $resource);
+                $existingCard = $this->backend->getCard($addressBookId, $cardUri);
+                if ($existingCard === false) {
+                    $this->backend->createCard($addressBookId, $cardUri, $vCard['body']);
+                } else {
+                    $this->backend->updateCard($addressBookId, $cardUri, $vCard['body']);
+                }
+            } else {
+                $this->backend->deleteCard($addressBookId, $cardUri);
+            }
+        }
+
+        return $response['token'];
+    }
+
+    /**
+     * @param string $principal
+     * @param string $id
+     * @param array $properties
+     * @return array|null
+     * @throws \Sabre\DAV\Exception\BadRequest
+     */
+    public function ensureSystemAddressBookExists($principal, $id, $properties) {
+        $book = $this->backend->getAddressBooksByUri($principal, $id);
+        if (!is_null($book)) {
+            return $book;
+        }
+        $this->backend->createAddressBook($principal, $id, $properties);
+
+        return $this->backend->getAddressBooksByUri($principal, $id);
+    }
+
+    /**
+     * Check if there is a valid certPath we should use
+     *
+     * @return string
+     */
+    protected function getCertPath() {
+
+        // we already have a valid certPath
+        if ($this->certPath !== '') {
+            return $this->certPath;
+        }
+
+        $certManager = \OC::$server->getCertificateManager();
+        $certPath = $certManager->getAbsoluteBundlePath();
+        if (file_exists($certPath)) {
+            $this->certPath = $certPath;
+        }
+
+        return $this->certPath;
+    }
+
+    /**
+     * @param string $url
+     * @param string $userName
+     * @param string $addressBookUrl
+     * @param string $sharedSecret
+     * @return Client
+     */
+    protected function getClient($url, $userName, $sharedSecret) {
+        $settings = [
+            'baseUri' => $url . '/',
+            'userName' => $userName,
+            'password' => $sharedSecret,
+        ];
+        $client = new Client($settings);
+        $certPath = $this->getCertPath();
+        $client->setThrowExceptions(true);
+
+        if ($certPath !== '' && strpos($url, 'http://') !== 0) {
+            $client->addCurlSetting(CURLOPT_CAINFO, $this->certPath);
+        }
+
+        return $client;
+    }
+
+    /**
+     * @param string $url
+     * @param string $userName
+     * @param string $addressBookUrl
+     * @param string $sharedSecret
+     * @param string $syncToken
+     * @return array
+     */
+    protected function requestSyncReport($url, $userName, $addressBookUrl, $sharedSecret, $syncToken) {
+        $client = $this->getClient($url, $userName, $sharedSecret);
+
+        $body = $this->buildSyncCollectionRequestBody($syncToken);
+
+        $response = $client->request('REPORT', $addressBookUrl, $body, [
+            'Content-Type' => 'application/xml'
+        ]);
+
+        return $this->parseMultiStatus($response['body']);
+    }
+
+    /**
+     * @param string $url
+     * @param string $userName
+     * @param string $sharedSecret
+     * @param string $resourcePath
+     * @return array
+     */
+    protected function download($url, $userName, $sharedSecret, $resourcePath) {
+        $client = $this->getClient($url, $userName, $sharedSecret);
+        return $client->request('GET', $resourcePath);
+    }
+
+    /**
+     * @param string|null $syncToken
+     * @return string
+     */
+    private function buildSyncCollectionRequestBody($syncToken) {
+        $dom = new \DOMDocument('1.0', 'UTF-8');
+        $dom->formatOutput = true;
+        $root = $dom->createElementNS('DAV:', 'd:sync-collection');
+        $sync = $dom->createElement('d:sync-token', $syncToken);
+        $prop = $dom->createElement('d:prop');
+        $cont = $dom->createElement('d:getcontenttype');
+        $etag = $dom->createElement('d:getetag');
+
+        $prop->appendChild($cont);
+        $prop->appendChild($etag);
+        $root->appendChild($sync);
+        $root->appendChild($prop);
+        $dom->appendChild($root);
+        return $dom->saveXML();
+    }
+
+    /**
+     * @param string $body
+     * @return array
+     * @throws \Sabre\Xml\ParseException
+     */
+    private function parseMultiStatus($body) {
+        $xml = new Service();
+
+        /** @var MultiStatus $multiStatus */
+        $multiStatus = $xml->expect('{DAV:}multistatus', $body);
+
+        $result = [];
+        foreach ($multiStatus->getResponses() as $response) {
+            $result[$response->getHref()] = $response->getResponseProperties();
+        }
+
+        return ['response' => $result, 'token' => $multiStatus->getSyncToken()];
+    }
+
+    /**
+     * @param IUser $user
+     */
+    public function updateUser(IUser $user) {
+        $systemAddressBook = $this->getLocalSystemAddressBook();
+        $addressBookId = $systemAddressBook['id'];
+        $converter = new Converter($this->accountManager);
+        $name = $user->getBackendClassName();
+        $userId = $user->getUID();
+
+        $cardId = "$name:$userId.vcf";
+        $card = $this->backend->getCard($addressBookId, $cardId);
+        if ($user->isEnabled()) {
+            if ($card === false) {
+                $vCard = $converter->createCardFromUser($user);
+                if ($vCard !== null) {
+                    $this->backend->createCard($addressBookId, $cardId, $vCard->serialize());
+                }
+            } else {
+                $vCard = $converter->createCardFromUser($user);
+                if (is_null($vCard)) {
+                    $this->backend->deleteCard($addressBookId, $cardId);
+                } else {
+                    $this->backend->updateCard($addressBookId, $cardId, $vCard->serialize());
+                }
+            }
+        } else {
+            $this->backend->deleteCard($addressBookId, $cardId);
+        }
+    }
+
+    /**
+     * @param IUser|string $userOrCardId
+     */
+    public function deleteUser($userOrCardId) {
+        $systemAddressBook = $this->getLocalSystemAddressBook();
+        if ($userOrCardId instanceof IUser) {
+            $name = $userOrCardId->getBackendClassName();
+            $userId = $userOrCardId->getUID();
+
+            $userOrCardId = "$name:$userId.vcf";
+        }
+        $this->backend->deleteCard($systemAddressBook['id'], $userOrCardId);
+    }
+
+    /**
+     * @return array|null
+     */
+    public function getLocalSystemAddressBook() {
+        if (is_null($this->localSystemAddressBook)) {
+            $systemPrincipal = "principals/system/system";
+            $this->localSystemAddressBook = $this->ensureSystemAddressBookExists($systemPrincipal, 'system', [
+                '{' . Plugin::NS_CARDDAV . '}addressbook-description' => 'System addressbook which holds all users of this instance'
+            ]);
+        }
+
+        return $this->localSystemAddressBook;
+    }
+
+    public function syncInstance(\Closure $progressCallback = null) {
+        $systemAddressBook = $this->getLocalSystemAddressBook();
+        $this->userManager->callForAllUsers(function ($user) use ($systemAddressBook, $progressCallback) {
+            $this->updateUser($user);
+            if (!is_null($progressCallback)) {
+                $progressCallback();
+            }
+        });
+
+        // remove no longer existing
+        $allCards = $this->backend->getCards($systemAddressBook['id']);
+        foreach ($allCards as $card) {
+            $vCard = Reader::read($card['carddata']);
+            $uid = $vCard->UID->getValue();
+            // load backend and see if user exists
+            if (!$this->userManager->userExists($uid)) {
+                $this->deleteUser($card['uri']);
+            }
+        }
+    }
 }

apps/dav/lib/DAV/Sharing/IShareable.php

Indentation +40 added lines, -40 removed lines

@@ -29,47 +29,47 @@
  */
 interface IShareable extends INode {
 
-	/**
-	 * Updates the list of shares.
-	 *
-	 * The first array is a list of people that are to be added to the
-	 * resource.
-	 *
-	 * Every element in the add array has the following properties:
-	 *   * href - A url. Usually a mailto: address
-	 *   * commonName - Usually a first and last name, or false
-	 *   * summary - A description of the share, can also be false
-	 *   * readOnly - A boolean value
-	 *
-	 * Every element in the remove array is just the address string.
-	 *
-	 * @param array $add
-	 * @param array $remove
-	 * @return void
-	 */
-	public function updateShares(array $add, array $remove);
+    /**
+     * Updates the list of shares.
+     *
+     * The first array is a list of people that are to be added to the
+     * resource.
+     *
+     * Every element in the add array has the following properties:
+     *   * href - A url. Usually a mailto: address
+     *   * commonName - Usually a first and last name, or false
+     *   * summary - A description of the share, can also be false
+     *   * readOnly - A boolean value
+     *
+     * Every element in the remove array is just the address string.
+     *
+     * @param array $add
+     * @param array $remove
+     * @return void
+     */
+    public function updateShares(array $add, array $remove);
 
-	/**
-	 * Returns the list of people whom this resource is shared with.
-	 *
-	 * Every element in this array should have the following properties:
-	 *   * href - Often a mailto: address
-	 *   * commonName - Optional, for example a first + last name
-	 *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
-	 *   * readOnly - boolean
-	 *   * summary - Optional, a description for the share
-	 *
-	 * @return array
-	 */
-	public function getShares();
+    /**
+     * Returns the list of people whom this resource is shared with.
+     *
+     * Every element in this array should have the following properties:
+     *   * href - Often a mailto: address
+     *   * commonName - Optional, for example a first + last name
+     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
+     *   * readOnly - boolean
+     *   * summary - Optional, a description for the share
+     *
+     * @return array
+     */
+    public function getShares();
 
-	/**
-	 * @return int
-	 */
-	public function getResourceId();
+    /**
+     * @return int
+     */
+    public function getResourceId();
 
-	/**
-	 * @return string
-	 */
-	public function getOwner();
+    /**
+     * @return string
+     */
+    public function getOwner();
 }

apps/dav/lib/DAV/Sharing/Xml/Invite.php

Indentation +106 added lines, -106 removed lines

@@ -41,120 +41,120 @@
  */
 class Invite implements XmlSerializable {
 
-	/**
-	 * The list of users a calendar has been shared to.
-	 *
-	 * @var array
-	 */
-	protected $users;
+    /**
+     * The list of users a calendar has been shared to.
+     *
+     * @var array
+     */
+    protected $users;
 
-	/**
-	 * The organizer contains information about the person who shared the
-	 * object.
-	 *
-	 * @var array|null
-	 */
-	protected $organizer;
+    /**
+     * The organizer contains information about the person who shared the
+     * object.
+     *
+     * @var array|null
+     */
+    protected $organizer;
 
-	/**
-	 * Creates the property.
-	 *
-	 * Users is an array. Each element of the array has the following
-	 * properties:
-	 *
-	 *   * href - Often a mailto: address
-	 *   * commonName - Optional, for example a first and lastname for a user.
-	 *   * status - One of the SharingPlugin::STATUS_* constants.
-	 *   * readOnly - true or false
-	 *   * summary - Optional, description of the share
-	 *
-	 * The organizer key is optional to specify. It's only useful when a
-	 * 'sharee' requests the sharing information.
-	 *
-	 * The organizer may have the following properties:
-	 *   * href - Often a mailto: address.
-	 *   * commonName - Optional human-readable name.
-	 *   * firstName - Optional first name.
-	 *   * lastName - Optional last name.
-	 *
-	 * If you wonder why these two structures are so different, I guess a
-	 * valid answer is that the current spec is still a draft.
-	 *
-	 * @param array $users
-	 */
-	public function __construct(array $users, array $organizer = null) {
-		$this->users = $users;
-		$this->organizer = $organizer;
-	}
+    /**
+     * Creates the property.
+     *
+     * Users is an array. Each element of the array has the following
+     * properties:
+     *
+     *   * href - Often a mailto: address
+     *   * commonName - Optional, for example a first and lastname for a user.
+     *   * status - One of the SharingPlugin::STATUS_* constants.
+     *   * readOnly - true or false
+     *   * summary - Optional, description of the share
+     *
+     * The organizer key is optional to specify. It's only useful when a
+     * 'sharee' requests the sharing information.
+     *
+     * The organizer may have the following properties:
+     *   * href - Often a mailto: address.
+     *   * commonName - Optional human-readable name.
+     *   * firstName - Optional first name.
+     *   * lastName - Optional last name.
+     *
+     * If you wonder why these two structures are so different, I guess a
+     * valid answer is that the current spec is still a draft.
+     *
+     * @param array $users
+     */
+    public function __construct(array $users, array $organizer = null) {
+        $this->users = $users;
+        $this->organizer = $organizer;
+    }
 
-	/**
-	 * Returns the list of users, as it was passed to the constructor.
-	 *
-	 * @return array
-	 */
-	public function getValue() {
-		return $this->users;
-	}
+    /**
+     * Returns the list of users, as it was passed to the constructor.
+     *
+     * @return array
+     */
+    public function getValue() {
+        return $this->users;
+    }
 
-	/**
-	 * The xmlSerialize metod is called during xml writing.
-	 *
-	 * Use the $writer argument to write its own xml serialization.
-	 *
-	 * An important note: do _not_ create a parent element. Any element
-	 * implementing XmlSerializble should only ever write what's considered
-	 * its 'inner xml'.
-	 *
-	 * The parent of the current element is responsible for writing a
-	 * containing element.
-	 *
-	 * This allows serializers to be re-used for different element names.
-	 *
-	 * If you are opening new elements, you must also close them again.
-	 *
-	 * @param Writer $writer
-	 * @return void
-	 */
-	public function xmlSerialize(Writer $writer) {
-		$cs = '{' . Plugin::NS_OWNCLOUD . '}';
+    /**
+     * The xmlSerialize metod is called during xml writing.
+     *
+     * Use the $writer argument to write its own xml serialization.
+     *
+     * An important note: do _not_ create a parent element. Any element
+     * implementing XmlSerializble should only ever write what's considered
+     * its 'inner xml'.
+     *
+     * The parent of the current element is responsible for writing a
+     * containing element.
+     *
+     * This allows serializers to be re-used for different element names.
+     *
+     * If you are opening new elements, you must also close them again.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    public function xmlSerialize(Writer $writer) {
+        $cs = '{' . Plugin::NS_OWNCLOUD . '}';
 
-		if (!is_null($this->organizer)) {
-			$writer->startElement($cs . 'organizer');
-			$writer->writeElement('{DAV:}href', $this->organizer['href']);
+        if (!is_null($this->organizer)) {
+            $writer->startElement($cs . 'organizer');
+            $writer->writeElement('{DAV:}href', $this->organizer['href']);
 
-			if (isset($this->organizer['commonName']) && $this->organizer['commonName']) {
-				$writer->writeElement($cs . 'common-name', $this->organizer['commonName']);
-			}
-			if (isset($this->organizer['firstName']) && $this->organizer['firstName']) {
-				$writer->writeElement($cs . 'first-name', $this->organizer['firstName']);
-			}
-			if (isset($this->organizer['lastName']) && $this->organizer['lastName']) {
-				$writer->writeElement($cs . 'last-name', $this->organizer['lastName']);
-			}
-			$writer->endElement(); // organizer
-		}
+            if (isset($this->organizer['commonName']) && $this->organizer['commonName']) {
+                $writer->writeElement($cs . 'common-name', $this->organizer['commonName']);
+            }
+            if (isset($this->organizer['firstName']) && $this->organizer['firstName']) {
+                $writer->writeElement($cs . 'first-name', $this->organizer['firstName']);
+            }
+            if (isset($this->organizer['lastName']) && $this->organizer['lastName']) {
+                $writer->writeElement($cs . 'last-name', $this->organizer['lastName']);
+            }
+            $writer->endElement(); // organizer
+        }
 
-		foreach ($this->users as $user) {
-			$writer->startElement($cs . 'user');
-			$writer->writeElement('{DAV:}href', $user['href']);
-			if (isset($user['commonName']) && $user['commonName']) {
-				$writer->writeElement($cs . 'common-name', $user['commonName']);
-			}
-			$writer->writeElement($cs . 'invite-accepted');
+        foreach ($this->users as $user) {
+            $writer->startElement($cs . 'user');
+            $writer->writeElement('{DAV:}href', $user['href']);
+            if (isset($user['commonName']) && $user['commonName']) {
+                $writer->writeElement($cs . 'common-name', $user['commonName']);
+            }
+            $writer->writeElement($cs . 'invite-accepted');
 
-			$writer->startElement($cs . 'access');
-			if ($user['readOnly']) {
-				$writer->writeElement($cs . 'read');
-			} else {
-				$writer->writeElement($cs . 'read-write');
-			}
-			$writer->endElement(); // access
+            $writer->startElement($cs . 'access');
+            if ($user['readOnly']) {
+                $writer->writeElement($cs . 'read');
+            } else {
+                $writer->writeElement($cs . 'read-write');
+            }
+            $writer->endElement(); // access
 
-			if (isset($user['summary']) && $user['summary']) {
-				$writer->writeElement($cs . 'summary', $user['summary']);
-			}
+            if (isset($user['summary']) && $user['summary']) {
+                $writer->writeElement($cs . 'summary', $user['summary']);
+            }
 
-			$writer->endElement(); //user
-		}
-	}
+            $writer->endElement(); //user
+        }
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -116,42 +116,42 @@
 	 * @return void
 	 */
 	public function xmlSerialize(Writer $writer) {
-		$cs = '{' . Plugin::NS_OWNCLOUD . '}';
+		$cs = '{'.Plugin::NS_OWNCLOUD.'}';
 
 		if (!is_null($this->organizer)) {
-			$writer->startElement($cs . 'organizer');
+			$writer->startElement($cs.'organizer');
 			$writer->writeElement('{DAV:}href', $this->organizer['href']);
 
 			if (isset($this->organizer['commonName']) && $this->organizer['commonName']) {
-				$writer->writeElement($cs . 'common-name', $this->organizer['commonName']);
+				$writer->writeElement($cs.'common-name', $this->organizer['commonName']);
 			}
 			if (isset($this->organizer['firstName']) && $this->organizer['firstName']) {
-				$writer->writeElement($cs . 'first-name', $this->organizer['firstName']);
+				$writer->writeElement($cs.'first-name', $this->organizer['firstName']);
 			}
 			if (isset($this->organizer['lastName']) && $this->organizer['lastName']) {
-				$writer->writeElement($cs . 'last-name', $this->organizer['lastName']);
+				$writer->writeElement($cs.'last-name', $this->organizer['lastName']);
 			}
 			$writer->endElement(); // organizer
 		}
 
 		foreach ($this->users as $user) {
-			$writer->startElement($cs . 'user');
+			$writer->startElement($cs.'user');
 			$writer->writeElement('{DAV:}href', $user['href']);
 			if (isset($user['commonName']) && $user['commonName']) {
-				$writer->writeElement($cs . 'common-name', $user['commonName']);
+				$writer->writeElement($cs.'common-name', $user['commonName']);
 			}
-			$writer->writeElement($cs . 'invite-accepted');
+			$writer->writeElement($cs.'invite-accepted');
 
-			$writer->startElement($cs . 'access');
+			$writer->startElement($cs.'access');
 			if ($user['readOnly']) {
-				$writer->writeElement($cs . 'read');
+				$writer->writeElement($cs.'read');
 			} else {
-				$writer->writeElement($cs . 'read-write');
+				$writer->writeElement($cs.'read-write');
 			}
 			$writer->endElement(); // access
 
 			if (isset($user['summary']) && $user['summary']) {
-				$writer->writeElement($cs . 'summary', $user['summary']);
+				$writer->writeElement($cs.'summary', $user['summary']);
 			}
 
 			$writer->endElement(); //user