nextcloud / server

apps/files/lib/Activity/Filter/Favorites.php

Indentation +118 added lines, -118 removed lines

@@ -32,129 +32,129 @@
 
 class Favorites implements IFilter {
 
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var Helper */
-	protected $helper;
-
-	/** @var IDBConnection */
-	protected $db;
-
-	/**
-	 * @param IL10N $l
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param Helper $helper
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IL10N $l, IURLGenerator $url, IManager $activityManager, Helper $helper, IDBConnection $db) {
-		$this->l = $l;
-		$this->url = $url;
-		$this->activityManager = $activityManager;
-		$this->helper = $helper;
-		$this->db = $db;
-	}
-
-	/**
-	 * @return string Lowercase a-z only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'files_favorites';
-	}
-
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('Favorites');
-	}
-
-	/**
-	 * @return int
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 10;
-	}
-
-	/**
-	 * @return string Full URL to an icon, empty string when none is given
-	 * @since 11.0.0
-	 */
-	public function getIcon() {
-		return $this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star-dark.svg'));
-	}
-
-	/**
-	 * @param string[] $types
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 * @since 11.0.0
-	 */
-	public function filterTypes(array $types) {
-		return array_intersect([
-			'file_created',
-			'file_changed',
-			'file_deleted',
-			'file_restored',
-		], $types);
-	}
-
-	/**
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 * @since 11.0.0
-	 */
-	public function allowedApps() {
-		return ['files'];
-	}
-
-	/**
-	 * @param IQueryBuilder $query
-	 */
-	public function filterFavorites(IQueryBuilder $query) {
-		try {
-			$user = $this->activityManager->getCurrentUserId();
-		} catch (\UnexpectedValueException $e) {
-			return;
-		}
-
-		try {
-			$favorites = $this->helper->getFavoriteFilePaths($user);
-		} catch (\RuntimeException $e) {
-			return;
-		}
-
-		$limitations = [];
-		if (!empty($favorites['items'])) {
-			$limitations[] = $query->expr()->in('file', $query->createNamedParameter($favorites['items'], IQueryBuilder::PARAM_STR_ARRAY));
-		}
-		foreach ($favorites['folders'] as $favorite) {
-			$limitations[] = $query->expr()->like('file', $query->createNamedParameter(
-				$this->db->escapeLikeParameter($favorite . '/') . '%'
-			));
-		}
-
-		if (empty($limitations)) {
-			return;
-		}
-
-		$function = $query->createFunction('
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var Helper */
+    protected $helper;
+
+    /** @var IDBConnection */
+    protected $db;
+
+    /**
+     * @param IL10N $l
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param Helper $helper
+     * @param IDBConnection $db
+     */
+    public function __construct(IL10N $l, IURLGenerator $url, IManager $activityManager, Helper $helper, IDBConnection $db) {
+        $this->l = $l;
+        $this->url = $url;
+        $this->activityManager = $activityManager;
+        $this->helper = $helper;
+        $this->db = $db;
+    }
+
+    /**
+     * @return string Lowercase a-z only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'files_favorites';
+    }
+
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('Favorites');
+    }
+
+    /**
+     * @return int
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 10;
+    }
+
+    /**
+     * @return string Full URL to an icon, empty string when none is given
+     * @since 11.0.0
+     */
+    public function getIcon() {
+        return $this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star-dark.svg'));
+    }
+
+    /**
+     * @param string[] $types
+     * @return string[] An array of allowed apps from which activities should be displayed
+     * @since 11.0.0
+     */
+    public function filterTypes(array $types) {
+        return array_intersect([
+            'file_created',
+            'file_changed',
+            'file_deleted',
+            'file_restored',
+        ], $types);
+    }
+
+    /**
+     * @return string[] An array of allowed apps from which activities should be displayed
+     * @since 11.0.0
+     */
+    public function allowedApps() {
+        return ['files'];
+    }
+
+    /**
+     * @param IQueryBuilder $query
+     */
+    public function filterFavorites(IQueryBuilder $query) {
+        try {
+            $user = $this->activityManager->getCurrentUserId();
+        } catch (\UnexpectedValueException $e) {
+            return;
+        }
+
+        try {
+            $favorites = $this->helper->getFavoriteFilePaths($user);
+        } catch (\RuntimeException $e) {
+            return;
+        }
+
+        $limitations = [];
+        if (!empty($favorites['items'])) {
+            $limitations[] = $query->expr()->in('file', $query->createNamedParameter($favorites['items'], IQueryBuilder::PARAM_STR_ARRAY));
+        }
+        foreach ($favorites['folders'] as $favorite) {
+            $limitations[] = $query->expr()->like('file', $query->createNamedParameter(
+                $this->db->escapeLikeParameter($favorite . '/') . '%'
+            ));
+        }
+
+        if (empty($limitations)) {
+            return;
+        }
+
+        $function = $query->createFunction('
 			CASE 
 				WHEN ' . $query->getColumnName('app') . ' <> ' . $query->createNamedParameter('files') . ' THEN 1
 				WHEN ' . $query->getColumnName('app') . ' = ' . $query->createNamedParameter('files') . '
 					AND (' . implode(' OR ', $limitations) . ')
 					THEN 1 
 			END = 1'
-		);
+        );
 
-		$query->andWhere($function);
-	}
+        $query->andWhere($function);
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -138,7 +138,7 @@ 
 		}
 		foreach ($favorites['folders'] as $favorite) {
 			$limitations[] = $query->expr()->like('file', $query->createNamedParameter(
-				$this->db->escapeLikeParameter($favorite . '/') . '%'
+				$this->db->escapeLikeParameter($favorite.'/').'%'
 			));
 		}
 
@@ -148,9 +148,9 @@ 
 
 		$function = $query->createFunction('
 			CASE 
-				WHEN ' . $query->getColumnName('app') . ' <> ' . $query->createNamedParameter('files') . ' THEN 1
-				WHEN ' . $query->getColumnName('app') . ' = ' . $query->createNamedParameter('files') . '
-					AND (' . implode(' OR ', $limitations) . ')
+				WHEN ' . $query->getColumnName('app').' <> '.$query->createNamedParameter('files').' THEN 1
+				WHEN ' . $query->getColumnName('app').' = '.$query->createNamedParameter('files').'
+					AND (' . implode(' OR ', $limitations).')
 					THEN 1 
 			END = 1'
 		);

apps/files/lib/Activity/Helper.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 			if (!empty($nodes)) {
 				/** @var \OCP\Files\Node $node */
 				$node = array_shift($nodes);
-				$path = substr($node->getPath(), strlen($user . '/files/'));
+				$path = substr($node->getPath(), strlen($user.'/files/'));
 
 				$items[] = $path;
 				if ($node instanceof Folder) {

Indentation +48 added lines, -48 removed lines

@@ -26,60 +26,60 @@
 use OCP\ITagManager;
 
 class Helper {
-	/** If a user has a lot of favorites the query might get too slow and long */
-	public const FAVORITE_LIMIT = 50;
+    /** If a user has a lot of favorites the query might get too slow and long */
+    public const FAVORITE_LIMIT = 50;
 
-	/** @var ITagManager */
-	protected $tagManager;
+    /** @var ITagManager */
+    protected $tagManager;
 
-	/**
-	 * @param ITagManager $tagManager
-	 */
-	public function __construct(ITagManager $tagManager) {
-		$this->tagManager = $tagManager;
-	}
+    /**
+     * @param ITagManager $tagManager
+     */
+    public function __construct(ITagManager $tagManager) {
+        $this->tagManager = $tagManager;
+    }
 
-	/**
-	 * Returns an array with the favorites
-	 *
-	 * @param string $user
-	 * @return array
-	 * @throws \RuntimeException when too many or no favorites where found
-	 */
-	public function getFavoriteFilePaths($user) {
-		$tags = $this->tagManager->load('files', [], false, $user);
-		$favorites = $tags->getFavorites();
+    /**
+     * Returns an array with the favorites
+     *
+     * @param string $user
+     * @return array
+     * @throws \RuntimeException when too many or no favorites where found
+     */
+    public function getFavoriteFilePaths($user) {
+        $tags = $this->tagManager->load('files', [], false, $user);
+        $favorites = $tags->getFavorites();
 
-		if (empty($favorites)) {
-			throw new \RuntimeException('No favorites', 1);
-		} elseif (isset($favorites[self::FAVORITE_LIMIT])) {
-			throw new \RuntimeException('Too many favorites', 2);
-		}
+        if (empty($favorites)) {
+            throw new \RuntimeException('No favorites', 1);
+        } elseif (isset($favorites[self::FAVORITE_LIMIT])) {
+            throw new \RuntimeException('Too many favorites', 2);
+        }
 
-		// Can not DI because the user is not known on instantiation
-		$rootFolder = \OC::$server->getUserFolder($user);
-		$folders = $items = [];
-		foreach ($favorites as $favorite) {
-			$nodes = $rootFolder->getById($favorite);
-			if (!empty($nodes)) {
-				/** @var \OCP\Files\Node $node */
-				$node = array_shift($nodes);
-				$path = substr($node->getPath(), strlen($user . '/files/'));
+        // Can not DI because the user is not known on instantiation
+        $rootFolder = \OC::$server->getUserFolder($user);
+        $folders = $items = [];
+        foreach ($favorites as $favorite) {
+            $nodes = $rootFolder->getById($favorite);
+            if (!empty($nodes)) {
+                /** @var \OCP\Files\Node $node */
+                $node = array_shift($nodes);
+                $path = substr($node->getPath(), strlen($user . '/files/'));
 
-				$items[] = $path;
-				if ($node instanceof Folder) {
-					$folders[] = $path;
-				}
-			}
-		}
+                $items[] = $path;
+                if ($node instanceof Folder) {
+                    $folders[] = $path;
+                }
+            }
+        }
 
-		if (empty($items)) {
-			throw new \RuntimeException('No favorites', 1);
-		}
+        if (empty($items)) {
+            throw new \RuntimeException('No favorites', 1);
+        }
 
-		return [
-			'items' => $items,
-			'folders' => $folders,
-		];
-	}
+        return [
+            'items' => $items,
+            'folders' => $folders,
+        ];
+    }
 }

apps/files/lib/BackgroundJob/DeleteOrphanedItems.php

Spacing +3 added lines, -3 removed lines

@@ -80,12 +80,12 @@
 		$deletedEntries = 0;
 
 		$query = $this->connection->getQueryBuilder();
-		$query->select('t1.' . $idCol)
+		$query->select('t1.'.$idCol)
 			->from($table, 't1')
 			->where($query->expr()->eq($typeCol, $query->expr()->literal('files')))
 			->andWhere($query->expr()->isNull('t2.fileid'))
-			->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.' . $idCol, IQueryBuilder::PARAM_INT), 't2.fileid'))
-			->groupBy('t1.' . $idCol)
+			->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.'.$idCol, IQueryBuilder::PARAM_INT), 't2.fileid'))
+			->groupBy('t1.'.$idCol)
 			->setMaxResults(self::CHUNK_SIZE);
 
 		$deleteQuery = $this->connection->getQueryBuilder();

Indentation +118 added lines, -118 removed lines

@@ -31,122 +31,122 @@
  * Delete all share entries that have no matching entries in the file cache table.
  */
 class DeleteOrphanedItems extends TimedJob {
-	public const CHUNK_SIZE = 200;
-
-	/** @var \OCP\IDBConnection */
-	protected $connection;
-
-	/** @var \OCP\ILogger */
-	protected $logger;
-
-	/**
-	 * Default interval in minutes
-	 *
-	 * @var int $defaultIntervalMin
-	 **/
-	protected $defaultIntervalMin = 60;
-
-	/**
-	 * sets the correct interval for this timed job
-	 */
-	public function __construct() {
-		$this->interval = $this->defaultIntervalMin * 60;
-		$this->connection = \OC::$server->getDatabaseConnection();
-		$this->logger = \OC::$server->getLogger();
-	}
-
-	/**
-	 * Makes the background job do its work
-	 *
-	 * @param array $argument unused argument
-	 */
-	public function run($argument) {
-		$this->cleanSystemTags();
-		$this->cleanUserTags();
-		$this->cleanComments();
-		$this->cleanCommentMarkers();
-	}
-
-	/**
-	 * Deleting orphaned system tag mappings
-	 *
-	 * @param string $table
-	 * @param string $idCol
-	 * @param string $typeCol
-	 * @return int Number of deleted entries
-	 */
-	protected function cleanUp($table, $idCol, $typeCol) {
-		$deletedEntries = 0;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('t1.' . $idCol)
-			->from($table, 't1')
-			->where($query->expr()->eq($typeCol, $query->expr()->literal('files')))
-			->andWhere($query->expr()->isNull('t2.fileid'))
-			->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.' . $idCol, IQueryBuilder::PARAM_INT), 't2.fileid'))
-			->groupBy('t1.' . $idCol)
-			->setMaxResults(self::CHUNK_SIZE);
-
-		$deleteQuery = $this->connection->getQueryBuilder();
-		$deleteQuery->delete($table)
-			->where($deleteQuery->expr()->eq($idCol, $deleteQuery->createParameter('objectid')));
-
-		$deletedInLastChunk = self::CHUNK_SIZE;
-		while ($deletedInLastChunk === self::CHUNK_SIZE) {
-			$result = $query->execute();
-			$deletedInLastChunk = 0;
-			while ($row = $result->fetch()) {
-				$deletedInLastChunk++;
-				$deletedEntries += $deleteQuery->setParameter('objectid', (int) $row[$idCol])
-					->execute();
-			}
-			$result->closeCursor();
-		}
-
-		return $deletedEntries;
-	}
-
-	/**
-	 * Deleting orphaned system tag mappings
-	 *
-	 * @return int Number of deleted entries
-	 */
-	protected function cleanSystemTags() {
-		$deletedEntries = $this->cleanUp('systemtag_object_mapping', 'objectid', 'objecttype');
-		$this->logger->debug("$deletedEntries orphaned system tag relations deleted", ['app' => 'DeleteOrphanedItems']);
-		return $deletedEntries;
-	}
-
-	/**
-	 * Deleting orphaned user tag mappings
-	 *
-	 * @return int Number of deleted entries
-	 */
-	protected function cleanUserTags() {
-		$deletedEntries = $this->cleanUp('vcategory_to_object', 'objid', 'type');
-		$this->logger->debug("$deletedEntries orphaned user tag relations deleted", ['app' => 'DeleteOrphanedItems']);
-		return $deletedEntries;
-	}
-
-	/**
-	 * Deleting orphaned comments
-	 *
-	 * @return int Number of deleted entries
-	 */
-	protected function cleanComments() {
-		$deletedEntries = $this->cleanUp('comments', 'object_id', 'object_type');
-		$this->logger->debug("$deletedEntries orphaned comments deleted", ['app' => 'DeleteOrphanedItems']);
-		return $deletedEntries;
-	}
-
-	/**
-	 * Deleting orphaned comment read markers
-	 *
-	 * @return int Number of deleted entries
-	 */
-	protected function cleanCommentMarkers() {
-		$deletedEntries = $this->cleanUp('comments_read_markers', 'object_id', 'object_type');
-		$this->logger->debug("$deletedEntries orphaned comment read marks deleted", ['app' => 'DeleteOrphanedItems']);
-		return $deletedEntries;
-	}
+    public const CHUNK_SIZE = 200;
+
+    /** @var \OCP\IDBConnection */
+    protected $connection;
+
+    /** @var \OCP\ILogger */
+    protected $logger;
+
+    /**
+     * Default interval in minutes
+     *
+     * @var int $defaultIntervalMin
+     **/
+    protected $defaultIntervalMin = 60;
+
+    /**
+     * sets the correct interval for this timed job
+     */
+    public function __construct() {
+        $this->interval = $this->defaultIntervalMin * 60;
+        $this->connection = \OC::$server->getDatabaseConnection();
+        $this->logger = \OC::$server->getLogger();
+    }
+
+    /**
+     * Makes the background job do its work
+     *
+     * @param array $argument unused argument
+     */
+    public function run($argument) {
+        $this->cleanSystemTags();
+        $this->cleanUserTags();
+        $this->cleanComments();
+        $this->cleanCommentMarkers();
+    }
+
+    /**
+     * Deleting orphaned system tag mappings
+     *
+     * @param string $table
+     * @param string $idCol
+     * @param string $typeCol
+     * @return int Number of deleted entries
+     */
+    protected function cleanUp($table, $idCol, $typeCol) {
+        $deletedEntries = 0;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('t1.' . $idCol)
+            ->from($table, 't1')
+            ->where($query->expr()->eq($typeCol, $query->expr()->literal('files')))
+            ->andWhere($query->expr()->isNull('t2.fileid'))
+            ->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.' . $idCol, IQueryBuilder::PARAM_INT), 't2.fileid'))
+            ->groupBy('t1.' . $idCol)
+            ->setMaxResults(self::CHUNK_SIZE);
+
+        $deleteQuery = $this->connection->getQueryBuilder();
+        $deleteQuery->delete($table)
+            ->where($deleteQuery->expr()->eq($idCol, $deleteQuery->createParameter('objectid')));
+
+        $deletedInLastChunk = self::CHUNK_SIZE;
+        while ($deletedInLastChunk === self::CHUNK_SIZE) {
+            $result = $query->execute();
+            $deletedInLastChunk = 0;
+            while ($row = $result->fetch()) {
+                $deletedInLastChunk++;
+                $deletedEntries += $deleteQuery->setParameter('objectid', (int) $row[$idCol])
+                    ->execute();
+            }
+            $result->closeCursor();
+        }
+
+        return $deletedEntries;
+    }
+
+    /**
+     * Deleting orphaned system tag mappings
+     *
+     * @return int Number of deleted entries
+     */
+    protected function cleanSystemTags() {
+        $deletedEntries = $this->cleanUp('systemtag_object_mapping', 'objectid', 'objecttype');
+        $this->logger->debug("$deletedEntries orphaned system tag relations deleted", ['app' => 'DeleteOrphanedItems']);
+        return $deletedEntries;
+    }
+
+    /**
+     * Deleting orphaned user tag mappings
+     *
+     * @return int Number of deleted entries
+     */
+    protected function cleanUserTags() {
+        $deletedEntries = $this->cleanUp('vcategory_to_object', 'objid', 'type');
+        $this->logger->debug("$deletedEntries orphaned user tag relations deleted", ['app' => 'DeleteOrphanedItems']);
+        return $deletedEntries;
+    }
+
+    /**
+     * Deleting orphaned comments
+     *
+     * @return int Number of deleted entries
+     */
+    protected function cleanComments() {
+        $deletedEntries = $this->cleanUp('comments', 'object_id', 'object_type');
+        $this->logger->debug("$deletedEntries orphaned comments deleted", ['app' => 'DeleteOrphanedItems']);
+        return $deletedEntries;
+    }
+
+    /**
+     * Deleting orphaned comment read markers
+     *
+     * @return int Number of deleted entries
+     */
+    protected function cleanCommentMarkers() {
+        $deletedEntries = $this->cleanUp('comments_read_markers', 'object_id', 'object_type');
+        $this->logger->debug("$deletedEntries orphaned comment read marks deleted", ['app' => 'DeleteOrphanedItems']);
+        return $deletedEntries;
+    }
 }

apps/user_ldap/appinfo/routes.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 $application->registerRoutes($this, [
 	'ocs' => [
 		['name' => 'ConfigAPI#create', 'url' => '/api/v1/config', 'verb' => 'POST'],
-		['name' => 'ConfigAPI#show',   'url' => '/api/v1/config/{configID}', 'verb' => 'GET'],
+		['name' => 'ConfigAPI#show', 'url' => '/api/v1/config/{configID}', 'verb' => 'GET'],
 		['name' => 'ConfigAPI#modify', 'url' => '/api/v1/config/{configID}', 'verb' => 'PUT'],
 		['name' => 'ConfigAPI#delete', 'url' => '/api/v1/config/{configID}', 'verb' => 'DELETE'],
 	]

Indentation +19 added lines, -19 removed lines

@@ -27,37 +27,37 @@
  *
  */
 $this->create('user_ldap_ajax_clearMappings', 'apps/user_ldap/ajax/clearMappings.php')
-	->actionInclude('user_ldap/ajax/clearMappings.php');
+    ->actionInclude('user_ldap/ajax/clearMappings.php');
 $this->create('user_ldap_ajax_deleteConfiguration', 'apps/user_ldap/ajax/deleteConfiguration.php')
-	->actionInclude('user_ldap/ajax/deleteConfiguration.php');
+    ->actionInclude('user_ldap/ajax/deleteConfiguration.php');
 $this->create('user_ldap_ajax_getConfiguration', 'apps/user_ldap/ajax/getConfiguration.php')
-	->actionInclude('user_ldap/ajax/getConfiguration.php');
+    ->actionInclude('user_ldap/ajax/getConfiguration.php');
 $this->create('user_ldap_ajax_getNewServerConfigPrefix', 'apps/user_ldap/ajax/getNewServerConfigPrefix.php')
-	->actionInclude('user_ldap/ajax/getNewServerConfigPrefix.php');
+    ->actionInclude('user_ldap/ajax/getNewServerConfigPrefix.php');
 $this->create('user_ldap_ajax_setConfiguration', 'apps/user_ldap/ajax/setConfiguration.php')
-	->actionInclude('user_ldap/ajax/setConfiguration.php');
+    ->actionInclude('user_ldap/ajax/setConfiguration.php');
 $this->create('user_ldap_ajax_testConfiguration', 'apps/user_ldap/ajax/testConfiguration.php')
-	->actionInclude('user_ldap/ajax/testConfiguration.php');
+    ->actionInclude('user_ldap/ajax/testConfiguration.php');
 $this->create('user_ldap_ajax_wizard', 'apps/user_ldap/ajax/wizard.php')
-	->actionInclude('user_ldap/ajax/wizard.php');
+    ->actionInclude('user_ldap/ajax/wizard.php');
 
 $application = new \OCP\AppFramework\App('user_ldap');
 $application->registerRoutes($this, [
-	'ocs' => [
-		['name' => 'ConfigAPI#create', 'url' => '/api/v1/config', 'verb' => 'POST'],
-		['name' => 'ConfigAPI#show',   'url' => '/api/v1/config/{configID}', 'verb' => 'GET'],
-		['name' => 'ConfigAPI#modify', 'url' => '/api/v1/config/{configID}', 'verb' => 'PUT'],
-		['name' => 'ConfigAPI#delete', 'url' => '/api/v1/config/{configID}', 'verb' => 'DELETE'],
-	]
+    'ocs' => [
+        ['name' => 'ConfigAPI#create', 'url' => '/api/v1/config', 'verb' => 'POST'],
+        ['name' => 'ConfigAPI#show',   'url' => '/api/v1/config/{configID}', 'verb' => 'GET'],
+        ['name' => 'ConfigAPI#modify', 'url' => '/api/v1/config/{configID}', 'verb' => 'PUT'],
+        ['name' => 'ConfigAPI#delete', 'url' => '/api/v1/config/{configID}', 'verb' => 'DELETE'],
+    ]
 ]);
 
 /** @var \OCA\User_LDAP\AppInfo\Application $application */
 $application = \OC::$server->query(\OCA\User_LDAP\AppInfo\Application::class);
 $application->registerRoutes($this, [
-	'routes' => [
-		['name' => 'renewPassword#tryRenewPassword', 'url' => '/renewpassword', 'verb' => 'POST'],
-		['name' => 'renewPassword#showRenewPasswordForm', 'url' => '/renewpassword/{user}', 'verb' => 'GET'],
-		['name' => 'renewPassword#cancel', 'url' => '/renewpassword/cancel', 'verb' => 'GET'],
-		['name' => 'renewPassword#showLoginFormInvalidPassword', 'url' => '/renewpassword/invalidlogin/{user}', 'verb' => 'GET'],
-	]
+    'routes' => [
+        ['name' => 'renewPassword#tryRenewPassword', 'url' => '/renewpassword', 'verb' => 'POST'],
+        ['name' => 'renewPassword#showRenewPasswordForm', 'url' => '/renewpassword/{user}', 'verb' => 'GET'],
+        ['name' => 'renewPassword#cancel', 'url' => '/renewpassword/cancel', 'verb' => 'GET'],
+        ['name' => 'renewPassword#showLoginFormInvalidPassword', 'url' => '/renewpassword/invalidlogin/{user}', 'verb' => 'GET'],
+    ]
 ]);

apps/files_external/ajax/applicable.php

Spacing +3 added lines, -3 removed lines

@@ -30,13 +30,13 @@
 $limit = null;
 $offset = null;
 if (isset($_GET['pattern'])) {
-	$pattern = (string)$_GET['pattern'];
+	$pattern = (string) $_GET['pattern'];
 }
 if (isset($_GET['limit'])) {
-	$limit = (int)$_GET['limit'];
+	$limit = (int) $_GET['limit'];
 }
 if (isset($_GET['offset'])) {
-	$offset = (int)$_GET['offset'];
+	$offset = (int) $_GET['offset'];
 }
 
 $groups = [];

Indentation +5 added lines, -5 removed lines

@@ -32,23 +32,23 @@
 $limit = null;
 $offset = null;
 if (isset($_GET['pattern'])) {
-	$pattern = (string)$_GET['pattern'];
+    $pattern = (string)$_GET['pattern'];
 }
 if (isset($_GET['limit'])) {
-	$limit = (int)$_GET['limit'];
+    $limit = (int)$_GET['limit'];
 }
 if (isset($_GET['offset'])) {
-	$offset = (int)$_GET['offset'];
+    $offset = (int)$_GET['offset'];
 }
 
 $groups = [];
 foreach (\OC::$server->getGroupManager()->search($pattern, $limit, $offset) as $group) {
-	$groups[$group->getGID()] = $group->getDisplayName();
+    $groups[$group->getGID()] = $group->getDisplayName();
 }
 
 $users = [];
 foreach (\OC::$server->getUserManager()->searchDisplayName($pattern, $limit, $offset) as $user) {
-	$users[$user->getUID()] = $user->getDisplayName();
+    $users[$user->getUID()] = $user->getDisplayName();
 }
 
 $results = ['groups' => $groups, 'users' => $users];

apps/files_external/lib/Service/ImportLegacyStoragesService.php

Indentation +18 added lines, -18 removed lines

@@ -24,25 +24,25 @@
 namespace OCA\Files_External\Service;
 
 class ImportLegacyStoragesService extends LegacyStoragesService {
-	private $data;
+    private $data;
 
-	/**
-	 * @param BackendService $backendService
-	 */
-	public function __construct(BackendService $backendService) {
-		$this->backendService = $backendService;
-	}
+    /**
+     * @param BackendService $backendService
+     */
+    public function __construct(BackendService $backendService) {
+        $this->backendService = $backendService;
+    }
 
-	public function setData($data) {
-		$this->data = $data;
-	}
+    public function setData($data) {
+        $this->data = $data;
+    }
 
-	/**
-	 * Read legacy config data
-	 *
-	 * @return array list of mount configs
-	 */
-	protected function readLegacyConfig() {
-		return $this->data;
-	}
+    /**
+     * Read legacy config data
+     *
+     * @return array list of mount configs
+     */
+    protected function readLegacyConfig() {
+        return $this->data;
+    }
 }

apps/files_external/lib/Service/GlobalStoragesService.php

Spacing +2 added lines, -2 removed lines

@@ -172,11 +172,11 @@
 	public function getStorageForAllUsers() {
 		$mounts = $this->dbConfig->getAllMounts();
 		$configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts);
-		$configs = array_filter($configs, function ($config) {
+		$configs = array_filter($configs, function($config) {
 			return $config instanceof StorageConfig;
 		});
 
-		$keys = array_map(function (StorageConfig $config) {
+		$keys = array_map(function(StorageConfig $config) {
 			return $config->getId();
 		}, $configs);
 

Indentation +147 added lines, -147 removed lines

@@ -36,151 +36,151 @@
  * Service class to manage global external storage
  */
 class GlobalStoragesService extends StoragesService {
-	/**
-	 * Triggers $signal for all applicable users of the given
-	 * storage
-	 *
-	 * @param StorageConfig $storage storage data
-	 * @param string $signal signal to trigger
-	 */
-	protected function triggerHooks(StorageConfig $storage, $signal) {
-		// FIXME: Use as expression in empty once PHP 5.4 support is dropped
-		$applicableUsers = $storage->getApplicableUsers();
-		$applicableGroups = $storage->getApplicableGroups();
-		if (empty($applicableUsers) && empty($applicableGroups)) {
-			// raise for user "all"
-			$this->triggerApplicableHooks(
-				$signal,
-				$storage->getMountPoint(),
-				\OCA\Files_External\MountConfig::MOUNT_TYPE_USER,
-				['all']
-			);
-			return;
-		}
-
-		$this->triggerApplicableHooks(
-			$signal,
-			$storage->getMountPoint(),
-			\OCA\Files_External\MountConfig::MOUNT_TYPE_USER,
-			$applicableUsers
-		);
-		$this->triggerApplicableHooks(
-			$signal,
-			$storage->getMountPoint(),
-			\OCA\Files_External\MountConfig::MOUNT_TYPE_GROUP,
-			$applicableGroups
-		);
-	}
-
-	/**
-	 * Triggers signal_create_mount or signal_delete_mount to
-	 * accommodate for additions/deletions in applicableUsers
-	 * and applicableGroups fields.
-	 *
-	 * @param StorageConfig $oldStorage old storage config
-	 * @param StorageConfig $newStorage new storage config
-	 */
-	protected function triggerChangeHooks(StorageConfig $oldStorage, StorageConfig $newStorage) {
-		// if mount point changed, it's like a deletion + creation
-		if ($oldStorage->getMountPoint() !== $newStorage->getMountPoint()) {
-			$this->triggerHooks($oldStorage, Filesystem::signal_delete_mount);
-			$this->triggerHooks($newStorage, Filesystem::signal_create_mount);
-			return;
-		}
-
-		$userAdditions = array_diff($newStorage->getApplicableUsers(), $oldStorage->getApplicableUsers());
-		$userDeletions = array_diff($oldStorage->getApplicableUsers(), $newStorage->getApplicableUsers());
-		$groupAdditions = array_diff($newStorage->getApplicableGroups(), $oldStorage->getApplicableGroups());
-		$groupDeletions = array_diff($oldStorage->getApplicableGroups(), $newStorage->getApplicableGroups());
-
-		// FIXME: Use as expression in empty once PHP 5.4 support is dropped
-		// if no applicable were set, raise a signal for "all"
-		$oldApplicableUsers = $oldStorage->getApplicableUsers();
-		$oldApplicableGroups = $oldStorage->getApplicableGroups();
-		if (empty($oldApplicableUsers) && empty($oldApplicableGroups)) {
-			$this->triggerApplicableHooks(
-				Filesystem::signal_delete_mount,
-				$oldStorage->getMountPoint(),
-				\OCA\Files_External\MountConfig::MOUNT_TYPE_USER,
-				['all']
-			);
-		}
-
-		// trigger delete for removed users
-		$this->triggerApplicableHooks(
-			Filesystem::signal_delete_mount,
-			$oldStorage->getMountPoint(),
-			\OCA\Files_External\MountConfig::MOUNT_TYPE_USER,
-			$userDeletions
-		);
-
-		// trigger delete for removed groups
-		$this->triggerApplicableHooks(
-			Filesystem::signal_delete_mount,
-			$oldStorage->getMountPoint(),
-			\OCA\Files_External\MountConfig::MOUNT_TYPE_GROUP,
-			$groupDeletions
-		);
-
-		// and now add the new users
-		$this->triggerApplicableHooks(
-			Filesystem::signal_create_mount,
-			$newStorage->getMountPoint(),
-			\OCA\Files_External\MountConfig::MOUNT_TYPE_USER,
-			$userAdditions
-		);
-
-		// and now add the new groups
-		$this->triggerApplicableHooks(
-			Filesystem::signal_create_mount,
-			$newStorage->getMountPoint(),
-			\OCA\Files_External\MountConfig::MOUNT_TYPE_GROUP,
-			$groupAdditions
-		);
-
-		// FIXME: Use as expression in empty once PHP 5.4 support is dropped
-		// if no applicable, raise a signal for "all"
-		$newApplicableUsers = $newStorage->getApplicableUsers();
-		$newApplicableGroups = $newStorage->getApplicableGroups();
-		if (empty($newApplicableUsers) && empty($newApplicableGroups)) {
-			$this->triggerApplicableHooks(
-				Filesystem::signal_create_mount,
-				$newStorage->getMountPoint(),
-				\OCA\Files_External\MountConfig::MOUNT_TYPE_USER,
-				['all']
-			);
-		}
-	}
-
-	/**
-	 * Get the visibility type for this controller, used in validation
-	 *
-	 * @return int BackendService::VISIBILITY_* constants
-	 */
-	public function getVisibilityType() {
-		return BackendService::VISIBILITY_ADMIN;
-	}
-
-	protected function isApplicable(StorageConfig $config) {
-		return true;
-	}
-
-	/**
-	 * Get all configured admin and personal mounts
-	 *
-	 * @return StorageConfig[] map of storage id to storage config
-	 */
-	public function getStorageForAllUsers() {
-		$mounts = $this->dbConfig->getAllMounts();
-		$configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts);
-		$configs = array_filter($configs, function ($config) {
-			return $config instanceof StorageConfig;
-		});
-
-		$keys = array_map(function (StorageConfig $config) {
-			return $config->getId();
-		}, $configs);
-
-		return array_combine($keys, $configs);
-	}
+    /**
+     * Triggers $signal for all applicable users of the given
+     * storage
+     *
+     * @param StorageConfig $storage storage data
+     * @param string $signal signal to trigger
+     */
+    protected function triggerHooks(StorageConfig $storage, $signal) {
+        // FIXME: Use as expression in empty once PHP 5.4 support is dropped
+        $applicableUsers = $storage->getApplicableUsers();
+        $applicableGroups = $storage->getApplicableGroups();
+        if (empty($applicableUsers) && empty($applicableGroups)) {
+            // raise for user "all"
+            $this->triggerApplicableHooks(
+                $signal,
+                $storage->getMountPoint(),
+                \OCA\Files_External\MountConfig::MOUNT_TYPE_USER,
+                ['all']
+            );
+            return;
+        }
+
+        $this->triggerApplicableHooks(
+            $signal,
+            $storage->getMountPoint(),
+            \OCA\Files_External\MountConfig::MOUNT_TYPE_USER,
+            $applicableUsers
+        );
+        $this->triggerApplicableHooks(
+            $signal,
+            $storage->getMountPoint(),
+            \OCA\Files_External\MountConfig::MOUNT_TYPE_GROUP,
+            $applicableGroups
+        );
+    }
+
+    /**
+     * Triggers signal_create_mount or signal_delete_mount to
+     * accommodate for additions/deletions in applicableUsers
+     * and applicableGroups fields.
+     *
+     * @param StorageConfig $oldStorage old storage config
+     * @param StorageConfig $newStorage new storage config
+     */
+    protected function triggerChangeHooks(StorageConfig $oldStorage, StorageConfig $newStorage) {
+        // if mount point changed, it's like a deletion + creation
+        if ($oldStorage->getMountPoint() !== $newStorage->getMountPoint()) {
+            $this->triggerHooks($oldStorage, Filesystem::signal_delete_mount);
+            $this->triggerHooks($newStorage, Filesystem::signal_create_mount);
+            return;
+        }
+
+        $userAdditions = array_diff($newStorage->getApplicableUsers(), $oldStorage->getApplicableUsers());
+        $userDeletions = array_diff($oldStorage->getApplicableUsers(), $newStorage->getApplicableUsers());
+        $groupAdditions = array_diff($newStorage->getApplicableGroups(), $oldStorage->getApplicableGroups());
+        $groupDeletions = array_diff($oldStorage->getApplicableGroups(), $newStorage->getApplicableGroups());
+
+        // FIXME: Use as expression in empty once PHP 5.4 support is dropped
+        // if no applicable were set, raise a signal for "all"
+        $oldApplicableUsers = $oldStorage->getApplicableUsers();
+        $oldApplicableGroups = $oldStorage->getApplicableGroups();
+        if (empty($oldApplicableUsers) && empty($oldApplicableGroups)) {
+            $this->triggerApplicableHooks(
+                Filesystem::signal_delete_mount,
+                $oldStorage->getMountPoint(),
+                \OCA\Files_External\MountConfig::MOUNT_TYPE_USER,
+                ['all']
+            );
+        }
+
+        // trigger delete for removed users
+        $this->triggerApplicableHooks(
+            Filesystem::signal_delete_mount,
+            $oldStorage->getMountPoint(),
+            \OCA\Files_External\MountConfig::MOUNT_TYPE_USER,
+            $userDeletions
+        );
+
+        // trigger delete for removed groups
+        $this->triggerApplicableHooks(
+            Filesystem::signal_delete_mount,
+            $oldStorage->getMountPoint(),
+            \OCA\Files_External\MountConfig::MOUNT_TYPE_GROUP,
+            $groupDeletions
+        );
+
+        // and now add the new users
+        $this->triggerApplicableHooks(
+            Filesystem::signal_create_mount,
+            $newStorage->getMountPoint(),
+            \OCA\Files_External\MountConfig::MOUNT_TYPE_USER,
+            $userAdditions
+        );
+
+        // and now add the new groups
+        $this->triggerApplicableHooks(
+            Filesystem::signal_create_mount,
+            $newStorage->getMountPoint(),
+            \OCA\Files_External\MountConfig::MOUNT_TYPE_GROUP,
+            $groupAdditions
+        );
+
+        // FIXME: Use as expression in empty once PHP 5.4 support is dropped
+        // if no applicable, raise a signal for "all"
+        $newApplicableUsers = $newStorage->getApplicableUsers();
+        $newApplicableGroups = $newStorage->getApplicableGroups();
+        if (empty($newApplicableUsers) && empty($newApplicableGroups)) {
+            $this->triggerApplicableHooks(
+                Filesystem::signal_create_mount,
+                $newStorage->getMountPoint(),
+                \OCA\Files_External\MountConfig::MOUNT_TYPE_USER,
+                ['all']
+            );
+        }
+    }
+
+    /**
+     * Get the visibility type for this controller, used in validation
+     *
+     * @return int BackendService::VISIBILITY_* constants
+     */
+    public function getVisibilityType() {
+        return BackendService::VISIBILITY_ADMIN;
+    }
+
+    protected function isApplicable(StorageConfig $config) {
+        return true;
+    }
+
+    /**
+     * Get all configured admin and personal mounts
+     *
+     * @return StorageConfig[] map of storage id to storage config
+     */
+    public function getStorageForAllUsers() {
+        $mounts = $this->dbConfig->getAllMounts();
+        $configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts);
+        $configs = array_filter($configs, function ($config) {
+            return $config instanceof StorageConfig;
+        });
+
+        $keys = array_map(function (StorageConfig $config) {
+            return $config->getId();
+        }, $configs);
+
+        return array_combine($keys, $configs);
+    }
 }

apps/files_external/lib/Command/Applicable.php

Spacing +3 added lines, -3 removed lines

@@ -103,7 +103,7 @@ 
 		try {
 			$mount = $this->globalService->getStorage($mountId);
 		} catch (NotFoundException $e) {
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts</error>');
+			$output->writeln('<error>Mount with id "'.$mountId.' not found, check "occ files_external:list" to get available mounts</error>');
 			return 404;
 		}
 
@@ -123,13 +123,13 @@ 
 		if ((count($addUsers) + count($removeUsers) + count($addGroups) + count($removeGroups) > 0) || $input->getOption('remove-all')) {
 			foreach ($addUsers as $addUser) {
 				if (!$this->userManager->userExists($addUser)) {
-					$output->writeln('<error>User "' . $addUser . '" not found</error>');
+					$output->writeln('<error>User "'.$addUser.'" not found</error>');
 					return 404;
 				}
 			}
 			foreach ($addGroups as $addGroup) {
 				if (!$this->groupManager->groupExists($addGroup)) {
-					$output->writeln('<error>Group "' . $addGroup . '" not found</error>');
+					$output->writeln('<error>Group "'.$addGroup.'" not found</error>');
 					return 404;
 				}
 			}

Indentation +99 added lines, -99 removed lines

@@ -36,112 +36,112 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Applicable extends Base {
-	protected GlobalStoragesService $globalService;
-	private IUserManager $userManager;
-	private IGroupManager $groupManager;
+    protected GlobalStoragesService $globalService;
+    private IUserManager $userManager;
+    private IGroupManager $groupManager;
 
-	public function __construct(
-		GlobalStoragesService $globalService,
-		IUserManager $userManager,
-		IGroupManager $groupManager
-	) {
-		parent::__construct();
-		$this->globalService = $globalService;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-	}
+    public function __construct(
+        GlobalStoragesService $globalService,
+        IUserManager $userManager,
+        IGroupManager $groupManager
+    ) {
+        parent::__construct();
+        $this->globalService = $globalService;
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+    }
 
-	protected function configure(): void {
-		$this
-			->setName('files_external:applicable')
-			->setDescription('Manage applicable users and groups for a mount')
-			->addArgument(
-				'mount_id',
-				InputArgument::REQUIRED,
-				'The id of the mount to edit'
-			)->addOption(
-				'add-user',
-				'',
-				InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
-				'user to add as applicable'
-			)->addOption(
-				'remove-user',
-				'',
-				InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
-				'user to remove as applicable'
-			)->addOption(
-				'add-group',
-				'',
-				InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
-				'group to add as applicable'
-			)->addOption(
-				'remove-group',
-				'',
-				InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
-				'group to remove as applicable'
-			)->addOption(
-				'remove-all',
-				'',
-				InputOption::VALUE_NONE,
-				'Set the mount to be globally applicable'
-			);
-		parent::configure();
-	}
+    protected function configure(): void {
+        $this
+            ->setName('files_external:applicable')
+            ->setDescription('Manage applicable users and groups for a mount')
+            ->addArgument(
+                'mount_id',
+                InputArgument::REQUIRED,
+                'The id of the mount to edit'
+            )->addOption(
+                'add-user',
+                '',
+                InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
+                'user to add as applicable'
+            )->addOption(
+                'remove-user',
+                '',
+                InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
+                'user to remove as applicable'
+            )->addOption(
+                'add-group',
+                '',
+                InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
+                'group to add as applicable'
+            )->addOption(
+                'remove-group',
+                '',
+                InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
+                'group to remove as applicable'
+            )->addOption(
+                'remove-all',
+                '',
+                InputOption::VALUE_NONE,
+                'Set the mount to be globally applicable'
+            );
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$mountId = $input->getArgument('mount_id');
-		try {
-			$mount = $this->globalService->getStorage($mountId);
-		} catch (NotFoundException $e) {
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts</error>');
-			return 404;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $mountId = $input->getArgument('mount_id');
+        try {
+            $mount = $this->globalService->getStorage($mountId);
+        } catch (NotFoundException $e) {
+            $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts</error>');
+            return 404;
+        }
 
-		if ($mount->getType() === StorageConfig::MOUNT_TYPE_PERSONAl) {
-			$output->writeln('<error>Can\'t change applicables on personal mounts</error>');
-			return 1;
-		}
+        if ($mount->getType() === StorageConfig::MOUNT_TYPE_PERSONAl) {
+            $output->writeln('<error>Can\'t change applicables on personal mounts</error>');
+            return 1;
+        }
 
-		$addUsers = $input->getOption('add-user');
-		$removeUsers = $input->getOption('remove-user');
-		$addGroups = $input->getOption('add-group');
-		$removeGroups = $input->getOption('remove-group');
+        $addUsers = $input->getOption('add-user');
+        $removeUsers = $input->getOption('remove-user');
+        $addGroups = $input->getOption('add-group');
+        $removeGroups = $input->getOption('remove-group');
 
-		$applicableUsers = $mount->getApplicableUsers();
-		$applicableGroups = $mount->getApplicableGroups();
+        $applicableUsers = $mount->getApplicableUsers();
+        $applicableGroups = $mount->getApplicableGroups();
 
-		if ((count($addUsers) + count($removeUsers) + count($addGroups) + count($removeGroups) > 0) || $input->getOption('remove-all')) {
-			foreach ($addUsers as $addUser) {
-				if (!$this->userManager->userExists($addUser)) {
-					$output->writeln('<error>User "' . $addUser . '" not found</error>');
-					return 404;
-				}
-			}
-			foreach ($addGroups as $addGroup) {
-				if (!$this->groupManager->groupExists($addGroup)) {
-					$output->writeln('<error>Group "' . $addGroup . '" not found</error>');
-					return 404;
-				}
-			}
+        if ((count($addUsers) + count($removeUsers) + count($addGroups) + count($removeGroups) > 0) || $input->getOption('remove-all')) {
+            foreach ($addUsers as $addUser) {
+                if (!$this->userManager->userExists($addUser)) {
+                    $output->writeln('<error>User "' . $addUser . '" not found</error>');
+                    return 404;
+                }
+            }
+            foreach ($addGroups as $addGroup) {
+                if (!$this->groupManager->groupExists($addGroup)) {
+                    $output->writeln('<error>Group "' . $addGroup . '" not found</error>');
+                    return 404;
+                }
+            }
 
-			if ($input->getOption('remove-all')) {
-				$applicableUsers = [];
-				$applicableGroups = [];
-			} else {
-				$applicableUsers = array_unique(array_merge($applicableUsers, $addUsers));
-				$applicableUsers = array_values(array_diff($applicableUsers, $removeUsers));
-				$applicableGroups = array_unique(array_merge($applicableGroups, $addGroups));
-				$applicableGroups = array_values(array_diff($applicableGroups, $removeGroups));
-			}
-			$mount->setApplicableUsers($applicableUsers);
-			$mount->setApplicableGroups($applicableGroups);
-			$this->globalService->updateStorage($mount);
-		}
+            if ($input->getOption('remove-all')) {
+                $applicableUsers = [];
+                $applicableGroups = [];
+            } else {
+                $applicableUsers = array_unique(array_merge($applicableUsers, $addUsers));
+                $applicableUsers = array_values(array_diff($applicableUsers, $removeUsers));
+                $applicableGroups = array_unique(array_merge($applicableGroups, $addGroups));
+                $applicableGroups = array_values(array_diff($applicableGroups, $removeGroups));
+            }
+            $mount->setApplicableUsers($applicableUsers);
+            $mount->setApplicableGroups($applicableGroups);
+            $this->globalService->updateStorage($mount);
+        }
 
-		$this->writeArrayInOutputFormat($input, $output, [
-			'users' => $applicableUsers,
-			'groups' => $applicableGroups
-		]);
-		return 0;
-	}
+        $this->writeArrayInOutputFormat($input, $output, [
+            'users' => $applicableUsers,
+            'groups' => $applicableGroups
+        ]);
+        return 0;
+    }
 }

apps/files_external/lib/Command/Config.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 		try {
 			$mount = $this->globalService->getStorage($mountId);
 		} catch (NotFoundException $e) {
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
+			$output->writeln('<error>Mount with id "'.$mountId.' not found, check "occ files_external:list" to get available mounts"</error>');
 			return 404;
 		}
 

Indentation +75 added lines, -75 removed lines

@@ -33,85 +33,85 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Config extends Base {
-	protected GlobalStoragesService $globalService;
+    protected GlobalStoragesService $globalService;
 
-	public function __construct(GlobalStoragesService $globalService) {
-		parent::__construct();
-		$this->globalService = $globalService;
-	}
+    public function __construct(GlobalStoragesService $globalService) {
+        parent::__construct();
+        $this->globalService = $globalService;
+    }
 
-	protected function configure(): void {
-		$this
-			->setName('files_external:config')
-			->setDescription('Manage backend configuration for a mount')
-			->addArgument(
-				'mount_id',
-				InputArgument::REQUIRED,
-				'The id of the mount to edit'
-			)->addArgument(
-				'key',
-				InputArgument::REQUIRED,
-				'key of the config option to set/get'
-			)->addArgument(
-				'value',
-				InputArgument::OPTIONAL,
-				'value to set the config option to, when no value is provided the existing value will be printed'
-			);
-		parent::configure();
-	}
+    protected function configure(): void {
+        $this
+            ->setName('files_external:config')
+            ->setDescription('Manage backend configuration for a mount')
+            ->addArgument(
+                'mount_id',
+                InputArgument::REQUIRED,
+                'The id of the mount to edit'
+            )->addArgument(
+                'key',
+                InputArgument::REQUIRED,
+                'key of the config option to set/get'
+            )->addArgument(
+                'value',
+                InputArgument::OPTIONAL,
+                'value to set the config option to, when no value is provided the existing value will be printed'
+            );
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$mountId = $input->getArgument('mount_id');
-		$key = $input->getArgument('key');
-		try {
-			$mount = $this->globalService->getStorage($mountId);
-		} catch (NotFoundException $e) {
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
-			return 404;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $mountId = $input->getArgument('mount_id');
+        $key = $input->getArgument('key');
+        try {
+            $mount = $this->globalService->getStorage($mountId);
+        } catch (NotFoundException $e) {
+            $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
+            return 404;
+        }
 
-		$value = $input->getArgument('value');
-		if ($value !== null) {
-			$this->setOption($mount, $key, $value, $output);
-		} else {
-			$this->getOption($mount, $key, $output);
-		}
-		return 0;
-	}
+        $value = $input->getArgument('value');
+        if ($value !== null) {
+            $this->setOption($mount, $key, $value, $output);
+        } else {
+            $this->getOption($mount, $key, $output);
+        }
+        return 0;
+    }
 
-	/**
-	 * @param StorageConfig $mount
-	 * @param string $key
-	 * @param OutputInterface $output
-	 */
-	protected function getOption(StorageConfig $mount, $key, OutputInterface $output) {
-		if ($key === 'mountpoint' || $key === 'mount_point') {
-			$value = $mount->getMountPoint();
-		} else {
-			$value = $mount->getBackendOption($key);
-		}
-		if (!is_string($value) && json_decode(json_encode($value)) === $value) { // show bools and objects correctly
-			$value = json_encode($value);
-		}
-		$output->writeln($value);
-	}
+    /**
+     * @param StorageConfig $mount
+     * @param string $key
+     * @param OutputInterface $output
+     */
+    protected function getOption(StorageConfig $mount, $key, OutputInterface $output) {
+        if ($key === 'mountpoint' || $key === 'mount_point') {
+            $value = $mount->getMountPoint();
+        } else {
+            $value = $mount->getBackendOption($key);
+        }
+        if (!is_string($value) && json_decode(json_encode($value)) === $value) { // show bools and objects correctly
+            $value = json_encode($value);
+        }
+        $output->writeln($value);
+    }
 
-	/**
-	 * @param StorageConfig $mount
-	 * @param string $key
-	 * @param string $value
-	 * @param OutputInterface $output
-	 */
-	protected function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) {
-		$decoded = json_decode($value, true);
-		if (!is_null($decoded) && json_encode($decoded) === $value) {
-			$value = $decoded;
-		}
-		if ($key === 'mountpoint' || $key === 'mount_point') {
-			$mount->setMountPoint($value);
-		} else {
-			$mount->setBackendOption($key, $value);
-		}
-		$this->globalService->updateStorage($mount);
-	}
+    /**
+     * @param StorageConfig $mount
+     * @param string $key
+     * @param string $value
+     * @param OutputInterface $output
+     */
+    protected function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) {
+        $decoded = json_decode($value, true);
+        if (!is_null($decoded) && json_encode($decoded) === $value) {
+            $value = $decoded;
+        }
+        if ($key === 'mountpoint' || $key === 'mount_point') {
+            $mount->setMountPoint($value);
+        } else {
+            $mount->setBackendOption($key, $value);
+        }
+        $this->globalService->updateStorage($mount);
+    }
 }