nextcloud / server

core/templates/layout.noscript.warning.php

Indentation +4 added lines, -4 removed lines

@@ -2,10 +2,10 @@
 	<div id="nojavascript">
 		<div>
 			<?php print_unescaped(str_replace(
-					['{linkstart}', '{linkend}'],
-					['<a href="https://www.enable-javascript.com/" target="_blank" rel="noreferrer noopener">', '</a>'],
-					$l->t('This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page.')
-				)); ?>
+                    ['{linkstart}', '{linkend}'],
+                    ['<a href="https://www.enable-javascript.com/" target="_blank" rel="noreferrer noopener">', '</a>'],
+                    $l->t('This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page.')
+                )); ?>
 		</div>
 	</div>
 </noscript>

settings/templates/settings/admin/server.php

Braces +8 added lines, -3 removed lines

@@ -165,15 +165,20 @@
 				<span class="crondate" title="<?php p($absolute_time);?>">
 				<?php p($l->t("Last job ran %s.", [$relative_time]));?>
 			</span>
-			<?php else: ?>
+			<?php else {
+    : ?>
 				<span class="status error"></span>
-				<span class="crondate" title="<?php p($absolute_time);?>">
+				<span class="crondate" title="<?php p($absolute_time);
+}
+?>">
 				<?php p($l->t("Last job execution ran %s. Something seems wrong.", [$relative_time]));?>
 			</span>
 			<?php endif;
-		else: ?>
+		else {
+		    : ?>
 			<span class="status error"></span>
 			<?php p($l->t("Background job didn’t run yet!"));
+		}
 		endif; ?>
 	</p>
 	<a target="_blank" rel="noreferrer noopener" class="icon-info"

Indentation +23 added lines, -23 removed lines

@@ -30,11 +30,11 @@ 
 	<h2 class="inlineblock"><?php p($l->t('Background jobs'));?></h2>
 	<p class="cronlog inlineblock">
 		<?php if ($_['lastcron'] !== false):
-			$relative_time = relative_modified_date($_['lastcron']);
+            $relative_time = relative_modified_date($_['lastcron']);
 
-			$formatter = \OC::$server->getDateTimeFormatter();
-			$absolute_time = $formatter->formatDateTime($_['lastcron'], 'long', 'long');
-			if (time() - $_['lastcron'] <= 3600): ?>
+            $formatter = \OC::$server->getDateTimeFormatter();
+            $absolute_time = $formatter->formatDateTime($_['lastcron'], 'long', 'long');
+            if (time() - $_['lastcron'] <= 3600): ?>
 				<span class="status success"></span>
 				<span class="crondate" title="<?php p($absolute_time);?>">
 				<?php p($l->t("Last job ran %s.", [$relative_time]));?>
@@ -45,10 +45,10 @@ 
 				<?php p($l->t("Last job execution ran %s. Something seems wrong.", [$relative_time]));?>
 			</span>
 			<?php endif;
-		else: ?>
+        else: ?>
 			<span class="status error"></span>
 			<?php p($l->t("Background job didn’t run yet!"));
-		endif; ?>
+        endif; ?>
 	</p>
 	<a target="_blank" rel="noreferrer noopener" class="icon-info"
 	   title="<?php p($l->t('Open documentation'));?>"
@@ -58,38 +58,38 @@ 
 	<p>
 		<input type="radio" name="mode" value="ajax" class="radio"
 			   id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") {
-			print_unescaped('checked="checked"');
-		} ?>>
+            print_unescaped('checked="checked"');
+        } ?>>
 		<label for="backgroundjobs_ajax">AJAX</label><br/>
 		<em><?php p($l->t("Execute one task with each page loaded")); ?></em>
 	</p>
 	<p>
 		<input type="radio" name="mode" value="webcron" class="radio"
 			   id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] === "webcron") {
-			print_unescaped('checked="checked"');
-		} ?>>
+            print_unescaped('checked="checked"');
+        } ?>>
 		<label for="backgroundjobs_webcron">Webcron</label><br/>
 		<em><?php p($l->t("cron.php is registered at a webcron service to call cron.php every 15 minutes over HTTP.")); ?></em>
 	</p>
 	<p>
 		<input type="radio" name="mode" value="cron" class="radio"
 			   id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] === "cron") {
-			print_unescaped('checked="checked"');
-		}
-		if (!$_['cli_based_cron_possible']) {
-			print_unescaped('disabled');
-		}?>>
+            print_unescaped('checked="checked"');
+        }
+        if (!$_['cli_based_cron_possible']) {
+            print_unescaped('disabled');
+        }?>>
 		<label for="backgroundjobs_cron">Cron</label><br/>
 		<em><?php p($l->t("Use system cron service to call the cron.php file every 15 minutes.")); ?>
 			<?php if($_['cli_based_cron_possible']) {
-				p($l->t('The cron.php needs to be executed by the system user "%s".', [$_['cli_based_cron_user']]));
-			} else {
-				print_unescaped(str_replace(
-					['{linkstart}', '{linkend}'],
-					['<a href="http://php.net/manual/en/book.posix.php">', ' ↗</a>'],
-					$l->t('To run this you need the PHP POSIX extension. See {linkstart}PHP documentation{linkend} for more details.')
-				));
-		} ?></em>
+                p($l->t('The cron.php needs to be executed by the system user "%s".', [$_['cli_based_cron_user']]));
+            } else {
+                print_unescaped(str_replace(
+                    ['{linkstart}', '{linkend}'],
+                    ['<a href="http://php.net/manual/en/book.posix.php">', ' ↗</a>'],
+                    $l->t('To run this you need the PHP POSIX extension. See {linkstart}PHP documentation{linkend} for more details.')
+                ));
+        } ?></em>
 
 	</p>
 </div>
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -27,7 +27,7 @@ 
 ?>
 
 <div class="section" id="backgroundjobs">
-	<h2 class="inlineblock"><?php p($l->t('Background jobs'));?></h2>
+	<h2 class="inlineblock"><?php p($l->t('Background jobs')); ?></h2>
 	<p class="cronlog inlineblock">
 		<?php if ($_['lastcron'] !== false):
 			$relative_time = relative_modified_date($_['lastcron']);
@@ -36,13 +36,13 @@ 
 			$absolute_time = $formatter->formatDateTime($_['lastcron'], 'long', 'long');
 			if (time() - $_['lastcron'] <= 3600): ?>
 				<span class="status success"></span>
-				<span class="crondate" title="<?php p($absolute_time);?>">
-				<?php p($l->t("Last job ran %s.", [$relative_time]));?>
+				<span class="crondate" title="<?php p($absolute_time); ?>">
+				<?php p($l->t("Last job ran %s.", [$relative_time])); ?>
 			</span>
 			<?php else: ?>
 				<span class="status error"></span>
-				<span class="crondate" title="<?php p($absolute_time);?>">
-				<?php p($l->t("Last job execution ran %s. Something seems wrong.", [$relative_time]));?>
+				<span class="crondate" title="<?php p($absolute_time); ?>">
+				<?php p($l->t("Last job execution ran %s. Something seems wrong.", [$relative_time])); ?>
 			</span>
 			<?php endif;
 		else: ?>
@@ -51,10 +51,10 @@ 
 		endif; ?>
 	</p>
 	<a target="_blank" rel="noreferrer noopener" class="icon-info"
-	   title="<?php p($l->t('Open documentation'));?>"
+	   title="<?php p($l->t('Open documentation')); ?>"
 	   href="<?php p(link_to_docs('admin-background-jobs')); ?>"></a>
 
-	<p class="settings-hint"><?php p($l->t('For optimal performance it\'s important to configure background jobs correctly. For bigger instances \'Cron\' is the recommended setting. Please see the documentation for more information.'));?></p>
+	<p class="settings-hint"><?php p($l->t('For optimal performance it\'s important to configure background jobs correctly. For bigger instances \'Cron\' is the recommended setting. Please see the documentation for more information.')); ?></p>
 	<p>
 		<input type="radio" name="mode" value="ajax" class="radio"
 			   id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") {
@@ -81,7 +81,7 @@ 
 		}?>>
 		<label for="backgroundjobs_cron">Cron</label><br/>
 		<em><?php p($l->t("Use system cron service to call the cron.php file every 15 minutes.")); ?>
-			<?php if($_['cli_based_cron_possible']) {
+			<?php if ($_['cli_based_cron_possible']) {
 				p($l->t('The cron.php needs to be executed by the system user "%s".', [$_['cli_based_cron_user']]));
 			} else {
 				print_unescaped(str_replace(

lib/public/Collaboration/AutoComplete/ISorter.php

Indentation +13 added lines, -13 removed lines

@@ -33,18 +33,18 @@
  */
 interface ISorter {
 
-	/**
-	 * @return string The ID of the sorter, e.g. commenters
-	 * @since 13.0.0
-	 */
-	public function getId();
+    /**
+     * @return string The ID of the sorter, e.g. commenters
+     * @since 13.0.0
+     */
+    public function getId();
 
-	/**
-	 * executes the sort action
-	 *
-	 * @param array $sortArray the array to be sorted, provided as reference
-	 * @param array $context carries key 'itemType' and 'itemId' of the source object (e.g. a file)
-	 * @since 13.0.0
-	 */
-	public function sort(array &$sortArray, array $context);
+    /**
+     * executes the sort action
+     *
+     * @param array $sortArray the array to be sorted, provided as reference
+     * @param array $context carries key 'itemType' and 'itemId' of the source object (e.g. a file)
+     * @since 13.0.0
+     */
+    public function sort(array &$sortArray, array $context);
 }

apps/dav/templates/settings-admin-caldav.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
  */
 
 script('dav', [
-	'settings-admin-caldav'
+    'settings-admin-caldav'
 ]);
 
 /** @var \OCP\IL10N $l */

lib/private/Files/Mount/CacheMountProvider.php

Indentation +35 added lines, -35 removed lines

@@ -31,42 +31,42 @@
  * Mount provider for custom cache storages
  */
 class CacheMountProvider implements IMountProvider {
-	/**
-	 * @var IConfig
-	 */
-	private $config;
+    /**
+     * @var IConfig
+     */
+    private $config;
 
-	/**
-	 * ObjectStoreHomeMountProvider constructor.
-	 *
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * ObjectStoreHomeMountProvider constructor.
+     *
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * Get the cache mount for a user
-	 *
-	 * @param IUser $user
-	 * @param IStorageFactory $loader
-	 * @return \OCP\Files\Mount\IMountPoint[]
-	 */
-	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
-		$cacheBaseDir = $this->config->getSystemValue('cache_path', '');
-		if ($cacheBaseDir !== '') {
-			$cacheDir = rtrim($cacheBaseDir, '/') . '/' . $user->getUID();
-			if (!file_exists($cacheDir)) {
-				mkdir($cacheDir, 0770, true);
-				mkdir($cacheDir . '/uploads', 0770, true);
-			}
+    /**
+     * Get the cache mount for a user
+     *
+     * @param IUser $user
+     * @param IStorageFactory $loader
+     * @return \OCP\Files\Mount\IMountPoint[]
+     */
+    public function getMountsForUser(IUser $user, IStorageFactory $loader) {
+        $cacheBaseDir = $this->config->getSystemValue('cache_path', '');
+        if ($cacheBaseDir !== '') {
+            $cacheDir = rtrim($cacheBaseDir, '/') . '/' . $user->getUID();
+            if (!file_exists($cacheDir)) {
+                mkdir($cacheDir, 0770, true);
+                mkdir($cacheDir . '/uploads', 0770, true);
+            }
 
-			return [
-				new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/cache', ['datadir' => $cacheDir, $loader]),
-				new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/uploads', ['datadir' => $cacheDir . '/uploads', $loader])
-			];
-		} else {
-			return [];
-		}
-	}
+            return [
+                new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/cache', ['datadir' => $cacheDir, $loader]),
+                new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/uploads', ['datadir' => $cacheDir . '/uploads', $loader])
+            ];
+        } else {
+            return [];
+        }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -55,15 +55,15 @@
 	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
 		$cacheBaseDir = $this->config->getSystemValue('cache_path', '');
 		if ($cacheBaseDir !== '') {
-			$cacheDir = rtrim($cacheBaseDir, '/') . '/' . $user->getUID();
+			$cacheDir = rtrim($cacheBaseDir, '/').'/'.$user->getUID();
 			if (!file_exists($cacheDir)) {
 				mkdir($cacheDir, 0770, true);
-				mkdir($cacheDir . '/uploads', 0770, true);
+				mkdir($cacheDir.'/uploads', 0770, true);
 			}
 
 			return [
-				new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/cache', ['datadir' => $cacheDir, $loader]),
-				new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/uploads', ['datadir' => $cacheDir . '/uploads', $loader])
+				new MountPoint('\OC\Files\Storage\Local', '/'.$user->getUID().'/cache', ['datadir' => $cacheDir, $loader]),
+				new MountPoint('\OC\Files\Storage\Local', '/'.$user->getUID().'/uploads', ['datadir' => $cacheDir.'/uploads', $loader])
 			];
 		} else {
 			return [];

core/Migrations/Version13000Date20170926101637.php

Indentation +27 added lines, -27 removed lines

@@ -11,32 +11,32 @@
  */
 class Version13000Date20170926101637 extends BigIntMigration {
 
-	/**
-	 * @return array Returns an array with the following structure
-	 * ['table1' => ['column1', 'column2'], ...]
-	 * @since 13.0.0
-	 */
-	protected function getColumnsByTable() {
-		return [
-			'admin_settings' => ['id'],
-			'authtoken' => ['id'],
-			'bruteforce_attempts' => ['id'],
-			'comments' => ['id', 'parent_id', 'topmost_parent_id'],
-			// Disabled for now 'filecache' => ['fileid', 'storage', 'parent', 'mimetype', 'mimepart'],
-			'file_locks' => ['id'],
-			'jobs' => ['id'],
-			// Disabled for now 'mimetypes' => ['id'],
-			'mounts' => ['id'],
-			'personal_settings' => ['id'],
-			'properties' => ['id'],
-			'share' => ['id', 'parent', 'file_source'],
-			// Disabled for now 'storages' => ['numeric_id'],
-			'systemtag' => ['id'],
-			'systemtag_group' => ['systemtagid'],
-			'systemtag_object_mapping' => ['systemtagid'],
-			'vcategory' => ['id'],
-			'vcategory_to_object' => ['objid', 'categoryid'],
-		];
-	}
+    /**
+     * @return array Returns an array with the following structure
+     * ['table1' => ['column1', 'column2'], ...]
+     * @since 13.0.0
+     */
+    protected function getColumnsByTable() {
+        return [
+            'admin_settings' => ['id'],
+            'authtoken' => ['id'],
+            'bruteforce_attempts' => ['id'],
+            'comments' => ['id', 'parent_id', 'topmost_parent_id'],
+            // Disabled for now 'filecache' => ['fileid', 'storage', 'parent', 'mimetype', 'mimepart'],
+            'file_locks' => ['id'],
+            'jobs' => ['id'],
+            // Disabled for now 'mimetypes' => ['id'],
+            'mounts' => ['id'],
+            'personal_settings' => ['id'],
+            'properties' => ['id'],
+            'share' => ['id', 'parent', 'file_source'],
+            // Disabled for now 'storages' => ['numeric_id'],
+            'systemtag' => ['id'],
+            'systemtag_group' => ['systemtagid'],
+            'systemtag_object_mapping' => ['systemtagid'],
+            'vcategory' => ['id'],
+            'vcategory_to_object' => ['objid', 'categoryid'],
+        ];
+    }
 
 }

core/Command/Db/ConvertFilecacheBigInt.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 					$column->setType(Type::getType(Type::BIGINT));
 					$column->setOptions(['length' => 20]);
 
-					$updates[] = $tableName . '.' . $columnName;
+					$updates[] = $tableName.'.'.$columnName;
 				}
 			}
 		}

Indentation +71 added lines, -71 removed lines

@@ -33,75 +33,75 @@
 
 class ConvertFilecacheBigInt extends Command {
 
-	/** @var IDBConnection */
-	private $connection;
-
-	/**
-	 * @param IDBConnection $connection
-	 */
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('db:convert-filecache-bigint')
-			->setDescription('Convert the ID columns of the filecache to BigInt');
-	}
-
-	protected function getColumnsByTable() {
-		return [
-			'activity' => ['activity_id', 'object_id'],
-			'activity_mq' => ['mail_id'],
-			'filecache' => ['fileid', 'storage', 'parent', 'mimetype', 'mimepart', 'mtime', 'storage_mtime'],
-			'mimetypes' => ['id'],
-			'storages' => ['numeric_id'],
-		];
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-
-		$schema = new SchemaWrapper($this->connection);
-		$updates = [];
-
-		$tables = $this->getColumnsByTable();
-		foreach ($tables as $tableName => $columns) {
-			if (!$schema->hasTable($tableName)) {
-				continue;
-			}
-
-			$table = $schema->getTable($tableName);
-
-			foreach ($columns as $columnName) {
-				$column = $table->getColumn($columnName);
-				if ($column->getType()->getName() !== Type::BIGINT) {
-					$column->setType(Type::getType(Type::BIGINT));
-					$column->setOptions(['length' => 20]);
-
-					$updates[] = $tableName . '.' . $columnName;
-				}
-			}
-		}
-
-		if (empty($updates)) {
-			$output->writeln('<info>All tables already up to date!</info>');
-			return 0;
-		}
-
-		$output->writeln('<comment>This can take up to hours, depending on the number of files in your instance!</comment>');
-
-		if ($input->isInteractive()) {
-			$helper = $this->getHelper('question');
-			$question = new ConfirmationQuestion('Continue with the conversion (y/n)? [n] ', false);
-
-			if (!$helper->ask($input, $output, $question)) {
-				return 1;
-			}
-		}
-
-		$this->connection->migrateToSchema($schema->getWrappedSchema());
-
-		return 0;
-	}
+    /** @var IDBConnection */
+    private $connection;
+
+    /**
+     * @param IDBConnection $connection
+     */
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('db:convert-filecache-bigint')
+            ->setDescription('Convert the ID columns of the filecache to BigInt');
+    }
+
+    protected function getColumnsByTable() {
+        return [
+            'activity' => ['activity_id', 'object_id'],
+            'activity_mq' => ['mail_id'],
+            'filecache' => ['fileid', 'storage', 'parent', 'mimetype', 'mimepart', 'mtime', 'storage_mtime'],
+            'mimetypes' => ['id'],
+            'storages' => ['numeric_id'],
+        ];
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+
+        $schema = new SchemaWrapper($this->connection);
+        $updates = [];
+
+        $tables = $this->getColumnsByTable();
+        foreach ($tables as $tableName => $columns) {
+            if (!$schema->hasTable($tableName)) {
+                continue;
+            }
+
+            $table = $schema->getTable($tableName);
+
+            foreach ($columns as $columnName) {
+                $column = $table->getColumn($columnName);
+                if ($column->getType()->getName() !== Type::BIGINT) {
+                    $column->setType(Type::getType(Type::BIGINT));
+                    $column->setOptions(['length' => 20]);
+
+                    $updates[] = $tableName . '.' . $columnName;
+                }
+            }
+        }
+
+        if (empty($updates)) {
+            $output->writeln('<info>All tables already up to date!</info>');
+            return 0;
+        }
+
+        $output->writeln('<comment>This can take up to hours, depending on the number of files in your instance!</comment>');
+
+        if ($input->isInteractive()) {
+            $helper = $this->getHelper('question');
+            $question = new ConfirmationQuestion('Continue with the conversion (y/n)? [n] ', false);
+
+            if (!$helper->ask($input, $output, $question)) {
+                return 1;
+            }
+        }
+
+        $this->connection->migrateToSchema($schema->getWrappedSchema());
+
+        return 0;
+    }
 }

apps/dav/lib/AppInfo/PluginManager.php

Indentation +125 added lines, -125 removed lines

@@ -30,141 +30,141 @@
  */
 class PluginManager {
 
-	/**
-	 * @var ServerContainer
-	 */
-	private $container;
+    /**
+     * @var ServerContainer
+     */
+    private $container;
 
-	/**
-	 * @var IAppManager
-	 */
-	private $appManager;
+    /**
+     * @var IAppManager
+     */
+    private $appManager;
 
-	/**
-	 * App plugins
-	 *
-	 * @var array
-	 */
-	private $plugins = null;
+    /**
+     * App plugins
+     *
+     * @var array
+     */
+    private $plugins = null;
 
-	/**
-	 * App collections
-	 *
-	 * @var array
-	 */
-	private $collections = null;
+    /**
+     * App collections
+     *
+     * @var array
+     */
+    private $collections = null;
 
-	/**
-	 * Contstruct a PluginManager
-	 *
-	 * @param ServerContainer $container server container for resolving plugin classes
-	 * @param IAppManager $appManager app manager to loading apps and their info
-	 */
-	public function __construct(ServerContainer $container, IAppManager $appManager) {
-		$this->container = $container;
-		$this->appManager = $appManager;
-	}
+    /**
+     * Contstruct a PluginManager
+     *
+     * @param ServerContainer $container server container for resolving plugin classes
+     * @param IAppManager $appManager app manager to loading apps and their info
+     */
+    public function __construct(ServerContainer $container, IAppManager $appManager) {
+        $this->container = $container;
+        $this->appManager = $appManager;
+    }
 
-	/**
-	 * Returns an array of app-registered plugins
-	 *
-	 * @return array
-	 */
-	public function getAppPlugins() {
-		if (null === $this->plugins) {
-			$this->populate();
-		}
-		return $this->plugins;
-	}
+    /**
+     * Returns an array of app-registered plugins
+     *
+     * @return array
+     */
+    public function getAppPlugins() {
+        if (null === $this->plugins) {
+            $this->populate();
+        }
+        return $this->plugins;
+    }
 
-	/**
-	 * Returns an array of app-registered collections
-	 *
-	 * @return array
-	 */
-	public function getAppCollections() {
-		if (null === $this->collections) {
-			$this->populate();
-		}
-		return $this->collections;
-	}
+    /**
+     * Returns an array of app-registered collections
+     *
+     * @return array
+     */
+    public function getAppCollections() {
+        if (null === $this->collections) {
+            $this->populate();
+        }
+        return $this->collections;
+    }
 
-	/**
-	 * Retrieve plugin and collection list and populate attributes
-	 */
-	private function populate() {
-		$this->plugins = [];
-		$this->collections = [];
-		foreach ($this->appManager->getInstalledApps() as $app) {
-			// load plugins and collections from info.xml
-			$info = $this->appManager->getAppInfo($app);
-			if (!isset($info['types']) || !in_array('dav', $info['types'], true)) {
-				continue;
-			}
-			// FIXME: switch to public API once available
-			// load app to make sure its classes are available
-			\OC_App::loadApp($app);
-			$this->loadSabrePluginsFromInfoXml($this->extractPluginList($info));
-			$this->loadSabreCollectionsFromInfoXml($this->extractCollectionList($info));
-		}
-	}
+    /**
+     * Retrieve plugin and collection list and populate attributes
+     */
+    private function populate() {
+        $this->plugins = [];
+        $this->collections = [];
+        foreach ($this->appManager->getInstalledApps() as $app) {
+            // load plugins and collections from info.xml
+            $info = $this->appManager->getAppInfo($app);
+            if (!isset($info['types']) || !in_array('dav', $info['types'], true)) {
+                continue;
+            }
+            // FIXME: switch to public API once available
+            // load app to make sure its classes are available
+            \OC_App::loadApp($app);
+            $this->loadSabrePluginsFromInfoXml($this->extractPluginList($info));
+            $this->loadSabreCollectionsFromInfoXml($this->extractCollectionList($info));
+        }
+    }
 
-	private function extractPluginList(array $array) {
-		if (isset($array['sabre']) && is_array($array['sabre'])) {
-			if (isset($array['sabre']['plugins']) && is_array($array['sabre']['plugins'])) {
-				if (isset($array['sabre']['plugins']['plugin'])) {
-					$items = $array['sabre']['plugins']['plugin'];
-					if (!is_array($items)) {
-						$items = [$items];
-					}
-					return $items;
-				}
-			}
-		}
-		return [];
-	}
+    private function extractPluginList(array $array) {
+        if (isset($array['sabre']) && is_array($array['sabre'])) {
+            if (isset($array['sabre']['plugins']) && is_array($array['sabre']['plugins'])) {
+                if (isset($array['sabre']['plugins']['plugin'])) {
+                    $items = $array['sabre']['plugins']['plugin'];
+                    if (!is_array($items)) {
+                        $items = [$items];
+                    }
+                    return $items;
+                }
+            }
+        }
+        return [];
+    }
 
-	private function extractCollectionList(array $array) {
-		if (isset($array['sabre']) && is_array($array['sabre'])) {
-			if (isset($array['sabre']['collections']) && is_array($array['sabre']['collections'])) {
-				if (isset($array['sabre']['collections']['collection'])) {
-					$items = $array['sabre']['collections']['collection'];
-					if (!is_array($items)) {
-						$items = [$items];
-					}
-					return $items;
-				}
-			}
-		}
-		return [];
-	}
+    private function extractCollectionList(array $array) {
+        if (isset($array['sabre']) && is_array($array['sabre'])) {
+            if (isset($array['sabre']['collections']) && is_array($array['sabre']['collections'])) {
+                if (isset($array['sabre']['collections']['collection'])) {
+                    $items = $array['sabre']['collections']['collection'];
+                    if (!is_array($items)) {
+                        $items = [$items];
+                    }
+                    return $items;
+                }
+            }
+        }
+        return [];
+    }
 
-	private function loadSabrePluginsFromInfoXml(array $plugins) {
-		foreach ($plugins as $plugin) {
-			try {
-				$this->plugins[] = $this->container->query($plugin);
-			} catch (QueryException $e) {
-				if (class_exists($plugin)) {
-					$this->plugins[] = new $plugin();
-				} else {
-					throw new \Exception("Sabre plugin class '$plugin' is unknown and could not be loaded");
-				}
-			}
-		}
-	}
+    private function loadSabrePluginsFromInfoXml(array $plugins) {
+        foreach ($plugins as $plugin) {
+            try {
+                $this->plugins[] = $this->container->query($plugin);
+            } catch (QueryException $e) {
+                if (class_exists($plugin)) {
+                    $this->plugins[] = new $plugin();
+                } else {
+                    throw new \Exception("Sabre plugin class '$plugin' is unknown and could not be loaded");
+                }
+            }
+        }
+    }
 
-	private function loadSabreCollectionsFromInfoXml(array $collections) {
-		foreach ($collections as $collection) {
-			try {
-				$this->collections[] = $this->container->query($collection);
-			} catch (QueryException $e) {
-				if (class_exists($collection)) {
-					$this->collections[] = new $collection();
-				} else {
-					throw new \Exception("Sabre collection class '$collection' is unknown and could not be loaded");
-				}
-			}
-		}
-	}
+    private function loadSabreCollectionsFromInfoXml(array $collections) {
+        foreach ($collections as $collection) {
+            try {
+                $this->collections[] = $this->container->query($collection);
+            } catch (QueryException $e) {
+                if (class_exists($collection)) {
+                    $this->collections[] = new $collection();
+                } else {
+                    throw new \Exception("Sabre collection class '$collection' is unknown and could not be loaded");
+                }
+            }
+        }
+    }
 
 }

apps/dav/lib/CalDAV/Activity/Backend.php

Spacing +18 added lines, -18 removed lines

@@ -133,7 +133,7 @@ 
 		foreach ($users as $user) {
 			$event->setAffectedUser($user)
 				->setSubject(
-					$user === $currentUser ? $action . '_self' : $action,
+					$user === $currentUser ? $action.'_self' : $action,
 					[
 						'actor' => $currentUser,
 						'calendar' => [
@@ -186,7 +186,7 @@ 
 					$event,
 					$calendarData,
 					Calendar::SUBJECT_UNSHARE_USER,
-					Calendar::SUBJECT_DELETE . '_self'
+					Calendar::SUBJECT_DELETE.'_self'
 				);
 
 				if ($owner !== $principal[2]) {
@@ -201,15 +201,15 @@ 
 					];
 
 					if ($owner === $event->getAuthor()) {
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_you';
+						$subject = Calendar::SUBJECT_UNSHARE_USER.'_you';
 					} else if ($principal[2] === $event->getAuthor()) {
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_self';
+						$subject = Calendar::SUBJECT_UNSHARE_USER.'_self';
 					} else {
 						$event->setAffectedUser($event->getAuthor())
-							->setSubject(Calendar::SUBJECT_UNSHARE_USER . '_you', $parameters);
+							->setSubject(Calendar::SUBJECT_UNSHARE_USER.'_you', $parameters);
 						$this->activityManager->publish($event);
 
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_by';
+						$subject = Calendar::SUBJECT_UNSHARE_USER.'_by';
 					}
 
 					$event->setAffectedUser($owner)
@@ -230,13 +230,13 @@ 
 				];
 
 				if ($owner === $event->getAuthor()) {
-					$subject = Calendar::SUBJECT_UNSHARE_GROUP . '_you';
+					$subject = Calendar::SUBJECT_UNSHARE_GROUP.'_you';
 				} else {
 					$event->setAffectedUser($event->getAuthor())
-						->setSubject(Calendar::SUBJECT_UNSHARE_GROUP . '_you', $parameters);
+						->setSubject(Calendar::SUBJECT_UNSHARE_GROUP.'_you', $parameters);
 					$this->activityManager->publish($event);
 
-					$subject = Calendar::SUBJECT_UNSHARE_GROUP . '_by';
+					$subject = Calendar::SUBJECT_UNSHARE_GROUP.'_by';
 				}
 
 				$event->setAffectedUser($owner)
@@ -272,13 +272,13 @@ 
 					];
 
 					if ($owner === $event->getAuthor()) {
-						$subject = Calendar::SUBJECT_SHARE_USER . '_you';
+						$subject = Calendar::SUBJECT_SHARE_USER.'_you';
 					} else {
 						$event->setAffectedUser($event->getAuthor())
-							->setSubject(Calendar::SUBJECT_SHARE_USER . '_you', $parameters);
+							->setSubject(Calendar::SUBJECT_SHARE_USER.'_you', $parameters);
 						$this->activityManager->publish($event);
 
-						$subject = Calendar::SUBJECT_SHARE_USER . '_by';
+						$subject = Calendar::SUBJECT_SHARE_USER.'_by';
 					}
 
 					$event->setAffectedUser($owner)
@@ -299,13 +299,13 @@ 
 				];
 
 				if ($owner === $event->getAuthor()) {
-					$subject = Calendar::SUBJECT_SHARE_GROUP . '_you';
+					$subject = Calendar::SUBJECT_SHARE_GROUP.'_you';
 				} else {
 					$event->setAffectedUser($event->getAuthor())
-						->setSubject(Calendar::SUBJECT_SHARE_GROUP . '_you', $parameters);
+						->setSubject(Calendar::SUBJECT_SHARE_GROUP.'_you', $parameters);
 					$this->activityManager->publish($event);
 
-					$subject = Calendar::SUBJECT_SHARE_GROUP . '_by';
+					$subject = Calendar::SUBJECT_SHARE_GROUP.'_by';
 				}
 
 				$event->setAffectedUser($owner)
@@ -403,7 +403,7 @@ 
 		}
 
 		$object = $this->getObjectNameAndType($objectData);
-		$action = $action . '_' . $object['type'];
+		$action = $action.'_'.$object['type'];
 
 		if ($object['type'] === 'todo' && strpos($action, Event::SUBJECT_OBJECT_UPDATE) === 0 && $object['status'] === 'COMPLETED') {
 			$action .= '_completed';
@@ -423,7 +423,7 @@ 
 		foreach ($users as $user) {
 			$event->setAffectedUser($user)
 				->setSubject(
-					$user === $currentUser ? $action . '_self' : $action,
+					$user === $currentUser ? $action.'_self' : $action,
 					[
 						'actor' => $event->getAuthor(),
 						'calendar' => [
@@ -448,7 +448,7 @@ 
 	protected function getObjectNameAndType(array $objectData) {
 		$vObject = Reader::read($objectData['calendardata']);
 		$component = $componentType = null;
-		foreach($vObject->getComponents() as $component) {
+		foreach ($vObject->getComponents() as $component) {
 			if (in_array($component->name, ['VEVENT', 'VTODO'])) {
 				$componentType = $component->name;
 				break;

Indentation +467 added lines, -467 removed lines

@@ -42,471 +42,471 @@
  */
 class Backend {
 
-	/** @var IActivityManager */
-	protected $activityManager;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var IUserSession */
-	protected $userSession;
-
-	/**
-	 * @param IActivityManager $activityManager
-	 * @param IGroupManager $groupManager
-	 * @param IUserSession $userSession
-	 */
-	public function __construct(IActivityManager $activityManager, IGroupManager $groupManager, IUserSession $userSession) {
-		$this->activityManager = $activityManager;
-		$this->groupManager = $groupManager;
-		$this->userSession = $userSession;
-	}
-
-	/**
-	 * Creates activities when a calendar was creates
-	 *
-	 * @param array $calendarData
-	 */
-	public function onCalendarAdd(array $calendarData) {
-		$this->triggerCalendarActivity(Calendar::SUBJECT_ADD, $calendarData);
-	}
-
-	/**
-	 * Creates activities when a calendar was updated
-	 *
-	 * @param array $calendarData
-	 * @param array $shares
-	 * @param array $properties
-	 */
-	public function onCalendarUpdate(array $calendarData, array $shares, array $properties) {
-		$this->triggerCalendarActivity(Calendar::SUBJECT_UPDATE, $calendarData, $shares, $properties);
-	}
-
-	/**
-	 * Creates activities when a calendar was deleted
-	 *
-	 * @param array $calendarData
-	 * @param array $shares
-	 */
-	public function onCalendarDelete(array $calendarData, array $shares) {
-		$this->triggerCalendarActivity(Calendar::SUBJECT_DELETE, $calendarData, $shares);
-	}
-
-	/**
-	 * Creates activities when a calendar was (un)published
-	 *
-	 * @param array $calendarData
-	 * @param bool $publishStatus
-	 */
-	public function onCalendarPublication(array $calendarData, $publishStatus) {
-		$this->triggerCalendarActivity($publishStatus ? Calendar::SUBJECT_PUBLISH : Calendar::SUBJECT_UNPUBLISH, $calendarData);
-	}
-
-	/**
-	 * Creates activities for all related users when a calendar was touched
-	 *
-	 * @param string $action
-	 * @param array $calendarData
-	 * @param array $shares
-	 * @param array $changedProperties
-	 */
-	protected function triggerCalendarActivity($action, array $calendarData, array $shares = [], array $changedProperties = []) {
-		if (!isset($calendarData['principaluri'])) {
-			return;
-		}
-
-		$principal = explode('/', $calendarData['principaluri']);
-		$owner = array_pop($principal);
-
-		$currentUser = $this->userSession->getUser();
-		if ($currentUser instanceof IUser) {
-			$currentUser = $currentUser->getUID();
-		} else {
-			$currentUser = $owner;
-		}
-
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('dav')
-			->setObject('calendar', (int) $calendarData['id'])
-			->setType('calendar')
-			->setAuthor($currentUser);
-
-		$changedVisibleInformation = array_intersect([
-			'{DAV:}displayname',
-			'{http://apple.com/ns/ical/}calendar-color'
-		], array_keys($changedProperties));
-
-		if (empty($shares) || ($action === Calendar::SUBJECT_UPDATE && empty($changedVisibleInformation))) {
-			$users = [$owner];
-		} else {
-			$users = $this->getUsersForShares($shares);
-			$users[] = $owner;
-		}
-
-		foreach ($users as $user) {
-			$event->setAffectedUser($user)
-				->setSubject(
-					$user === $currentUser ? $action . '_self' : $action,
-					[
-						'actor' => $currentUser,
-						'calendar' => [
-							'id' => (int) $calendarData['id'],
-							'uri' => $calendarData['uri'],
-							'name' => $calendarData['{DAV:}displayname'],
-						],
-					]
-				);
-			$this->activityManager->publish($event);
-		}
-	}
-
-	/**
-	 * Creates activities for all related users when a calendar was (un-)shared
-	 *
-	 * @param array $calendarData
-	 * @param array $shares
-	 * @param array $add
-	 * @param array $remove
-	 */
-	public function onCalendarUpdateShares(array $calendarData, array $shares, array $add, array $remove) {
-		$principal = explode('/', $calendarData['principaluri']);
-		$owner = $principal[2];
-
-		$currentUser = $this->userSession->getUser();
-		if ($currentUser instanceof IUser) {
-			$currentUser = $currentUser->getUID();
-		} else {
-			$currentUser = $owner;
-		}
-
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('dav')
-			->setObject('calendar', (int) $calendarData['id'])
-			->setType('calendar')
-			->setAuthor($currentUser);
-
-		foreach ($remove as $principal) {
-			// principal:principals/users/test
-			$parts = explode(':', $principal, 2);
-			if ($parts[0] !== 'principal') {
-				continue;
-			}
-			$principal = explode('/', $parts[1]);
-
-			if ($principal[1] === 'users') {
-				$this->triggerActivityUser(
-					$principal[2],
-					$event,
-					$calendarData,
-					Calendar::SUBJECT_UNSHARE_USER,
-					Calendar::SUBJECT_DELETE . '_self'
-				);
-
-				if ($owner !== $principal[2]) {
-					$parameters = [
-						'actor' => $event->getAuthor(),
-						'calendar' => [
-							'id' => (int) $calendarData['id'],
-							'uri' => $calendarData['uri'],
-							'name' => $calendarData['{DAV:}displayname'],
-						],
-						'user' => $principal[2],
-					];
-
-					if ($owner === $event->getAuthor()) {
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_you';
-					} else if ($principal[2] === $event->getAuthor()) {
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_self';
-					} else {
-						$event->setAffectedUser($event->getAuthor())
-							->setSubject(Calendar::SUBJECT_UNSHARE_USER . '_you', $parameters);
-						$this->activityManager->publish($event);
-
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_by';
-					}
-
-					$event->setAffectedUser($owner)
-						->setSubject($subject, $parameters);
-					$this->activityManager->publish($event);
-				}
-			} else if ($principal[1] === 'groups') {
-				$this->triggerActivityGroup($principal[2], $event, $calendarData, Calendar::SUBJECT_UNSHARE_USER);
-
-				$parameters = [
-					'actor' => $event->getAuthor(),
-					'calendar' => [
-						'id' => (int) $calendarData['id'],
-						'uri' => $calendarData['uri'],
-						'name' => $calendarData['{DAV:}displayname'],
-					],
-					'group' => $principal[2],
-				];
-
-				if ($owner === $event->getAuthor()) {
-					$subject = Calendar::SUBJECT_UNSHARE_GROUP . '_you';
-				} else {
-					$event->setAffectedUser($event->getAuthor())
-						->setSubject(Calendar::SUBJECT_UNSHARE_GROUP . '_you', $parameters);
-					$this->activityManager->publish($event);
-
-					$subject = Calendar::SUBJECT_UNSHARE_GROUP . '_by';
-				}
-
-				$event->setAffectedUser($owner)
-					->setSubject($subject, $parameters);
-				$this->activityManager->publish($event);
-			}
-		}
-
-		foreach ($add as $share) {
-			if ($this->isAlreadyShared($share['href'], $shares)) {
-				continue;
-			}
-
-			// principal:principals/users/test
-			$parts = explode(':', $share['href'], 2);
-			if ($parts[0] !== 'principal') {
-				continue;
-			}
-			$principal = explode('/', $parts[1]);
-
-			if ($principal[1] === 'users') {
-				$this->triggerActivityUser($principal[2], $event, $calendarData, Calendar::SUBJECT_SHARE_USER);
-
-				if ($owner !== $principal[2]) {
-					$parameters = [
-						'actor' => $event->getAuthor(),
-						'calendar' => [
-							'id' => (int) $calendarData['id'],
-							'uri' => $calendarData['uri'],
-							'name' => $calendarData['{DAV:}displayname'],
-						],
-						'user' => $principal[2],
-					];
-
-					if ($owner === $event->getAuthor()) {
-						$subject = Calendar::SUBJECT_SHARE_USER . '_you';
-					} else {
-						$event->setAffectedUser($event->getAuthor())
-							->setSubject(Calendar::SUBJECT_SHARE_USER . '_you', $parameters);
-						$this->activityManager->publish($event);
-
-						$subject = Calendar::SUBJECT_SHARE_USER . '_by';
-					}
-
-					$event->setAffectedUser($owner)
-						->setSubject($subject, $parameters);
-					$this->activityManager->publish($event);
-				}
-			} else if ($principal[1] === 'groups') {
-				$this->triggerActivityGroup($principal[2], $event, $calendarData, Calendar::SUBJECT_SHARE_USER);
-
-				$parameters = [
-					'actor' => $event->getAuthor(),
-					'calendar' => [
-						'id' => (int) $calendarData['id'],
-						'uri' => $calendarData['uri'],
-						'name' => $calendarData['{DAV:}displayname'],
-					],
-					'group' => $principal[2],
-				];
-
-				if ($owner === $event->getAuthor()) {
-					$subject = Calendar::SUBJECT_SHARE_GROUP . '_you';
-				} else {
-					$event->setAffectedUser($event->getAuthor())
-						->setSubject(Calendar::SUBJECT_SHARE_GROUP . '_you', $parameters);
-					$this->activityManager->publish($event);
-
-					$subject = Calendar::SUBJECT_SHARE_GROUP . '_by';
-				}
-
-				$event->setAffectedUser($owner)
-					->setSubject($subject, $parameters);
-				$this->activityManager->publish($event);
-			}
-		}
-	}
-
-	/**
-	 * Checks if a calendar is already shared with a principal
-	 *
-	 * @param string $principal
-	 * @param array[] $shares
-	 * @return bool
-	 */
-	protected function isAlreadyShared($principal, $shares) {
-		foreach ($shares as $share) {
-			if ($principal === $share['href']) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Creates the given activity for all members of the given group
-	 *
-	 * @param string $gid
-	 * @param IEvent $event
-	 * @param array $properties
-	 * @param string $subject
-	 */
-	protected function triggerActivityGroup($gid, IEvent $event, array $properties, $subject) {
-		$group = $this->groupManager->get($gid);
-
-		if ($group instanceof IGroup) {
-			foreach ($group->getUsers() as $user) {
-				// Exclude current user
-				if ($user->getUID() !== $event->getAuthor()) {
-					$this->triggerActivityUser($user->getUID(), $event, $properties, $subject);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Creates the given activity for the given user
-	 *
-	 * @param string $user
-	 * @param IEvent $event
-	 * @param array $properties
-	 * @param string $subject
-	 * @param string $subjectSelf
-	 */
-	protected function triggerActivityUser($user, IEvent $event, array $properties, $subject, $subjectSelf = '') {
-		$event->setAffectedUser($user)
-			->setSubject(
-				$user === $event->getAuthor() && $subjectSelf ? $subjectSelf : $subject,
-				[
-					'actor' => $event->getAuthor(),
-					'calendar' => [
-						'id' => (int) $properties['id'],
-						'uri' => $properties['uri'],
-						'name' => $properties['{DAV:}displayname'],
-					],
-				]
-			);
-
-		$this->activityManager->publish($event);
-	}
-
-	/**
-	 * Creates activities when a calendar object was created/updated/deleted
-	 *
-	 * @param string $action
-	 * @param array $calendarData
-	 * @param array $shares
-	 * @param array $objectData
-	 */
-	public function onTouchCalendarObject($action, array $calendarData, array $shares, array $objectData) {
-		if (!isset($calendarData['principaluri'])) {
-			return;
-		}
-
-		$principal = explode('/', $calendarData['principaluri']);
-		$owner = array_pop($principal);
-
-		$currentUser = $this->userSession->getUser();
-		if ($currentUser instanceof IUser) {
-			$currentUser = $currentUser->getUID();
-		} else {
-			$currentUser = $owner;
-		}
-
-		$object = $this->getObjectNameAndType($objectData);
-		$action = $action . '_' . $object['type'];
-
-		if ($object['type'] === 'todo' && strpos($action, Event::SUBJECT_OBJECT_UPDATE) === 0 && $object['status'] === 'COMPLETED') {
-			$action .= '_completed';
-		} else if ($object['type'] === 'todo' && strpos($action, Event::SUBJECT_OBJECT_UPDATE) === 0 && $object['status'] === 'NEEDS-ACTION') {
-			$action .= '_needs_action';
-		}
-
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('dav')
-			->setObject('calendar', (int) $calendarData['id'])
-			->setType($object['type'] === 'event' ? 'calendar_event' : 'calendar_todo')
-			->setAuthor($currentUser);
-
-		$users = $this->getUsersForShares($shares);
-		$users[] = $owner;
-
-		foreach ($users as $user) {
-			$event->setAffectedUser($user)
-				->setSubject(
-					$user === $currentUser ? $action . '_self' : $action,
-					[
-						'actor' => $event->getAuthor(),
-						'calendar' => [
-							'id' => (int) $calendarData['id'],
-							'uri' => $calendarData['uri'],
-							'name' => $calendarData['{DAV:}displayname'],
-						],
-						'object' => [
-							'id' => $object['id'],
-							'name' => $object['name'],
-						],
-					]
-				);
-			$this->activityManager->publish($event);
-		}
-	}
-
-	/**
-	 * @param array $objectData
-	 * @return string[]|bool
-	 */
-	protected function getObjectNameAndType(array $objectData) {
-		$vObject = Reader::read($objectData['calendardata']);
-		$component = $componentType = null;
-		foreach($vObject->getComponents() as $component) {
-			if (in_array($component->name, ['VEVENT', 'VTODO'])) {
-				$componentType = $component->name;
-				break;
-			}
-		}
-
-		if (!$componentType) {
-			// Calendar objects must have a VEVENT or VTODO component
-			return false;
-		}
-
-		if ($componentType === 'VEVENT') {
-			return ['id' => (string) $component->UID, 'name' => (string) $component->SUMMARY, 'type' => 'event'];
-		}
-		return ['id' => (string) $component->UID, 'name' => (string) $component->SUMMARY, 'type' => 'todo', 'status' => (string) $component->STATUS];
-	}
-
-	/**
-	 * Get all users that have access to a given calendar
-	 *
-	 * @param array $shares
-	 * @return string[]
-	 */
-	protected function getUsersForShares(array $shares) {
-		$users = $groups = [];
-		foreach ($shares as $share) {
-			$prinical = explode('/', $share['{http://owncloud.org/ns}principal']);
-			if ($prinical[1] === 'users') {
-				$users[] = $prinical[2];
-			} else if ($prinical[1] === 'groups') {
-				$groups[] = $prinical[2];
-			}
-		}
-
-		if (!empty($groups)) {
-			foreach ($groups as $gid) {
-				$group = $this->groupManager->get($gid);
-				if ($group instanceof IGroup) {
-					foreach ($group->getUsers() as $user) {
-						$users[] = $user->getUID();
-					}
-				}
-			}
-		}
-
-		return array_unique($users);
-	}
+    /** @var IActivityManager */
+    protected $activityManager;
+
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var IUserSession */
+    protected $userSession;
+
+    /**
+     * @param IActivityManager $activityManager
+     * @param IGroupManager $groupManager
+     * @param IUserSession $userSession
+     */
+    public function __construct(IActivityManager $activityManager, IGroupManager $groupManager, IUserSession $userSession) {
+        $this->activityManager = $activityManager;
+        $this->groupManager = $groupManager;
+        $this->userSession = $userSession;
+    }
+
+    /**
+     * Creates activities when a calendar was creates
+     *
+     * @param array $calendarData
+     */
+    public function onCalendarAdd(array $calendarData) {
+        $this->triggerCalendarActivity(Calendar::SUBJECT_ADD, $calendarData);
+    }
+
+    /**
+     * Creates activities when a calendar was updated
+     *
+     * @param array $calendarData
+     * @param array $shares
+     * @param array $properties
+     */
+    public function onCalendarUpdate(array $calendarData, array $shares, array $properties) {
+        $this->triggerCalendarActivity(Calendar::SUBJECT_UPDATE, $calendarData, $shares, $properties);
+    }
+
+    /**
+     * Creates activities when a calendar was deleted
+     *
+     * @param array $calendarData
+     * @param array $shares
+     */
+    public function onCalendarDelete(array $calendarData, array $shares) {
+        $this->triggerCalendarActivity(Calendar::SUBJECT_DELETE, $calendarData, $shares);
+    }
+
+    /**
+     * Creates activities when a calendar was (un)published
+     *
+     * @param array $calendarData
+     * @param bool $publishStatus
+     */
+    public function onCalendarPublication(array $calendarData, $publishStatus) {
+        $this->triggerCalendarActivity($publishStatus ? Calendar::SUBJECT_PUBLISH : Calendar::SUBJECT_UNPUBLISH, $calendarData);
+    }
+
+    /**
+     * Creates activities for all related users when a calendar was touched
+     *
+     * @param string $action
+     * @param array $calendarData
+     * @param array $shares
+     * @param array $changedProperties
+     */
+    protected function triggerCalendarActivity($action, array $calendarData, array $shares = [], array $changedProperties = []) {
+        if (!isset($calendarData['principaluri'])) {
+            return;
+        }
+
+        $principal = explode('/', $calendarData['principaluri']);
+        $owner = array_pop($principal);
+
+        $currentUser = $this->userSession->getUser();
+        if ($currentUser instanceof IUser) {
+            $currentUser = $currentUser->getUID();
+        } else {
+            $currentUser = $owner;
+        }
+
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('dav')
+            ->setObject('calendar', (int) $calendarData['id'])
+            ->setType('calendar')
+            ->setAuthor($currentUser);
+
+        $changedVisibleInformation = array_intersect([
+            '{DAV:}displayname',
+            '{http://apple.com/ns/ical/}calendar-color'
+        ], array_keys($changedProperties));
+
+        if (empty($shares) || ($action === Calendar::SUBJECT_UPDATE && empty($changedVisibleInformation))) {
+            $users = [$owner];
+        } else {
+            $users = $this->getUsersForShares($shares);
+            $users[] = $owner;
+        }
+
+        foreach ($users as $user) {
+            $event->setAffectedUser($user)
+                ->setSubject(
+                    $user === $currentUser ? $action . '_self' : $action,
+                    [
+                        'actor' => $currentUser,
+                        'calendar' => [
+                            'id' => (int) $calendarData['id'],
+                            'uri' => $calendarData['uri'],
+                            'name' => $calendarData['{DAV:}displayname'],
+                        ],
+                    ]
+                );
+            $this->activityManager->publish($event);
+        }
+    }
+
+    /**
+     * Creates activities for all related users when a calendar was (un-)shared
+     *
+     * @param array $calendarData
+     * @param array $shares
+     * @param array $add
+     * @param array $remove
+     */
+    public function onCalendarUpdateShares(array $calendarData, array $shares, array $add, array $remove) {
+        $principal = explode('/', $calendarData['principaluri']);
+        $owner = $principal[2];
+
+        $currentUser = $this->userSession->getUser();
+        if ($currentUser instanceof IUser) {
+            $currentUser = $currentUser->getUID();
+        } else {
+            $currentUser = $owner;
+        }
+
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('dav')
+            ->setObject('calendar', (int) $calendarData['id'])
+            ->setType('calendar')
+            ->setAuthor($currentUser);
+
+        foreach ($remove as $principal) {
+            // principal:principals/users/test
+            $parts = explode(':', $principal, 2);
+            if ($parts[0] !== 'principal') {
+                continue;
+            }
+            $principal = explode('/', $parts[1]);
+
+            if ($principal[1] === 'users') {
+                $this->triggerActivityUser(
+                    $principal[2],
+                    $event,
+                    $calendarData,
+                    Calendar::SUBJECT_UNSHARE_USER,
+                    Calendar::SUBJECT_DELETE . '_self'
+                );
+
+                if ($owner !== $principal[2]) {
+                    $parameters = [
+                        'actor' => $event->getAuthor(),
+                        'calendar' => [
+                            'id' => (int) $calendarData['id'],
+                            'uri' => $calendarData['uri'],
+                            'name' => $calendarData['{DAV:}displayname'],
+                        ],
+                        'user' => $principal[2],
+                    ];
+
+                    if ($owner === $event->getAuthor()) {
+                        $subject = Calendar::SUBJECT_UNSHARE_USER . '_you';
+                    } else if ($principal[2] === $event->getAuthor()) {
+                        $subject = Calendar::SUBJECT_UNSHARE_USER . '_self';
+                    } else {
+                        $event->setAffectedUser($event->getAuthor())
+                            ->setSubject(Calendar::SUBJECT_UNSHARE_USER . '_you', $parameters);
+                        $this->activityManager->publish($event);
+
+                        $subject = Calendar::SUBJECT_UNSHARE_USER . '_by';
+                    }
+
+                    $event->setAffectedUser($owner)
+                        ->setSubject($subject, $parameters);
+                    $this->activityManager->publish($event);
+                }
+            } else if ($principal[1] === 'groups') {
+                $this->triggerActivityGroup($principal[2], $event, $calendarData, Calendar::SUBJECT_UNSHARE_USER);
+
+                $parameters = [
+                    'actor' => $event->getAuthor(),
+                    'calendar' => [
+                        'id' => (int) $calendarData['id'],
+                        'uri' => $calendarData['uri'],
+                        'name' => $calendarData['{DAV:}displayname'],
+                    ],
+                    'group' => $principal[2],
+                ];
+
+                if ($owner === $event->getAuthor()) {
+                    $subject = Calendar::SUBJECT_UNSHARE_GROUP . '_you';
+                } else {
+                    $event->setAffectedUser($event->getAuthor())
+                        ->setSubject(Calendar::SUBJECT_UNSHARE_GROUP . '_you', $parameters);
+                    $this->activityManager->publish($event);
+
+                    $subject = Calendar::SUBJECT_UNSHARE_GROUP . '_by';
+                }
+
+                $event->setAffectedUser($owner)
+                    ->setSubject($subject, $parameters);
+                $this->activityManager->publish($event);
+            }
+        }
+
+        foreach ($add as $share) {
+            if ($this->isAlreadyShared($share['href'], $shares)) {
+                continue;
+            }
+
+            // principal:principals/users/test
+            $parts = explode(':', $share['href'], 2);
+            if ($parts[0] !== 'principal') {
+                continue;
+            }
+            $principal = explode('/', $parts[1]);
+
+            if ($principal[1] === 'users') {
+                $this->triggerActivityUser($principal[2], $event, $calendarData, Calendar::SUBJECT_SHARE_USER);
+
+                if ($owner !== $principal[2]) {
+                    $parameters = [
+                        'actor' => $event->getAuthor(),
+                        'calendar' => [
+                            'id' => (int) $calendarData['id'],
+                            'uri' => $calendarData['uri'],
+                            'name' => $calendarData['{DAV:}displayname'],
+                        ],
+                        'user' => $principal[2],
+                    ];
+
+                    if ($owner === $event->getAuthor()) {
+                        $subject = Calendar::SUBJECT_SHARE_USER . '_you';
+                    } else {
+                        $event->setAffectedUser($event->getAuthor())
+                            ->setSubject(Calendar::SUBJECT_SHARE_USER . '_you', $parameters);
+                        $this->activityManager->publish($event);
+
+                        $subject = Calendar::SUBJECT_SHARE_USER . '_by';
+                    }
+
+                    $event->setAffectedUser($owner)
+                        ->setSubject($subject, $parameters);
+                    $this->activityManager->publish($event);
+                }
+            } else if ($principal[1] === 'groups') {
+                $this->triggerActivityGroup($principal[2], $event, $calendarData, Calendar::SUBJECT_SHARE_USER);
+
+                $parameters = [
+                    'actor' => $event->getAuthor(),
+                    'calendar' => [
+                        'id' => (int) $calendarData['id'],
+                        'uri' => $calendarData['uri'],
+                        'name' => $calendarData['{DAV:}displayname'],
+                    ],
+                    'group' => $principal[2],
+                ];
+
+                if ($owner === $event->getAuthor()) {
+                    $subject = Calendar::SUBJECT_SHARE_GROUP . '_you';
+                } else {
+                    $event->setAffectedUser($event->getAuthor())
+                        ->setSubject(Calendar::SUBJECT_SHARE_GROUP . '_you', $parameters);
+                    $this->activityManager->publish($event);
+
+                    $subject = Calendar::SUBJECT_SHARE_GROUP . '_by';
+                }
+
+                $event->setAffectedUser($owner)
+                    ->setSubject($subject, $parameters);
+                $this->activityManager->publish($event);
+            }
+        }
+    }
+
+    /**
+     * Checks if a calendar is already shared with a principal
+     *
+     * @param string $principal
+     * @param array[] $shares
+     * @return bool
+     */
+    protected function isAlreadyShared($principal, $shares) {
+        foreach ($shares as $share) {
+            if ($principal === $share['href']) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Creates the given activity for all members of the given group
+     *
+     * @param string $gid
+     * @param IEvent $event
+     * @param array $properties
+     * @param string $subject
+     */
+    protected function triggerActivityGroup($gid, IEvent $event, array $properties, $subject) {
+        $group = $this->groupManager->get($gid);
+
+        if ($group instanceof IGroup) {
+            foreach ($group->getUsers() as $user) {
+                // Exclude current user
+                if ($user->getUID() !== $event->getAuthor()) {
+                    $this->triggerActivityUser($user->getUID(), $event, $properties, $subject);
+                }
+            }
+        }
+    }
+
+    /**
+     * Creates the given activity for the given user
+     *
+     * @param string $user
+     * @param IEvent $event
+     * @param array $properties
+     * @param string $subject
+     * @param string $subjectSelf
+     */
+    protected function triggerActivityUser($user, IEvent $event, array $properties, $subject, $subjectSelf = '') {
+        $event->setAffectedUser($user)
+            ->setSubject(
+                $user === $event->getAuthor() && $subjectSelf ? $subjectSelf : $subject,
+                [
+                    'actor' => $event->getAuthor(),
+                    'calendar' => [
+                        'id' => (int) $properties['id'],
+                        'uri' => $properties['uri'],
+                        'name' => $properties['{DAV:}displayname'],
+                    ],
+                ]
+            );
+
+        $this->activityManager->publish($event);
+    }
+
+    /**
+     * Creates activities when a calendar object was created/updated/deleted
+     *
+     * @param string $action
+     * @param array $calendarData
+     * @param array $shares
+     * @param array $objectData
+     */
+    public function onTouchCalendarObject($action, array $calendarData, array $shares, array $objectData) {
+        if (!isset($calendarData['principaluri'])) {
+            return;
+        }
+
+        $principal = explode('/', $calendarData['principaluri']);
+        $owner = array_pop($principal);
+
+        $currentUser = $this->userSession->getUser();
+        if ($currentUser instanceof IUser) {
+            $currentUser = $currentUser->getUID();
+        } else {
+            $currentUser = $owner;
+        }
+
+        $object = $this->getObjectNameAndType($objectData);
+        $action = $action . '_' . $object['type'];
+
+        if ($object['type'] === 'todo' && strpos($action, Event::SUBJECT_OBJECT_UPDATE) === 0 && $object['status'] === 'COMPLETED') {
+            $action .= '_completed';
+        } else if ($object['type'] === 'todo' && strpos($action, Event::SUBJECT_OBJECT_UPDATE) === 0 && $object['status'] === 'NEEDS-ACTION') {
+            $action .= '_needs_action';
+        }
+
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('dav')
+            ->setObject('calendar', (int) $calendarData['id'])
+            ->setType($object['type'] === 'event' ? 'calendar_event' : 'calendar_todo')
+            ->setAuthor($currentUser);
+
+        $users = $this->getUsersForShares($shares);
+        $users[] = $owner;
+
+        foreach ($users as $user) {
+            $event->setAffectedUser($user)
+                ->setSubject(
+                    $user === $currentUser ? $action . '_self' : $action,
+                    [
+                        'actor' => $event->getAuthor(),
+                        'calendar' => [
+                            'id' => (int) $calendarData['id'],
+                            'uri' => $calendarData['uri'],
+                            'name' => $calendarData['{DAV:}displayname'],
+                        ],
+                        'object' => [
+                            'id' => $object['id'],
+                            'name' => $object['name'],
+                        ],
+                    ]
+                );
+            $this->activityManager->publish($event);
+        }
+    }
+
+    /**
+     * @param array $objectData
+     * @return string[]|bool
+     */
+    protected function getObjectNameAndType(array $objectData) {
+        $vObject = Reader::read($objectData['calendardata']);
+        $component = $componentType = null;
+        foreach($vObject->getComponents() as $component) {
+            if (in_array($component->name, ['VEVENT', 'VTODO'])) {
+                $componentType = $component->name;
+                break;
+            }
+        }
+
+        if (!$componentType) {
+            // Calendar objects must have a VEVENT or VTODO component
+            return false;
+        }
+
+        if ($componentType === 'VEVENT') {
+            return ['id' => (string) $component->UID, 'name' => (string) $component->SUMMARY, 'type' => 'event'];
+        }
+        return ['id' => (string) $component->UID, 'name' => (string) $component->SUMMARY, 'type' => 'todo', 'status' => (string) $component->STATUS];
+    }
+
+    /**
+     * Get all users that have access to a given calendar
+     *
+     * @param array $shares
+     * @return string[]
+     */
+    protected function getUsersForShares(array $shares) {
+        $users = $groups = [];
+        foreach ($shares as $share) {
+            $prinical = explode('/', $share['{http://owncloud.org/ns}principal']);
+            if ($prinical[1] === 'users') {
+                $users[] = $prinical[2];
+            } else if ($prinical[1] === 'groups') {
+                $groups[] = $prinical[2];
+            }
+        }
+
+        if (!empty($groups)) {
+            foreach ($groups as $gid) {
+                $group = $this->groupManager->get($gid);
+                if ($group instanceof IGroup) {
+                    foreach ($group->getUsers() as $user) {
+                        $users[] = $user->getUID();
+                    }
+                }
+            }
+        }
+
+        return array_unique($users);
+    }
 }